Merge pull request #12 from zhqu1148980644/patch-2

Auto-activate ActivableEffect weapon when defend
jecrell · Mar 30, 2020 · 9b06965 · 9b06965
2 parents 2f16692 + 8b212e4
commit 9b06965
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Source/AllModdingComponents/CompActivatableEffect/HarmonyCompActivatableEffect.cs b/Source/AllModdingComponents/CompActivatableEffect/HarmonyCompActivatableEffect.cs
@@ -106,8 +106,10 @@ public static bool TryStartCastOnPrefix(ref bool __result, Verb __instance)
                 {
                 }
 
-                if (compActivatableEffect.CurrentState == CompActivatableEffect.State.Activated) return true;
-
+                if (compActivatableEffect.CurrentState == CompActivatableEffect.State.Activated)
+                    return true;
+                else if (compActivatableEffect.TryActivate())
+                    return true;
                 if (Find.TickManager.TicksGame % 250 == 0)
                     Messages.Message("DeactivatedWarning".Translate(pawn.Label),
                         MessageTypeDefOf.RejectInput);
@@ -300,4 +302,4 @@ public static void GetGizmosPrefix(Pawn __instance, ref IEnumerable<Gizmo> __res
             }
         }
     }
-}
+}