(Aegis) unify parameters

ahyangyi · Nov 6, 2023 · 89b9078 · 89b9078
1 parent c411ade
commit 89b9078
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/industry/economies/firs_arctic.py b/industry/economies/firs_arctic.py
@@ -91,7 +91,7 @@ def get_economy(self, parameters):
             del ret.graph[ammonia_plant]
             del ret.graph[clay_pit]
 
-        if parameters["BOOSTER"] == "UNIVERSAL":
+        if parameters["PRIMARY_INDUSTRY_GROWTH"] == "UNIVERSAL_SUPPLIES":
             if ammonia_plant in ret.graph:
                 ret.graph[ammonia_plant].boosters = engineering_supplies
             if clay_pit in ret.graph:
@@ -106,7 +106,7 @@ def get_economy(self, parameters):
             ret.graph[herding_coop].boosters = engineering_supplies
 
             ret.graph[paper_mill].produces += (engineering_supplies,)
-        elif parameters["BOOSTER"] == "GENERIC":
+        elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES":
             if ammonia_plant in ret.graph:
                 ret.graph[ammonia_plant].boosters = engineering_supplies
             if clay_pit in ret.graph:
@@ -122,7 +122,7 @@ def get_economy(self, parameters):
 
             ret.graph[paper_mill].produces += (engineering_supplies,)
             ret.graph[chemical_plant].produces += (farm_supplies,)
-        elif parameters["BOOSTER"] == "GENERIC_PASSENGERS":
+        elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES_PASSENGERS":
             if ammonia_plant in ret.graph:
                 ret.graph[ammonia_plant].boosters = engineering_supplies
             if clay_pit in ret.graph:

diff --git a/industry/economies/firs_temperate.py b/industry/economies/firs_temperate.py
@@ -85,19 +85,19 @@ def get_economy(self, parameters):
             ret.graph[port] = SecondaryIndustry(china_clay, chemicals)
             # del ret.graph[clay_pit]
 
-        if parameters["BOOSTER"] == "UNIVERSAL":
+        if parameters["PRIMARY_INDUSTRY_GROWTH"] == "UNIVERSAL_SUPPLIES":
             ret.graph[clay_pit].boosters = engineering_supplies
             ret.graph[fish_farm].boosters = engineering_supplies
             ret.graph[orchard_and_piggery].boosters = engineering_supplies
 
             ret.graph[cider_mill].produces += (engineering_supplies,)
-        elif parameters["BOOSTER"] == "GENERIC":
+        elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES":
             ret.graph[clay_pit].boosters = engineering_supplies
             ret.graph[fish_farm].boosters = farm_supplies
             ret.graph[orchard_and_piggery].boosters = farm_supplies
 
             ret.graph[cider_mill].produces += (engineering_supplies, farm_supplies)
-        elif parameters["BOOSTER"] == "GENERIC_PASSENGERS":
+        elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES_PASSENGERS":
             ret.graph[clay_pit].boosters = engineering_supplies
             ret.graph[fish_farm].boosters = farm_supplies
             ret.graph[orchard_and_piggery].boosters = farm_supplies

diff --git a/industry/economies/vanilla_subarctic.py b/industry/economies/vanilla_subarctic.py
@@ -72,15 +72,15 @@ def get_economy(self, parameters):
             ret.graph[port] = SecondaryIndustry(wood, paper)
             del ret.graph[paper_mill]
 
-        if parameters["BOOSTER"] == "UNIVERSAL":
+        if parameters["PRIMARY_INDUSTRY_GROWTH"] == "UNIVERSAL_SUPPLIES":
             ret.graph[coal_mine].boosters = engineering_supplies
             ret.graph[oil_wells].boosters = engineering_supplies
             ret.graph[gold_mine].boosters = engineering_supplies
             ret.graph[farm].boosters = engineering_supplies
             ret.graph[forest].boosters = engineering_supplies
 
             ret.graph[printing_works].produces += (engineering_supplies,)
-        elif parameters["BOOSTER"] == "GENERIC":
+        elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES":
             ret.graph[coal_mine].boosters = engineering_supplies
             ret.graph[oil_wells].boosters = engineering_supplies
             ret.graph[gold_mine].boosters = engineering_supplies
@@ -89,7 +89,7 @@ def get_economy(self, parameters):
 
             ret.graph[printing_works].produces += (engineering_supplies,)
             ret.graph[oil_refinery].produces += (farm_supplies,)
-        elif parameters["BOOSTER"] == "GENERIC_PASSENGERS":
+        elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES_PASSENGERS":
             ret.graph[coal_mine].boosters = engineering_supplies
             ret.graph[oil_wells].boosters = passengers
             ret.graph[gold_mine].boosters = engineering_supplies

