cleanup + fixed maintenance not being performed

rheirman · Apr 19, 2020 · fd92dc0 · fd92dc0
1 parent ecc5738
commit fd92dc0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/1.1/Assemblies/WhatTheHack.dll b/1.1/Assemblies/WhatTheHack.dll
diff --git a/1.1/Source/WhatTheHack/Harmony/HealthCardUtility.cs b/1.1/Source/WhatTheHack/Harmony/HealthCardUtility.cs
@@ -15,16 +15,13 @@ class HealthCardUtility_GenerateSurgeryOption
     {
         static bool Prefix(Pawn pawn, RecipeDef recipe, BodyPartRecord part, ref FloatMenuOption __result)
         {
-            Log.Message("generateSurgeryOption called for: " + recipe.defName);
             if(recipe.Worker is Recipe_Hacking worker)
             {
                 if (!worker.CanApplyOn(pawn, out string reason)){
                     if(reason == "")
                     {
-                        Log.Message("no reason for: " + recipe.defName);
                         return false;
                     }
-                    Log.Message("generating option for: " + recipe.defName);
                     string text = recipe.Worker.GetLabelWhenUsedOn(pawn, part).CapitalizeFirst();
                     if (part != null && !recipe.hideBodyPartNames)
                     {
@@ -37,12 +34,7 @@ static bool Prefix(Pawn pawn, RecipeDef recipe, BodyPartRecord part, ref FloatMe
                     __result = floatMenuOption;
                     return false;
                 }
-                else
-                {
-                    Log.Message("cannot apply: " + recipe.defName);
-                }
             }
-            Log.Message("GenerateSurgeryOption failed for: " + recipe.defName);
             return true;
         }
     }

diff --git a/1.1/Source/WhatTheHack/Harmony/StatWorker.cs b/1.1/Source/WhatTheHack/Harmony/StatWorker.cs
@@ -45,7 +45,7 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
             var instructionsList = new List<CodeInstruction>(instructions);
             foreach (CodeInstruction instruction in instructionsList)
             {
-                if (instruction.operand as MethodInfo == typeof(Pawn).GetField("skills"))
+                if (instruction.operand as MethodInfo == AccessTools.Field(typeof(Pawn), "skills"))
                 {
                     yield return new CodeInstruction(OpCodes.Ldarg_0);
                     yield return new CodeInstruction(OpCodes.Ldfld, AccessTools.Field(typeof(StatWorker), "stat"));

diff --git a/1.1/Source/WhatTheHack/Jobs/WorkGiver_PerformMaintenance.cs b/1.1/Source/WhatTheHack/Jobs/WorkGiver_PerformMaintenance.cs
@@ -24,11 +24,12 @@ public override bool ShouldSkip(Pawn pawn, bool forced = false)
             return false;
         }
 
-        private static bool PawnNeedsMaintenance(Pawn mech)
+        private bool PawnNeedsMaintenance(Pawn mech)
         {
-            if (mech.needs != null && mech.needs.TryGetNeed(WTH_DefOf.WTH_Mechanoid_Maintenance) is Need_Maintenance need && need.CurLevel < need.maintenanceThreshold)
-            {
-                return true;
+            if (mech.needs != null && mech.needs.TryGetNeed(WTH_DefOf.WTH_Mechanoid_Maintenance) is Need_Maintenance need){
+                if(need.CurLevel < GetThresHold(need)){
+                    return true;
+                }
             }
             return false;
         }

diff --git a/About/Version.xml b/About/Version.xml
@@ -4,7 +4,7 @@
 	but no minimum version will be required -->
 
 	<!-- Optional. This specifies the version of your mod for the library. Otherwise, the version of your mod's assembly will be used. -->
-	<overrideVersion>2.1.1</overrideVersion>
+	<overrideVersion>2.1.2</overrideVersion>
 	<!-- Optional. Use this to specify the version of HugsLib you are targeting.
 	See https://github.com/UnlimitedHugs/RimworldHugsLib/releases for the current version of the library.-->
 	<requiredLibraryVersion>5.0.0</requiredLibraryVersion>