chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.NET Format Style Fixes

Browse Source
This commit is contained in:
refringe
2025-06-18 17:09:20 +00:00
committed by Format Bot
parent ca0a7d6345
commit 6e01428b2b
774 changed files with 23507 additions and 40003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Controllers/TradeController.cs
+72 -36
View File
@@ -50,7 +50,8 @@ public class TradeController(
public ItemEventRouterResponse ConfirmTrading(
PmcData pmcData,
ProcessBaseTradeRequestData request,
string sessionID)
string sessionID
)
{
var output = _eventOutputHolder.GetOutput(sessionID);
@@ -58,7 +59,7 @@ public class TradeController(
if (request.Type == "buy_from_trader")
{
var foundInRaid = _traderConfig.PurchasesAreFoundInRaid;
var buyData = (ProcessBuyTradeRequestData) request;
var buyData = (ProcessBuyTradeRequestData)request;
_tradeHelper.BuyItem(pmcData, buyData, sessionID, foundInRaid, output);
return output;
@@ -67,7 +68,7 @@ public class TradeController(
// Selling
if (request.Type == "sell_to_trader")
{
var sellData = (ProcessSellTradeRequestData) request;
var sellData = (ProcessSellTradeRequestData)request;
_tradeHelper.SellItem(pmcData, pmcData, sellData, sessionID, output);
return output;
@@ -76,7 +77,11 @@ public class TradeController(
var errorMessage = $"Unhandled trade event: {request.Type}";
_logger.Error(errorMessage);
return _httpResponseUtil.AppendErrorToOutput(output, errorMessage, BackendErrorCodes.RagfairUnavailable);
return _httpResponseUtil.AppendErrorToOutput(
output,
errorMessage,
BackendErrorCodes.RagfairUnavailable
);
}
/// <summary>
@@ -89,7 +94,8 @@ public class TradeController(
public ItemEventRouterResponse ConfirmRagfairTrading(
PmcData pmcData,
ProcessRagfairTradeRequestData request,
string sessionID)
string sessionID
)
{
var output = _eventOutputHolder.GetOutput(sessionID);
@@ -111,7 +117,11 @@ public class TradeController(
"ragfair-unable_to_purchase_0_count_item",
_itemHelper.GetItem(fleaOffer.Items[0].Template).Value.Name
);
return _httpResponseUtil.AppendErrorToOutput(output, errorMessage, BackendErrorCodes.OfferOutOfStock);
return _httpResponseUtil.AppendErrorToOutput(
output,
errorMessage,
BackendErrorCodes.OfferOutOfStock
);
}
if (_ragfairOfferHelper.OfferIsFromTrader(fleaOffer))
@@ -146,18 +156,24 @@ public class TradeController(
PmcData pmcData,
RagfairOffer fleaOffer,
OfferRequest requestOffer,
ItemEventRouterResponse output)
ItemEventRouterResponse output
)
{
// Skip buying items when player doesn't have needed loyalty
if (PlayerLacksTraderLoyaltyLevelToBuyOffer(fleaOffer, pmcData))
{
var errorMessage = $"Unable to buy item: {fleaOffer.Items[0].Template} from trader: {fleaOffer.User.Id} as loyalty level too low, skipping";
var errorMessage =
$"Unable to buy item: {fleaOffer.Items[0].Template} from trader: {fleaOffer.User.Id} as loyalty level too low, skipping";
if (_logger.IsLogEnabled(LogLevel.Debug))
{
_logger.Debug(errorMessage);
}
_httpResponseUtil.AppendErrorToOutput(output, errorMessage, BackendErrorCodes.RagfairUnavailable);
_httpResponseUtil.AppendErrorToOutput(
output,
errorMessage,
BackendErrorCodes.RagfairUnavailable
);
return;
}
@@ -171,9 +187,15 @@ public class TradeController(
ItemId = fleaOffer.Root,
Count = requestOffer.Count,
SchemeId = 0,
SchemeItems = requestOffer.Items
SchemeItems = requestOffer.Items,
};
_tradeHelper.BuyItem(pmcData, buyData, sessionId, _traderConfig.PurchasesAreFoundInRaid, output);
_tradeHelper.BuyItem(
pmcData,
buyData,
sessionId,
_traderConfig.PurchasesAreFoundInRaid,
output
);
// Remove/lower offer quantity of item purchased from trader flea offer
_ragfairServer.ReduceOfferQuantity(fleaOffer.Id, requestOffer.Count ?? 0);
@@ -192,7 +214,8 @@ public class TradeController(
PmcData pmcData,
RagfairOffer fleaOffer,
OfferRequest requestOffer,
ItemEventRouterResponse output)
ItemEventRouterResponse output
)
{
var buyData = new ProcessBuyTradeRequestData
{
@@ -202,11 +225,17 @@ public class TradeController(
ItemId = fleaOffer.Id, // Store ragfair offerId in buyRequestData.item_id
Count = requestOffer.Count,
SchemeId = 0,
SchemeItems = requestOffer.Items
SchemeItems = requestOffer.Items,
};
// buyItem() must occur prior to removing the offer stack, otherwise item inside offer doesn't exist for confirmTrading() to use
_tradeHelper.BuyItem(pmcData, buyData, sessionId, _ragfairConfig.Dynamic.PurchasesAreFoundInRaid, output);
_tradeHelper.BuyItem(
pmcData,
buyData,
sessionId,
_ragfairConfig.Dynamic.PurchasesAreFoundInRaid,
output
);
if (output.Warnings?.Count > 0)
{
return;
@@ -234,9 +263,7 @@ public class TradeController(
/// <param name="offerId">id of the offer</param>
/// <param name="offerOwnerId">Owner id</param>
/// <returns>true if offer was made by a player</returns>
protected bool IsPlayerOffer(
string offerId,
string? offerOwnerId)
protected bool IsPlayerOffer(string offerId, string? offerOwnerId)
{
// No ownerId, not player offer
if (offerOwnerId is null)
@@ -246,7 +273,7 @@ public class TradeController(
var offerCreatorProfile = _profileHelper.GetPmcProfile(offerOwnerId);
if (offerCreatorProfile is null || offerCreatorProfile.RagfairInfo.Offers?.Count == 0)
// No profile or no offers
// No profile or no offers
{
return false;
}
@@ -261,9 +288,7 @@ public class TradeController(
/// <param name="fleaOffer">Flea offer being bought</param>
/// <param name="pmcData">Player profile</param>
/// <returns>True if player can buy offer</returns>
protected bool PlayerLacksTraderLoyaltyLevelToBuyOffer(
RagfairOffer fleaOffer,
PmcData pmcData)
protected bool PlayerLacksTraderLoyaltyLevelToBuyOffer(RagfairOffer fleaOffer, PmcData pmcData)
{
return fleaOffer.LoyaltyLevel > pmcData.TradersInfo[fleaOffer.User.Id].LoyaltyLevel;
}
@@ -278,11 +303,12 @@ public class TradeController(
public ItemEventRouterResponse SellScavItemsToFence(
PmcData pmcData,
SellScavItemsToFenceRequestData request,
string sessionId)
string sessionId
)
{
var output = _eventOutputHolder.GetOutput(sessionId);
MailMoneyToPlayer(sessionId, (int) request.TotalValue, Traders.FENCE);
MailMoneyToPlayer(sessionId, (int)request.TotalValue, Traders.FENCE);
return output;
}
@@ -293,10 +319,7 @@ public class TradeController(
/// <param name="sessionId">Session id</param>
/// <param name="roublesToSend">amount of roubles to send</param>
/// <param name="trader">Trader to sell items to</param>
protected void MailMoneyToPlayer(
string sessionId,
int roublesToSend,
string trader)
protected void MailMoneyToPlayer(string sessionId, int roublesToSend, string trader)
{
if (_logger.IsLogEnabled(LogLevel.Debug))
{
@@ -308,10 +331,7 @@ public class TradeController(
{
Id = _hashUtil.Generate(),
Template = Money.ROUBLES,
Upd = new Upd
{
StackObjectsCount = roublesToSend
}
Upd = new Upd { StackObjectsCount = roublesToSend },
};
// Ensure money is properly split to follow its max stack size limit
@@ -322,7 +342,11 @@ public class TradeController(
sessionId,
trader,
MessageType.MessageWithItems,
_randomUtil.GetArrayValue(_databaseService.GetTrader(trader).Dialogue.TryGetValue("soldItems", out var items) ? items : new List<string>()),
_randomUtil.GetArrayValue(
_databaseService.GetTrader(trader).Dialogue.TryGetValue("soldItems", out var items)
? items
: new List<string>()
),
curencyReward.SelectMany(x => x).ToList(),
_timeUtil.GetHoursAsSeconds(72)
);
@@ -340,7 +364,8 @@ public class TradeController(
string parentItemId,
List<Item> items,
Dictionary<string, int?> handbookPrices,
TraderBase traderDetails)
TraderBase traderDetails
)
{
var itemWithChildren = _itemHelper.FindAndReturnChildrenAsItems(items, parentItemId);
@@ -348,14 +373,25 @@ public class TradeController(
foreach (var itemToSell in itemWithChildren)
{
var itemDetails = _itemHelper.GetItem(itemToSell.Template);
if (!(itemDetails.Key && _itemHelper.IsOfBaseclasses(itemDetails.Value.Id, traderDetails.ItemsBuy.Category)))
// Skip if tpl isn't item OR item doesn't fulfil match traders buy categories
if (
!(
itemDetails.Key
&& _itemHelper.IsOfBaseclasses(
itemDetails.Value.Id,
traderDetails.ItemsBuy.Category
)
)
)
// Skip if tpl isn't item OR item doesn't fulfil match traders buy categories
{
continue;
}
// Get price of item multiplied by how many are in stack
totalPrice += (int) ((handbookPrices[itemToSell.Template] ?? 0) * (itemToSell.Upd?.StackObjectsCount ?? 1));
totalPrice += (int)(
(handbookPrices[itemToSell.Template] ?? 0)
* (itemToSell.Upd?.StackObjectsCount ?? 1)
);
}
return totalPrice;