fix(workshop): Trigger not evaluated correctly

Relates to #801

packages/kitten-scientists/source/BonfireManager.ts

@@ -75,9 +75,10 @@ export class BonfireManager implements Automation {
         (build.baseBuilding ?? build.building) as Building,
       ).meta;
     }
+    const sectionTrigger = this.settings.trigger;
 
     // Let the bulkmanager determine the builds we can make.
-    const buildList = bulkManager.bulk(builds, metaData, this.settings.trigger, "Bonfire");
+    const buildList = bulkManager.bulk(builds, metaData, sectionTrigger, "Bonfire");
 
     // Build all entries in the build list, where we can build any items.
     for (const build of buildList.filter(item => 0 < item.count)) {

packages/kitten-scientists/source/ReligionManager.ts

@@ -119,6 +119,8 @@ export class ReligionManager implements Automation {
       return;
     }
 
+    const sectionTrigger = this.settings.trigger;
+
     if (bestUnicornBuilding === "unicornPasture") {
       this._bonfireManager.build(bestUnicornBuilding, 0, 1);
     } else {
@@ -177,7 +179,7 @@ export class ReligionManager implements Automation {
       const build = this._bulkManager.bulk(
         buildRequest,
         this.getBuildMetaData(buildRequest),
-        this.settings.trigger,
+        sectionTrigger,
         "Religion",
       );
       if (0 < build.length && 0 < build[0].count) {
@@ -207,9 +209,10 @@ export class ReligionManager implements Automation {
     const metaData: Partial<
       Record<FaithItem, ReligionUpgradeInfo | TranscendenceUpgradeInfo | ZiggurathUpgradeInfo>
     > = this.getBuildMetaData(builds);
+    const sectionTrigger = this.settings.trigger;
 
     // Let the bulk manager figure out which of the builds to actually build.
-    const buildList = this._bulkManager.bulk(builds, metaData, this.settings.trigger, "Religion");
+    const buildList = this._bulkManager.bulk(builds, metaData, sectionTrigger, "Religion");
 
     for (const build of buildList) {
       if (0 < build.count) {

packages/kitten-scientists/source/SpaceManager.ts

@@ -64,7 +64,7 @@ export class SpaceManager implements Automation {
     builds: Partial<Record<SpaceBuilding, SpaceBuildingSetting>> = this.settings.buildings,
   ) {
     const bulkManager = this._bulkManager;
-    const trigger = this.settings.trigger;
+    const sectionTrigger = this.settings.trigger;
 
     // Get the current metadata for all the referenced buildings.
     const metaData: Partial<Record<SpaceBuilding, SpaceBuildingInfo>> = {};
@@ -73,7 +73,7 @@ export class SpaceManager implements Automation {
     }
 
     // Let the bulkmanager determine the builds we can make.
-    const buildList = bulkManager.bulk(builds, metaData, trigger, "Space");
+    const buildList = bulkManager.bulk(builds, metaData, sectionTrigger, "Space");
 
     // Build all entries in the build list, where we can build any items.
     for (const build of buildList) {

packages/kitten-scientists/source/TimeManager.ts

@@ -66,7 +66,7 @@ export class TimeManager {
     builds: Partial<Record<TimeItem, TimeSettingsItem>> = this.settings.buildings,
   ) {
     const bulkManager = this._bulkManager;
-    const trigger = this.settings.trigger;
+    const sectionTrigger = this.settings.trigger;
 
     // Get the current metadata for all the referenced buildings.
     const metaData: Partial<Record<TimeItem, ChronoForgeUpgradeInfo | VoidSpaceUpgradeInfo>> = {};
@@ -90,7 +90,7 @@ export class TimeManager {
     }
 
     // Let the bulkmanager determine the builds we can make.
-    const buildList = bulkManager.bulk(builds, metaData, trigger, "Time");
+    const buildList = bulkManager.bulk(builds, metaData, sectionTrigger, "Time");
 
     for (const build of buildList) {
       if (build.count > 0) {

packages/kitten-scientists/source/TradeManager.ts

@@ -53,13 +53,13 @@ export class TradeManager implements Automation {
   autoTrade(cacheManager?: MaterialsCache) {
     const catpower = this._workshopManager.getResource("manpower");
     const gold = this._workshopManager.getResource("gold");
-    const requireTrigger = this.settings.trigger;
+    const sectionTrigger = this.settings.trigger;
 
     // We should only trade if catpower and gold hit the trigger value.
     // Trades can additionally require specific resources. We will check for those later.
     if (
-      catpower.value / catpower.maxValue < requireTrigger ||
-      gold.value / gold.maxValue < requireTrigger
+      catpower.value / catpower.maxValue < sectionTrigger ||
+      gold.value / gold.maxValue < sectionTrigger
     ) {
       return;
     }
@@ -108,7 +108,7 @@ export class TradeManager implements Automation {
         // the required resource must be over the trigger value.
         // Additionally, gold must also be over the trigger value.
         !require ||
-        requireTrigger <= require.value / require.maxValue
+        sectionTrigger <= require.value / require.maxValue
       ) {
         trades.push(trade.race);
       }
@@ -144,8 +144,8 @@ export class TradeManager implements Automation {
         : this._workshopManager.getResource(tradeSettings.require);
       // Have the trigger conditions for this trade been met?
       const trigConditions =
-        (!require || requireTrigger <= require.value / require.maxValue) &&
-        requireTrigger <= gold.value / gold.maxValue;
+        (!require || sectionTrigger <= require.value / require.maxValue) &&
+        sectionTrigger <= gold.value / gold.maxValue;
       // How many trades could we do?
       const tradePos = this.getLowestTradeAmount(race, tradeSettings.limited, trigConditions);
       // If no trades are possible, remove the race.

packages/kitten-scientists/source/WorkshopManager.ts

@@ -107,6 +107,7 @@ export class WorkshopManager extends UpgradeManager implements Automation {
         }>;
       }
     >();
+    const sectionTrigger = this.settings.trigger;
 
     // Find all resources we would want to craft.
     // For crafts that require resources with a capacity, those resources must
@@ -133,10 +134,10 @@ export class WorkshopManager extends UpgradeManager implements Automation {
         .map(material => this.getResource(material))
         .filter(material => 0 < material.maxValue);
 
+      const trigger = Engine.evaluateSubSectionTrigger(sectionTrigger, craft.trigger);
       const allMaterialsAboveTrigger =
-        requiredMaterials.filter(
-          material => material.value / material.maxValue < this.settings.trigger,
-        ).length === 0;
+        requiredMaterials.filter(material => material.value / material.maxValue < trigger)
+          .length === 0;
 
       if (!allMaterialsAboveTrigger) {
         continue;