cogames 0.3.59.post1.dev2__py3-none-any.whl → 0.3.65__py3-none-any.whl

cogames/cogs_vs_clips/variants.py

@@ -1,95 +1,74 @@
-from typing import override
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, override
 
 from cogames.cogs_vs_clips.evals.difficulty_variants import DIFFICULTY_VARIANTS
-from cogames.cogs_vs_clips.mission import Mission, MissionVariant
-from cogames.cogs_vs_clips.procedural import BaseHubVariant, MachinaArenaVariant
-from mettagrid.config.action_config import VibeTransfer
-from mettagrid.config.game_value import stat
-from mettagrid.config.reward_config import reward
+from cogames.cogs_vs_clips.terrain import BaseHubVariant, MachinaArenaVariant
+from cogames.core import CoGameMissionVariant
 from mettagrid.map_builder.map_builder import MapBuilderConfig
 from mettagrid.mapgen.mapgen import MapGen
 from mettagrid.mapgen.scenes.base_hub import DEFAULT_EXTRACTORS as HUB_EXTRACTORS
 from mettagrid.mapgen.scenes.building_distributions import DistributionConfig, DistributionType
 
+if TYPE_CHECKING:
+    from cogames.cogs_vs_clips.mission import CvCMission
+
+
+class NumCogsVariant(CoGameMissionVariant):
+    name: str = "num_cogs"
+    description: str = "Set the number of cogs for the mission."
+    num_cogs: int
 
-class DarkSideVariant(MissionVariant):
+    @override
+    def modify_mission(self, mission: CvCMission) -> None:
+        if self.num_cogs < mission.site.min_cogs or self.num_cogs > mission.site.max_cogs:
+            raise ValueError(
+                f"Invalid number of cogs for {mission.site.name}: {self.num_cogs}. "
+                + f"Must be between {mission.site.min_cogs} and {mission.site.max_cogs}"
+            )
+
+        mission.num_cogs = self.num_cogs
+
+
+class DarkSideVariant(CoGameMissionVariant):
     name: str = "dark_side"
     description: str = "You're on the dark side of the asteroid. You recharge slower."
 
     @override
-    def modify_mission(self, mission):
-        assert isinstance(mission, Mission)
+    def modify_mission(self, mission: CvCMission) -> None:
         mission.cog.energy_regen = 0
 
 
-class SuperChargedVariant(MissionVariant):
+class SuperChargedVariant(CoGameMissionVariant):
     name: str = "super_charged"
     description: str = "The sun is shining on you. You recharge faster."
 
     @override
-    def modify_mission(self, mission):
-        assert isinstance(mission, Mission)
+    def modify_mission(self, mission: CvCMission) -> None:
         mission.cog.energy_regen += 2
 
 
-class RoughTerrainVariant(MissionVariant):
-    name: str = "rough_terrain"
-    description: str = "The terrain is rough. Moving is more energy intensive."
-
-    @override
-    def modify_mission(self, mission):
-        assert isinstance(mission, Mission)
-        mission.cog.move_energy_cost += 2
-
-
-class PackRatVariant(MissionVariant):
-    name: str = "pack_rat"
-    description: str = "Raise heart, cargo, energy, and gear caps to 255."
-
-    @override
-    def modify_mission(self, mission):
-        assert isinstance(mission, Mission)
-        mission.cog.heart_limit = max(mission.cog.heart_limit, 255)
-        mission.cog.energy_limit = max(mission.cog.energy_limit, 255)
-        mission.cog.cargo_limit = max(mission.cog.cargo_limit, 255)
-        mission.cog.gear_limit = max(mission.cog.gear_limit, 255)
-
-
-class EnergizedVariant(MissionVariant):
+class EnergizedVariant(CoGameMissionVariant):
     name: str = "energized"
     description: str = "Max energy and full regen so agents never run dry."
 
     @override
-    def modify_mission(self, mission):
-        assert isinstance(mission, Mission)
+    def modify_mission(self, mission: CvCMission) -> None:
         mission.cog.energy_limit = max(mission.cog.energy_limit, 255)
         mission.cog.energy_regen = mission.cog.energy_limit
 
 
-class CompassVariant(MissionVariant):
-    name: str = "compass"
-    description: str = "Enable compass observation."
-
-    @override
-    def modify_env(self, mission, env):
-        env.game.obs.global_obs.compass = True
-
-
-class Small50Variant(MissionVariant):
+class Small50Variant(CoGameMissionVariant):
     name: str = "small_50"
     description: str = "Set map size to 50x50 for quick runs."
 
     def modify_env(self, mission, env) -> None:
         map_builder = env.game.map_builder
