fixed more than annoying release problem

rheirman · Jan 27, 2019 · a60de23 · a60de23
1 parent cc9b60f
commit a60de23
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Assemblies/WhatTheHack.dll b/Assemblies/WhatTheHack.dll
diff --git a/Source/WhatTheHack/Base.cs b/Source/WhatTheHack/Base.cs
@@ -156,9 +156,9 @@ where isHackingFaction(td)
             powerChargeModifier.CustomDrawer = rect => GUIDrawUtility.CustomDrawer_Filter(rect, powerChargeModifier, false, 0.05f, 5f, highlight1);
             powerChargeModifier.VisibilityPredicate = delegate { return settingsGroup_Balance; };
 
-            deathOnDownedChance = Settings.GetHandle<float>("deathOnDownedChance", "WTH_DeathOnDownedChance_Title".Translate(), "WTH_DeathOnDownedChance_Description".Translate(), 50f, Validators.FloatRangeValidator(0f, 100f));
-            deathOnDownedChance.CustomDrawer = rect => GUIDrawUtility.CustomDrawer_Filter(rect, deathOnDownedChance, false, 0f, 100f, highlight1);
-            deathOnDownedChance.VisibilityPredicate = delegate { return settingsGroup_Balance; };
+            //deathOnDownedChance = Settings.GetHandle<float>("deathOnDownedChance", "WTH_DeathOnDownedChance_Title".Translate(), "WTH_DeathOnDownedChance_Description".Translate(), 50f, Validators.FloatRangeValidator(0f, 100f));
+            //deathOnDownedChance.CustomDrawer = rect => GUIDrawUtility.CustomDrawer_Filter(rect, deathOnDownedChance, false, 0f, 100f, highlight1);
+            //deathOnDownedChance.VisibilityPredicate = delegate { return settingsGroup_Balance; };
 
             downedOnDeathThresholdChance = Settings.GetHandle<float>("downedOnDeathThresholdChance", "WTH_DownedOnDeathThresholdChance_Title".Translate(), "WTH_DownedOnDeathThresholdChance_Description".Translate(), 25f, Validators.FloatRangeValidator(0f, 100f));
             downedOnDeathThresholdChance.CustomDrawer = rect => GUIDrawUtility.CustomDrawer_Filter(rect, downedOnDeathThresholdChance, false, 0f, 100f, highlight1);

diff --git a/Source/WhatTheHack/Harmony/CombatExtended/CE_JobGiver_TakeAndEquip.cs b/Source/WhatTheHack/Harmony/CombatExtended/CE_JobGiver_TakeAndEquip.cs
@@ -10,9 +10,9 @@
 namespace WhatTheHack.Harmony
 {
     [HarmonyPatch]
-    class CE_JobGiver_TakeAndEquip_TryGiveJob
+    public class CE_JobGiver_TakeAndEquip_TryGiveJob
     {
-        static MethodBase TargetMethod()
+        public static MethodBase TargetMethod()
         {
             Assembly assemblyCE = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault((Assembly assembly) => assembly.FullName.StartsWith("CombatExtended"));
             MethodInfo stub = typeof(CE_JobGiver_TakeAndEquip_TryGiveJob).GetMethod("Stub");

diff --git a/Source/WhatTheHack/Harmony/Pawn_HealthTracker.cs b/Source/WhatTheHack/Harmony/Pawn_HealthTracker.cs
@@ -49,7 +49,7 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
                 if(flag && instruction.opcode == OpCodes.Ldc_R4)
                 {
                     //yield return new CodeInstruction(OpCodes.Call, typeof(Pawn_HealthTracker_CheckForStateChange).GetMethod(""))
-                    yield return new CodeInstruction(OpCodes.Ldc_R4,Base.deathOnDownedChance);//TODO: no magic number? 
+                    yield return new CodeInstruction(OpCodes.Ldc_R4, 0.5f);//TODO: no magic number? 
                     flag = false;
                 }
                 else
@@ -77,7 +77,7 @@ static void Postfix(Pawn_HealthTracker __instance, ref bool __result)
                     __result = false;
                     return;
                 }
-                if (Rand.Chance(Base.downedOnDeathThresholdChance))//Chance mech goes down instead of dying when lethal threshold is achieved. 
+                if (Rand.Chance(Base.downedOnDeathThresholdChance.Value/100f))//Chance mech goes down instead of dying when lethal threshold is achieved. 
                 {
                     __instance.AddHediff(WTH_DefOf.WTH_HeavilyDamaged);
                     if (pawn.mindState == null)