cogames 0.3.49__py3-none-any.whl → 0.3.64__py3-none-any.whl

cogames/cogs_vs_clips/mission.py

@@ -1,43 +1,50 @@
 from __future__ import annotations
 
 from abc import ABC
-from typing import override
+from typing import TypeVar, override
 
 from pydantic import Field
+from typing_extensions import Self
 
+from cogames.cogs_vs_clips.cog import CogConfig
 from cogames.cogs_vs_clips.stations import (
-    CarbonExtractorConfig,
-    ChargerConfig,
-    CvCAssemblerConfig,
-    CvCChestConfig,
+    ELEMENTS,
+    GEAR,
+    CogsGuardChestConfig,
     CvCWallConfig,
-    GermaniumExtractorConfig,
-    OxygenExtractorConfig,
-    SiliconExtractorConfig,
-    resources,
+    GearStationConfig,
+    HubConfig,
+    JunctionConfig,
+    SimpleExtractorConfig,
 )
 from mettagrid.base_config import Config
-from mettagrid.config import vibes
-from mettagrid.config.mettagrid_config import (
+from mettagrid.config.action_config import (
     ActionsConfig,
-    AgentConfig,
-    AgentRewards,
     ChangeVibeActionConfig,
-    ClipperConfig,
+    MoveActionConfig,
+    NoopActionConfig,
+)
+from mettagrid.config.event_config import EventConfig, periodic
+from mettagrid.config.filter import isAlignedTo, isNear
+from mettagrid.config.game_value import inv
+from mettagrid.config.game_value import stat as game_stat
+from mettagrid.config.mettagrid_config import (
+    CollectiveConfig,
     GameConfig,
-    GlobalObsConfig,
     InventoryConfig,
     MettaGridConfig,
-    MoveActionConfig,
-    NoopActionConfig,
-    ProtocolConfig,
     ResourceLimitsConfig,
-    TransferActionConfig,
-    VibeTransfer,
 )
+from mettagrid.config.mutation import alignTo
+from mettagrid.config.obs_config import GlobalObsConfig, ObsConfig
+from mettagrid.config.reward_config import numObjects, reward
+from mettagrid.config.tag import typeTag
 from mettagrid.config.vibes import Vibe
 from mettagrid.map_builder.map_builder import AnyMapBuilderConfig
 
+# Type variable for mission types
+TMission = TypeVar("TMission", bound="MissionBase")
+
 
 class MissionVariant(Config, ABC):
     # Note: we could derive the name from the class name automatically, but it would make it
@@ -45,17 +52,17 @@ class MissionVariant(Config, ABC):
     name: str
     description: str = Field(default="")
 
-    def modify_mission(self, mission: Mission) -> None:
+    def modify_mission(self, mission: MissionBase) -> 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: Mission, env: MettaGridConfig) -> None:
+    def modify_env(self, mission: MissionBase, 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: Mission) -> bool:
+    def compat(self, mission: MissionBase) -> bool:
         """Check if this variant is compatible with the given mission.
 
         Returns True if the variant can be safely applied to the mission.
@@ -63,7 +70,7 @@ class MissionVariant(Config, ABC):
         """
         return True
 
-    def apply(self, mission: Mission) -> Mission:
+    def apply(self, mission: TMission) -> TMission:
         mission = mission.model_copy(deep=True)
         mission.variants.append(self)
         self.modify_mission(mission)
@@ -107,8 +114,8 @@ class Site(Config):
 MAP_MISSION_DELIMITER = "."
 
 
-class Mission(Config):
-    """Mission configuration for Cogs vs Clips."""
+class MissionBase(Config, ABC):
+    """Base class for Mission configurations with common fields and methods."""
 
     name: str
     description: str
@@ -118,27 +125,7 @@ class Mission(Config):
     # Variants are applied to the mission immediately, and to its env when make_env is called
     variants: list[MissionVariant] = Field(default_factory=list)
 
