(Aegis) support string-tuple SplitDefinition format

agrf/parameters/__init__.py

@@ -35,6 +35,9 @@ def range(self):
     def set_index(self, index):
         self.index = index
 
+    def enum_index(self, name):
+        return [k for k, v in self.enum.items() if v == name][0]
+
 
 class ParameterList:
     def __init__(self, parameters):

industry/aegis_gen.py

@@ -27,9 +27,9 @@ def initialize_metadata():
                     all_cargos.append(cargo)
 
     for industry in all_industries:
-        industry._props["exists"] = SplitDefinition((0,), {})
-        industry._props["production_types"] = SplitDefinition((0,), {})
-        industry._props["acceptance_types"] = SplitDefinition((0,), {})
+        industry._props["exists"] = SplitDefinition(("ECONOMY",), {})
+        industry._props["production_types"] = SplitDefinition(("ECONOMY",), {})
+        industry._props["acceptance_types"] = SplitDefinition(("ECONOMY",), {})
 
     for i, meta_economy in enumerate(all_economies):
         for variation in parameter_choices.iterate_variations():

industry/lib/industry/__init__.py

@@ -10,11 +10,17 @@ def __init__(self, variables, branches):
             # Legacy format
             variables = (variables,)
             branches = {(i,): b for i, b in branches.items()}
-        if isinstance(variables, str):
+        elif isinstance(variables, str):
             idx = parameter_list.index(variables)
             p = parameter_list.parameters[idx]
             variables = (idx,)
-            branches = {(next(k for k, v in p.enum.items() if v == i),): b for i, b in branches.items()}
+            branches = {(p.enum_index(i),): b for i, b in branches.items()}
+        elif isinstance(variables[0], str):
+            variables = tuple(parameter_list.index(idx) for idx in variables)
+            branches = {
+                tuple(parameter_list.index(idx).enum_index(s) for idx, s in zip(variables, i)): b
+                for i, b in branches.items()
+            }
         self.variables = variables
         self.branches = branches