-        # Only set width/height if instance is a SceneConfig, not a MapBuilderConfig
-        # When instance is a MapBuilderConfig, width and height must be None
         if isinstance(map_builder, MapGen.Config) and isinstance(map_builder.instance, MapBuilderConfig):
-            # Skip setting width/height for MapBuilderConfig instances
             return
         env.game.map_builder = map_builder.model_copy(update={"width": 50, "height": 50})
 
 
-# Biome variants (weather) for procedural maps
 class DesertVariant(MachinaArenaVariant):
     name: str = "desert"
     description: str = "The desert sands make navigation challenging."
@@ -117,7 +96,6 @@ class CityVariant(MachinaArenaVariant):
     def modify_node(self, node):
         node.biome_weights = {"city": 1.0, "caves": 0.0, "desert": 0.0, "forest": 0.0}
         node.base_biome = "city"
-        # Fill almost the entire map with the city layer
         node.density_scale = 1.0
         node.biome_count = 1
         node.max_biome_zone_fraction = 0.95
@@ -140,32 +118,29 @@ class DistantResourcesVariant(MachinaArenaVariant):
 
     @override
     def modify_node(self, node):
-        # Bias buildings toward the map edges using bimodal clusters centered at
         node.building_coverage = 0.01
 
         vertical_edges = DistributionConfig(
             type=DistributionType.BIMODAL,
-            center1_x=0.92,  # top right corner
+            center1_x=0.92,
             center1_y=0.08,
-            center2_x=0.08,  # bottom left corner
+            center2_x=0.08,
             center2_y=0.92,
             cluster_std=0.18,
         )
         horizontal_edges = DistributionConfig(
             type=DistributionType.BIMODAL,
-            center1_x=0.08,  # top left corner
+            center1_x=0.08,
             center1_y=0.08,
-            center2_x=0.92,  # bottom right corner
+            center2_x=0.92,
             center2_y=0.92,
             cluster_std=0.18,
         )
 
-        # Apply edge-biased distributions to extractors; other buildings follow the global distribution
         names = list(self.building_names)
         node.building_distributions = {
             name: (vertical_edges if i % 2 == 0 else horizontal_edges) for i, name in enumerate(names)
         }
-        # Fallback for any unspecified building types
         node.distribution = DistributionConfig(type=DistributionType.UNIFORM)
 
 
@@ -180,10 +155,10 @@ class QuadrantBuildingsVariant(MachinaArenaVariant):
 
         names = list(node.building_names or self.building_names)
         centers = [
-            (0.25, 0.25),  # top-left
-            (0.75, 0.25),  # top-right
-            (0.25, 0.75),  # bottom-left
-            (0.75, 0.75),  # bottom-right
+            (0.25, 0.25),
+            (0.75, 0.25),
+            (0.25, 0.75),
+            (0.75, 0.75),
         ]
         dists: dict[str, DistributionConfig] = {}
         for i, name in enumerate(names):
@@ -206,8 +181,6 @@ class SingleResourceUniformVariant(MachinaArenaVariant):
 
     @override
     def modify_node(self, node):
-        # Resolve resource to a concrete building name
-        # Restrict building set to only the chosen building and enforce uniform distribution
         node.building_names = [self.building_name]
         node.building_weights = {self.building_name: 1.0}
         node.building_distributions = None
@@ -217,12 +190,10 @@ class SingleResourceUniformVariant(MachinaArenaVariant):
 class EmptyBaseVariant(BaseHubVariant):
     name: str = "empty_base"
     description: str = "Base hub with extractors removed from the four corners."
-    # Extractor object names to remove, e.g., ["oxygen_extractor"]
     missing: list[str] = list(HUB_EXTRACTORS)
 
     @override
     def modify_node(self, node):
-        # Use the default extractor order and blank out any that are missing
         missing_set = set(self.missing or [])
         corner_objects = [name if name not in missing_set else "" for name in HUB_EXTRACTORS]
         node.corner_objects = corner_objects
@@ -230,8 +201,6 @@ class EmptyBaseVariant(BaseHubVariant):
 
 
 class BalancedCornersVariant(MachinaArenaVariant):
-    """Enable corner balancing to ensure fair spawn distances."""
-
     name: str = "balanced_corners"
     description: str = "Balance path distances from center to corners for fair spawns."
     balance_tolerance: float = 1.5
