(Aegis) LAND_PORT -> SEA_INDUSTRY

ahyangyi · Nov 6, 2023 · c701165 · c701165
1 parent 3fc4178
commit c701165
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 13 deletions.
diff --git a/industry/economies/firs_arctic.py b/industry/economies/firs_arctic.py
@@ -154,10 +154,10 @@ def get_economy(self, parameters):
             ret.graph[peatlands].boosters = workers
 
         if port in ret.graph:
-            if parameters["LAND_PORTS"] == "LAND_ONLY":
+            if parameters["SEA_INDUSTRY"] == "LAND_ONLY":
                 ret.graph[trading_centre] = ret.graph[port]
                 del ret.graph[port]
-            elif parameters["LAND_PORTS"] == "BOTH":
+            elif parameters["SEA_INDUSTRY"] == "BOTH":
                 ret.graph[trading_centre] = ret.graph[port]
 
         if parameters["TOWN_GOODS"] == "SUBTROPICAL":

diff --git a/industry/economies/firs_temperate.py b/industry/economies/firs_temperate.py
@@ -119,10 +119,10 @@ def get_economy(self, parameters):
             ret.graph[orchard_and_piggery].boosters = workers
 
         if port in ret.graph:
-            if parameters["LAND_PORTS"] == "LAND_ONLY":
+            if parameters["SEA_INDUSTRY"] == "LAND_ONLY":
                 ret.graph[trading_centre] = ret.graph[port]
                 del ret.graph[port]
-            elif parameters["LAND_PORTS"] == "BOTH":
+            elif parameters["SEA_INDUSTRY"] == "BOTH":
                 ret.graph[trading_centre] = ret.graph[port]
 
         if parameters["TOWN_GOODS"] == "SUBTROPICAL":

diff --git a/industry/economies/vanilla_subarctic.py b/industry/economies/vanilla_subarctic.py
@@ -115,10 +115,10 @@ def get_economy(self, parameters):
             ret.graph[coal_mine].boosters = workers
 
         if port in ret.graph:
-            if parameters["LAND_PORTS"] == "LAND_ONLY":
+            if parameters["SEA_INDUSTRY"] == "LAND_ONLY":
                 ret.graph[trading_centre] = ret.graph[port]
                 del ret.graph[port]
-            elif parameters["LAND_PORTS"] == "BOTH":
+            elif parameters["SEA_INDUSTRY"] == "BOTH":
                 ret.graph[trading_centre] = ret.graph[port]
 
         if parameters["TOWN_GOODS"] == "SUBTROPICAL":

diff --git a/industry/lang/english-uk.lng b/industry/lang/english-uk.lng
@@ -90,6 +90,15 @@ STR_PARAM_SECONDARY_INDUSTRY_PROCESSING_PRESET      :Preset
 STR_PARAM_SECONDARY_INDUSTRY_PROCESSING_STRICT      :Strict
 STR_PARAM_SECONDARY_INDUSTRY_PROCESSING_NORMAL      :Normal
 
+STR_PARAM_SEA_INDUSTRY                              :Sea Industry
+STR_PARAM_SEA_INDUSTRY_DESC                         :Some industries have a land and a sea version. Choose which version(s) to use.
+STR_PARAM_SEA_INDUSTRY_PRESET                       :Preset
+STR_PARAM_SEA_INDUSTRY_ORGANIC                      :Organic
+STR_PARAM_SEA_INDUSTRY_LAND_ONLY                    :Land Only
+STR_PARAM_SEA_INDUSTRY_BOTH                         :Both
+STR_PARAM_SEA_INDUSTRY_EITHER                       :Either
+STR_PARAM_SEA_INDUSTRY_SEA_ONLY                     :Sea Only
+
 STR_PARAM_INDUSTRY_SIZE         :Graphics - Industry Size
 STR_PARAM_INDUSTRY_SIZE_DESC    :Choose the visual size of the industries
 STR_PARAM_INDUSTRY_SIZE_ENORMOUS:Enormous

diff --git a/industry/lib/parameters.py b/industry/lib/parameters.py
@@ -119,6 +119,18 @@
                 2: "NORMAL",
             },
         ),
+        Parameter(
+            "SEA_INDUSTRY",
+            0,
+            {
+                0: "PRESET",
+                1: "ORGANIC",
+                2: "LAND_ONLY",
+                3: "BOTH",
+                4: "EITHER",
+                5: "SEA_ONLY",
+            },
+        ),
         Parameter(
             "INDUSTRY_SIZE",
             3,
@@ -179,7 +191,7 @@
                 "YETI_TIRED",
             ],
         ),
-        ("LAND_PORTS", ["ORGANIC", "LAND_ONLY", "BOTH", "SEA_ONLY"]),
+        ("SEA_INDUSTRY", ["ORGANIC", "LAND_ONLY", "BOTH", "SEA_ONLY"]),
         ("TOWN_GOODS", ["ORGANIC", "NONE", "SUBARCTIC", "SUBTROPICAL"]),
     ],
     parameter_list,
@@ -188,7 +200,7 @@
 
 docs_parameter_choices = parameter_choices.copy()
 docs_parameter_choices.update_params("WORKFORCE", ["ABSTRACT", "PROFESSIONAL", "YETI"])
-docs_parameter_choices.update_params("LAND_PORTS", ["ORGANIC"])
+docs_parameter_choices.update_params("SEA_INDUSTRY", ["ORGANIC"])
 docs_parameter_choices.update_params("TOWN_GOODS", ["ORGANIC"])
 
 
@@ -197,35 +209,35 @@
         "POLICY": "AUTARKY",
         "BOOSTER": "NONE",
         "WORKFORCE": "ABSTRACT",
-        "LAND_PORTS": "ORGANIC",
+        "SEA_INDUSTRY": "ORGANIC",
         "TOWN_GOODS": "ORGANIC",
     },
     "FIRS": {
         "POLICY": "FREE_TRADE",
         "BOOSTER": "GENERIC",
         "WORKFORCE": "ABSTRACT",
-        "LAND_PORTS": "ORGANIC",
+        "SEA_INDUSTRY": "ORGANIC",
         "TOWN_GOODS": "ORGANIC",
     },
     "YETI": {
         "POLICY": "AUTARKY",
         "BOOSTER": "UNIVERSAL",
         "WORKFORCE": "YETI",
-        "LAND_PORTS": "ORGANIC",
+        "SEA_INDUSTRY": "ORGANIC",
         "TOWN_GOODS": "ORGANIC",
     },
     "CARIBBEAN": {
         "POLICY": "EXPORT",
         "BOOSTER": "GENERIC",
         "WORKFORCE": "ABSTRACT",
-        "LAND_PORTS": "ORGANIC",
+        "SEA_INDUSTRY": "ORGANIC",
         "TOWN_GOODS": "ORGANIC",
     },
     "LUMBERJACK": {
         "POLICY": "AUTARKY",
         "BOOSTER": "GENERIC",
         "WORKFORCE": "ABSTRACT",
-        "LAND_PORTS": "ORGANIC",
+        "SEA_INDUSTRY": "ORGANIC",
         "TOWN_GOODS": "ORGANIC",
     },
 }