Merge pull request #35 from stayintarkov/update-29351

Update 29351

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);

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
 {

LootingBots-SIT/logics/PeacefulLogic.cs

@@ -1,7 +1,7 @@
 using DrakiaXYZ.BigBrain.Brains;
 using EFT;
 
-using PeacefulNodeClass = GClass185;
+using PeacefulNodeClass = GClass209;
 
 namespace LootingBots.Brain.Logics
 {

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;
 
 

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
 {

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": "",
@@ -72,7 +72,7 @@
   {
     "Name": "MoreCheckmarks",
     "Author": "VIPkiller17",
-    "SupportedVersion": "1.10.8839.30073",
+    "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.8839.30073",
+    "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.8839.30073",
+    "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.8839.30073",
+    "SupportedVersion": "1.10.8854.18454",
     "ModVersion": "1.3.0",
     "PortVersion": "1.3.0",
     "Description": "Required for SAIN and most other AI mods",
@@ -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.",
@@ -200,7 +200,7 @@
   {
     "Name": "Looting Bots",
     "Author": "Skwizzy",
-    "SupportedVersion": "1.10.8839.30073",
+    "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.8839.30073",
+    "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!",
@@ -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)",
@@ -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.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.",
+    "ModUrl": "https://hub.sp-tarkov.com/files/file/1453-that-s-lit/",
+    "RequiresFiles": false,
+    "PluginFiles": [
+      "ThatsLit-Release.dll"
+    ],
+    "ConfigFiles": []
   }
 ]

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");
                 }
             }
 

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<GClass598>.Instance.OnGrenadeThrow += GrenadeThrown;
-            Singleton<GClass598>.Instance.OnGrenadeExplosive += GrenadeExplosion;
+            Singleton<EFTSoundPlayer>.Instance.OnGrenadeThrow += GrenadeThrown;
+            Singleton<EFTSoundPlayer>.Instance.OnGrenadeExplosive += GrenadeExplosion;
             AISoundPlayed += SoundPlayed;
             PlayerTalk += PlayerTalked;
             Singleton<GameWorld>.Instance.gameObject.AddComponent<DebugData>();
@@ -334,8 +335,8 @@ public void Dispose()
 
                 AISoundPlayed -= SoundPlayed;
                 PlayerTalk -= PlayerTalked;
-                Singleton<GClass598>.Instance.OnGrenadeThrow -= GrenadeThrown;
-                Singleton<GClass598>.Instance.OnGrenadeExplosive -= GrenadeExplosion;
+                Singleton<EFTSoundPlayer>.Instance.OnGrenadeThrow -= GrenadeThrown;
+                Singleton<EFTSoundPlayer>.Instance.OnGrenadeExplosive -= GrenadeExplosion;
 
                 if (Bots.Count > 0)
                 {

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

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";

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;
 

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]

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";
 

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)
                 {

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<GClass598>.Instance.OnSoundPlayed += HearSound;
+            Singleton<EFTSoundPlayer>.Instance.OnSoundPlayed += HearSound;
         }
 
         public void Update()
@@ -25,7 +26,7 @@ public void Update()
 
         public void Dispose()
         {
-            Singleton<GClass598>.Instance.OnSoundPlayed -= HearSound;
+            Singleton<EFTSoundPlayer>.Instance.OnSoundPlayed -= HearSound;
         }
 
         public void HearSound(IPlayer player, Vector3 position, float power, AISoundType type)

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;
 

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<GClass598>.Instance.OnSoundPlayed += enemySoundHeard;
-                botOwner.GetPlayer.OnIPlayerDeadOrUnspawn += (player) => { Singleton<GClass598>.Instance.OnSoundPlayed -= enemySoundHeard; };
+                Singleton<EFTSoundPlayer>.Instance.OnSoundPlayed += enemySoundHeard;
+                botOwner.GetPlayer.OnIPlayerDeadOrUnspawn += (player) => { Singleton<EFTSoundPlayer>.Instance.OnSoundPlayed -= enemySoundHeard; };
             }
 
             lootingLayerMonitor = botOwner.GetPlayer.gameObject.AddComponent<LogicLayerMonitor>();

SPTQuestingBots-SIT/Controllers/ConfigController.cs

@@ -223,7 +223,7 @@ public static bool TryDeserializeObject<T>(string json, string errorMessage, out
                     }
                 }
 
-                obj = JsonConvert.DeserializeObject<T>(json, GClass1448.SerializerSettings);
+                obj = JsonConvert.DeserializeObject<T>(json, GClass1456.SerializerSettings);
 
                 return true;
             }