(Aegis) unify SplitDefinition format

ahyangyi · Nov 14, 2023 · bafeb7c · bafeb7c
1 parent 01e712b
commit bafeb7c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 36 deletions.
diff --git a/industry/industries/farm.py b/industry/industries/farm.py
@@ -69,16 +69,16 @@
     translation_name="FARM",
     override_type=0x09,
     layouts=SplitDefinition(
-        "INDUSTRY_SIZE",
+        ("INDUSTRY_SIZE",),
         {
-            "ENORMOUS": transcribe(large_set, tile_map),
-            "HUGE": transcribe(large_set, tile_map),
-            "LARGE": transcribe(large_set, tile_map),
-            "MEDIUM": transcribe(medium_set, tile_map),
-            "SMALL": transcribe(small_set, tile_map),
-            "TINY": transcribe(tiny_set, tile_map),
-            "ONE_TILE": transcribe(one_tile_set, tile_map),
-            "ONE_TILE_FLAT": [[{"xofs": 0, "yofs": 0, "gfx": grf.NewIndustryTileID(0x23)}]],
+            ("ENORMOUS",): transcribe(large_set, tile_map),
+            ("HUGE",): transcribe(large_set, tile_map),
+            ("LARGE",): transcribe(large_set, tile_map),
+            ("MEDIUM",): transcribe(medium_set, tile_map),
+            ("SMALL",): transcribe(small_set, tile_map),
+            ("TINY",): transcribe(tiny_set, tile_map),
+            ("ONE_TILE",): transcribe(one_tile_set, tile_map),
+            ("ONE_TILE_FLAT",): [[{"xofs": 0, "yofs": 0, "gfx": grf.NewIndustryTileID(0x23)}]],
         },
     ),
     mapgen_probability=15,

diff --git a/industry/industries/forest/__init__.py b/industry/industries/forest/__init__.py
@@ -18,16 +18,16 @@
     translation_name="FOREST",
     override_type=0x03,
     layouts=SplitDefinition(
-        "INDUSTRY_SIZE",
+        ("INDUSTRY_SIZE",),
         {
-            "ENORMOUS": transcribe(enormous_set, tile_map),
-            "HUGE": transcribe(huge_set, tile_map),
-            "LARGE": transcribe(large_set, tile_map),
-            "MEDIUM": transcribe(medium_set, tile_map),
-            "SMALL": transcribe(small_set, tile_map),
-            "TINY": transcribe(tiny_set, tile_map),
-            "ONE_TILE": transcribe(one_grid_set, tile_map),
-            "ONE_TILE_FLAT": transcribe(one_grid_set, tile_map),
+            ("ENORMOUS",): transcribe(enormous_set, tile_map),
+            ("HUGE",): transcribe(huge_set, tile_map),
+            ("LARGE",): transcribe(large_set, tile_map),
+            ("MEDIUM",): transcribe(medium_set, tile_map),
+            ("SMALL",): transcribe(small_set, tile_map),
+            ("TINY",): transcribe(tiny_set, tile_map),
+            ("ONE_TILE",): transcribe(one_grid_set, tile_map),
+            ("ONE_TILE_FLAT",): transcribe(one_grid_set, tile_map),
         },
     ),
     mapgen_probability=10,

diff --git a/industry/industries/oil_wells/__init__.py b/industry/industries/oil_wells/__init__.py
@@ -35,16 +35,16 @@
     translation_name="OIL_WELLS",
     override_type=0x0B,
     layouts=SplitDefinition(
-        "INDUSTRY_SIZE",
+        ("INDUSTRY_SIZE",),
         {
-            "ENORMOUS": transcribe(enormous_set, tile_map),
-            "HUGE": transcribe(huge_set, tile_map),
-            "LARGE": transcribe(large_set, tile_map),
-            "MEDIUM": transcribe(medium_set, tile_map),
-            "SMALL": transcribe(small_set, tile_map),
-            "TINY": transcribe(tiny_set, tile_map),
-            "ONE_TILE": transcribe(one_tile_set, tile_map),
-            "ONE_TILE_FLAT": [[{"xofs": 0, "yofs": 0, "gfx": grf.NewIndustryTileID(0x23)}]],
+            ("ENORMOUS",): transcribe(enormous_set, tile_map),
+            ("HUGE",): transcribe(huge_set, tile_map),
+            ("LARGE",): transcribe(large_set, tile_map),
+            ("MEDIUM",): transcribe(medium_set, tile_map),
+            ("SMALL",): transcribe(small_set, tile_map),
+            ("TINY",): transcribe(tiny_set, tile_map),
+            ("ONE_TILE",): transcribe(one_tile_set, tile_map),
+            ("ONE_TILE_FLAT",): [[{"xofs": 0, "yofs": 0, "gfx": grf.NewIndustryTileID(0x23)}]],
         },
     ),
     mapgen_probability=6,

diff --git a/industry/lib/industry/__init__.py b/industry/lib/industry/__init__.py
@@ -22,15 +22,7 @@ def __init__(self, variables, branches):
         self.branches = branches
 
     def fixup(self):
-        if isinstance(self.variables, int):
-            # Legacy format
-            self.variables = (self.variables,)
-            self.branches = {(i,): b for i, b in self.branches.items()}
-        elif isinstance(self.variables, str):
-            idx = parameter_list.index(self.variables)
-            self.variables = (idx,)
-            self.branches = {(parameter_list.parameters[idx].enum_index(i),): b for i, b in self.branches.items()}
-        elif isinstance(self.variables[0], str):
+        if isinstance(self.variables[0], str):
             self.variables = tuple(parameter_list.index(idx) for idx in self.variables)
             self.branches = {
                 tuple(parameter_list.parameters[idx].enum_index(s) for idx, s in zip(self.variables, i)): b