-    carbon_extractor: CarbonExtractorConfig = Field(default_factory=CarbonExtractorConfig)
-    oxygen_extractor: OxygenExtractorConfig = Field(default_factory=OxygenExtractorConfig)
-    germanium_extractor: GermaniumExtractorConfig = Field(default_factory=GermaniumExtractorConfig)
-    silicon_extractor: SiliconExtractorConfig = Field(default_factory=SiliconExtractorConfig)
-    charger: ChargerConfig = Field(default_factory=ChargerConfig)
-    chest: CvCChestConfig = Field(default_factory=CvCChestConfig)
-    wall: CvCWallConfig = Field(default_factory=CvCWallConfig)
-    assembler: CvCAssemblerConfig = Field(default_factory=CvCAssemblerConfig)
-
-    clip_period: int = Field(default=0)
-    cargo_capacity: int = Field(default=100)
-    energy_capacity: int = Field(default=100)
-    energy_regen_amount: int = Field(default=1)
-    inventory_regen_interval: int = Field(default=1)
-    gear_capacity: int = Field(default=5)
-    move_energy_cost: int = Field(default=2)
-    heart_capacity: int = Field(default=1)
-    # Control vibe swapping in variants
-    enable_vibe_change: bool = Field(default=True)
-    vibes: list[Vibe] | None = Field(default=None)
-    compass_enabled: bool = Field(default=True)
+    max_steps: int = Field(default=10000)
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -146,7 +133,7 @@ class Mission(Config):
         for variant in self.variants:
             variant.modify_mission(self)
 
-    def with_variants(self, variants: list[MissionVariant]) -> Mission:
+    def with_variants(self, variants: list[MissionVariant]) -> Self:
         mission = self
         for variant in variants:
             mission = variant.apply(mission)
@@ -155,6 +142,48 @@ class Mission(Config):
     def full_name(self) -> str:
         return f"{self.site.name}{MAP_MISSION_DELIMITER}{self.name}"
 
