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

Various changes

Browse Source
This commit is contained in:
Chomp
2025-02-01 23:16:34 +00:00
parent 3e2625692c
commit 7032dad47e
6 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Core/Controllers/HideoutController.cs
+10 -10
View File
@@ -229,7 +229,7 @@ public class HideoutController(
HideoutArea dbHideoutArea, Stage hideoutStage)
{
// Add key/value to `hideoutAreaStashes` dictionary - used to link hideout area to inventory stash by its id
if (pmcData.Inventory.HideoutAreaStashes.GetValueOrDefault(dbHideoutArea.Type.ToString()) is null)
if (!pmcData.Inventory.HideoutAreaStashes.ContainsKey(dbHideoutArea.Type.ToString()))
{
pmcData.Inventory.HideoutAreaStashes[dbHideoutArea.Type.ToString()] = dbHideoutArea.Id;
}
@@ -432,7 +432,7 @@ public class HideoutController(
}
// Assume only one item in slot
var itemToReturn = hideoutArea.Slots.FirstOrDefault(slot => slot.LocationIndex == slotIndexToRemove)?.Items.FirstOrDefault();
var itemToReturn = hideoutArea.Slots?.FirstOrDefault(slot => slot.LocationIndex == slotIndexToRemove)?.Items.FirstOrDefault();
if (itemToReturn is null)
{
_logger.Warning($"Unable to remove resource from area: {removeResourceRequest.AreaType} slot as no item found, RESTART CLIENT IMMEDIATELY");
@@ -440,7 +440,7 @@ public class HideoutController(
return output;
}
AddItemDirectRequest request = new AddItemDirectRequest
var request = new AddItemDirectRequest
{
ItemWithModsToAdd = [itemToReturn.ConvertToItem()],
FoundInRaid = itemToReturn.Upd?.SpawnedInSession,
@@ -451,7 +451,7 @@ public class HideoutController(
_inventoryHelper.AddItemToStash(sessionID, request, pmcData, output);
if (output.Warnings?.Count > 0)
{
// Adding to stash failed, drop out - dont remove item from hideout area slot
// Adding to stash failed, drop out - don't remove item from hideout area slot
return output;
}
@@ -555,7 +555,7 @@ public class HideoutController(
}
}
var recipe = _databaseService.GetHideout().Production.ScavRecipes.FirstOrDefault(r => r.Id == body.RecipeId);
var recipe = _databaseService.GetHideout().Production?.ScavRecipes?.FirstOrDefault(r => r.Id == body.RecipeId);
if (recipe is null)
{
_logger.Error(
@@ -1015,9 +1015,9 @@ public class HideoutController(
var hasSeverePain = pmcData.Health.BodyParts["Chest"].Effects?.ContainsKey("SevereMusclePain");
// Has no muscle pain at all, add mild
if (hasMildPain is null && hasSeverePain is null)
if (!hasMildPain.GetValueOrDefault(false) && !hasSeverePain.GetValueOrDefault(false))
{
// nullguard
// Nullguard
pmcData.Health.BodyParts["Chest"].Effects ??= new Dictionary<string, BodyPartEffectProperties>();
pmcData.Health.BodyParts["Chest"].Effects["MildMusclePain"] = new BodyPartEffectProperties
{
@@ -1027,7 +1027,7 @@ public class HideoutController(
return;
}
if (hasMildPain is not null)
if (hasMildPain.GetValueOrDefault(false))
{
// Already has mild pain, remove mild and add severe
pmcData.Health.BodyParts["Chest"].Effects.Remove("MildMusclePain");
@@ -1041,7 +1041,7 @@ public class HideoutController(
public void RecordShootingRangePoints(string sessionId, PmcData pmcData, RecordShootingRangePoints request)
{
var shootingRangeKey = "ShootingRangePoints";
const string shootingRangeKey = "ShootingRangePoints";
var overallCounterItems = pmcData.Stats.Eft.OverallCounters.Items;
// Find counter by key
@@ -1218,7 +1218,7 @@ public class HideoutController(
var slots = _itemHelper.GetItem(equipmentPresetStage.Container).Value.Properties.Slots;
foreach (var mannequinSlot in slots)
{
// Chek if we've already added this manniquin
// Check if we've already added this mannequin
var existingMannequin = pmcData.Inventory.Items.FirstOrDefault(
(item) => item.ParentId == equipmentPresetHideoutArea.Id && item.SlotId == mannequinSlot.Name
);
Libraries/Core/Controllers/QuestController.cs
+1 -4
View File
@@ -169,11 +169,8 @@ public class QuestController(
if (repeatableQuestProfile.Side == "Scav" && _questTypes.Contains(repeatableQuestProfile.Type.ToString()))
{
var fullProfile = _profileHelper.GetFullProfile(sessionID);
if (fullProfile.CharacterData.ScavData.Quests is null)
{
fullProfile.CharacterData.ScavData.Quests = [];
}
fullProfile.CharacterData.ScavData.Quests ??= [];
fullProfile.CharacterData.ScavData.Quests.Add(newRepeatableQuest);
}
Libraries/Core/Controllers/RagfairController.cs
+2 -2
View File
@@ -199,7 +199,7 @@ public class RagfairController
var firstItem = offer.Items[0];
var traderAssorts = _traderHelper.GetTraderAssortsByTraderId(offer.User.Id).Items;
var assortPurchased = traderAssorts.FirstOrDefault(x => x.Id == offer.Items.First().Id);
var assortPurchased = traderAssorts?.FirstOrDefault(x => x.Id == offer.Items.First().Id);
if (assortPurchased is null)
{
_logger.Warning(
@@ -939,7 +939,7 @@ public class RagfairController
// Count how many items are being sold and multiply the requested amount accordingly
foreach (var itemId in itemIdsFromFleaOfferRequest)
{
var item = pmcData.Inventory.Items.FirstOrDefault((i) => i.Id == itemId);
var item = pmcData.Inventory?.Items?.FirstOrDefault((i) => i.Id == itemId);
if (item is null)
{
errorMessage = _localisationService.GetText("ragfair-unable_to_find_item_in_inventory", new { id = itemId });
Libraries/Core/Controllers/RepeatableQuestController.cs
+1 -1
View File
@@ -238,7 +238,7 @@ public class RepeatableQuestController(
}
}
private RepeatableQuest AttemptToGenerateRepeatableQuest(string sessionId, PmcData pmcData,
private RepeatableQuest? AttemptToGenerateRepeatableQuest(string sessionId, PmcData pmcData,
QuestTypePool questTypePool, RepeatableQuestConfig repeatableConfig)
{
const int maxAttempts = 10;