1.8.2 bug fixes

llebj · Dec 31, 2020 · cd93a5c · cd93a5c
1 parent 7b03cdb
commit cd93a5c
Show file tree

Hide file tree

Showing 12 changed files with 175 additions and 86 deletions.
diff --git a/DeathRun/DeathRun.cs b/DeathRun/DeathRun.cs
diff --git a/DeathRun/DeathRunConfig.cs b/DeathRun/DeathRunConfig.cs
@@ -52,6 +52,7 @@ public class Config : ConfigFile
 
         public const string NO_VEHICLES = "No Vehicles Challenge!";
         public const string DEATH_VEHICLES = "Death Run (exotic costs)";
+        public const string DEATH_VEHICLES_2 = "Death Run (alternate costs)";
         public const string HARD_VEHICLES = "Hard (unusual costs)";
 
         public const string RADIATION_DEATHRUN = "Death Run (60m)";
@@ -102,7 +103,7 @@ public class Config : ConfigFile
         [Choice("Power to Exit Vehicles", new string[] { EXORBITANT, DEATHRUN, HARD, NORMAL }), OnChange(nameof(ChangedChoice))]
         public string powerExitVehicles = DEATHRUN;
 
-        [Choice("Vehicle Costs", new string[] { NO_VEHICLES, DEATH_VEHICLES, HARD_VEHICLES, NORMAL }), OnChange(nameof(ChangedChoice))]
+        [Choice("Vehicle Costs", new string[] { NO_VEHICLES, DEATH_VEHICLES, DEATH_VEHICLES_2, HARD_VEHICLES, NORMAL }), OnChange(nameof(ChangedChoice))]
         public string vehicleCosts = DEATH_VEHICLES;
 
         [Choice("Habitat Builder", new string[] { DEATHRUN, HARD, NORMAL }), OnChange(nameof(ChangedChoice))]

diff --git a/DeathRun/DeathRunUtils.cs b/DeathRun/DeathRunUtils.cs
@@ -280,7 +280,7 @@ public static void ShowHighScores(bool should)
             }
 
             highScoreLabel.setAlign(TextAnchor.MiddleCenter);
-            highScoreLabel.ShowMessage("Death Run 1.8.1 - Best Scores");
+            highScoreLabel.ShowMessage("Death Run 1.8.2 - Best Scores");
             highScoreTag.setAlign(TextAnchor.MiddleCenter);
 
             int pick;

