fix: Don't hunt during pacifism

Implements upstream change 937fb24
oliversalzburg · Jul 18, 2021 · ccbffc5 · ccbffc5
1 parent 92a1782
commit ccbffc5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/packages/userscript/source/Engine.ts b/packages/userscript/source/Engine.ts
@@ -1643,6 +1643,10 @@ export class Engine {
     const manpower = this._craftManager.getResource("manpower");
     const subTrigger = this._host.options.auto.options.items.hunt.subTrigger ?? 0;
 
+    if (manpower.value < 100 || this._host.gamePage.challenges.isActive("pacifism")) {
+      return;
+    }
+
     if (subTrigger <= manpower.value / manpower.maxValue && 100 <= manpower.value) {
       // Determine how many hunts are being performed.
       let huntCount = Math.floor(manpower.value / 100);

diff --git a/packages/userscript/source/types/gamePage.ts b/packages/userscript/source/types/gamePage.ts
@@ -76,6 +76,7 @@ export type GamePage = {
       calculateEffects: (model: unknown, game: GamePage) => void;
       researched: number;
     };
+    isActive: (challenge: Challenge) => boolean;
   };
   console: {
     maxMessages: number;

diff --git a/packages/userscript/source/types/index.ts b/packages/userscript/source/types/index.ts
@@ -156,7 +156,13 @@ export type GameTab = {
   visible: boolean;
 };
 
-export type Challenge = "1000Years" | "anarchy" | "atheism" | "energy" | "winterIsComing";
+export type Challenge =
+  | "1000Years"
+  | "anarchy"
+  | "atheism"
+  | "energy"
+  | "pacifism"
+  | "winterIsComing";
 
 export * from "./buildings";
 export * from "./gamePage";