From 08b03e6059bdd75ba71becfa2420447b7fbaa9e3 Mon Sep 17 00:00:00 2001 From: caellach Date: Fri, 29 Mar 2024 09:13:57 -0400 Subject: [PATCH 1/7] update 29351: LootingBots, MoreCheckmarks, SAIN, QuestingBots, ThatsLit --- LootingBots-SIT/components/TransactionController.cs | 2 +- LootingBots-SIT/logics/PeacefulLogic.cs | 2 +- LootingBots-SIT/utils/EquipmentTypes.cs | 8 ++++---- LootingBots-SIT/utils/LootUtils.cs | 2 +- MoreCheckmarks-SIT/MoreCheckmarks.cs | 2 +- SAIN-SIT/BotController/SAINBotControllerComponent.cs | 9 +++++---- SAIN-SIT/Editor/GUITabs.cs | 2 +- SAIN-SIT/Helpers/AudioHelpers.cs | 2 +- SAIN-SIT/Helpers/HelpersGClass.cs | 10 +++++----- SAIN-SIT/Plugin/Patches/Shoot/RateofFirePatch.cs | 2 +- SAIN-SIT/Plugin/SAINPlugin.cs | 2 +- .../Classes/Info/SAINBotEquipmentClass.cs | 6 +++--- .../Classes/Sense/SAINHearingSensorClass.cs | 5 +++-- .../BehaviorExtensions/CustomLogicDelayedUpdate.cs | 2 +- SPTQuestingBots-SIT/BotLogic/BotMonitor.cs | 5 +++-- SPTQuestingBots-SIT/Controllers/ConfigController.cs | 2 +- SPTQuestingBots-SIT/Helpers/ItemHelpers.cs | 2 +- SPTQuestingBots-SIT/Patches/CheckLookEnemyPatch.cs | 2 +- SPTQuestingBots-SIT/Patches/GameStartPatch.cs | 8 ++++---- SPT_ThatsLit/Components/ThatsLitMainPlayerComponent.cs | 8 ++++---- SPT_ThatsLit/ThatsLit.csproj | 7 ++----- SPT_ThatsLit/ThatsLitPlugin.cs | 2 +- 22 files changed, 46 insertions(+), 46 deletions(-) diff --git a/LootingBots-SIT/components/TransactionController.cs b/LootingBots-SIT/components/TransactionController.cs index 934389fb..3fbd511f 100644 --- a/LootingBots-SIT/components/TransactionController.cs +++ b/LootingBots-SIT/components/TransactionController.cs @@ -15,7 +15,7 @@ using InventoryControllerResultStruct = SOperationResult; using InventoryHelperClass = ItemMovementHandler; using GridClassEx = GridContainer; -using GridCacheClass = GClass1390; +using GridCacheClass = GClass1398; namespace LootingBots.Patch.Components { diff --git a/LootingBots-SIT/logics/PeacefulLogic.cs b/LootingBots-SIT/logics/PeacefulLogic.cs index 0783143e..0734ebed 100644 --- a/LootingBots-SIT/logics/PeacefulLogic.cs +++ b/LootingBots-SIT/logics/PeacefulLogic.cs @@ -1,7 +1,7 @@ using DrakiaXYZ.BigBrain.Brains; using EFT; -using PeacefulNodeClass = GClass185; +using PeacefulNodeClass = GClass187; namespace LootingBots.Brain.Logics { diff --git a/LootingBots-SIT/utils/EquipmentTypes.cs b/LootingBots-SIT/utils/EquipmentTypes.cs index babeec30..80ab72ff 100644 --- a/LootingBots-SIT/utils/EquipmentTypes.cs +++ b/LootingBots-SIT/utils/EquipmentTypes.cs @@ -3,10 +3,10 @@ using EFT.InventoryLogic; -using BodyArmorClass = GClass2637; -using HeadArmorClass = GClass2636; -using FaceCoveringClass = GClass2635; -using BackpackItemClass = GClass2684; +using BodyArmorClass = GClass2648; +using HeadArmorClass = GClass2647; +using FaceCoveringClass = GClass2646; +using BackpackItemClass = GClass2695; using TacticalRigItemClass = ArmorClass1; diff --git a/LootingBots-SIT/utils/LootUtils.cs b/LootingBots-SIT/utils/LootUtils.cs index 6da3bdbe..d74c4199 100644 --- a/LootingBots-SIT/utils/LootUtils.cs +++ b/LootingBots-SIT/utils/LootUtils.cs @@ -16,7 +16,7 @@ using GridItemClass = GItem8; using ItemAddressExClass = GridItemAddress; using SortErrorClass = GInventoryError18; -using GridCacheClass = GClass1390; +using GridCacheClass = GClass1398; namespace LootingBots.Patch.Util { diff --git a/MoreCheckmarks-SIT/MoreCheckmarks.cs b/MoreCheckmarks-SIT/MoreCheckmarks.cs index f9752a19..1d7c3aba 100644 --- a/MoreCheckmarks-SIT/MoreCheckmarks.cs +++ b/MoreCheckmarks-SIT/MoreCheckmarks.cs @@ -760,7 +760,7 @@ public static void DoPatching() // UPDATE: This is to know when a new profile is selected so we can load up to date data // We want to do this when client makes request "/client/game/profile/select" // Look for that string in dnspy, this creates a callback with a method_0, that is the method we want to postfix - ProfileSelector = assemblies[i].GetType("TradingBackend1+Class1291"); + ProfileSelector = assemblies[i].GetType("TradingBackend1+Class1300"); } } diff --git a/SAIN-SIT/BotController/SAINBotControllerComponent.cs b/SAIN-SIT/BotController/SAINBotControllerComponent.cs index b65a0c85..f40d61f3 100644 --- a/SAIN-SIT/BotController/SAINBotControllerComponent.cs +++ b/SAIN-SIT/BotController/SAINBotControllerComponent.cs @@ -10,6 +10,7 @@ using UnityEngine; using UnityEngine.AI; using UnityEngine.UIElements; +using EFTSoundPlayer = GClass603; namespace SAIN.Components { @@ -49,8 +50,8 @@ private void Awake() BotExtractManager.Awake(); BotSquads.Awake(); - Singleton.Instance.OnGrenadeThrow += GrenadeThrown; - Singleton.Instance.OnGrenadeExplosive += GrenadeExplosion; + Singleton.Instance.OnGrenadeThrow += GrenadeThrown; + Singleton.Instance.OnGrenadeExplosive += GrenadeExplosion; AISoundPlayed += SoundPlayed; PlayerTalk += PlayerTalked; Singleton.Instance.gameObject.AddComponent(); @@ -334,8 +335,8 @@ public void Dispose() AISoundPlayed -= SoundPlayed; PlayerTalk -= PlayerTalked; - Singleton.Instance.OnGrenadeThrow -= GrenadeThrown; - Singleton.Instance.OnGrenadeExplosive -= GrenadeExplosion; + Singleton.Instance.OnGrenadeThrow -= GrenadeThrown; + Singleton.Instance.OnGrenadeExplosive -= GrenadeExplosion; if (Bots.Count > 0) { diff --git a/SAIN-SIT/Editor/GUITabs.cs b/SAIN-SIT/Editor/GUITabs.cs index fd5730ea..4bef0213 100644 --- a/SAIN-SIT/Editor/GUITabs.cs +++ b/SAIN-SIT/Editor/GUITabs.cs @@ -8,7 +8,7 @@ using UnityEngine; using static EFT.SpeedTree.TreeWind; using SAIN.Preset.GlobalSettings; -using static GClass1844; +using static GClass1854; using SAIN.Attributes; namespace SAIN.Editor diff --git a/SAIN-SIT/Helpers/AudioHelpers.cs b/SAIN-SIT/Helpers/AudioHelpers.cs index 64d89d76..cce203b5 100644 --- a/SAIN-SIT/Helpers/AudioHelpers.cs +++ b/SAIN-SIT/Helpers/AudioHelpers.cs @@ -118,7 +118,7 @@ private static float AudibleRange(string ammocaliber) public static bool IsSilencer(Mod mod) { - return mod.GetType() == GClass2741.TypeTable[SuppressorTypeId]; + return mod.GetType() == GClass2752.TypeTable[SuppressorTypeId]; } public static readonly string SuppressorTypeId = "550aa4cd4bdc2dd8348b456c"; diff --git a/SAIN-SIT/Helpers/HelpersGClass.cs b/SAIN-SIT/Helpers/HelpersGClass.cs index e5caf607..8fca56d0 100644 --- a/SAIN-SIT/Helpers/HelpersGClass.cs +++ b/SAIN-SIT/Helpers/HelpersGClass.cs @@ -6,12 +6,12 @@ using System.Collections.Generic; using System.Reflection; using UnityEngine; -using EFTCore = GClass531; -using EFTFileSettings = GClass532; +using EFTCore = GClass536; +using EFTFileSettings = GClass537; using EFTSettingsGroup = BotSettingsComponents; -using EFTSoundPlayer = GClass598; -using EFTStatModifiersClass = GClass529; -using EFTTime = GClass1296; +using EFTSoundPlayer = GClass603; +using EFTStatModifiersClass = GClass534; +using EFTTime = GClass1303; using EFTSearchPoint = PlaceForCheck; using StayInTarkov; diff --git a/SAIN-SIT/Plugin/Patches/Shoot/RateofFirePatch.cs b/SAIN-SIT/Plugin/Patches/Shoot/RateofFirePatch.cs index 056929c7..1f004408 100644 --- a/SAIN-SIT/Plugin/Patches/Shoot/RateofFirePatch.cs +++ b/SAIN-SIT/Plugin/Patches/Shoot/RateofFirePatch.cs @@ -88,7 +88,7 @@ public class SemiAutoPatch : ModulePatch { protected override MethodBase GetTargetMethod() { - return AccessTools.Method(typeof(GClass396), "method_1"); + return AccessTools.Method(typeof(GClass401), "method_1"); } [PatchPostfix] diff --git a/SAIN-SIT/Plugin/SAINPlugin.cs b/SAIN-SIT/Plugin/SAINPlugin.cs index 9f915728..16de778e 100644 --- a/SAIN-SIT/Plugin/SAINPlugin.cs +++ b/SAIN-SIT/Plugin/SAINPlugin.cs @@ -30,7 +30,7 @@ public static class AssemblyInfo public const string Trademark = ""; public const string Culture = ""; - public const int TarkovVersion = 29197; + public const int TarkovVersion = 29351; public const string EscapeFromTarkov = "EscapeFromTarkov.exe"; diff --git a/SAIN-SIT/SAINComponent/Classes/Info/SAINBotEquipmentClass.cs b/SAIN-SIT/SAINComponent/Classes/Info/SAINBotEquipmentClass.cs index d5dc1640..bdc7faee 100644 --- a/SAIN-SIT/SAINComponent/Classes/Info/SAINBotEquipmentClass.cs +++ b/SAIN-SIT/SAINComponent/Classes/Info/SAINBotEquipmentClass.cs @@ -178,7 +178,7 @@ public void Log() private static bool IsSilencer(Type modType) { - return modType == GClass2741.TypeTable[SuppressorTypeId]; + return modType == GClass2752.TypeTable[SuppressorTypeId]; } private static bool IsOptic(Type modType) @@ -205,14 +205,14 @@ private static bool CheckTemplates(Type modType, params string[] templateIDs) private static bool CheckTemplateType(Type modType, string id) { - if (GClass2741.TypeTable.TryGetValue(id, out Type result)) + if (GClass2752.TypeTable.TryGetValue(id, out Type result)) { if (result == modType) { return true; } } - if (GClass2741.TemplateTypeTable.TryGetValue(id, out result)) + if (GClass2752.TemplateTypeTable.TryGetValue(id, out result)) { if (result == modType) { diff --git a/SAIN-SIT/SAINComponent/Classes/Sense/SAINHearingSensorClass.cs b/SAIN-SIT/SAINComponent/Classes/Sense/SAINHearingSensorClass.cs index 8074b492..40d5ca4f 100644 --- a/SAIN-SIT/SAINComponent/Classes/Sense/SAINHearingSensorClass.cs +++ b/SAIN-SIT/SAINComponent/Classes/Sense/SAINHearingSensorClass.cs @@ -5,6 +5,7 @@ using SAIN.Helpers; using SAIN.SAINComponent; using UnityEngine; +using EFTSoundPlayer = GClass603; namespace SAIN.SAINComponent.Classes { @@ -16,7 +17,7 @@ public SAINHearingSensorClass(SAINComponentClass sain) : base(sain) public void Init() { - Singleton.Instance.OnSoundPlayed += HearSound; + Singleton.Instance.OnSoundPlayed += HearSound; } public void Update() @@ -25,7 +26,7 @@ public void Update() public void Dispose() { - Singleton.Instance.OnSoundPlayed -= HearSound; + Singleton.Instance.OnSoundPlayed -= HearSound; } public void HearSound(IPlayer player, Vector3 position, float power, AISoundType type) diff --git a/SPTQuestingBots-SIT/BehaviorExtensions/CustomLogicDelayedUpdate.cs b/SPTQuestingBots-SIT/BehaviorExtensions/CustomLogicDelayedUpdate.cs index dd1cdd7a..ab4143a1 100644 --- a/SPTQuestingBots-SIT/BehaviorExtensions/CustomLogicDelayedUpdate.cs +++ b/SPTQuestingBots-SIT/BehaviorExtensions/CustomLogicDelayedUpdate.cs @@ -26,7 +26,7 @@ public abstract class CustomLogicDelayedUpdate : CustomLogic private Stopwatch actionElapsedTime = new Stopwatch(); // Find by CreateNode(BotLogicDecision type, BotOwner bot) -> case BotLogicDecision.simplePatrol -> private gclass object - private GClass329 baseSteeringLogic = new GClass329(); + private GClass333 baseSteeringLogic = new GClass333(); protected double ActionElpasedTime => actionElapsedTime.ElapsedMilliseconds / 1000.0; diff --git a/SPTQuestingBots-SIT/BotLogic/BotMonitor.cs b/SPTQuestingBots-SIT/BotLogic/BotMonitor.cs index bcf08e9f..83cafa27 100644 --- a/SPTQuestingBots-SIT/BotLogic/BotMonitor.cs +++ b/SPTQuestingBots-SIT/BotLogic/BotMonitor.cs @@ -13,6 +13,7 @@ using SPTQuestingBots.Controllers; using SPTQuestingBots.Helpers; using UnityEngine; +using EFTSoundPlayer = GClass603; namespace SPTQuestingBots.BotLogic { @@ -39,8 +40,8 @@ public BotMonitor(BotOwner _botOwner) if (ConfigController.Config.Questing.BotQuestingRequirements.HearingSensor.Enabled) { - Singleton.Instance.OnSoundPlayed += enemySoundHeard; - botOwner.GetPlayer.OnIPlayerDeadOrUnspawn += (player) => { Singleton.Instance.OnSoundPlayed -= enemySoundHeard; }; + Singleton.Instance.OnSoundPlayed += enemySoundHeard; + botOwner.GetPlayer.OnIPlayerDeadOrUnspawn += (player) => { Singleton.Instance.OnSoundPlayed -= enemySoundHeard; }; } lootingLayerMonitor = botOwner.GetPlayer.gameObject.AddComponent(); diff --git a/SPTQuestingBots-SIT/Controllers/ConfigController.cs b/SPTQuestingBots-SIT/Controllers/ConfigController.cs index 2293490d..7a0fe5ed 100644 --- a/SPTQuestingBots-SIT/Controllers/ConfigController.cs +++ b/SPTQuestingBots-SIT/Controllers/ConfigController.cs @@ -223,7 +223,7 @@ public static bool TryDeserializeObject(string json, string errorMessage, out } } - obj = JsonConvert.DeserializeObject(json, GClass1448.SerializerSettings); + obj = JsonConvert.DeserializeObject(json, GClass1456.SerializerSettings); return true; } diff --git a/SPTQuestingBots-SIT/Helpers/ItemHelpers.cs b/SPTQuestingBots-SIT/Helpers/ItemHelpers.cs index 05afacf0..c8fe7ba5 100644 --- a/SPTQuestingBots-SIT/Helpers/ItemHelpers.cs +++ b/SPTQuestingBots-SIT/Helpers/ItemHelpers.cs @@ -37,7 +37,7 @@ public static float HearingMultiplier(this BotOwner botOwner) multiplier *= ConfigController.Config.Questing.BotQuestingRequirements.HearingSensor.LoudnessMultiplierHeadset; } - GClass2536 helmetTemplate = helmet?.Template as GClass2536; + GClass2547 helmetTemplate = helmet?.Template as GClass2547; switch (helmetTemplate?.DeafStrength) { case EDeafStrength.Low: diff --git a/SPTQuestingBots-SIT/Patches/CheckLookEnemyPatch.cs b/SPTQuestingBots-SIT/Patches/CheckLookEnemyPatch.cs index 895966f8..75c03f32 100644 --- a/SPTQuestingBots-SIT/Patches/CheckLookEnemyPatch.cs +++ b/SPTQuestingBots-SIT/Patches/CheckLookEnemyPatch.cs @@ -17,7 +17,7 @@ protected override MethodBase GetTargetMethod() } [PatchPrefix] - private static bool PatchPrefix(EnemyInfo __instance, GClass448 lookAll) + private static bool PatchPrefix(EnemyInfo __instance, GClass453 lookAll) { if (!QuestingBotsPluginConfig.SleepingEnabled.Value) { diff --git a/SPTQuestingBots-SIT/Patches/GameStartPatch.cs b/SPTQuestingBots-SIT/Patches/GameStartPatch.cs index aa290a41..cece288c 100644 --- a/SPTQuestingBots-SIT/Patches/GameStartPatch.cs +++ b/SPTQuestingBots-SIT/Patches/GameStartPatch.cs @@ -161,7 +161,7 @@ private static IEnumerable getAllTimers() timers.Add(timer); } - FieldInfo bossWavesField = AccessTools.Field(Aki.Reflection.Utils.PatchConstants.LocalGameType, "gclass579_0"); + FieldInfo bossWavesField = AccessTools.Field(Aki.Reflection.Utils.PatchConstants.LocalGameType, "gclass584_0"); BossWaveManager bossWaves = (BossWaveManager)bossWavesField.GetValue(localGameObj); //LoggingController.LogInfo("Found Boss Waves instance"); @@ -176,12 +176,12 @@ private static IEnumerable getAllTimers() timers.Add(timer); } - FieldInfo questTriggerField = AccessTools.Field(typeof(BossWaveManager), "gclass580_0"); - GClass580 questTrigger = (GClass580)questTriggerField.GetValue(bossWaves); + FieldInfo questTriggerField = AccessTools.Field(typeof(BossWaveManager), "gclass585_0"); + GClass585 questTrigger = (GClass585)questTriggerField.GetValue(bossWaves); //LoggingController.LogInfo("Found Boss Waves Quest Trigger instance"); - FieldInfo questTriggerTimerField = AccessTools.Field(typeof(GClass580), "ginterface13_0"); + FieldInfo questTriggerTimerField = AccessTools.Field(typeof(GClass585), "ginterface13_0"); object questTriggerTimer = questTriggerTimerField.GetValue(questTrigger); if (questTriggerTimer != null) diff --git a/SPT_ThatsLit/Components/ThatsLitMainPlayerComponent.cs b/SPT_ThatsLit/Components/ThatsLitMainPlayerComponent.cs index b7c96cf3..cab1f889 100644 --- a/SPT_ThatsLit/Components/ThatsLitMainPlayerComponent.cs +++ b/SPT_ThatsLit/Components/ThatsLitMainPlayerComponent.cs @@ -16,7 +16,7 @@ using BaseCellClass = AbstractSpCell; using CellClass = GAbstractSpCell; -using SpatialPartitionClass = GClass1067; +using SpatialPartitionClass = GClass1074; namespace ThatsLit.Components { @@ -826,13 +826,13 @@ IEnumerator BuildTerrainDetailMapCoroutine(Terrain terrain, List detailM BaseCellClass cell; if (spData.GetCell(BaseCellClass.CalculateHash(terrainCellX, 0, terrainCellY), out cell)) { - CellClass gclass965 = (CellClass)cell; - if (gclass965.detailMapData != null) + CellClass gclass971 = (CellClass)cell; + if (gclass971.detailMapData != null) { for (int cellResX = 0; cellResX < resolutionPerCell; ++cellResX) { for (int cellResY = 0; cellResY < resolutionPerCell; ++cellResY) - detailLayer[cellResX + terrainCellX * resolutionPerCell, cellResY + terrainCellY * resolutionPerCell] = gclass965.detailMapData[layer][cellResX + cellResY * resolutionPerCell]; + detailLayer[cellResX + terrainCellX * resolutionPerCell, cellResY + terrainCellY * resolutionPerCell] = gclass971.detailMapData[layer][cellResX + cellResY * resolutionPerCell]; } } } diff --git a/SPT_ThatsLit/ThatsLit.csproj b/SPT_ThatsLit/ThatsLit.csproj index f1b68c70..726b8e46 100644 --- a/SPT_ThatsLit/ThatsLit.csproj +++ b/SPT_ThatsLit/ThatsLit.csproj @@ -82,7 +82,6 @@ ..\References\UnityEngine.TextRenderingModule.dll - $(ManagedAssembliesPath)\UnityEngine.PhysicsModule.dll False @@ -150,14 +149,12 @@ - + - + \ No newline at end of file diff --git a/SPT_ThatsLit/ThatsLitPlugin.cs b/SPT_ThatsLit/ThatsLitPlugin.cs index 863c3a62..77e41c05 100644 --- a/SPT_ThatsLit/ThatsLitPlugin.cs +++ b/SPT_ThatsLit/ThatsLitPlugin.cs @@ -21,7 +21,7 @@ public static class AssemblyInfo public const string Trademark = ""; public const string Culture = ""; - public const int TarkovVersion = 29197; + public const int TarkovVersion = 29351; public const string EscapeFromTarkov = "EscapeFromTarkov.exe"; public const string ModName = "That's Lit"; public const string ModVersion = "1.373.5"; From 28f11b332c415853ea8d1d7a243e22a0db082db6 Mon Sep 17 00:00:00 2001 From: caellach Date: Fri, 29 Mar 2024 10:15:00 -0400 Subject: [PATCH 2/7] more updates --- LootingBots-SIT/logics/PeacefulLogic.cs | 2 +- SPTQuestingBots-SIT/Helpers/BotBrainHelpers.cs | 8 ++++---- .../Patches/BossLocationSpawnActivatePatch.cs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LootingBots-SIT/logics/PeacefulLogic.cs b/LootingBots-SIT/logics/PeacefulLogic.cs index 0734ebed..d3617603 100644 --- a/LootingBots-SIT/logics/PeacefulLogic.cs +++ b/LootingBots-SIT/logics/PeacefulLogic.cs @@ -1,7 +1,7 @@ using DrakiaXYZ.BigBrain.Brains; using EFT; -using PeacefulNodeClass = GClass187; +using PeacefulNodeClass = GClass209; namespace LootingBots.Brain.Logics { diff --git a/SPTQuestingBots-SIT/Helpers/BotBrainHelpers.cs b/SPTQuestingBots-SIT/Helpers/BotBrainHelpers.cs index bcf784a8..1abbebca 100644 --- a/SPTQuestingBots-SIT/Helpers/BotBrainHelpers.cs +++ b/SPTQuestingBots-SIT/Helpers/BotBrainHelpers.cs @@ -204,8 +204,8 @@ public static List ToStringList(this IEnumerable list) public static readonly WildSpawnType[] pmcSpawnTypes = new WildSpawnType[2] { - (WildSpawnType)47, - (WildSpawnType)48 + WildSpawnType.sptUsec, + WildSpawnType.sptBear }; public static bool WillBotBeAPMC(BotOwner botOwner) @@ -224,8 +224,8 @@ public static bool WillBotBeABoss(BotOwner botOwner) public static EPlayerSide GetSideForWildSpawnType(WildSpawnType spawnType) { - WildSpawnType sptUsec = (WildSpawnType)47; - WildSpawnType sptBear = (WildSpawnType)48; + WildSpawnType sptUsec = WildSpawnType.sptUsec; + WildSpawnType sptBear = WildSpawnType.sptBear; if (spawnType == sptUsec) { diff --git a/SPTQuestingBots-SIT/Patches/BossLocationSpawnActivatePatch.cs b/SPTQuestingBots-SIT/Patches/BossLocationSpawnActivatePatch.cs index 3b560d12..d083acdf 100644 --- a/SPTQuestingBots-SIT/Patches/BossLocationSpawnActivatePatch.cs +++ b/SPTQuestingBots-SIT/Patches/BossLocationSpawnActivatePatch.cs @@ -16,7 +16,7 @@ public class BossLocationSpawnActivatePatch : ModulePatch protected override MethodBase GetTargetMethod() { Type localGameType = Aki.Reflection.Utils.PatchConstants.LocalGameType; - Type targetType = localGameType.GetNestedType("Class1367", BindingFlags.Public | BindingFlags.Instance); + Type targetType = localGameType.GetNestedType("Class1376", BindingFlags.Public | BindingFlags.Instance); return targetType.GetMethod("method_1", BindingFlags.Public | BindingFlags.Instance); } From 05e304457c6fa5d951dbf7af760680d3226392a4 Mon Sep 17 00:00:00 2001 From: caellach Date: Fri, 29 Mar 2024 20:45:32 -0400 Subject: [PATCH 3/7] update MasterList.json with new SIT version --- MasterList.json | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/MasterList.json b/MasterList.json index ddb6c7db..c7572724 100644 --- a/MasterList.json +++ b/MasterList.json @@ -72,7 +72,7 @@ { "Name": "MoreCheckmarks", "Author": "VIPkiller17", - "SupportedVersion": "1.10.8839.30073", + "SupportedVersion": "1.10.8854.13992", "ModVersion": "1.5.9", "PortVersion": "1.3.0", "Description": "A mod that adds checkmarks and more detailed tooltips to items to indicate if it is needed for hideout upgrades, quests, or if it is on your wishlist", @@ -86,7 +86,7 @@ { "Name": "SAIN", "Author": "Solarint & DrakiaXYZ", - "SupportedVersion": "1.10.8839.30073", + "SupportedVersion": "1.10.8854.13992", "ModVersion": "2.1.9", "PortVersion": "1.3.0", "Description": "Bots that don't suck. FULL AI COMBAT SYSTEM REPLACEMENT", @@ -100,7 +100,7 @@ { "Name": "BigBrain", "Author": "DrakiaXYZ", - "SupportedVersion": "1.10.8839.30073", + "SupportedVersion": "1.10.8854.13992", "ModVersion": "0.3.2", "PortVersion": "1.3.0", "Description": "Required for SAIN and most other AI mods", @@ -114,7 +114,7 @@ { "Name": "Waypoints", "Author": "DrakiaXYZ", - "SupportedVersion": "1.10.8839.30073", + "SupportedVersion": "1.10.8854.13992", "ModVersion": "1.3.0", "PortVersion": "1.3.0", "Description": "Required for SAIN and most other AI mods", @@ -200,7 +200,7 @@ { "Name": "Looting Bots", "Author": "Skwizzy", - "SupportedVersion": "1.10.8839.30073", + "SupportedVersion": "1.10.8854.13992", "ModVersion": "1.2.1", "PortVersion": "1.4.0", "Description": "This mod aims to add more life to the bots by enhancing some EFT looting behaviors letting bots loot items, containers, and corpses during patrols. More features to come!", @@ -214,7 +214,7 @@ { "Name": "Questing Bots", "Author": "DanW", - "SupportedVersion": "1.10.8839.30073", + "SupportedVersion": "1.10.8854.13992", "ModVersion": "0.4.2", "PortVersion": "1.4.0", "Description": "This mod aims to add more life to the bots by enhancing some EFT looting behaviors letting bots loot items, containers, and corpses during patrols. More features to come!", @@ -309,7 +309,7 @@ ], "ConfigFiles": [] }, - { + { "Name": "Container Quick Loot", "Author": "CactusPie", "SupportedVersion": "1.9.8767.26420", @@ -322,5 +322,19 @@ "CactusPie.ContainerQuickLoot.dll" ], "ConfigFiles": [] + }, + { + "Name": "That's Lit", + "Author": "No3371", + "SupportedVersion": "1.10.8854.13992", + "ModVersion": "1.373.5", + "PortVersion": "1.0.0", + "Description": "One step closer to fair gameplay, by giving AIs non-perfect vision and reactions. Because we too deserve grasses, bushes and nights.", + "ModUrl": "https://hub.sp-tarkov.com/files/file/1453-that-s-lit/", + "RequiresFiles": false, + "PluginFiles": [ + "ThatsLit-Release.dll" + ], + "ConfigFiles": [] } ] \ No newline at end of file From da36dbc765ef1af1eb422bf25b5495ff28c0b93a Mon Sep 17 00:00:00 2001 From: caellach Date: Fri, 29 Mar 2024 20:58:06 -0400 Subject: [PATCH 4/7] use the publicly released version instead of local build version --- MasterList.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MasterList.json b/MasterList.json index c7572724..1bebf61c 100644 --- a/MasterList.json +++ b/MasterList.json @@ -72,7 +72,7 @@ { "Name": "MoreCheckmarks", "Author": "VIPkiller17", - "SupportedVersion": "1.10.8854.13992", + "SupportedVersion": "1.10.8854.18454", "ModVersion": "1.5.9", "PortVersion": "1.3.0", "Description": "A mod that adds checkmarks and more detailed tooltips to items to indicate if it is needed for hideout upgrades, quests, or if it is on your wishlist", @@ -86,7 +86,7 @@ { "Name": "SAIN", "Author": "Solarint & DrakiaXYZ", - "SupportedVersion": "1.10.8854.13992", + "SupportedVersion": "1.10.8854.18454", "ModVersion": "2.1.9", "PortVersion": "1.3.0", "Description": "Bots that don't suck. FULL AI COMBAT SYSTEM REPLACEMENT", @@ -100,7 +100,7 @@ { "Name": "BigBrain", "Author": "DrakiaXYZ", - "SupportedVersion": "1.10.8854.13992", + "SupportedVersion": "1.10.8854.18454", "ModVersion": "0.3.2", "PortVersion": "1.3.0", "Description": "Required for SAIN and most other AI mods", @@ -114,7 +114,7 @@ { "Name": "Waypoints", "Author": "DrakiaXYZ", - "SupportedVersion": "1.10.8854.13992", + "SupportedVersion": "1.10.8854.18454", "ModVersion": "1.3.0", "PortVersion": "1.3.0", "Description": "Required for SAIN and most other AI mods", @@ -200,7 +200,7 @@ { "Name": "Looting Bots", "Author": "Skwizzy", - "SupportedVersion": "1.10.8854.13992", + "SupportedVersion": "1.10.8854.18454", "ModVersion": "1.2.1", "PortVersion": "1.4.0", "Description": "This mod aims to add more life to the bots by enhancing some EFT looting behaviors letting bots loot items, containers, and corpses during patrols. More features to come!", @@ -214,7 +214,7 @@ { "Name": "Questing Bots", "Author": "DanW", - "SupportedVersion": "1.10.8854.13992", + "SupportedVersion": "1.10.8854.18454", "ModVersion": "0.4.2", "PortVersion": "1.4.0", "Description": "This mod aims to add more life to the bots by enhancing some EFT looting behaviors letting bots loot items, containers, and corpses during patrols. More features to come!", @@ -326,7 +326,7 @@ { "Name": "That's Lit", "Author": "No3371", - "SupportedVersion": "1.10.8854.13992", + "SupportedVersion": "1.10.8854.18454", "ModVersion": "1.373.5", "PortVersion": "1.0.0", "Description": "One step closer to fair gameplay, by giving AIs non-perfect vision and reactions. Because we too deserve grasses, bushes and nights.", From 6f85de9b2b5ad7117cf620d6c03d7a8a80ee67c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 29 Mar 2024 20:42:44 -0700 Subject: [PATCH 5/7] Update Loot Value --- LootValue-SIT/Plugin.cs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/LootValue-SIT/Plugin.cs b/LootValue-SIT/Plugin.cs index fb977569..2420dba7 100644 --- a/LootValue-SIT/Plugin.cs +++ b/LootValue-SIT/Plugin.cs @@ -12,9 +12,10 @@ using System.Collections.Generic; using System.Threading.Tasks; using StayInTarkov; -using CurrencyUtil = GClass2517; +using CurrencyUtil = GClass2528; using static LootValue.Globals; -using GClass1711 = GClass1844; +using InventoryItemInfo = GClass1854; +using InGameStatus = GClass1859; /// https://hub.sp-tarkov.com/files/file/1606-lootvalue/ /// https://github.com/IhanaMies/LootValue @@ -346,7 +347,7 @@ static async void Prefix(GridItemView __instance, PointerEventData.InputButton b itemSells.Add(item.Id); - if (LootValueMod.EnableQuickSell.Value && !GClass1849.InRaid && item != null) + if (LootValueMod.EnableQuickSell.Value && !InGameStatus.InRaid && item != null) { if (Input.GetKey(KeyCode.LeftShift) && Input.GetKey(KeyCode.LeftAlt)) { @@ -390,8 +391,8 @@ static async void Prefix(GridItemView __instance, PointerEventData.InputButton b return; } - GClass1711[] gs = { - new GClass1711 { count = fleaPrice.Value - 1, _tpl = "5449016a4bdc2d6f028b456f" } + InventoryItemInfo[] gs = { + new InventoryItemInfo { count = fleaPrice.Value - 1, _tpl = "5449016a4bdc2d6f028b456f" } }; Session.RagFair.AddOffer(false, new string[1] { item.Id }, gs, null); @@ -481,8 +482,8 @@ static void SellToFlea(Item item) if (Session.RagFair.Available && fleaPrice.HasValue) { - GClass1711[] gs = { - new GClass1711 { count = fleaPrice.Value - 1, _tpl = "5449016a4bdc2d6f028b456f" } + InventoryItemInfo[] gs = { + new InventoryItemInfo { count = fleaPrice.Value - 1, _tpl = "5449016a4bdc2d6f028b456f" } }; Session.RagFair.AddOffer(false, new string[1] { item.Id }, gs, null); From d7e1aec682205c1a9d23eb537222cbce95842127 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 29 Mar 2024 20:43:25 -0700 Subject: [PATCH 6/7] Update Amands Sense --- AmandsSense-SIT/AmandsSenseClass.cs | 100 ++++++++++++++-------------- 1 file changed, 51 insertions(+), 49 deletions(-) diff --git a/AmandsSense-SIT/AmandsSenseClass.cs b/AmandsSense-SIT/AmandsSenseClass.cs index 2556fbfb..6fc5eb94 100644 --- a/AmandsSense-SIT/AmandsSenseClass.cs +++ b/AmandsSense-SIT/AmandsSenseClass.cs @@ -20,6 +20,8 @@ using Aki.Common.Utils; using Sirenix.Utilities; +using ItemsListClass = GClass2752; + namespace AmandsSense { public class AmandsSenseClass : MonoBehaviour @@ -406,175 +408,175 @@ public void ClearAlwaysOn() } public static ESenseItemType SenseItemType(Type itemType) { - if (GClass2741.TypeTable["57864ada245977548638de91"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["57864ada245977548638de91"].IsAssignableFrom(itemType)) { return ESenseItemType.BuildingMaterials; } - if (GClass2741.TypeTable["57864a66245977548f04a81f"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["57864a66245977548f04a81f"].IsAssignableFrom(itemType)) { return ESenseItemType.Electronics; } - if (GClass2741.TypeTable["57864ee62459775490116fc1"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["57864ee62459775490116fc1"].IsAssignableFrom(itemType)) { return ESenseItemType.EnergyElements; } - if (GClass2741.TypeTable["57864e4c24597754843f8723"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["57864e4c24597754843f8723"].IsAssignableFrom(itemType)) { return ESenseItemType.FlammableMaterials; } - if (GClass2741.TypeTable["57864c322459775490116fbf"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["57864c322459775490116fbf"].IsAssignableFrom(itemType)) { return ESenseItemType.HouseholdMaterials; } - if (GClass2741.TypeTable["57864c8c245977548867e7f1"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["57864c8c245977548867e7f1"].IsAssignableFrom(itemType)) { return ESenseItemType.MedicalSupplies; } - if (GClass2741.TypeTable["57864bb7245977548b3b66c2"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["57864bb7245977548b3b66c2"].IsAssignableFrom(itemType)) { return ESenseItemType.Tools; } - if (GClass2741.TypeTable["57864a3d24597754843f8721"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["57864a3d24597754843f8721"].IsAssignableFrom(itemType)) { return ESenseItemType.Valuables; } - if (GClass2741.TypeTable["590c745b86f7743cc433c5f2"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["590c745b86f7743cc433c5f2"].IsAssignableFrom(itemType)) { return ESenseItemType.Others; } - if (GClass2741.TypeTable["5448e53e4bdc2d60728b4567"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448e53e4bdc2d60728b4567"].IsAssignableFrom(itemType)) { return ESenseItemType.Backpacks; } - if (GClass2741.TypeTable["5448e54d4bdc2dcc718b4568"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448e54d4bdc2dcc718b4568"].IsAssignableFrom(itemType)) { return ESenseItemType.BodyArmor; } - if (GClass2741.TypeTable["5448e5724bdc2ddf718b4568"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448e5724bdc2ddf718b4568"].IsAssignableFrom(itemType)) { return ESenseItemType.Eyewear; } - if (GClass2741.TypeTable["5a341c4686f77469e155819e"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5a341c4686f77469e155819e"].IsAssignableFrom(itemType)) { return ESenseItemType.Facecovers; } - if (GClass2741.TypeTable["5a341c4086f77401f2541505"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5a341c4086f77401f2541505"].IsAssignableFrom(itemType)) { return ESenseItemType.Headgear; } - if (GClass2741.TypeTable["57bef4c42459772e8d35a53b"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["57bef4c42459772e8d35a53b"].IsAssignableFrom(itemType)) { return ESenseItemType.GearComponents; } - if (GClass2741.TypeTable["5b3f15d486f77432d0509248"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5b3f15d486f77432d0509248"].IsAssignableFrom(itemType)) { return ESenseItemType.GearComponents; } - if (GClass2741.TypeTable["5645bcb74bdc2ded0b8b4578"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5645bcb74bdc2ded0b8b4578"].IsAssignableFrom(itemType)) { return ESenseItemType.Headsets; } - if (GClass2741.TypeTable["5448bf274bdc2dfc2f8b456a"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448bf274bdc2dfc2f8b456a"].IsAssignableFrom(itemType)) { return ESenseItemType.SecureContainers; } - if (GClass2741.TypeTable["5795f317245977243854e041"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5795f317245977243854e041"].IsAssignableFrom(itemType)) { return ESenseItemType.StorageContainers; } - if (GClass2741.TypeTable["5448e5284bdc2dcb718b4567"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448e5284bdc2dcb718b4567"].IsAssignableFrom(itemType)) { return ESenseItemType.TacticalRigs; } - if (GClass2741.TypeTable["550aa4154bdc2dd8348b456b"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["550aa4154bdc2dd8348b456b"].IsAssignableFrom(itemType)) { return ESenseItemType.FunctionalMods; } - if (GClass2741.TypeTable["55802f3e4bdc2de7118b4584"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["55802f3e4bdc2de7118b4584"].IsAssignableFrom(itemType)) { return ESenseItemType.GearMods; } - if (GClass2741.TypeTable["5a74651486f7744e73386dd1"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5a74651486f7744e73386dd1"].IsAssignableFrom(itemType)) { return ESenseItemType.GearMods; } - if (GClass2741.TypeTable["55802f4a4bdc2ddb688b4569"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["55802f4a4bdc2ddb688b4569"].IsAssignableFrom(itemType)) { return ESenseItemType.VitalParts; } - if (GClass2741.TypeTable["5447e1d04bdc2dff2f8b4567"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5447e1d04bdc2dff2f8b4567"].IsAssignableFrom(itemType)) { return ESenseItemType.MeleeWeapons; } - if (GClass2741.TypeTable["543be6564bdc2df4348b4568"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["543be6564bdc2df4348b4568"].IsAssignableFrom(itemType)) { return ESenseItemType.Throwables; } - if (GClass2741.TypeTable["543be5cb4bdc2deb348b4568"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["543be5cb4bdc2deb348b4568"].IsAssignableFrom(itemType)) { return ESenseItemType.AmmoPacks; } - if (GClass2741.TypeTable["5485a8684bdc2da71d8b4567"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5485a8684bdc2da71d8b4567"].IsAssignableFrom(itemType)) { return ESenseItemType.Rounds; } - if (GClass2741.TypeTable["5448e8d64bdc2dce718b4568"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448e8d64bdc2dce718b4568"].IsAssignableFrom(itemType)) { return ESenseItemType.Drinks; } - if (GClass2741.TypeTable["5448e8d04bdc2ddf718b4569"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448e8d04bdc2ddf718b4569"].IsAssignableFrom(itemType)) { return ESenseItemType.Food; } - if (GClass2741.TypeTable["5448f3a64bdc2d60728b456a"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448f3a64bdc2d60728b456a"].IsAssignableFrom(itemType)) { return ESenseItemType.Injectors; } - if (GClass2741.TypeTable["5448f3ac4bdc2dce718b4569"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448f3ac4bdc2dce718b4569"].IsAssignableFrom(itemType)) { return ESenseItemType.InjuryTreatment; } - if (GClass2741.TypeTable["5448f39d4bdc2d0a728b4568"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448f39d4bdc2d0a728b4568"].IsAssignableFrom(itemType)) { return ESenseItemType.Medkits; } - if (GClass2741.TypeTable["5448f3a14bdc2d27728b4569"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448f3a14bdc2d27728b4569"].IsAssignableFrom(itemType)) { return ESenseItemType.Pills; } - if (GClass2741.TypeTable["5c164d2286f774194c5e69fa"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5c164d2286f774194c5e69fa"].IsAssignableFrom(itemType)) { return ESenseItemType.ElectronicKeys; } - if (GClass2741.TypeTable["5c99f98d86f7745c314214b3"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5c99f98d86f7745c314214b3"].IsAssignableFrom(itemType)) { return ESenseItemType.MechanicalKeys; } - if (GClass2741.TypeTable["5448ecbe4bdc2d60728b4568"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5448ecbe4bdc2d60728b4568"].IsAssignableFrom(itemType)) { return ESenseItemType.InfoItems; } - if (GClass2741.TypeTable["5447e0e74bdc2d3c308b4567"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5447e0e74bdc2d3c308b4567"].IsAssignableFrom(itemType)) { return ESenseItemType.SpecialEquipment; } - if (GClass2741.TypeTable["616eb7aea207f41933308f46"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["616eb7aea207f41933308f46"].IsAssignableFrom(itemType)) { return ESenseItemType.SpecialEquipment; } - if (GClass2741.TypeTable["61605ddea09d851a0a0c1bbc"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["61605ddea09d851a0a0c1bbc"].IsAssignableFrom(itemType)) { return ESenseItemType.SpecialEquipment; } - if (GClass2741.TypeTable["5f4fbaaca5573a5ac31db429"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["5f4fbaaca5573a5ac31db429"].IsAssignableFrom(itemType)) { return ESenseItemType.SpecialEquipment; } - if (GClass2741.TypeTable["567849dd4bdc2d150f8b456e"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["567849dd4bdc2d150f8b456e"].IsAssignableFrom(itemType)) { return ESenseItemType.Maps; } - if (GClass2741.TypeTable["543be5dd4bdc2deb348b4569"].IsAssignableFrom(itemType)) + if (ItemsListClass.TypeTable["543be5dd4bdc2deb348b4569"].IsAssignableFrom(itemType)) { return ESenseItemType.Money; } @@ -1324,7 +1326,7 @@ private async void WaitAndStart() } else if (item.Template != null && !item.Template.CanSellOnRagfair && !AmandsSenseClass.itemsJsonClass.NonFleaExclude.Contains(item.TemplateId) && eSenseItemColor != ESenseItemColor.Rare && eSenseItemColor != ESenseItemColor.WishList) { - if (!AmandsSensePlugin.NonFleaAmmo.Value && GClass2741.TypeTable["5485a8684bdc2da71d8b4567"].IsAssignableFrom(item.GetType())) + if (!AmandsSensePlugin.NonFleaAmmo.Value && ItemsListClass.TypeTable["5485a8684bdc2da71d8b4567"].IsAssignableFrom(item.GetType())) { continue; } @@ -1508,7 +1510,7 @@ private async void WaitAndStart() { if (item.Parent != null) { - if (item.Parent.Container != null && item.Parent.Container.ParentItem != null && GClass2741.TypeTable["5448bf274bdc2dfc2f8b456a"].IsAssignableFrom(item.Parent.Container.ParentItem.GetType())) + if (item.Parent.Container != null && item.Parent.Container.ParentItem != null && ItemsListClass.TypeTable["5448bf274bdc2dfc2f8b456a"].IsAssignableFrom(item.Parent.Container.ParentItem.GetType())) { continue; } @@ -1547,7 +1549,7 @@ private async void WaitAndStart() } else if (item.Template != null && !item.Template.CanSellOnRagfair && !AmandsSenseClass.itemsJsonClass.NonFleaExclude.Contains(item.TemplateId) && eSenseItemColor != ESenseItemColor.Rare && eSenseItemColor != ESenseItemColor.WishList) { - if (!AmandsSensePlugin.NonFleaAmmo.Value && GClass2741.TypeTable["5485a8684bdc2da71d8b4567"].IsAssignableFrom(item.GetType())) + if (!AmandsSensePlugin.NonFleaAmmo.Value && ItemsListClass.TypeTable["5485a8684bdc2da71d8b4567"].IsAssignableFrom(item.GetType())) { continue; } @@ -2280,7 +2282,7 @@ private async void WaitAndStart() } else if (item.Template != null && !item.Template.CanSellOnRagfair && !AmandsSenseClass.itemsJsonClass.NonFleaExclude.Contains(item.TemplateId) && eSenseItemColor != ESenseItemColor.Rare && eSenseItemColor != ESenseItemColor.WishList) { - if (!AmandsSensePlugin.NonFleaAmmo.Value && GClass2741.TypeTable["5485a8684bdc2da71d8b4567"].IsAssignableFrom(item.GetType())) + if (!AmandsSensePlugin.NonFleaAmmo.Value && ItemsListClass.TypeTable["5485a8684bdc2da71d8b4567"].IsAssignableFrom(item.GetType())) { continue; } @@ -2449,7 +2451,7 @@ private async void WaitAndStart() { if (item.Parent != null) { - if (item.Parent.Container != null && item.Parent.Container.ParentItem != null && GClass2741.TypeTable["5448bf274bdc2dfc2f8b456a"].IsAssignableFrom(item.Parent.Container.ParentItem.GetType())) + if (item.Parent.Container != null && item.Parent.Container.ParentItem != null && ItemsListClass.TypeTable["5448bf274bdc2dfc2f8b456a"].IsAssignableFrom(item.Parent.Container.ParentItem.GetType())) { continue; } @@ -2488,7 +2490,7 @@ private async void WaitAndStart() } else if (item.Template != null && !item.Template.CanSellOnRagfair && !AmandsSenseClass.itemsJsonClass.NonFleaExclude.Contains(item.TemplateId) && eSenseItemColor != ESenseItemColor.Rare && eSenseItemColor != ESenseItemColor.WishList) { - if (!AmandsSensePlugin.NonFleaAmmo.Value && GClass2741.TypeTable["5485a8684bdc2da71d8b4567"].IsAssignableFrom(item.GetType())) + if (!AmandsSensePlugin.NonFleaAmmo.Value && ItemsListClass.TypeTable["5485a8684bdc2da71d8b4567"].IsAssignableFrom(item.GetType())) { continue; } From c9aa397f8aee3d882035c7a8b3e0e9ed15caf4a9 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 29 Mar 2024 20:44:13 -0700 Subject: [PATCH 7/7] Update MasterList.json --- MasterList.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MasterList.json b/MasterList.json index 1bebf61c..84e39c0e 100644 --- a/MasterList.json +++ b/MasterList.json @@ -16,7 +16,7 @@ { "Name": "Amands's Graphics", "Author": "Amands2Mello", - "SupportedVersion": "1.10.8839.30073", + "SupportedVersion": "1.10.8854.18454", "ModVersion": "1.5.3", "PortVersion": "1.2.0", "Description": "Lighting and postprocessing overhaul", @@ -44,7 +44,7 @@ { "Name": "Amands's Sense", "Author": "Amands2Mello", - "SupportedVersion": "1.10.8839.30073", + "SupportedVersion": "1.10.8854.18454", "ModVersion": "1.1.0", "PortVersion": "1.2.0", "Description": "", @@ -142,7 +142,7 @@ { "Name": "ConfigurationManager", "Author": "BepInEx", - "SupportedVersion": "1.9.8767.26420", + "SupportedVersion": "1.10.8854.18454", "ModVersion": "18.0.1", "PortVersion": "1.1.0", "Description": "An easy way to let user configure how a plugin behaves without the need to make your own GUI. The user can change any of the settings you expose, even keyboard shortcuts.\n\nThe configuration manager can be accessed in-game by pressing the hotkey (by default F1). Hover over the setting names to see their descriptions, if any.", @@ -284,7 +284,7 @@ { "Name": "LootValue", "Author": "IhanaMies", - "SupportedVersion": "1.10.8839.30073", + "SupportedVersion": "1.10.8854.18454", "ModVersion": "1.2.2", "PortVersion": "1.4.0", "Description": "Adds selectable quick sell functionality, one button (left click) or two button (left and right click)",