2.2.1 - fix table coral for nonviolent

llebj · Jan 31, 2021 · 44abaef · 44abaef
1 parent 4160b45
commit 44abaef
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/DeathRun/DeathRunUtils.cs b/DeathRun/DeathRunUtils.cs
@@ -20,7 +20,7 @@ namespace DeathRun
 
     public class DeathRunUtils
     {
-        public const string VERSION = "2.2.0";
+        public const string VERSION = "2.2.1";
 
         public static CenterText[] centerMessages = new CenterText[] {
             new CenterText(250f, true),

diff --git a/DeathRun/Patchers/KnifePatcher.cs b/DeathRun/Patchers/KnifePatcher.cs
@@ -41,7 +41,15 @@ public static bool Prefix(ref Knife __instance, GUIHand hand)
 					if (liveMixin)
 					{
 						bool wasAlive = liveMixin.IsAlive();
-						//liveMixin.TakeDamage(__instance.damage, position, __instance.damageType, null);
+						TechType t = CraftData.GetTechType(gameObject);
+						if ((t == TechType.GenericJeweledDisk) ||
+							(t == TechType.BlueJeweledDisk) ||
+							(t == TechType.GreenJeweledDisk) ||
+							(t == TechType.PurpleJeweledDisk) ||
+							(t == TechType.RedJeweledDisk))
+						{
+							liveMixin.TakeDamage(__instance.damage, position, __instance.damageType, null);
+						}
 						__instance.GiveResourceOnDamage(gameObject, liveMixin.IsAlive(), wasAlive);
 					}
 					global::Utils.PlayFMODAsset(__instance.attackSound, __instance.transform, 20f);

diff --git a/DeathRun/ReadMe.txt b/DeathRun/ReadMe.txt
@@ -1,4 +1,4 @@
-DEATH RUN - 2.2.0 - by Cattlesquat "standing on the shoulders of giants"
+DEATH RUN - 2.2.1 - 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.
 
@@ -19,6 +19,7 @@ Turns Subnautica into a "roguelike" where everything is harder and the only real
 • Vehicles and the Habitat Builder much more expensive
 
 -------------------------------------------------------------------------------------------------------------
+• 2.2.1 - Patched issue where "Nonviolent" knife couldn't cut Table Coral samples
 • 2.2.0 - Integrated Filter Chip now purges nitrogen while you're inside a base
 • 2.2.0 - Worse-than-DeathRun "Challenge" option for Radiation to go to 200m implemented
 • 2.2.0 - Challenge options for Filter Pump (to not work "in" the Aurora, or optionally "near" it)

diff --git a/QMods/DeathRun/ReadMe.txt b/QMods/DeathRun/ReadMe.txt
@@ -1,4 +1,4 @@
-DEATH RUN - 2.2.0 - by Cattlesquat "standing on the shoulders of giants"
+DEATH RUN - 2.2.1 - 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.
 
@@ -19,6 +19,7 @@ Turns Subnautica into a "roguelike" where everything is harder and the only real
 • Vehicles and the Habitat Builder much more expensive
 
 -------------------------------------------------------------------------------------------------------------
+• 2.2.1 - Patched issue where "Nonviolent" knife couldn't cut Table Coral samples
 • 2.2.0 - Integrated Filter Chip now purges nitrogen while you're inside a base
 • 2.2.0 - Worse-than-DeathRun "Challenge" option for Radiation to go to 200m implemented
 • 2.2.0 - Challenge options for Filter Pump (to not work "in" the Aurora, or optionally "near" it)