fix up painkillerdesat mod

CWXDEV · Jun 17, 2024 · 109ca52 · 109ca52
1 parent a083418
commit 109ca52
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 20 deletions.
diff --git a/src/Build/BepInEx/plugins/CWX/CWX_MegaMod.dll b/src/Build/BepInEx/plugins/CWX/CWX_MegaMod.dll
diff --git a/src/CWX-MegaMod/MegaMod.cs b/src/CWX-MegaMod/MegaMod.cs
@@ -1,7 +1,6 @@
 using BepInEx;
 using BepInEx.Configuration;
 using BepInEx.Logging;
-using CWX_MegaMod.BackpackReload;
 using CWX_MegaMod.Config;
 using CWX_MegaMod.InventoryViewer;
 using CWX_MegaMod.PainkillerDesat;
@@ -41,6 +40,7 @@ public void Awake()
 			new PainkillerDesatScript1().Enable();
 			new PainkillerDesatScript2().Enable();
 			new PainkillerDesatScript3().Enable();
+			new PainkillerDesatScript4().Enable();
 			new WeatherPatcherScopePatch().Enable();
 		}
 

diff --git a/src/CWX-MegaMod/PainkillerDesat/PainkillerDesatPatch1.cs b/src/CWX-MegaMod/PainkillerDesat/PainkillerDesatPatch1.cs
@@ -12,21 +12,19 @@ protected override MethodBase GetTargetMethod()
         }
 
         [PatchPrefix] // removes the sharpen/desat effect from some painkillers
-        public static bool PatchPrefix(bool desaturateProvider, CC_Sharpen ___cc_Sharpen_0)
+        public static bool PatchPrefix(ref CC_Sharpen ___cc_Sharpen_0)
         {
             if (!MegaMod.PainkillerDesat.Value)
             {
                 return true;
             }
 
-            if (desaturateProvider)
-            {
-                ___cc_Sharpen_0.DesaturateEffectSettingsProvider.Radius = 0f;
-            }
-            else
-            {
-                ___cc_Sharpen_0.Radius = 0f;
-            }
+            ___cc_Sharpen_0.DesaturateEffectSettingsProvider.MaskDesaturate = 0f;
+            ___cc_Sharpen_0.MaskDesaturate = 0f;
+            ___cc_Sharpen_0.DesaturateEffectSettingsProvider.Radius = 1f;
+            ___cc_Sharpen_0.Radius = 1f;
+            ___cc_Sharpen_0.DesaturateEffectSettingsProvider.RadiusFalloff = 0.425f;
+            ___cc_Sharpen_0.RadiusFalloff = 0.425f;
 
             return false; // dont do method
         }

diff --git a/src/CWX-MegaMod/PainkillerDesat/PainkillerDesatPatch2.cs b/src/CWX-MegaMod/PainkillerDesat/PainkillerDesatPatch2.cs
@@ -12,21 +12,19 @@ protected override MethodBase GetTargetMethod()
         }
 
         [PatchPrefix] // removes the sharpen/desat effect from some painkillers
-        public static bool PatchPrefix(bool desaturateProvider, CC_Sharpen ___cc_Sharpen_0)
+        public static bool PatchPrefix(ref CC_Sharpen ___cc_Sharpen_0)
         {
             if (!MegaMod.PainkillerDesat.Value)
             {
                 return true;
             }
 
-            if (desaturateProvider)
-            {
-                ___cc_Sharpen_0.DesaturateEffectSettingsProvider.MaskDesaturate = 0f;
-            }
-            else
-            {
-                ___cc_Sharpen_0.MaskDesaturate = 0f;
-            }
+            ___cc_Sharpen_0.DesaturateEffectSettingsProvider.MaskDesaturate = 0f;
+            ___cc_Sharpen_0.MaskDesaturate = 0f;
+            ___cc_Sharpen_0.DesaturateEffectSettingsProvider.Radius = 1f;
+            ___cc_Sharpen_0.Radius = 1f;
+            ___cc_Sharpen_0.DesaturateEffectSettingsProvider.RadiusFalloff = 0.425f;
+            ___cc_Sharpen_0.RadiusFalloff = 0.425f;
 
             return false; // dont do method
         }

diff --git a/src/CWX-MegaMod/PainkillerDesat/PainkillerDesatPatch3.cs b/src/CWX-MegaMod/PainkillerDesat/PainkillerDesatPatch3.cs
@@ -12,7 +12,7 @@ protected override MethodBase GetTargetMethod()
         }
 
         [PatchPrefix] // removes the wiggle effect from some painkillers
-        public static bool PatchPrefix(CC_Wiggle ___cc_Wiggle_0)
+        public static bool PatchPrefix(ref CC_Wiggle ___cc_Wiggle_0)
         {
             if (!MegaMod.PainkillerDesat.Value)
             {

diff --git a/src/CWX-MegaMod/PainkillerDesat/PainkillerDesatPatch4.cs b/src/CWX-MegaMod/PainkillerDesat/PainkillerDesatPatch4.cs
@@ -0,0 +1,27 @@
+using System.Reflection;
+using Aki.Reflection.Patching;
+using HarmonyLib;
+
+namespace CWX_MegaMod.PainkillerDesat
+{
+    public class PainkillerDesatScript4 : ModulePatch
+    {
+        protected override MethodBase GetTargetMethod()
+        {
+            return AccessTools.Method(typeof(EffectsController.Class568), nameof(EffectsController.Class568.Toggle));
+        }
+
+        [PatchPrefix] // removes the double vision effect from some painkillers
+        public static bool PatchPrefix(ref CC_DoubleVision ___cc_DoubleVision_0)
+        {
+            if (!MegaMod.PainkillerDesat.Value)
+            {
+                return true;
+            }
+
+            ___cc_DoubleVision_0.enabled = false;
+
+            return false; // dont do method
+        }
+    }
+}