diff --git a/industry/economies/vanilla_subtropical.py b/industry/economies/vanilla_subtropical.py
@@ -58,15 +58,15 @@ def get_economy(self, parameters):
             },
             parameters,
         )
-        if parameters["BOOSTER"] == "UNIVERSAL":
+        if parameters["PRIMARY_INDUSTRY_GROWTH"] == "UNIVERSAL_SUPPLIES":
             ret.graph[diamond_mine].boosters = engineering_supplies
             ret.graph[oil_wells].boosters = engineering_supplies
             ret.graph[copper_ore_mine].boosters = engineering_supplies
             ret.graph[farm].boosters = engineering_supplies
             ret.graph[lumber_mill].boosters = engineering_supplies
 
             ret.graph[factory].produces += (engineering_supplies,)
-        elif parameters["BOOSTER"] == "GENERIC":
+        elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES":
             ret.graph[diamond_mine].boosters = engineering_supplies
             ret.graph[oil_wells].boosters = engineering_supplies
             ret.graph[copper_ore_mine].boosters = engineering_supplies

diff --git a/industry/economies/vanilla_temperate.py b/industry/economies/vanilla_temperate.py
@@ -62,7 +62,7 @@ def get_economy(self, parameters):
             },
             parameters,
         )
-        if parameters["BOOSTER"] == "UNIVERSAL":
+        if parameters["PRIMARY_INDUSTRY_GROWTH"] == "UNIVERSAL_SUPPLIES":
             ret.graph[coal_mine].boosters = engineering_supplies
             ret.graph[oil_wells].boosters = engineering_supplies
             ret.graph[oil_rig].boosters = engineering_supplies
@@ -71,7 +71,7 @@ def get_economy(self, parameters):
             ret.graph[forest].boosters = engineering_supplies
 
             ret.graph[factory].produces += (engineering_supplies,)
-        elif parameters["BOOSTER"] == "GENERIC":
+        elif parameters["PRIMARY_INDUSTRY_GROWTH"] == "GENERIC_SUPPLIES":
             ret.graph[coal_mine].boosters = engineering_supplies
             ret.graph[oil_wells].boosters = engineering_supplies
             ret.graph[oil_rig].boosters = engineering_supplies

diff --git a/industry/lib/parameters.py b/industry/lib/parameters.py
@@ -176,7 +176,7 @@
 parameter_choices = SearchSpace(
     [
         ("POLICY", ["AUTARKY", "SELF_SUFFICIENT", "FREE_TRADE", "EXPORT"]),
-        ("BOOSTER", ["NONE", "UNIVERSAL", "GENERIC", "GENERIC_PASSENGERS"]),
+        ("PRIMARY_INDUSTRY_GROWTH", ["NONE", "UNIVERSAL_SUPPLIES", "GENERIC_SUPPLIES", "SPECIFIC_SUPPLIES"]),
         (
             "WORKFORCE",
             [
@@ -207,35 +207,35 @@
 PRESETS = {
     "VANILLA": {
         "POLICY": "AUTARKY",
-        "BOOSTER": "NONE",
+        "PRIMARY_INDUSTRY_GROWTH": "NONE",
         "WORKFORCE": "ABSTRACT",
         "SEA_INDUSTRY": "ORGANIC",
         "TOWN_GOODS": "ORGANIC",
     },
     "FIRS": {
         "POLICY": "FREE_TRADE",
-        "BOOSTER": "GENERIC",
+        "PRIMARY_INDUSTRY_GROWTH": "GENERIC_SUPPLIES",
         "WORKFORCE": "ABSTRACT",
         "SEA_INDUSTRY": "ORGANIC",
         "TOWN_GOODS": "ORGANIC",
     },
     "YETI": {
         "POLICY": "AUTARKY",
-        "BOOSTER": "UNIVERSAL",
+        "PRIMARY_INDUSTRY_GROWTH": "UNIVERSAL_SUPPLIES",
         "WORKFORCE": "YETI",
         "SEA_INDUSTRY": "ORGANIC",
         "TOWN_GOODS": "ORGANIC",
     },
     "CARIBBEAN": {
         "POLICY": "EXPORT",
-        "BOOSTER": "GENERIC",
+        "PRIMARY_INDUSTRY_GROWTH": "GENERIC_SUPPLIES",
         "WORKFORCE": "ABSTRACT",
         "SEA_INDUSTRY": "ORGANIC",
         "TOWN_GOODS": "ORGANIC",
     },
     "LUMBERJACK": {
         "POLICY": "AUTARKY",
-        "BOOSTER": "GENERIC",
+        "PRIMARY_INDUSTRY_GROWTH": "GENERIC_SUPPLIES",
         "WORKFORCE": "ABSTRACT",
         "SEA_INDUSTRY": "ORGANIC",
         "TOWN_GOODS": "ORGANIC",