disable mech when arrive at world map + small fixes

rheirman · May 8, 2019 · 2572cc3 · 2572cc3
1 parent 9ed4e38
commit 2572cc3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/Assemblies/WhatTheHack.dll b/Assemblies/WhatTheHack.dll
diff --git a/Source/WhatTheHack/Extensions.cs b/Source/WhatTheHack/Extensions.cs
@@ -252,6 +252,7 @@ public static bool CanStartWorkNow(this Pawn pawn)
                 Need_Power powerNeed = pawn.needs.TryGetNeed<Need_Power>();
                 if(pawn.Downed ||
                     pawn.ShouldRecharge() ||
+                    pawn.ShouldBeMaintained() || 
                     (pawn.OnBaseMechanoidPlatform() && powerNeed.CurLevelPercentage <= powerNeed.canStartWorkThreshold) ||
                     pawn.OnHackingTable())
                 {

diff --git a/Source/WhatTheHack/Harmony/GenSpawn.cs b/Source/WhatTheHack/Harmony/GenSpawn.cs
@@ -7,6 +7,7 @@
 using System.Text;
 using Verse;
 using WhatTheHack.Comps;
+using WhatTheHack.Storage;
 
 namespace WhatTheHack.Harmony
 {
@@ -40,6 +41,12 @@ static void Postfix(ref Thing newThing, bool respawningAfterLoad)
             {
                 LessonAutoActivator.TeachOpportunity(WTH_DefOf.WTH_Modification, OpportunityType.Important);
             }
+            //disable mechs on map arrival
+            if (!respawningAfterLoad && newThing is Pawn pawn && pawn.IsHacked() && pawn.Faction == Faction.OfPlayer && Base.Instance.GetExtendedDataStorage() is ExtendedDataStorage store)
+            {
+                ExtendedPawnData extendedPawnData = store.GetExtendedDataFor(pawn);
+                extendedPawnData.isActive = false;
+            }
         }
 
         //Only initialize the refeulcomp of mechanoids that have a repairmodule. 

diff --git a/Source/WhatTheHack/Harmony/Pawn_Draftcontroller.cs b/Source/WhatTheHack/Harmony/Pawn_Draftcontroller.cs
@@ -67,6 +67,10 @@ private static void DisableCommandIfMechanoidPowerLow(Pawn_DraftController __ins
                 {
                     toggleCommand.Disable("WTH_Reason_PowerLow".Translate());
                 }
+                if (__instance.pawn.ShouldBeMaintained())
+                {
+                    toggleCommand.Disable("WTH_Reason_MaintenanceLow".Translate());
+                }
             }
         }
-Original file line number
+Diff line change
@@ Expand Up @@
                     {
                         toggleCommand.Disable("WTH_Reason_PowerLow".Translate());
                     }
+                    if (__instance.pawn.ShouldBeMaintained())
+                    {
+                        toggleCommand.Disable("WTH_Reason_MaintenanceLow".Translate());
+                    }
                 }
             }
@@ Expand Down @@