@@ -244,65 +213,19 @@ class BalancedCornersVariant(MachinaArenaVariant):
         node.max_balance_shortcuts = self.max_balance_shortcuts
 
 
-class TraderVariant(MissionVariant):
-    name: str = "trader"
-    description: str = "Agents can trade resources with each other."
-
-    @override
-    def modify_env(self, mission, env):
-        # Define vibe transfers for trading resources (actor gives, target receives)
-        trade_transfers = [
-            VibeTransfer(vibe="carbon_a", target={"carbon": 1}, actor={"carbon": -1}),
-            VibeTransfer(vibe="carbon_b", target={"carbon": 10}, actor={"carbon": -10}),
-            VibeTransfer(vibe="oxygen_a", target={"oxygen": 1}, actor={"oxygen": -1}),
-            VibeTransfer(vibe="oxygen_b", target={"oxygen": 10}, actor={"oxygen": -10}),
-            VibeTransfer(vibe="germanium_a", target={"germanium": 1}, actor={"germanium": -1}),
-            VibeTransfer(vibe="germanium_b", target={"germanium": 4}, actor={"germanium": -4}),
-            VibeTransfer(vibe="silicon_a", target={"silicon": 10}, actor={"silicon": -10}),
-            VibeTransfer(vibe="silicon_b", target={"silicon": 50}, actor={"silicon": -50}),
-            VibeTransfer(vibe="heart_a", target={"heart": 1}, actor={"heart": -1}),
-            VibeTransfer(vibe="heart_b", target={"heart": 4}, actor={"heart": -4}),
-        ]
-        # Enable transfer action with these vibes
-        env.game.actions.transfer.enabled = True
-        env.game.actions.transfer.vibe_transfers.extend(trade_transfers)
-
-
-class SharedRewardsVariant(MissionVariant):
-    name: str = "shared_rewards"
-    description: str = "Rewards for deposited hearts are shared among all agents."
-
-    @override
-    def modify_env(self, mission, env):
-        num_cogs = mission.num_cogs if mission.num_cogs is not None else mission.site.min_cogs
-        env.game.agent.rewards["chest_heart_deposited_by_agent"] = reward(
-            stat("chest.heart.deposited_by_agent"), weight=0
-        )
-        env.game.agent.rewards["chest_heart_amount"] = reward(stat("chest.heart.amount"), weight=1 / num_cogs)
-
-
-# TODO - validate that all variant names are unique
-VARIANTS: list[MissionVariant] = [
+VARIANTS: list[CoGameMissionVariant] = [
     CavesVariant(),
     CityVariant(),
-    CompassVariant(),
     DarkSideVariant(),
     DesertVariant(),
     EmptyBaseVariant(),
     EnergizedVariant(),
     ForestVariant(),
-    PackRatVariant(),
     QuadrantBuildingsVariant(),
-    RoughTerrainVariant(),
-    SharedRewardsVariant(),
     SingleResourceUniformVariant(),
     Small50Variant(),
     SuperChargedVariant(),
-    TraderVariant(),
     *DIFFICULTY_VARIANTS,
 ]
 
-# Hidden variants registry: Remains usable but will NOT appear in `cogames variants` listing
-HIDDEN_VARIANTS: list[MissionVariant] = [
-    # Example: ExperimentalVariant(),  # keep empty by default
-]
+HIDDEN_VARIANTS: list[CoGameMissionVariant] = []

cogames/core.py

@@ -0,0 +1,87 @@
+"""Core base classes for CoGame missions and variants."""
+
+from __future__ import annotations
+
+from abc import ABC
+from typing import TypeVar
+
+from pydantic import Field
+from typing_extensions import Self
+
+from mettagrid.base_config import Config
+from mettagrid.config.mettagrid_config import MettaGridConfig
+from mettagrid.map_builder.map_builder import AnyMapBuilderConfig
+
+# Type variable for mission types
+TMission = TypeVar("TMission", bound="CoGameMission")
+
+MAP_MISSION_DELIMITER = "."
+
+
+class CoGameMissionVariant(Config, ABC):
+    # Note: we could derive the name from the class name automatically, but it would make it
+    # harder to find the variant source code based on CLI interactions.
+    name: str
+    description: str = Field(default="")
+
+    def modify_mission(self, mission: CoGameMission) -> None:
+        # Override this method to modify the mission.
+        # Variants are allowed to modify the mission in-place - it's guaranteed to be a one-time only instance.
+        pass
+
+    def modify_env(self, mission: CoGameMission, env: MettaGridConfig) -> None:
+        # Override this method to modify the produced environment.
+        # Variants are allowed to modify the environment in-place.
+        pass
+
+    def compat(self, mission: CoGameMission) -> bool:
+        """Check if this variant is compatible with the given mission.
+
+        Returns True if the variant can be safely applied to the mission.
+        Override this method to add compatibility checks.
+        """
+        return True
+
+    def apply(self, mission: TMission) -> TMission:
+        mission = mission.model_copy(deep=True)
+        mission.variants.append(self)
+        self.modify_mission(mission)
+        return mission
+
+
+class CoGameSite(Config):
+    name: str
+    description: str
+    map_builder: AnyMapBuilderConfig
+
+    min_cogs: int = Field(default=1, ge=1)
+    max_cogs: int = Field(default=1000, ge=1)
+
+
+class CoGameMission(Config, ABC):
+    """Base class for Mission configurations with common fields and methods."""
+
+    name: str
+    description: str
+    site: CoGameSite
+    num_cogs: int | None = None
+
+    # Variants are applied to the mission immediately, and to its env when make_env is called
+    variants: list[CoGameMissionVariant] = Field(default_factory=list)
+
+    max_steps: int = Field(default=10000)
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        # Can't call `variant.apply` here because it will create a new mission instance
+        for variant in self.variants:
+            variant.modify_mission(self)
+
+    def with_variants(self, variants: list[CoGameMissionVariant]) -> Self:
+        mission = self
+        for variant in variants:
+            mission = variant.apply(mission)
+        return mission
+
+    def full_name(self) -> str:
+        return f"{self.site.name}{MAP_MISSION_DELIMITER}{self.name}"

cogames/main.py

@@ -109,13 +109,17 @@ def _register_policies() -> None:
     discover_and_register_policies()
 
 
+def _register_policies_callback() -> None:
+    _register_policies()
+
+
 app = typer.Typer(
     help="CoGames - Multi-agent cooperative and competitive games",
     context_settings={"help_option_names": ["-h", "--help"]},
     no_args_is_help=True,
     rich_markup_mode="rich",
     pretty_exceptions_show_locals=False,
-    callback=_register_policies,
+    callback=_register_policies_callback,
 )
 
 tutorial_app = typer.Typer(

cogames/maps/evals/eval_balanced_spread.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.C....O......................#
     #C.......#.......................G.....#
     #......C.#.....###.....###.............#
-    #........#.....#O.......G#...........O.#
-    #.....#........#....=....#......#......#
-    #.....#.....G...................##.....#
+    #........#.....#O...m...G#...........O.#
+    #.....#........#...a=r...#......#......#
+    #.....#.....G.......t...........##.....#
     #....C#.............&....S.......##....#
     #.....#.............@@@@@@@@......#....#
     #.....#....C...........................#
@@ -51,3 +51,7 @@ char_to_map_name:
   "@": agent.agent
   "&": hub
   "=": chest
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_clip_oxygen.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###.............#
-    #........#.....#O.......G#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#O...m...G#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#.............&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#........S.......................#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_collect_resources.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####...........C.................#
     #....S...#........................O....#
     #........#.....###.....###.............#
-    #........#.....#O.......G#.............#
-    #.....#........#.@..=..@.#......#......#
-    #.....#................@........##.....#
+    #........#.....#O...m...G#.............#
+    #.....#........#.@.a=r.@.#......#......#
+    #.....#.............t..@........##.....#
     #.....#...C......@..&............##....#
     #.....#.............@..@..........#....#
     #.....#..........@.......@.............#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_collect_resources_hard.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###.............#
-    #........#.....#.........#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#....m....#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#.............&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_collect_resources_medium.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###...........G.#
-    #........#.....#.........#.............#
-    #.....#........#....=....#......#......#
-    #.....#......C..................##.....#
+    #........#.....#....m....#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#......C......t...........##.....#
     #.....#.............&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_divide_and_conquer.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###.............#
-    #........#.....#.........#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#....m....#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#.............&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -51,3 +51,7 @@ char_to_map_name:
   "@": agent.agent
   "&": hub
   "=": chest
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_energy_starved.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #...S....#........................S....#
     #........#.....###.....###.............#
-    #........#.....#.........#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#....m....#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#...O.........&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -51,3 +51,7 @@ char_to_map_name:
   "@": agent.agent
   "&": hub
   "=": chest
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_multi_coordinated_collect_hard.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###.............#
-    #........#.....#.........#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#....m....#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#.............&....@.......##....#
     #.....#.............@.............#....#
     #.....#.........@.......@..............#
@@ -54,3 +54,7 @@ char_to_map_name:
 
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_oxygen_bottleneck.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.............................#
     #........#.............................#
     #........#.....###.....###.............#
-    #........#.....#........G#.............#
-    #.....#........#....=....#......#......#
-    #.....#.........................##.....#
+    #........#.....#....m...G#.............#
+    #.....#........#...a=r...#......#......#
+    #.....#.............t...........##.....#
     #.....#.............&............##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/eval_single_use_world.map

@@ -15,9 +15,9 @@ map_data: |-
     #.....####.C....O......................#
     #C.......#.......................G.....#
     #......C.#.....###.....###.............#
-    #........#.....#O.......G#...........O.#
-    #.....#........#....=....#......#......#
-    #.....#.....G...................##.....#
+    #........#.....#O...m...G#...........O.#
+    #.....#........#...a=r...#......#......#
+    #.....#.....G.......t...........##.....#
     #....C#.............&....S.......##....#
     #.....#.............@@@@@@@@......#....#
     #.....#................................#
@@ -53,3 +53,7 @@ char_to_map_name:
   "=": chest
 
 
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/extractor_hub_100x100.map

@@ -55,10 +55,10 @@ map_data: |-
   #####............###............#...###.....#.........@.........#...#.......#.....#..###...##...#.##...#######
   ########..#..###.##.#.#.....#.S....#.##..##.......................#.#....#..#.G.......##.#####.###.....#######
   ######........##......#..#..#......#.#.....#........@.&.@........##...##.#.##.........##....#..##.#....#######
-  #####....##.C.#........###..#.#...##.###..#......................#...#......##......C.####...#.#..#.....######
+  #####....##.C.#........###..#.#...##.###..#...........m..........#...#......##......C.####...#.#..#.....######
   ######...#........#...........#.......#..####.........@.........#.#..#..####.#........####.....##.......######
-  #######.........#..##.G.#...#.####....#.....#.........=.........#..##..#####......+.#...#.##..##....S...######
-  ########.#.##..#...##.....###.###.......##..#...................#.......#....#............#.............######
+  #######.........#..##.G.#...#.####....#.....#........a=r........#..##..#####......+.#...#.##..##....S...######
+  ########.#.##..#...##.....###.###.......##..#.........t.........#.......#....#............#.............######
   #######.#######....##..#.######.....##..##..#...................####..G.##.....##...###..#..###....#..########
   ######......#....#..#.####.###..###....####.#...................#####...##.##.##...##.....#######.#..#########
   #####.....O...O.....#.###...##.##.....#..####...................#...#...#####...#..##.##....#..####..##..#####
@@ -121,3 +121,7 @@ char_to_map_name:
   "S": silicon_extractor
   "O": oxygen_extractor
   "C": carbon_extractor
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/extractor_hub_30x30.map

@@ -20,10 +20,10 @@ map_data: |-
   ########.#......@..@....@....#....######
   ########........................+..#####
   ######...........@.&.@.............#####
-  ######..#..........................#####
+  ######..#..........m...............#####
   #####..###......@..@.@.......###..######
-  #####..###.........=.........##..#######
-  #####..###...................#..########
+  #####..###........a=r........##..#######
+  #####..###.........t.........#..########
   #####...##...................#..########
   ######..##...................#.#########
   #######..#...................#.....#####
@@ -51,3 +51,7 @@ char_to_map_name:
   "S": silicon_extractor
   "O": oxygen_extractor
   "C": carbon_extractor
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station

cogames/maps/evals/extractor_hub_50x50.map

@@ -30,10 +30,10 @@ map_data: |-
   #####...#....#.....#..@......@.....@...#.#..#.......########
   #####.....#.............................##..##.....#########
   #####..........#...........@.&.@..............##.###########
-  ######..##.G..###........................C....##.###########
+  ######..##.G..###............m...........C....##.###########
   ######.###.....##..#.....@...@.........#..........#...######
-  #####..##....G.....#.........=.........#........##.....#####
-  #####..#...........#...................#........##.....#####
+  #####..##....G.....#........a=r........#........##.....#####
+  #####..#...........#.........t.........#........##.....#####
   #####...#.....#....#...................#......#..#.O..######
   #####....####.##...#...................#..............######
   #####....##........#...................#..............######
@@ -71,3 +71,7 @@ char_to_map_name:
   "S": silicon_extractor
   "O": oxygen_extractor
   "C": carbon_extractor
+  "a": aligner_station
+  "r": scrambler_station
+  "m": miner_station
+  "t": scout_station