spt/modules
spt/modules
0
0
Fork 0
mirror of https://github.com/sp-tarkov/modules.git synced 2025-02-13 03:10:45 -05:00
Code

Fix medkits being FiR inside PMC pockets

Browse Source 
FIx weapons inside PMC backpacks having FiR mods
Fix PMC armors having FiR plates/soft inserts
Fix PMC headwear having FiR soft inserts
This commit is contained in:
Dev 2024-02-05 10:16:52 +00:00
parent 2ebabeffc9
commit 0a1115d0d6
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
project/Aki.Custom/CustomAI/PmcFoundInRaidEquipment.cs
View File

@ -16,7 +16,9 @@ namespace Aki.Custom.CustomAI
private static readonly string throwableItemId = "543be6564bdc2df4348b4568"; private static readonly string throwableItemId = "543be6564bdc2df4348b4568";
private static readonly string ammoItemId = "5485a8684bdc2da71d8b4567"; private static readonly string ammoItemId = "5485a8684bdc2da71d8b4567";
private static readonly string weaponId = "5422acb9af1c889c16000029"; private static readonly string weaponId = "5422acb9af1c889c16000029";
private static readonly List<string> nonFiRItems = new List<string>() { magazineId, drugId, mediKitItem, medicalItemId, injectorItemId, throwableItemId, ammoItemId }; private static readonly string armorPlate = "644120aa86ffbe10ee032b6f";
private static readonly string builtInInserts = "65649eb40bf0ed77b8044453";
private static readonly List<string> nonFiRItems = new List<string>() { magazineId, drugId, mediKitItem, medicalItemId, injectorItemId, throwableItemId, ammoItemId, armorPlate, builtInInserts };
private static readonly string pistolId = "5447b5cf4bdc2d65278b4567"; private static readonly string pistolId = "5447b5cf4bdc2d65278b4567";
private static readonly string smgId = "5447b5e04bdc2d62278b4567"; private static readonly string smgId = "5447b5e04bdc2d62278b4567";
@ -42,20 +44,34 @@ namespace Aki.Custom.CustomAI
// Must run before the container loot code, otherwise backpack loot is not FiR // Must run before the container loot code, otherwise backpack loot is not FiR
MakeEquipmentNotFiR(___botOwner_0); MakeEquipmentNotFiR(___botOwner_0);
// Get inventory items that hold other items (backpack/rig/pockets) // Get inventory items that hold other items (backpack/rig/pockets/armor)
IReadOnlyList<Slot> containerGear = ___botOwner_0.Profile.Inventory.Equipment.ContainerSlots; IReadOnlyList<Slot> containerGear = ___botOwner_0.Profile.Inventory.Equipment.ContainerSlots;
var nonFiRRootItems = new List<Item>();
foreach (var container in containerGear) foreach (var container in containerGear)
{ {
var firstItem = container.Items.FirstOrDefault();
foreach (var item in container.ContainedItem.GetAllItems()) foreach (var item in container.ContainedItem.GetAllItems())
{ {
// Skip items that match container (array has itself as an item) // Skip items that match container (array has itself as an item)
if (item.Id == container.Items.FirstOrDefault()?.Id) if (item.Id == firstItem?.Id)
{ {
//this.logger.LogError($"Skipping item {item.Id} {item.Name} as its same as container {container.FullId}"); //this.logger.LogError($"Skipping item {item.Id} {item.Name} as its same as container {container.FullId}");
continue; continue;
} }
// Dont add FiR to tacvest items PMC usually brings into raid (meds/mags etc) // Don't add FiR to any item inside armor vest, e.g. plates/soft inserts
if (container.Name == "ArmorVest")
{
continue;
}
// Don't add FiR to any item inside head gear, e.g. soft inserts/nvg/lights
if (container.Name == "Headwear")
{
continue;
}
// Don't add FiR to tacvest items PMC usually brings into raid (meds/mags etc)
if (container.Name == "TacticalVest" && nonFiRItems.Any(item.Template._parent.Contains)) if (container.Name == "TacticalVest" && nonFiRItems.Any(item.Template._parent.Contains))
{ {
//this.logger.LogError($"Skipping item {item.Id} {item.Name} as its on the item type blacklist"); //this.logger.LogError($"Skipping item {item.Id} {item.Name} as its on the item type blacklist");
@ -65,17 +81,26 @@ namespace Aki.Custom.CustomAI
// Don't add FiR to weapons in backpack (server sometimes adds pre-made weapons to backpack to simulate PMCs looting bodies) // Don't add FiR to weapons in backpack (server sometimes adds pre-made weapons to backpack to simulate PMCs looting bodies)
if (container.Name == "Backpack" && weaponTypeIds.Any(item.Template._parent.Contains)) if (container.Name == "Backpack" && weaponTypeIds.Any(item.Template._parent.Contains))
{ {
// Add weapon root to list for later use
nonFiRRootItems.Add(item);
//this.logger.LogError($"Skipping item {item.Id} {item.Name} as its on the item type blacklist"); //this.logger.LogError($"Skipping item {item.Id} {item.Name} as its on the item type blacklist");
continue; continue;
} }
// Don't add FiR to grenades/mags/ammo in pockets // Don't add FiR to grenades/mags/ammo/meds in pockets
if (container.Name == "Pockets" && new List<string> { throwableItemId, ammoItemId, magazineId, medicalItemId }.Any(item.Template._parent.Contains)) if (container.Name == "Pockets" && new List<string> { throwableItemId, ammoItemId, magazineId, medicalItemId, mediKitItem }.Any(item.Template._parent.Contains))
{ {
//this.logger.LogError($"Skipping item {item.Id} {item.Name} as its on the item type blacklist"); //this.logger.LogError($"Skipping item {item.Id} {item.Name} as its on the item type blacklist");
continue; continue;
} }
// Check for mods of weapons in backpacks
var isChildOfEquippedNonFiRItem = nonFiRRootItems.Any(nonFiRRootItem => item.IsChildOf(nonFiRRootItem));
if (isChildOfEquippedNonFiRItem)
{
continue;
}
//Logger.LogError($"flagging item FiR: {item.Id} {item.Name} _parent: {item.Template._parent}"); //Logger.LogError($"flagging item FiR: {item.Id} {item.Name} _parent: {item.Template._parent}");
item.SpawnedInSession = true; item.SpawnedInSession = true;
} }