+
+# CogsGuard vibes
+COGSGUARD_VIBES = [
+    Vibe("😐", "default"),
+    Vibe("❤️", "heart"),
+    Vibe("⚙️", "gear"),
+    Vibe("🌀", "scrambler"),
+    Vibe("🔗", "aligner"),
+    Vibe("⛏️", "miner"),
+    Vibe("🔭", "scout"),
+]
+
+
+class Mission(MissionBase):
+    """Mission configuration for CogsGuard game mode."""
+
+    # Agent configuration
+    cog: CogConfig = Field(default_factory=CogConfig)
+
+    wealth: int = Field(default=1)
+
+    # Collective initial resources
+    collective_initial_carbon: int = Field(default=10)
+    collective_initial_oxygen: int = Field(default=10)
+    collective_initial_germanium: int = Field(default=10)
+    collective_initial_silicon: int = Field(default=10)
+    collective_initial_heart: int = Field(default=5)
+
+    # Clips Behavior - scramble cogs junctions to neutral
+    # Note: must start after initial_clips fires at timestep 10 (events fire alphabetically)
+    clips_scramble_start: int = Field(default=50)
+    clips_scramble_interval: int = Field(default=100)
+    clips_scramble_radius: int = Field(default=25)
+
+    # Clips Behavior - align neutral junctions to clips
+    clips_align_start: int = Field(default=100)
+    clips_align_interval: int = Field(default=100)
+    clips_align_radius: int = Field(default=25)
+
+    # Station configs
+    wall: CvCWallConfig = Field(default_factory=CvCWallConfig)
+
     def make_env(self) -> MettaGridConfig:
         """Create a MettaGridConfig from this mission.
 
@@ -166,119 +195,125 @@ class Mission(Config):
         map_builder = self.site.map_builder
         num_cogs = self.num_cogs if self.num_cogs is not None else self.site.min_cogs
 
+        gear = GEAR
+        elements = ELEMENTS
+        resources_list = ["energy", "heart", "hp", "influence", *elements, *gear]
+        vibe_names = [vibe.name for vibe in COGSGUARD_VIBES]
+
+        extractor_objects = {
+            f"{resource}_extractor": SimpleExtractorConfig(resource=resource).station_cfg() for resource in elements
+        }
+        gear_objects = {f"{g}_station": GearStationConfig(gear_type=g).station_cfg() for g in gear}
+
+        # Create inventory observations for collective resources
+        collective_obs = [inv(f"collective.{resource}") for resource in elements]
+
         game = GameConfig(
             map_builder=map_builder,
+            max_steps=self.max_steps,
             num_agents=num_cogs,
-            resource_names=resources,
-            vibe_names=[vibe.name for vibe in vibes.VIBES],
-            global_obs=GlobalObsConfig(compass=self.compass_enabled, goal_obs=True),
+            resource_names=resources_list,
+            vibe_names=vibe_names,
+            obs=ObsConfig(global_obs=GlobalObsConfig(obs=collective_obs, local_position=True)),
             actions=ActionsConfig(
-                move=MoveActionConfig(consumed_resources={"energy": self.move_energy_cost}),
+                move=MoveActionConfig(consumed_resources={"energy": self.cog.move_energy_cost}),
                 noop=NoopActionConfig(),
-                change_vibe=ChangeVibeActionConfig(
-                    vibes=(
-                        []
-                        if not self.enable_vibe_change
-                        else (self.vibes if self.vibes is not None else list(vibes.VIBES))
-                    )
-                ),
-                transfer=TransferActionConfig(
-                    enabled=True,
-                    vibe_transfers=[VibeTransfer(vibe="charger", target={"energy": 20}, actor={"energy": -20})],
-                ),
+                change_vibe=ChangeVibeActionConfig(vibes=COGSGUARD_VIBES),
             ),
-            agent=AgentConfig(
-                inventory=InventoryConfig(
-                    limits={
-                        "heart": ResourceLimitsConfig(limit=self.heart_capacity, resources=["heart"]),
-                        "energy": ResourceLimitsConfig(limit=self.energy_capacity, resources=["energy"]),
-                        "cargo": ResourceLimitsConfig(
-                            limit=self.cargo_capacity, resources=["carbon", "oxygen", "germanium", "silicon"]
-                        ),
-                        "gear": ResourceLimitsConfig(
-                            limit=self.gear_capacity, resources=["scrambler", "modulator", "decoder", "resonator"]
+            agent=self.cog.agent_config(gear=gear, elements=elements).model_copy(
+                update={
+                    "rewards": {
+                        "aligned_junction_held": reward(
+                            game_stat("collective.aligned.junction.held"),
+                            weight=1.0 / self.max_steps,
+                            denoms=[numObjects("junction")],
                         ),
                     },
-                    initial={"energy": self.energy_capacity},
-                    regen_amounts={"default": {"energy": self.energy_regen_amount}},
-                ),
-                rewards=AgentRewards(
-                    # Reward only the agent that deposits a heart.
-                    stats={"chest.heart.deposited_by_agent": 1.0},
-                ),
-                diversity_tracked_resources=["energy", "carbon", "oxygen", "germanium", "silicon", "heart"],
-            ),
-            inventory_regen_interval=self.inventory_regen_interval,
-            clipper=ClipperConfig(
-                unclipping_protocols=[
-                    ProtocolConfig(
-                        input_resources={"decoder": 1},
-                        cooldown=1,
-                    ),
-                    ProtocolConfig(
-                        input_resources={"modulator": 1},
-                        cooldown=1,
-                    ),
-                    ProtocolConfig(
-                        input_resources={"scrambler": 1},
-                        cooldown=1,
-                    ),
-                    ProtocolConfig(
-                        input_resources={"resonator": 1},
-                        cooldown=1,
-                    ),
-                ],
-                clip_period=self.clip_period,
+                }
             ),
             objects={
                 "wall": self.wall.station_cfg(),
-                "assembler": self.assembler.station_cfg(),
-                "chest": self.chest.station_cfg(),
-                "charger": self.charger.station_cfg(),
-                "carbon_extractor": self.carbon_extractor.station_cfg(),
-                "oxygen_extractor": self.oxygen_extractor.station_cfg(),
-                "germanium_extractor": self.germanium_extractor.station_cfg(),
-                "silicon_extractor": self.silicon_extractor.station_cfg(),
-                # Resource-specific chests used by diagnostic missions
-                # These use simplified vibe_transfers (only "default") to avoid issues when vibes are restricted
-                "chest_carbon": self.chest.station_cfg().model_copy(
-                    update={
-                        "map_name": "chest_carbon",
-                        "vibe_transfers": {"default": {"carbon": 255}},
-                    }
+                "hub": HubConfig(map_name="hub", team="cogs").station_cfg(),
+                "junction": JunctionConfig(map_name="junction").station_cfg(),
+                "chest": CogsGuardChestConfig().station_cfg(),
+                **extractor_objects,
+                **gear_objects,
+            },
+            collectives={
+                "cogs": CollectiveConfig(
+                    inventory=InventoryConfig(
+                        limits={
+                            "resources": ResourceLimitsConfig(min=10000, resources=elements),
+                            "hearts": ResourceLimitsConfig(min=65535, resources=["heart"]),
+                        },
+                        initial={
+                            "carbon": self.collective_initial_carbon * self.wealth,
+                            "oxygen": self.collective_initial_oxygen * self.wealth,
+                            "germanium": self.collective_initial_germanium * self.wealth,
+                            "silicon": self.collective_initial_silicon * self.wealth,
+                            "heart": self.collective_initial_heart * self.wealth,
+                        },
+                    ),
                 ),
-                "chest_oxygen": self.chest.station_cfg().model_copy(
-                    update={
-                        "map_name": "chest_oxygen",
-                        "vibe_transfers": {"default": {"oxygen": 255}},
-                    }
+                "clips": CollectiveConfig(),
+            },
+            events={
+                "initial_clips": EventConfig(
+                    name="initial_clips",
+                    target_tag=typeTag("junction"),
+                    timesteps=[10],
+                    mutations=[alignTo("clips")],
+                    max_targets=1,
                 ),
-                "chest_germanium": self.chest.station_cfg().model_copy(
-                    update={
-                        "map_name": "chest_germanium",
-                        "vibe_transfers": {"default": {"germanium": 255}},
-                    }
+                "cogs_to_neutral": EventConfig(
+                    name="cogs_to_neutral",
+                    target_tag=typeTag("junction"),
+                    timesteps=periodic(
+                        start=self.clips_scramble_start,
+                        period=self.clips_scramble_interval,
+                        end_period=self.clips_scramble_interval // 5,
+                        end=self.max_steps,
+                    ),
+                    filters=[
+                        isNear(typeTag("junction"), [isAlignedTo("clips")], radius=self.clips_scramble_radius),
+                        isAlignedTo("cogs"),
+                    ],
+                    mutations=[alignTo(None)],
+                    max_targets=1,
                 ),
-                "chest_silicon": self.chest.station_cfg().model_copy(
-                    update={
-                        "map_name": "chest_silicon",
-                        "vibe_transfers": {"default": {"silicon": 255}},
-                    }
+                "neutral_to_clips": EventConfig(
+                    name="neutral_to_clips",
+                    target_tag=typeTag("junction"),
+                    timesteps=periodic(
+                        start=self.clips_align_start,
+                        period=self.clips_align_interval,
+                        end_period=self.clips_align_interval // 5,
+                        end=self.max_steps,
+                    ),
+                    filters=[
+                        isNear(typeTag("junction"), [isAlignedTo("clips")], radius=self.clips_align_radius),
+                        isAlignedTo(None),
+                    ],
+                    mutations=[alignTo("clips")],
+                    max_targets=1,
+                    fallback="cogs_to_neutral",
+                ),
+                # If the Clips can't find any junctions near them, align a random junction
+                "presence_check": EventConfig(
+                    name="presence_check",
+                    target_tag=typeTag("junction"),
+                    timesteps=periodic(
+                        start=self.clips_scramble_start,
+                        period=self.clips_scramble_interval,
+                        end=self.max_steps,
+                    ),
+                    filters=[
+                        isNear(typeTag("junction"), [isAlignedTo("clips")], radius=self.clips_scramble_radius),
+                    ],
+                    mutations=[],
+                    max_targets=1,
+                    fallback="initial_clips",
                 ),
-                # Clipped variants with unique map_names so they don't conflict with regular extractors
-                # These are used by maps that explicitly place clipped extractors
-                "clipped_carbon_extractor": self.carbon_extractor.model_copy(update={"start_clipped": True})
-                .station_cfg()
-                .model_copy(update={"map_name": "clipped_carbon_extractor"}),
-                "clipped_oxygen_extractor": self.oxygen_extractor.model_copy(update={"start_clipped": True})
-                .station_cfg()
-                .model_copy(update={"map_name": "clipped_oxygen_extractor"}),
-                "clipped_germanium_extractor": self.germanium_extractor.model_copy(update={"start_clipped": True})
-                .station_cfg()
-                .model_copy(update={"map_name": "clipped_germanium_extractor"}),
-                "clipped_silicon_extractor": self.silicon_extractor.model_copy(update={"start_clipped": True})
-                .station_cfg()
-                .model_copy(update={"map_name": "clipped_silicon_extractor"}),
             },
         )
 
@@ -293,3 +328,9 @@ class Mission(Config):
             env.label += f".{variant.name}"
 
         return env
+
+
+# Backwards compatibility alias
+CogsGuardMission = Mission
+
+AnyMission = Mission

cogames/cogs_vs_clips/missions.py

@@ -1,166 +1,78 @@
 from functools import lru_cache
 
-from cogames.cogs_vs_clips.mission import Mission
-from cogames.cogs_vs_clips.mission_utils import get_map
-from cogames.cogs_vs_clips.sites import HELLO_WORLD, MACHINA_1, TRAINING_FACILITY
-from cogames.cogs_vs_clips.variants import (
-    AssemblerDrawsFromChestsVariant,
-    BalancedCornersVariant,
-    ClipHubStationsVariant,
-    ClipPeriodOnVariant,
-    EmptyBaseVariant,
-    ExtractorHeartTuneVariant,
-    HeartChorusVariant,
-    InventoryHeartTuneVariant,
-    LonelyHeartVariant,
-    PackRatVariant,
-    SharedRewardsVariant,
-    VibeCheckMin2Variant,
+from cogames.cogs_vs_clips.mission import AnyMission, Mission
+from cogames.cogs_vs_clips.sites import (
+    COGSGUARD_ARENA,
+    COGSGUARD_MACHINA_1,
+    make_cogsguard_machina1_site,
 )
 from mettagrid.config.mettagrid_config import MettaGridConfig
 
-# Training Facility Missions
+# CogsGuard Missions
 
-HarvestMission = Mission(
-    name="harvest",
-    description="Collect resources, assemble hearts, and deposit them in the chest. Make sure to stay charged!",
-    site=TRAINING_FACILITY,
-    variants=[ExtractorHeartTuneVariant(hearts=10), PackRatVariant(), LonelyHeartVariant()],
-)
-
-VibeCheckMission = Mission(
-    name="vibe_check",
-    description="Modulate the group vibe to assemble HEARTs.",
-    site=TRAINING_FACILITY,
-    num_cogs=4,
-    variants=[VibeCheckMin2Variant(), ExtractorHeartTuneVariant(hearts=10)],
-)
-
-
-RepairMission = Mission(
-    name="repair",
-    description="Repair disabled stations to restore their functionality.",
-    site=TRAINING_FACILITY,
-    num_cogs=2,
-    variants=[
-        InventoryHeartTuneVariant(hearts=1),
-        ExtractorHeartTuneVariant(hearts=10),
-        LonelyHeartVariant(),
-        ClipPeriodOnVariant(),
-        ClipHubStationsVariant(),
-    ],
-)  # If you get only two hearts you failed.
-
-
-# Easy Hearts: simplified heart crafting and generous limits with extractor hub
-EasyHeartsTrainingMission = Mission(
-    name="easy_hearts_training_facility",
-    description="Simplified heart crafting with generous caps and extractor base.",
-    site=TRAINING_FACILITY,
-    variants=[
-        LonelyHeartVariant(),
-        HeartChorusVariant(),
-        PackRatVariant(),
-    ],
-)
-
-# Easy Hearts: simplified heart crafting and generous limits with extractor hub
-EasyHeartsHelloWorldMission = Mission(
-    name="easy_hearts_hello_world",
-    description="Simplified heart crafting with generous caps and extractor base.",
-    site=HELLO_WORLD,
-    variants=[
-        LonelyHeartVariant(),
-        HeartChorusVariant(),
-        PackRatVariant(),
-    ],
-)
 
+def make_cogsguard_mission(num_agents: int = 10, max_steps: int = 10000) -> Mission:
+    """Create a CogsGuard mission with configurable parameters (Machina1 layout)."""
+    return Mission(
+        name="basic",
+        description="Basic CogsGuard mission (Machina1 layout)",
+        site=make_cogsguard_machina1_site(num_agents),
+        num_cogs=num_agents,
+        max_steps=max_steps,
+    )
 
-# Hello World Missions
 
-HelloWorldOpenWorldMission = Mission(
-    name="open_world",
-    description="Collect resources and assemble HEARTs.",
-    site=HELLO_WORLD,
-    variants=[EmptyBaseVariant()],
+CogsGuardMachina1Mission = Mission(
+    name="basic",
+    description="CogsGuard Machina1 - compete to control junctions with gear abilities.",
+    site=COGSGUARD_MACHINA_1,
+    num_cogs=8,
+    max_steps=10000,
 )
 
-
-# Machina 1 Missions
-Machina1OpenWorldMission = Mission(
-    name="open_world",
-    description="Collect resources and assemble HEARTs.",
-    site=MACHINA_1,
-    variants=[EmptyBaseVariant()],
+CogsGuardBasicMission = Mission(
+    name="basic",
+    description="CogsGuard Arena - compact training map with gear abilities.",
+    site=COGSGUARD_ARENA,
+    num_cogs=8,
+    max_steps=1000,
 )
 
-Machina1OpenWorldWithChestsMission = Mission(
-    name="open_world_with_chests",
-    description="Collect resources and assemble HEARTs.",
-    site=MACHINA_1,
-    variants=[EmptyBaseVariant(), AssemblerDrawsFromChestsVariant()],
-)
 
-Machina1BalancedCornersMission = Mission(
-    name="balanced_corners",
-    description="Collect resources and assemble HEARTs. Map has balanced corner distances for fair spawns.",
-    site=MACHINA_1,
-    variants=[EmptyBaseVariant(), BalancedCornersVariant()],
-)
-
-Machina1OpenWorldSharedRewardsMission = Mission(
-    name="open_world_shared_rewards",
-    description="Collect resources and assemble HEARTs. Rewards for deposited hearts are shared among all agents.",
-    site=MACHINA_1,
-    variants=[EmptyBaseVariant(), SharedRewardsVariant()],
-)
+_CORE_MISSIONS: list[AnyMission] = [
+    CogsGuardMachina1Mission,
+    CogsGuardBasicMission,
+]
 
 
-HelloWorldUnclipMission = Mission(
-    name="hello_world_unclip",
-    description="Stabilize clipped extractors scattered across the hello_world sector.",
-    site=HELLO_WORLD,
-    num_cogs=4,
-    variants=[ClipPeriodOnVariant(), InventoryHeartTuneVariant(hearts=1), ClipHubStationsVariant()],
-)
-
+def get_core_missions() -> list[AnyMission]:
+    return list(_CORE_MISSIONS)
 
-_CORE_MISSIONS: list[Mission] = [
-    HarvestMission,
-    VibeCheckMission,
-    RepairMission,
-    EasyHeartsTrainingMission,
-    EasyHeartsHelloWorldMission,
-    HelloWorldUnclipMission,
-    HelloWorldOpenWorldMission,
-    Machina1OpenWorldMission,
-    Machina1OpenWorldWithChestsMission,
-    Machina1BalancedCornersMission,
-    Machina1OpenWorldSharedRewardsMission,
-]
 
+def get_legacy_missions() -> list[Mission]:
+    """Get legacy (pre-CogsGuard) missions for backward compatibility.
 