diff --git a/DeathRun/Patchers/AggressionPatcher.cs b/DeathRun/Patchers/AggressionPatcher.cs
@@ -188,7 +188,7 @@ public static void PostFix(EcoRegion __instance, EcoTargetType type, Vector3 wsP
                 {
                     float sqrMagnitude = (wsPos - ecoTarget.GetPosition()).sqrMagnitude;
 
-                    if (((ecoTarget.GetGameObject() == Player.main.gameObject) && !Player.main.IsInside()) || 
+                    if (((ecoTarget.GetGameObject() == Player.main.gameObject) && !Player.main.IsInside() && Player.main.IsUnderwater()) || 
                         (ecoTarget.GetGameObject().GetComponent<Vehicle>() && (ecoTarget.GetGameObject().GetComponent<Vehicle>() == Player.main.currentMountedVehicle)))
                     {
                         bool feeding = false;

diff --git a/DeathRun/Patchers/DamagePatcher.cs b/DeathRun/Patchers/DamagePatcher.cs
@@ -64,7 +64,14 @@ public static void Postfix(DamageType type, GameObject target, ref float __resul
                         break;
 
                     case DamageType.Normal:
-                        __result *= little;
+                        if (__result < 50)
+                        {
+                            __result *= UnityEngine.Random.Range(little, big);
+                        }
+                        else
+                        {
+                            __result *= little;
+                        }
                         break;
 
                     case DamageType.Poison:

diff --git a/DeathRun/Patchers/MainMenuPatcher.cs b/DeathRun/Patchers/MainMenuPatcher.cs
@@ -57,7 +57,7 @@ public static bool Prefix()
 
 
     [HarmonyPatch(typeof(uGUI_MainMenu))]
-    [HarmonyPatch("OnButtonFreedom")]
+    [HarmonyPatch("OnButtonCreative")]
     internal class CreativeButtonPatcher
     {
         [HarmonyPrefix]

diff --git a/DeathRun/Patchers/NitroLevPatcher.cs b/DeathRun/Patchers/NitroLevPatcher.cs
@@ -270,9 +270,9 @@ public static bool Prefix (ref NitrogenLevel __instance)
                                     {
                                         DeathRunUtils.CenterMessage("Decompression Warning", 5);
                                         DeathRunUtils.CenterMessage("Dive to Safe Depth!", 5, 1);
-                                        DeathRun.saveData.nitroSave.n2WarningTicks = ticks;
                                     }
                                 }
+                                DeathRun.saveData.nitroSave.n2WarningTicks = ticks;
                             }
                         }
 
@@ -392,9 +392,9 @@ private static void doAscentWarning (int ticks)
                 {
                     ErrorMessage.AddMessage("Ascending too quickly!");
                     DeathRunUtils.CenterMessage("Ascending too quickly!", 5);
-                    DeathRun.saveData.nitroSave.ascentWarningTicks = ticks;
                 }
             }
+            DeathRun.saveData.nitroSave.ascentWarningTicks = ticks;
         }
 
         /**

diff --git a/DeathRun/Properties/AssemblyInfo.cs b/DeathRun/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.1.0")]
-[assembly: AssemblyFileVersion("1.8.1.0")]
+[assembly: AssemblyVersion("1.8.2.0")]
+[assembly: AssemblyFileVersion("1.8.2.0")]
diff --git a/DeathRun/ReadMe.txt b/DeathRun/ReadMe.txt
@@ -1,4 +1,4 @@
-DEATH RUN - 1.8.1 - by Cattlesquat "standing on the shoulders of giants"
+DEATH RUN - 1.8.2 - by Cattlesquat "standing on the shoulders of giants"
 
 Turns Subnautica into a "roguelike" where everything is harder and the only real question is how LONG you can survive.
 
@@ -46,6 +46,9 @@ Turns Subnautica into a "roguelike" where everything is harder and the only real
 • 1.8 - Damage increases WEREN'T WORKING. Now they are! FEAR THE DAMAGE INCREASES!!!
 • 1.8 - Won't take Bends damage while inside your own base
 • 1.8 - Can adjust the frequency with which Bends / Air Breathability / Etc warnings (aka "tips") appear
+• 1.8.2 - Alternative "Death Run Costs" for Vehicles available
+• 1.8.2 - Fixed lack of bends damage w/ warnings turned off
+• 1.8.2 - Spotlights back to only requiring one scan (since they don't despawn when you scan them, no point)
 -------------------------------------------------------------------------------------------------------------
 
 :: GENERAL OTHER STUFF ::

diff --git a/DeathRun/mod.json b/DeathRun/mod.json
@@ -2,7 +2,7 @@
   "Id": "DeathRun",
   "DisplayName": "DeathRun",
   "Author": "Cattlesquat",
-  "Version": "1.8.1",
+  "Version": "1.8.2",
   "Enable": true,
   "AssemblyName": "DeathRun.dll",
   "EntryMethod": "DeathRun.DeathRun.Patch",

diff --git a/QMods/DeathRun/ReadMe.txt b/QMods/DeathRun/ReadMe.txt
@@ -1,4 +1,4 @@
-DEATH RUN - 1.7.3 - by Cattlesquat "standing on the shoulders of giants"
+DEATH RUN - 1.8.2 - by Cattlesquat "standing on the shoulders of giants"
 
 Turns Subnautica into a "roguelike" where everything is harder and the only real question is how LONG you can survive.
 
@@ -46,6 +46,9 @@ Turns Subnautica into a "roguelike" where everything is harder and the only real
 • 1.8 - Damage increases WEREN'T WORKING. Now they are! FEAR THE DAMAGE INCREASES!!!
 • 1.8 - Won't take Bends damage while inside your own base
 • 1.8 - Can adjust the frequency with which Bends / Air Breathability / Etc warnings (aka "tips") appear
+• 1.8.2 - Alternative "Death Run Costs" for Vehicles available
+• 1.8.2 - Fixed lack of bends damage w/ warnings turned off
+• 1.8.2 - Spotlights back to only requiring one scan (since they don't despawn when you scan them, no point)
 -------------------------------------------------------------------------------------------------------------
 
 :: GENERAL OTHER STUFF ::

diff --git a/QMods/DeathRun/mod.json b/QMods/DeathRun/mod.json
@@ -2,7 +2,7 @@
   "Id": "DeathRun",
   "DisplayName": "DeathRun",
   "Author": "Cattlesquat",
-  "Version": "1.7.3",
+  "Version": "1.8.2",
   "Enable": true,
   "AssemblyName": "DeathRun.dll",
   "EntryMethod": "DeathRun.DeathRun.Patch",