convert: Refactor SWBGCCCivSubprocessor into separate files.

Author: heinezen

openage/convert/processor/conversion/swgbcc/CMakeLists.txt

@@ -14,3 +14,4 @@ add_py_modules(
 
 add_subdirectory(ability)
 add_subdirectory(auxiliary)
+add_subdirectory(civ)

openage/convert/processor/conversion/swgbcc/civ/CMakeLists.txt

@@ -0,0 +1,5 @@
+add_py_modules(
+    __init__.py
+    modifiers.py
+    starting_resources.py
+)

openage/convert/processor/conversion/swgbcc/civ/__init__.py

@@ -0,0 +1,5 @@
+# Copyright 2025-2025 the openage authors. See copying.md for legal info.
+
+"""
+Creates patches and modifiers for civs.
+"""

openage/convert/processor/conversion/swgbcc/civ/modifiers.py

@@ -0,0 +1,26 @@
+# Copyright 2025-2025 the openage authors. See copying.md for legal info.
+
+"""
+nyan conversion routines for civ modifiers.
+"""
+from __future__ import annotations
+import typing
+
+
+if typing.TYPE_CHECKING:
+    from .....value_object.conversion.forward_ref import ForwardRef
+    from .....entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup
+
+
+def get_modifiers(civ_group: GenieCivilizationGroup) -> list[ForwardRef]:
+    """
+    Returns global modifiers of a civ.
+    """
+    modifiers = []
+
+    for civ_bonus in civ_group.civ_boni.values():
+        if civ_bonus.replaces_researchable_tech():
+            # TODO: instant tech research modifier
+            pass
+
+    return modifiers

openage/convert/processor/conversion/swgbcc/civ/starting_resources.py

@@ -0,0 +1,139 @@
+# Copyright 2025-2025 the openage authors. See copying.md for legal info.
+
+"""
+nyan conversion routines for civ starting resources.
+"""
+from __future__ import annotations
+import typing
+
+from .....entity_object.conversion.converter_object import RawAPIObject
+from .....service.conversion import internal_name_lookups
+from .....value_object.conversion.forward_ref import ForwardRef
+
+if typing.TYPE_CHECKING:
+    from .....entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup
+
+
+def get_starting_resources(civ_group: GenieCivilizationGroup) -> list[ForwardRef]:
+    """
+    Returns the starting resources of a civ.
+    """
+    resource_amounts = []
+
+    civ_id = civ_group.get_id()
+    dataset = civ_group.data
+
+    civ_lookup_dict = internal_name_lookups.get_civ_lookups(dataset.game_version)
+
+    civ_name = civ_lookup_dict[civ_id][0]
+
+    # Find starting resource amounts
+    food_amount = civ_group.civ["resources"][91].value
+    carbon_amount = civ_group.civ["resources"][92].value
+    nova_amount = civ_group.civ["resources"][93].value
+    ore_amount = civ_group.civ["resources"][94].value
+
+    # Find civ unique starting resources
+    tech_tree = civ_group.get_tech_tree_effects()
+    for effect in tech_tree:
+        type_id = effect.get_type()
+
+        if type_id != 1:
+            continue
+
+        resource_id = effect["attr_a"].value
+        amount = effect["attr_d"].value
+        if resource_id == 91:
+            food_amount += amount
+
+        elif resource_id == 92:
+            carbon_amount += amount
+
+        elif resource_id == 93:
+            nova_amount += amount
+
+        elif resource_id == 94:
+            ore_amount += amount
+
+    food_ref = f"{civ_name}.FoodStartingAmount"
+    food_raw_api_object = RawAPIObject(food_ref, "FoodStartingAmount",
+                                       dataset.nyan_api_objects)
+    food_raw_api_object.add_raw_parent("engine.util.resource.ResourceAmount")
+    civ_location = ForwardRef(civ_group, civ_lookup_dict[civ_group.get_id()][0])
+    food_raw_api_object.set_location(civ_location)
+
+    resource = dataset.pregen_nyan_objects["util.resource.types.Food"].get_nyan_object()
+    food_raw_api_object.add_raw_member("type",
+                                       resource,
+                                       "engine.util.resource.ResourceAmount")
+
+    food_raw_api_object.add_raw_member("amount",
+                                       food_amount,
+                                       "engine.util.resource.ResourceAmount")
+
+    food_forward_ref = ForwardRef(civ_group, food_ref)
+    resource_amounts.append(food_forward_ref)
+
+    carbon_ref = f"{civ_name}.CarbonStartingAmount"
+    carbon_raw_api_object = RawAPIObject(carbon_ref, "CarbonStartingAmount",
+                                         dataset.nyan_api_objects)
+    carbon_raw_api_object.add_raw_parent("engine.util.resource.ResourceAmount")
+    civ_location = ForwardRef(civ_group, civ_lookup_dict[civ_group.get_id()][0])
+    carbon_raw_api_object.set_location(civ_location)
+
+    resource = dataset.pregen_nyan_objects["util.resource.types.Carbon"].get_nyan_object()
+    carbon_raw_api_object.add_raw_member("type",
+                                         resource,
+                                         "engine.util.resource.ResourceAmount")
+
+    carbon_raw_api_object.add_raw_member("amount",
+                                         carbon_amount,
+                                         "engine.util.resource.ResourceAmount")
+
+    carbon_forward_ref = ForwardRef(civ_group, carbon_ref)
+    resource_amounts.append(carbon_forward_ref)
+
+    nova_ref = f"{civ_name}.NovaStartingAmount"
+    nova_raw_api_object = RawAPIObject(nova_ref, "NovaStartingAmount",
+                                       dataset.nyan_api_objects)
+    nova_raw_api_object.add_raw_parent("engine.util.resource.ResourceAmount")
+    civ_location = ForwardRef(civ_group, civ_lookup_dict[civ_group.get_id()][0])
+    nova_raw_api_object.set_location(civ_location)
+
+    resource = dataset.pregen_nyan_objects["util.resource.types.Nova"].get_nyan_object()
+    nova_raw_api_object.add_raw_member("type",
+                                       resource,
+                                       "engine.util.resource.ResourceAmount")
+
+    nova_raw_api_object.add_raw_member("amount",
+                                       nova_amount,
+                                       "engine.util.resource.ResourceAmount")
+
+    nova_forward_ref = ForwardRef(civ_group, nova_ref)
+    resource_amounts.append(nova_forward_ref)
+
+    ore_ref = f"{civ_name}.OreStartingAmount"
+    ore_raw_api_object = RawAPIObject(ore_ref, "OreStartingAmount",
+                                      dataset.nyan_api_objects)
+    ore_raw_api_object.add_raw_parent("engine.util.resource.ResourceAmount")
+    civ_location = ForwardRef(civ_group, civ_lookup_dict[civ_group.get_id()][0])
+    ore_raw_api_object.set_location(civ_location)
+
+    resource = dataset.pregen_nyan_objects["util.resource.types.Ore"].get_nyan_object()
+    ore_raw_api_object.add_raw_member("type",
+                                      resource,
+                                      "engine.util.resource.ResourceAmount")
+
+    ore_raw_api_object.add_raw_member("amount",
+                                      ore_amount,
+                                      "engine.util.resource.ResourceAmount")
+
+    ore_forward_ref = ForwardRef(civ_group, ore_ref)
+    resource_amounts.append(ore_forward_ref)
+
+    civ_group.add_raw_api_object(food_raw_api_object)
+    civ_group.add_raw_api_object(carbon_raw_api_object)
+    civ_group.add_raw_api_object(nova_raw_api_object)
+    civ_group.add_raw_api_object(ore_raw_api_object)
+
+    return resource_amounts

openage/convert/processor/conversion/swgbcc/civ_subprocessor.py

@@ -8,15 +8,15 @@
 from __future__ import annotations
 import typing
 
-from ....entity_object.conversion.converter_object import RawAPIObject
-from ....service.conversion import internal_name_lookups
-from ....value_object.conversion.forward_ref import ForwardRef
 from ..aoc.civ_subprocessor import AoCCivSubprocessor
 from .tech_subprocessor import SWGBCCTechSubprocessor
 
+from .civ.modifiers import get_modifiers
+from .civ.starting_resources import get_starting_resources
+
 if typing.TYPE_CHECKING:
-    from openage.convert.entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup
-    from openage.convert.entity_object.conversion.aoc.genie_unit import GenieGameEntityGroup
+    from ....value_object.conversion.forward_ref import ForwardRef
+    from ....entity_object.conversion.aoc.genie_civ import GenieCivilizationGroup
 
 
 class SWGBCCCivSubprocessor:
@@ -42,141 +42,5 @@ def get_civ_setup(cls, civ_group: GenieCivilizationGroup) -> list[ForwardRef]:
 
         return patches
 
-    @classmethod
-    def get_modifiers(cls, civ_group: GenieCivilizationGroup) -> list[ForwardRef]:
-        """
-        Returns global modifiers of a civ.
-        """
-        modifiers = []
-
-        for civ_bonus in civ_group.civ_boni.values():
-            if civ_bonus.replaces_researchable_tech():
-                # TODO: instant tech research modifier
-                pass
-
-        return modifiers
-
-    @staticmethod
-    def get_starting_resources(civ_group: GenieCivilizationGroup) -> list[ForwardRef]:
-        """
-        Returns the starting resources of a civ.
-        """
-        resource_amounts = []
-
-        civ_id = civ_group.get_id()
-        dataset = civ_group.data
-
-        civ_lookup_dict = internal_name_lookups.get_civ_lookups(dataset.game_version)
-
-        civ_name = civ_lookup_dict[civ_id][0]
-
-        # Find starting resource amounts
-        food_amount = civ_group.civ["resources"][91].value
-        carbon_amount = civ_group.civ["resources"][92].value
-        nova_amount = civ_group.civ["resources"][93].value
-        ore_amount = civ_group.civ["resources"][94].value
-
-        # Find civ unique starting resources
-        tech_tree = civ_group.get_tech_tree_effects()
-        for effect in tech_tree:
-            type_id = effect.get_type()
-
-            if type_id != 1:
-                continue
-
-            resource_id = effect["attr_a"].value
-            amount = effect["attr_d"].value
-            if resource_id == 91:
-                food_amount += amount
-
-            elif resource_id == 92:
-                carbon_amount += amount
-
-            elif resource_id == 93:
-                nova_amount += amount
-
-            elif resource_id == 94:
-                ore_amount += amount
-
-        food_ref = f"{civ_name}.FoodStartingAmount"
-        food_raw_api_object = RawAPIObject(food_ref, "FoodStartingAmount",
-                                           dataset.nyan_api_objects)
-        food_raw_api_object.add_raw_parent("engine.util.resource.ResourceAmount")
-        civ_location = ForwardRef(civ_group, civ_lookup_dict[civ_group.get_id()][0])
-        food_raw_api_object.set_location(civ_location)
-
-        resource = dataset.pregen_nyan_objects["util.resource.types.Food"].get_nyan_object()
-        food_raw_api_object.add_raw_member("type",
-                                           resource,
-                                           "engine.util.resource.ResourceAmount")
-
-        food_raw_api_object.add_raw_member("amount",
-                                           food_amount,
-                                           "engine.util.resource.ResourceAmount")
-
-        food_forward_ref = ForwardRef(civ_group, food_ref)
-        resource_amounts.append(food_forward_ref)
-
-        carbon_ref = f"{civ_name}.CarbonStartingAmount"
-        carbon_raw_api_object = RawAPIObject(carbon_ref, "CarbonStartingAmount",
-                                             dataset.nyan_api_objects)
-        carbon_raw_api_object.add_raw_parent("engine.util.resource.ResourceAmount")
-        civ_location = ForwardRef(civ_group, civ_lookup_dict[civ_group.get_id()][0])
-        carbon_raw_api_object.set_location(civ_location)
-
-        resource = dataset.pregen_nyan_objects["util.resource.types.Carbon"].get_nyan_object()
-        carbon_raw_api_object.add_raw_member("type",
-                                             resource,
-                                             "engine.util.resource.ResourceAmount")
-
-        carbon_raw_api_object.add_raw_member("amount",
-                                             carbon_amount,
-                                             "engine.util.resource.ResourceAmount")
-
-        carbon_forward_ref = ForwardRef(civ_group, carbon_ref)
-        resource_amounts.append(carbon_forward_ref)
-
-        nova_ref = f"{civ_name}.NovaStartingAmount"
-        nova_raw_api_object = RawAPIObject(nova_ref, "NovaStartingAmount",
-                                           dataset.nyan_api_objects)
-        nova_raw_api_object.add_raw_parent("engine.util.resource.ResourceAmount")
-        civ_location = ForwardRef(civ_group, civ_lookup_dict[civ_group.get_id()][0])
-        nova_raw_api_object.set_location(civ_location)
-
-        resource = dataset.pregen_nyan_objects["util.resource.types.Nova"].get_nyan_object()
-        nova_raw_api_object.add_raw_member("type",
-                                           resource,
-                                           "engine.util.resource.ResourceAmount")
-
-        nova_raw_api_object.add_raw_member("amount",
-                                           nova_amount,
-                                           "engine.util.resource.ResourceAmount")
-
-        nova_forward_ref = ForwardRef(civ_group, nova_ref)
-        resource_amounts.append(nova_forward_ref)
-
-        ore_ref = f"{civ_name}.OreStartingAmount"
-        ore_raw_api_object = RawAPIObject(ore_ref, "OreStartingAmount",
-                                          dataset.nyan_api_objects)
-        ore_raw_api_object.add_raw_parent("engine.util.resource.ResourceAmount")
-        civ_location = ForwardRef(civ_group, civ_lookup_dict[civ_group.get_id()][0])
-        ore_raw_api_object.set_location(civ_location)
-
-        resource = dataset.pregen_nyan_objects["util.resource.types.Ore"].get_nyan_object()
-        ore_raw_api_object.add_raw_member("type",
-                                          resource,
-                                          "engine.util.resource.ResourceAmount")
-
-        ore_raw_api_object.add_raw_member("amount",
-                                          ore_amount,
-                                          "engine.util.resource.ResourceAmount")
-
-        ore_forward_ref = ForwardRef(civ_group, ore_ref)
-        resource_amounts.append(ore_forward_ref)
-
-        civ_group.add_raw_api_object(food_raw_api_object)
-        civ_group.add_raw_api_object(carbon_raw_api_object)
-        civ_group.add_raw_api_object(nova_raw_api_object)
-        civ_group.add_raw_api_object(ore_raw_api_object)
-
-        return resource_amounts
+    get_modifiers = staticmethod(get_modifiers)
+    get_starting_resources = staticmethod(get_starting_resources)