Merge branch 'dev-4.0-new-remap' into dev-4.0

project-fika · Jan 18, 2025 · 9c46ce2 · 9c46ce2
2 parents 3e82c94 + 348b806
commit 9c46ce2
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 19 deletions.
diff --git a/Fika.Headless/FikaHeadlessPlugin.cs b/Fika.Headless/FikaHeadlessPlugin.cs
@@ -96,18 +96,18 @@ protected void Awake()
             new ValidateFormatPatch2().Enable();
             new ValidateFormatPatch3().Enable();
             new GameWorld_OnGameStarted_Patch().Enable();
-            new MainMenuController_method_48_Patch().Enable();
+            new MainMenuControllerClass_method_48_Patch().Enable();
             new ConsoleScreen_OnProfileReceive_Patch().Enable();
             new Class442_Run_Patch().Enable();
             new Player_VisualPass_Patch().Enable();
             new IsReflexAvailablePatch().Enable();
             new AudioSource_Play_Transpiler().Enable();
             new LevelSettings_ApplySettings_Transpiler().Enable();
             new LevelSettings_ApplyTreeWindSettings_Transpiler().Enable();
-            new MainMenuController_method_45_Patch().Enable();
-            new MainMenuController_method_46_Patch().Enable();
-            new MainMenuController_method_73_Patch().Enable();
-            new MainMenuController_method_74_Patch().Enable();
+            new MainMenuControllerClass_method_45_Patch().Enable();
+            new MainMenuControllerClass_method_46_Patch().Enable();
+            new MainMenuControllerClass_method_73_Patch().Enable();
+            new MainMenuControllerClass_method_74_Patch().Enable();
             new LocaleManagerClass_String_0_Patch().Enable();
             new TarkovApplication_method_39_Patch().Enable();
             new MovementContext_AnimatorStatesLateUpdate_Update().Enable();