-def get_core_missions() -> list[Mission]:
-    return list(_CORE_MISSIONS)
+    Legacy missions have been removed. Returns empty list.
+    """
+    return []
 
 
-def _build_eval_missions() -> list[Mission]:
-    from cogames.cogs_vs_clips.evals.diagnostic_evals import DIAGNOSTIC_EVALS
+def _build_eval_missions() -> list[AnyMission]:
+    from cogames.cogs_vs_clips.evals.cogsguard_evals import COGSGUARD_EVAL_MISSIONS
     from cogames.cogs_vs_clips.evals.integrated_evals import EVAL_MISSIONS as INTEGRATED_EVAL_MISSIONS
 
     return [
+        *COGSGUARD_EVAL_MISSIONS,
         *INTEGRATED_EVAL_MISSIONS,
-        *[mission_cls() for mission_cls in DIAGNOSTIC_EVALS],  # type: ignore[call-arg]
     ]
 
 
 @lru_cache(maxsize=1)
-def get_missions() -> list[Mission]:
+def get_missions() -> list[AnyMission]:
     return [*_CORE_MISSIONS, *_build_eval_missions()]
 
 
-def __getattr__(name: str) -> list[Mission]:
+def __getattr__(name: str) -> list[AnyMission]:
     if name == "MISSIONS":
         missions = get_missions()
         globals()["MISSIONS"] = missions
@@ -169,9 +81,6 @@ def __getattr__(name: str) -> list[Mission]:
 
 
 def make_game(num_cogs: int = 2, map_name: str = "training_facility_open_1.map") -> MettaGridConfig:
-    """Create a default cogs vs clips game configuration."""
-    mission = HarvestMission.model_copy(deep=True)
-    mission.num_cogs = num_cogs
-    env = mission.make_env()
-    env.game.map_builder = get_map(map_name)
-    return env
+    """Create a default CogsGuard game configuration."""
+    mission = make_cogsguard_mission(num_agents=num_cogs)
+    return mission.make_env()