Merge pull request #162 from whateverusername0/bleeding-edge

shitfix
whateverusername0 · Apr 30, 2024 · da38d43 · da38d43
2 parents b3744b4 + 53643af
commit da38d43
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/VRTRAKILL.Plugin/Plugin/PluginInfo.cs b/VRTRAKILL.Plugin/Plugin/PluginInfo.cs
@@ -9,7 +9,7 @@ public static class PluginInfo
         public const string
             PLUGIN_GUID = "VRTRAKILL", // do not change this string EVER
             PLUGIN_NAME = "VRTRAKILL",
-            PLUGIN_VERSION = "0.20.0"; // never use spaces
+            PLUGIN_VERSION = "0.20.1"; // never use spaces
 
         public static readonly string
             PluginPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), // "~/BepInEx/plugins/VRTRAKILL"

diff --git a/VRTRAKILL.Plugin/Plugin/ULTRAKILL/Guns/Patches/AimingP.cs b/VRTRAKILL.Plugin/Plugin/ULTRAKILL/Guns/Patches/AimingP.cs
@@ -845,7 +845,7 @@ [HarmonyPrefix] [HarmonyPatch(typeof(ShotgunHammer), nameof(ShotgunHammer.Impact
         }
         [HarmonyPrefix] [HarmonyPatch(typeof(ShotgunHammer), nameof(ShotgunHammer.ThrowNade))] static bool HammerTN(ShotgunHammer __instance)
         {
-            __instance.grenadeCooldown = 0f;
+            MonoSingleton<WeaponCharges>.Instance.shoAltNadeCharge = 0f;
             __instance.pulledOut = 0.3f;
             __instance.gunReady = false;
             __instance.aboutToSecondary = false;
@@ -1040,7 +1040,7 @@ [HarmonyPrefix] [HarmonyPatch(typeof(ShotgunHammer), nameof(ShotgunHammer.Update
             }
 
             __instance.modelTransform.localPosition = new Vector3(__instance.defaultModelPosition.x + Random.Range((0f - __instance.swingCharge) / 30f, __instance.swingCharge / 30f), __instance.defaultModelPosition.y + Random.Range((0f - __instance.swingCharge) / 30f, __instance.swingCharge / 30f), __instance.defaultModelPosition.z + Random.Range((0f - __instance.swingCharge) / 30f, __instance.swingCharge / 30f));
-            if (MonoSingleton<InputManager>.Instance.InputSource.Fire2.IsPressed && __instance.variation != 2 && (__instance.variation == 1 || (float)__instance.grenadeCooldown >= 2f) && !__instance.aboutToSecondary && __instance.gunReady && __instance.gc.activated && !GameStateManager.Instance.PlayerInputLocked)
+            if (MonoSingleton<InputManager>.Instance.InputSource.Fire2.IsPressed && __instance.variation != 2 && (__instance.variation == 1 || MonoSingleton<WeaponCharges>.Instance.shoAltNadeCharge >= 2f) && !__instance.aboutToSecondary && __instance.gunReady && __instance.gc.activated && !GameStateManager.Instance.PlayerInputLocked)
             {
                 __instance.gunReady = false;
                 if (!__instance.wid || __instance.wid.delay == 0f)
@@ -1081,10 +1081,10 @@ [HarmonyPrefix] [HarmonyPatch(typeof(ShotgunHammer), nameof(ShotgunHammer.Update
 
             if (NoWeaponCooldown.NoCooldown)
             {
-                __instance.grenadeCooldown = 2f;
+                MonoSingleton<WeaponCharges>.Instance.shoAltNadeCharge = 2f;
             }
 
-            if ((float)__instance.grenadeCooldown < 2f)
+            if (MonoSingleton<WeaponCharges>.Instance.shoAltNadeCharge < 2f)
             {
                 __instance.nadeCharging = true;
             }

diff --git a/lib/Assembly-CSharp.dll b/lib/Assembly-CSharp.dll