@@ -372,7 +372,7 @@ private IEnumerator BeginFikaStartRaid(StartHeadlessRequest request, ISession se
             raidSettings.RaidMode = ERaidMode.Local;
             raidSettings.IsPveOffline = true;
 
-            MainMenuController mmc = Traverse.Create(tarkovApplication).Field<MainMenuController>("mainMenuController").Value;
+            MainMenuControllerClass mmc = Traverse.Create(tarkovApplication).Field<MainMenuControllerClass>("mainMenuController").Value;
             Traverse mmcTraverse = Traverse.Create(mmc);
             mmcTraverse.Field<RaidSettings>("raidSettings_0").Value = raidSettings;
             mmcTraverse.Field<RaidSettings>("raidSettings_1").Value = raidSettings;

diff --git a/Fika.Headless/Patches/DestroyGraphics/RainFallDrops_Awake_Patch.cs b/Fika.Headless/Patches/DestroyGraphics/RainFallDrops_Awake_Patch.cs
@@ -0,0 +1,21 @@
+using SPT.Reflection.Patching;
+using UnityEngine;
+using System.Reflection;
+
+namespace Fika.Headless.Patches.DestroyGraphics
+{
+    internal class RainFallDrops_Awake_Patch : ModulePatch
+    {
+        protected override MethodBase GetTargetMethod()
+        {
+            return typeof(RainFallDrops).GetMethod(nameof(RainFallDrops.smethod_0));
+        }
+
+        [PatchPrefix]
+        public static bool Prefix(int count, ref Mesh __result)
+        {
+            __result = new();
+            return false;
+        }
+    }
+}
diff --git a/...hes/MainMenuController_method_45_Patch.cs → ...ainMenuControllerClass_method_45_Patch.cs b/...hes/MainMenuController_method_45_Patch.cs → ...ainMenuControllerClass_method_45_Patch.cs
@@ -6,15 +6,15 @@ namespace Fika.Headless.Patches
     /// <summary>
     /// This patch simulates clicking "Next" by calling the method bound to the event of the button
     /// </summary>
-    internal class MainMenuController_method_45_Patch : ModulePatch
+    internal class MainMenuControllerClass_method_45_Patch : ModulePatch
     {
         protected override MethodBase GetTargetMethod()
         {
-            return typeof(MainMenuController).GetMethod(nameof(MainMenuController.method_45));
+            return typeof(MainMenuControllerClass).GetMethod(nameof(MainMenuControllerClass.method_45));
         }
 
         [PatchPrefix]
-        public static bool Prefix(MainMenuController __instance)
+        public static bool Prefix(MainMenuControllerClass __instance)
         {
             __instance.method_77();
             return false;

diff --git a/...hes/MainMenuController_method_46_Patch.cs → ...ainMenuControllerClass_method_46_Patch.cs b/...hes/MainMenuController_method_46_Patch.cs → ...ainMenuControllerClass_method_46_Patch.cs
@@ -6,15 +6,15 @@ namespace Fika.Headless.Patches
     /// <summary>
     /// This patch simulates clicking "Next" by calling the method bound to the event of the button
     /// </summary>
-    internal class MainMenuController_method_46_Patch : ModulePatch
+    internal class MainMenuControllerClass_method_46_Patch : ModulePatch
     {
         protected override MethodBase GetTargetMethod()
         {
-            return typeof(MainMenuController).GetMethod(nameof(MainMenuController.method_46));
+            return typeof(MainMenuControllerClass).GetMethod(nameof(MainMenuControllerClass.method_46));
         }
 
         [PatchPrefix]
-        public static bool Prefix(MainMenuController __instance)
+        public static bool Prefix(MainMenuControllerClass __instance)
         {
             __instance.method_47();
             return false;

diff --git a/...hes/MainMenuController_method_48_Patch.cs → ...ainMenuControllerClass_method_48_Patch.cs b/...hes/MainMenuController_method_48_Patch.cs → ...ainMenuControllerClass_method_48_Patch.cs
@@ -6,11 +6,11 @@ namespace Fika.Headless.Patches
     /// <summary>
     /// This patch skips checking for keys (e.g. Labs)
     /// </summary>
-    public class MainMenuController_method_48_Patch : ModulePatch
+    public class MainMenuControllerClass_method_48_Patch : ModulePatch
     {
         protected override MethodBase GetTargetMethod()
         {
-            return typeof(MainMenuController).GetMethod(nameof(MainMenuController.method_48));
+            return typeof(MainMenuControllerClass).GetMethod(nameof(MainMenuControllerClass.method_48));
         }
 
         [PatchPrefix]

diff --git a/...hes/MainMenuController_method_73_Patch.cs → ...ainMenuControllerClass_method_73_Patch.cs b/...hes/MainMenuController_method_73_Patch.cs → ...ainMenuControllerClass_method_73_Patch.cs
@@ -6,11 +6,11 @@ namespace Fika.Headless.Patches
     /// <summary>
     /// This patch skips a bunch of unneccesary methods
     /// </summary>
-    internal class MainMenuController_method_73_Patch : ModulePatch
+    internal class MainMenuControllerClass_method_73_Patch : ModulePatch
     {
         protected override MethodBase GetTargetMethod()
         {
-            return typeof(MainMenuController).GetMethod(nameof(MainMenuController.method_73));
+            return typeof(MainMenuControllerClass).GetMethod(nameof(MainMenuControllerClass.method_73));
         }
 
         [PatchPrefix]

diff --git a/...hes/MainMenuController_method_74_Patch.cs → ...ainMenuControllerClass_method_74_Patch.cs b/...hes/MainMenuController_method_74_Patch.cs → ...ainMenuControllerClass_method_74_Patch.cs
@@ -7,15 +7,15 @@ namespace Fika.Headless.Patches
     /// <summary>
     /// This patch ensures that the raid settings are skipped if you are playing as a scav
     /// </summary>
-    internal class MainMenuController_method_74_Patch : ModulePatch
+    internal class MainMenuControllerClass_method_74_Patch : ModulePatch
     {
         protected override MethodBase GetTargetMethod()
         {
-            return typeof(MainMenuController).GetMethod(nameof(MainMenuController.method_74));
+            return typeof(MainMenuControllerClass).GetMethod(nameof(MainMenuControllerClass.method_74));
         }
 
         [PatchPostfix]
-        public static void Postfix(MainMenuController __instance, RaidSettings ___raidSettings_0)
+        public static void Postfix(MainMenuControllerClass __instance, RaidSettings ___raidSettings_0)
         {
             if (___raidSettings_0.IsScav)
             {

diff --git a/References/hollowed.dll b/References/hollowed.dll
diff --git a/References/spt-common.dll b/References/spt-common.dll
diff --git a/References/spt-core.dll b/References/spt-core.dll
diff --git a/References/spt-custom.dll b/References/spt-custom.dll
diff --git a/References/spt-debugging.dll b/References/spt-debugging.dll
diff --git a/References/spt-reflection.dll b/References/spt-reflection.dll
diff --git a/References/spt-singleplayer.dll b/References/spt-singleplayer.dll