Merge branch 'main' of https://github.com/sp-tarkov/server-csharp
This commit is contained in:
@@ -496,7 +496,7 @@ public class HideoutController(
|
||||
recipe.Requirements.Where((r) => r.Type == "Item" || r.Type == "Tool")
|
||||
);
|
||||
|
||||
List<IdWithCount> itemsToDelete = new List<IdWithCount>();
|
||||
List<IdWithCount> itemsToDelete = [];
|
||||
var output = _eventOutputHolder.GetOutput(sessionID);
|
||||
itemsToDelete.AddRange(body.Tools);
|
||||
itemsToDelete.AddRange(body.Items);
|
||||
@@ -789,7 +789,7 @@ public class HideoutController(
|
||||
hoursCrafting += recipe.ProductionTime;
|
||||
if (hoursCrafting / _hideoutConfig.HoursForSkillCrafting >= 1)
|
||||
{
|
||||
// Spent enough time crafting to get a bonus xp multipler
|
||||
// Spent enough time crafting to get a bonus xp multiplier
|
||||
var multiplierCrafting = Math.Floor((double)hoursCrafting / _hideoutConfig.HoursForSkillCrafting);
|
||||
craftingExpAmount += (int)(1 * multiplierCrafting);
|
||||
hoursCrafting -= _hideoutConfig.HoursForSkillCrafting * multiplierCrafting;
|
||||
|
||||
@@ -257,9 +257,9 @@ public class InventoryController(
|
||||
var rewards = new List<List<Item>>();
|
||||
var unlockedWeaponCrates = new List<string>
|
||||
{
|
||||
"665829424de4820934746ce6",
|
||||
"665732e7ac60f009f270d1ef",
|
||||
"665888282c4a1b73af576b77"
|
||||
ItemTpl.RANDOMLOOTCONTAINER_ARENA_WEAPONCRATE_VIOLET_OPEN,
|
||||
ItemTpl.RANDOMLOOTCONTAINER_ARENA_WEAPONCRATE_BLUE_OPEN,
|
||||
ItemTpl.RANDOMLOOTCONTAINER_ARENA_WEAPONCRATE_GREEN_OPEN
|
||||
};
|
||||
// Temp fix for unlocked weapon crate hideout craft
|
||||
if (isSealedWeaponBox || unlockedWeaponCrates.Contains(containerDetailsDb.Value.Id))
|
||||
|
||||
@@ -177,9 +177,8 @@ public class ProfileController(
|
||||
/**
|
||||
* Handle client/game/profile/search
|
||||
*/
|
||||
public List<SearchFriendResponse> GetFriends(SearchFriendRequestData info, string sessionID)
|
||||
public List<SearchFriendResponse> SearchProfiles(SearchProfilesRequestData info, string sessionID)
|
||||
{
|
||||
// TODO: We should probably rename this method in the next client update
|
||||
var result = new List<SearchFriendResponse>();
|
||||
|
||||
// Find any profiles with a nickname containing the entered name
|
||||
|
||||
@@ -140,7 +140,7 @@ public class RagfairController
|
||||
var traderAssorts = _ragfairHelper.GetDisplayableAssorts(sessionID);
|
||||
var result = new GetOffersResult
|
||||
{
|
||||
Offers = new List<RagfairOffer>(),
|
||||
Offers = [],
|
||||
OffersCount = searchRequest.Limit,
|
||||
SelectedCategory = searchRequest.HandbookId,
|
||||
};
|
||||
@@ -986,7 +986,7 @@ public class RagfairController
|
||||
)
|
||||
);
|
||||
|
||||
pmcData.RagfairInfo.Offers = new List<RagfairOffer>();
|
||||
pmcData.RagfairInfo.Offers = [];
|
||||
}
|
||||
|
||||
var playerOfferIndex = playerProfileOffers.FindIndex(offer => offer.Id == removeRequest.OfferId);
|
||||
|
||||
Reference in New Issue
Block a user