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

cogames/cogs_vs_clips/missions.py

@@ -1,6 +1,6 @@
 from functools import lru_cache
 
-from cogames.cogs_vs_clips.mission import AnyMission, Mission
+from cogames.cogs_vs_clips.mission import CvCMission
 from cogames.cogs_vs_clips.sites import (
     COGSGUARD_ARENA,
     COGSGUARD_MACHINA_1,
@@ -11,9 +11,9 @@ from mettagrid.config.mettagrid_config import MettaGridConfig
 # CogsGuard Missions
 
 
-def make_cogsguard_mission(num_agents: int = 10, max_steps: int = 10000) -> Mission:
+def make_cogsguard_mission(num_agents: int = 10, max_steps: int = 10000) -> CvCMission:
     """Create a CogsGuard mission with configurable parameters (Machina1 layout)."""
-    return Mission(
+    return CvCMission(
         name="basic",
         description="Basic CogsGuard mission (Machina1 layout)",
         site=make_cogsguard_machina1_site(num_agents),
@@ -22,7 +22,7 @@ def make_cogsguard_mission(num_agents: int = 10, max_steps: int = 10000) -> Miss
     )
 
 
-CogsGuardMachina1Mission = Mission(
+CogsGuardMachina1Mission = CvCMission(
     name="basic",
     description="CogsGuard Machina1 - compete to control junctions with gear abilities.",
     site=COGSGUARD_MACHINA_1,
@@ -30,7 +30,7 @@ CogsGuardMachina1Mission = Mission(
     max_steps=10000,
 )
 
-CogsGuardBasicMission = Mission(
+CogsGuardBasicMission = CvCMission(
     name="basic",
     description="CogsGuard Arena - compact training map with gear abilities.",
     site=COGSGUARD_ARENA,
@@ -39,25 +39,17 @@ CogsGuardBasicMission = Mission(
 )
 
 
-_CORE_MISSIONS: list[AnyMission] = [
+_CORE_MISSIONS: list[CvCMission] = [
     CogsGuardMachina1Mission,
     CogsGuardBasicMission,
 ]
 
 
-def get_core_missions() -> list[AnyMission]:
+def get_core_missions() -> list[CvCMission]:
     return list(_CORE_MISSIONS)
 
 
-def get_legacy_missions() -> list[Mission]:
-    """Get legacy (pre-CogsGuard) missions for backward compatibility.
-
-    Legacy missions have been removed. Returns empty list.
-    """
-    return []
-
-
-def _build_eval_missions() -> list[Mission]:
+def _build_eval_missions() -> list[CvCMission]:
     from cogames.cogs_vs_clips.evals.integrated_evals import EVAL_MISSIONS as INTEGRATED_EVAL_MISSIONS
 
     return [
@@ -66,19 +58,19 @@ def _build_eval_missions() -> list[Mission]:
 
 
 @lru_cache(maxsize=1)
-def get_missions() -> list[AnyMission]:
+def get_missions() -> list[CvCMission]:
     return [*_CORE_MISSIONS, *_build_eval_missions()]
 
 
-def __getattr__(name: str) -> list[AnyMission]:
+def make_game(num_cogs: int = 2, map_name: str = "training_facility_open_1.map") -> MettaGridConfig:
+    """Create a default CogsGuard game configuration."""
+    mission = make_cogsguard_mission(num_agents=num_cogs)
+    return mission.make_env()
+
+
+def __getattr__(name: str) -> list[CvCMission]:
     if name == "MISSIONS":
         missions = get_missions()
         globals()["MISSIONS"] = missions
         return missions
     raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
-
-
-def make_game(num_cogs: int = 2, map_name: str = "training_facility_open_1.map") -> MettaGridConfig:
-    """Create a default CogsGuard game configuration."""
-    mission = make_cogsguard_mission(num_agents=num_cogs)
-    return mission.make_env()

cogames/cogs_vs_clips/sites.py

@@ -1,14 +1,34 @@
 """Central site definitions shared across mission modules."""
 
+from pathlib import Path
 from typing import cast
 
-from cogames.cogs_vs_clips.mission import Site
-from cogames.cogs_vs_clips.mission_utils import get_map
-from cogames.cogs_vs_clips.procedural import MachinaArena, RandomTransform, SequentialMachinaArena
+from cogames.cogs_vs_clips.terrain import MachinaArena, RandomTransform, SequentialMachinaArena
+from cogames.core import CoGameSite
+from mettagrid.map_builder.map_builder import MapBuilderConfig
 from mettagrid.mapgen.mapgen import MapGen, MapGenConfig
 from mettagrid.mapgen.scenes.base_hub import BaseHub, BaseHubConfig
 
-TRAINING_FACILITY = Site(
+MAPS_DIR = Path(__file__).resolve().parent.parent / "maps"
+
+
+def get_map(map_name: str) -> MapBuilderConfig:
+    """Load a map builder configuration from the maps directory."""
+    normalized = map_name
+    if normalized.startswith("evals/"):
+        normalized = f"diagnostic_evals/{normalized.split('/', 1)[1]}"
+    map_path = MAPS_DIR / normalized
+    if not map_path.exists():
+        raise FileNotFoundError(f"Map not found: {map_path}")
+    return MapGen.Config(
+        instance=MapBuilderConfig.from_uri(str(map_path)),
+        instances=1,  # Force single instance - use spawn points from ASCII map directly
+        fixed_spawn_order=False,
+        instance_border_width=0,  # Don't add border - maps already have borders built in
+    )
+
+
+TRAINING_FACILITY = CoGameSite(
     name="training_facility",
     description="COG Training Facility. Basic training facility with open spaces and no obstacles.",
     map_builder=MapGen.Config(
@@ -25,6 +45,7 @@ TRAINING_FACILITY = Site(
                     "silicon_extractor",
                 ],
                 cross_bundle="none",
+                junction_object="junction",
             )
         ),
     ),
@@ -32,7 +53,7 @@ TRAINING_FACILITY = Site(
     max_cogs=4,
 )
 
-HELLO_WORLD = Site(
+HELLO_WORLD = CoGameSite(
     name="hello_world",
     description="Welcome to space.",
     map_builder=MapGen.Config(width=100, height=100, instance=MachinaArena.Config(spawn_count=20)),
@@ -40,7 +61,7 @@ HELLO_WORLD = Site(
     max_cogs=20,
 )
 
-MACHINA_1 = Site(
+MACHINA_1 = CoGameSite(
     name="machina_1",
     description="Your first mission. Collect resources and assemble HEARTs.",
     map_builder=MapGen.Config(width=88, height=88, instance=SequentialMachinaArena.Config(spawn_count=20)),
@@ -54,6 +75,7 @@ def _cogsguard_hub_config() -> BaseHubConfig:
         corner_bundle="extractors",
         cross_bundle="none",
         cross_distance=7,
+        junction_object="junction",
         stations=[
             "aligner_station",
             "scrambler_station",
@@ -66,7 +88,7 @@ def _cogsguard_hub_config() -> BaseHubConfig:
 
 # Evals site used by diagnostic evaluation missions
 # Note: Individual diagnostic missions override this with their own specific maps
-EVALS = Site(
+EVALS = CoGameSite(
     name="evals",
     description="Diagnostic evaluation arenas.",
     map_builder=get_map("diagnostic_evals/diagnostic_radial.map"),  # Default map (rarely used)
@@ -75,7 +97,7 @@ EVALS = Site(
 )
 
 
-def make_cogsguard_arena_site(num_agents: int = 10) -> Site:
+def make_cogsguard_arena_site(num_agents: int = 10) -> CoGameSite:
     """Create a CogsGuard arena site with configurable agent count."""
     map_builder = MapGen.Config(
         width=50,
@@ -86,7 +108,7 @@ def make_cogsguard_arena_site(num_agents: int = 10) -> Site:
             hub=_cogsguard_hub_config(),
         ),
     )
-    return Site(
+    return CoGameSite(
         name="cogsguard_arena",
         description="CogsGuard arena map",
         map_builder=map_builder,
@@ -111,9 +133,9 @@ def _build_cogsguard_machina1_map_builder(spawn_count: int) -> MapGenConfig:
     )
 
 
-def make_cogsguard_machina1_site(num_agents: int = 10) -> Site:
+def make_cogsguard_machina1_site(num_agents: int = 10) -> CoGameSite:
     """Create a CogsGuard Machina1 site with configurable agent count."""
-    return Site(
+    return CoGameSite(
         name="cogsguard_machina_1",
         description="CogsGuard Machina1 layout with gear stations.",
         map_builder=_build_cogsguard_machina1_map_builder(num_agents),
@@ -123,7 +145,7 @@ def make_cogsguard_machina1_site(num_agents: int = 10) -> Site:
 
 
 # Default CogsGuard Machina1 site with flexible agent count
-COGSGUARD_MACHINA_1 = Site(
+COGSGUARD_MACHINA_1 = CoGameSite(
     name="cogsguard_machina_1",
     description="CogsGuard Machina1 layout with gear stations.",
     map_builder=_build_cogsguard_machina1_map_builder(20),
@@ -132,7 +154,7 @@ COGSGUARD_MACHINA_1 = Site(
 )
 
 # Default CogsGuard arena site with flexible agent count
-COGSGUARD_ARENA = Site(
+COGSGUARD_ARENA = CoGameSite(
     name="cogsguard_arena",
     description="CogsGuard arena - compact training map with gear stations.",
     map_builder=MapGen.Config(
@@ -149,20 +171,8 @@ COGSGUARD_ARENA = Site(
 )
 
 
-# Feature flag: Set to True to include legacy (pre-CogsGuard) sites in the CLI.
-# To enable, add TRAINING_FACILITY, HELLO_WORLD, MACHINA_1 to SITES below.
-# Also set _INCLUDE_LEGACY_MISSIONS = True in missions.py.
-_INCLUDE_LEGACY_SITES = False
-
-_LEGACY_SITES = [
-    TRAINING_FACILITY,
-    HELLO_WORLD,
-    MACHINA_1,
-]
-
 SITES = [
     COGSGUARD_MACHINA_1,
     COGSGUARD_ARENA,
     EVALS,
-    *(_LEGACY_SITES if _INCLUDE_LEGACY_SITES else []),
 ]

cogames/cogs_vs_clips/stations.py

@@ -2,8 +2,8 @@ from typing import Optional
 
 from pydantic import Field
 
+from cogames.cogs_vs_clips.config import CvCConfig
 from mettagrid.base_config import Config
-from mettagrid.config import vibes
 from mettagrid.config.handler_config import (
     AOEConfig,
     ClearInventoryMutation,
@@ -25,48 +25,11 @@ from mettagrid.config.handler_config import (
     withdraw,
 )
 from mettagrid.config.mettagrid_config import (
-    ChestConfig,
     GridObjectConfig,
     InventoryConfig,
     WallConfig,
 )
 
-resources = [
-    "energy",
-    "carbon",
-    "oxygen",
-    "germanium",
-    "silicon",
-    "heart",
-    "decoder",
-    "modulator",
-    "resonator",
-    "scrambler",
-]
-
-# CogsGuard constants
-GEAR = ["aligner", "scrambler", "miner", "scout"]
-ELEMENTS = ["oxygen", "carbon", "germanium", "silicon"]
-
-
-HEART_COST = {e: 10 for e in ELEMENTS}
-COGSGUARD_ALIGN_COST = {"heart": 1}
-COGSGUARD_SCRAMBLE_COST = {"heart": 1}
-
-GEAR_COSTS = {
-    "aligner": {"carbon": 3, "oxygen": 1, "germanium": 1, "silicon": 1},
-    "scrambler": {"carbon": 1, "oxygen": 3, "germanium": 1, "silicon": 1},
-    "miner": {"carbon": 1, "oxygen": 1, "germanium": 3, "silicon": 1},
-    "scout": {"carbon": 1, "oxygen": 1, "germanium": 1, "silicon": 3},
-}
-
-GEAR_SYMBOLS = {
-    "aligner": "🔗",
-    "scrambler": "🌀",
-    "miner": "⛏️",
-    "scout": "🔭",
-}
-
 
 def _neg(recipe: dict[str, int]) -> dict[str, int]:
     return {k: -v for k, v in recipe.items()}
@@ -79,15 +42,10 @@ class CvCStationConfig(Config):
 
 class CvCWallConfig(CvCStationConfig):
     def station_cfg(self) -> WallConfig:
-        return WallConfig(name="wall", render_symbol=vibes.VIBE_BY_NAME["wall"].symbol)
-
+        return WallConfig(name="wall", render_symbol="⬛")
 
-# ==============================================================================
-# CogsGuard Station Configs
-# ==============================================================================
 
-
-class SimpleExtractorConfig(CvCStationConfig):
+class CvCExtractorConfig(CvCStationConfig):
     """Simple resource extractor with inventory that transfers resources to actors."""
 
     resource: str = Field(description="The resource to extract")
@@ -95,10 +53,9 @@ class SimpleExtractorConfig(CvCStationConfig):
     small_amount: int = Field(default=1, description="Amount extracted without mining equipment")
     large_amount: int = Field(default=10, description="Amount extracted with mining equipment")
 
-    def station_cfg(self) -> ChestConfig:
-        return ChestConfig(
+    def station_cfg(self) -> GridObjectConfig:
+        return GridObjectConfig(
             name=f"{self.resource}_extractor",
-            map_name=f"{self.resource}_extractor",
             render_symbol="📦",
             on_use_handlers={
                 # Order matters: miner first so agents with miner gear get the bonus
@@ -115,24 +72,18 @@ class SimpleExtractorConfig(CvCStationConfig):
         )
 
 
-class JunctionConfig(CvCStationConfig):
+class CvCJunctionConfig(CvCStationConfig):
     """Supply depot that receives element resources via default vibe into collective."""
 
-    map_name: str = Field(description="Map name for this junction")
-    team: Optional[str] = Field(default=None, description="Team/collective this junction belongs to")
     aoe_range: int = Field(default=10, description="Range for AOE effects")
     influence_deltas: dict[str, int] = Field(default_factory=lambda: {"influence": 10, "energy": 100, "hp": 100})
     attack_deltas: dict[str, int] = Field(default_factory=lambda: {"hp": -1, "influence": -100})
-    elements: list[str] = Field(default_factory=lambda: ELEMENTS)
-    align_cost: dict[str, int] = Field(default_factory=lambda: COGSGUARD_ALIGN_COST)
-    scramble_cost: dict[str, int] = Field(default_factory=lambda: COGSGUARD_SCRAMBLE_COST)
 
-    def station_cfg(self) -> GridObjectConfig:
+    def station_cfg(self, team: Optional[str] = None) -> GridObjectConfig:
         return GridObjectConfig(
             name="junction",
-            map_name=self.map_name,
             render_symbol="📦",
-            collective=self.team,
+            collective=team,
             aoes={
                 "influence": AOEConfig(
                     radius=self.aoe_range,
@@ -148,30 +99,33 @@ class JunctionConfig(CvCStationConfig):
             on_use_handlers={
                 "deposit": Handler(
                     filters=[isAlignedToActor()],
-                    mutations=[collectiveDeposit({resource: 100 for resource in self.elements})],
+                    mutations=[collectiveDeposit({resource: 100 for resource in CvCConfig.ELEMENTS})],
                 ),
                 "align": Handler(
-                    filters=[isNeutral(), actorHas({"aligner": 1, "influence": 1, **self.align_cost})],
-                    mutations=[updateActor(_neg(self.align_cost)), alignToActor()],
+                    filters=[isNeutral(), actorHas({"aligner": 1, "influence": 1, **CvCConfig.ALIGN_COST})],
+                    mutations=[updateActor(_neg(CvCConfig.ALIGN_COST)), alignToActor()],
                 ),
                 "scramble": Handler(
-                    filters=[isEnemy(), actorHas({"scrambler": 1, **self.scramble_cost})],
-                    mutations=[removeAlignment(), updateActor(_neg(self.scramble_cost))],
+                    filters=[isEnemy(), actorHas({"scrambler": 1, **CvCConfig.SCRAMBLE_COST})],
+                    mutations=[removeAlignment(), updateActor(_neg(CvCConfig.SCRAMBLE_COST))],
                 ),
             },
         )
 
 
-class HubConfig(JunctionConfig):
-    """Main hub with influence AOE effect. A junction without align/scramble handlers."""
+class CvCHubConfig(CvCStationConfig):
+    """Hub station that provides AOE influence/attack and accepts deposits."""
 
-    def station_cfg(self) -> GridObjectConfig:
+    aoe_range: int = Field(default=10, description="Range for AOE effects")
+    influence_deltas: dict[str, int] = Field(default_factory=lambda: {"influence": 10, "energy": 100, "hp": 100})
+    attack_deltas: dict[str, int] = Field(default_factory=lambda: {"hp": -1, "influence": -100})
+    elements: list[str] = Field(default_factory=lambda: CvCConfig.ELEMENTS)
+
+    def station_cfg(self, team: str) -> GridObjectConfig:
         return GridObjectConfig(
             name="hub",
-            map_name=self.map_name,
-            render_name="hub",
             render_symbol="📦",
-            collective=self.team,
+            collective=team,
             aoes={
                 "influence": AOEConfig(
                     radius=self.aoe_range,
@@ -193,18 +147,16 @@ class HubConfig(JunctionConfig):
         )
 
 
-class CogsGuardChestConfig(CvCStationConfig):
-    """Chest for heart management in CogsGuard."""
+class CvCChestConfig(CvCStationConfig):
+    """Chest station for heart management."""
 
-    collective: str = Field(default="cogs", description="Collective this chest belongs to")
-    heart_cost: dict[str, int] = Field(default_factory=lambda: HEART_COST)
+    heart_cost: dict[str, int] = Field(default_factory=lambda: CvCConfig.HEART_COST)
 
-    def station_cfg(self) -> GridObjectConfig:
+    def station_cfg(self, team: str) -> GridObjectConfig:
         return GridObjectConfig(
             name="chest",
-            map_name="chest",
             render_symbol="📦",
-            collective=self.collective,
+            collective=team,
             on_use_handlers={
                 "get_heart": Handler(
                     filters=[isAlignedToActor(), targetCollectiveHas({"heart": 1})],
@@ -221,20 +173,19 @@ class CogsGuardChestConfig(CvCStationConfig):
         )
 
 
-class GearStationConfig(CvCStationConfig):
+class CvCGearStationConfig(CvCStationConfig):
     """Gear station that clears all gear and adds the specified gear type."""
 
     gear_type: str = Field(description="Type of gear this station provides")
-    collective: str = Field(default="cogs", description="Collective this station belongs to")
-    gear_costs: dict[str, dict[str, int]] = Field(default_factory=lambda: GEAR_COSTS)
+    gear_costs: dict[str, dict[str, int]] = Field(default_factory=lambda: CvCConfig.GEAR_COSTS)
+    gear_symbols: dict[str, str] = Field(default_factory=lambda: CvCConfig.GEAR_SYMBOLS)
 
-    def station_cfg(self) -> GridObjectConfig:
+    def station_cfg(self, team: str) -> GridObjectConfig:
         cost = self.gear_costs.get(self.gear_type, {})
         return GridObjectConfig(
             name=f"{self.gear_type}_station",
-            map_name=f"{self.gear_type}_station",
-            render_symbol=GEAR_SYMBOLS.get(self.gear_type, "⚙️"),
-            collective=self.collective,
+            render_symbol=self.gear_symbols[self.gear_type],
+            collective=team,
             on_use_handlers={
                 "keep_gear": Handler(
                     filters=[isAlignedToActor(), actorHas({self.gear_type: 1})],

cogames/cogs_vs_clips/team.py

@@ -0,0 +1,44 @@
+"""Team configuration for CogsGuard missions.
+
+Teams are named collectives (resource pools) shared by agents.
+"""
+
+from pydantic import Field
+
+from cogames.cogs_vs_clips.config import CvCConfig
+from mettagrid.base_config import Config
+from mettagrid.config.mettagrid_config import (
+    CollectiveConfig,
+    InventoryConfig,
+    ResourceLimitsConfig,
+)
+
+
+class CogTeam(Config):
+    """Configuration for a cogs team."""
+
+    name: str = Field(default="cogs", description="Team name")
+    wealth: int = Field(default=1, description="Wealth multiplier for initial resources")
+    num_agents: int = Field(default=8, ge=1, description="Number of agents in the team")
+
+    def collective_config(self) -> CollectiveConfig:
+        """Create a CollectiveConfig for this team.
+
+        Returns:
+            CollectiveConfig with resource limits and initial inventory.
+        """
+        return CollectiveConfig(
+            inventory=InventoryConfig(
+                limits={
+                    "resources": ResourceLimitsConfig(min=10000, resources=CvCConfig.ELEMENTS),
+                    "hearts": ResourceLimitsConfig(min=65535, resources=["heart"]),
+                },
+                initial={
+                    "carbon": 10 * self.wealth,
+                    "oxygen": 10 * self.wealth,
+                    "germanium": 10 * self.wealth,
+                    "silicon": 10 * self.wealth,
+                    "heart": 5 * self.wealth,
+                },
+            ),
+        )

cogames/cogs_vs_clips/{procedural.py → terrain.py}

@@ -1,9 +1,14 @@
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
-from typing import Any, Literal, override
+from typing import TYPE_CHECKING, Any, Literal, override
 
 import numpy as np
 
-from cogames.cogs_vs_clips.mission import Mission, MissionVariant
+from cogames.core import CoGameMissionVariant
+
+if TYPE_CHECKING:
+    from cogames.cogs_vs_clips.mission import CvCMission
 from mettagrid.config.mettagrid_config import MettaGridConfig
 from mettagrid.mapgen.area import AreaWhere
 from mettagrid.mapgen.mapgen import MapGen, MapGenConfig
@@ -65,6 +70,7 @@ class MachinaArenaConfig(SceneConfig):
         corner_bundle="extractors",
         cross_bundle="none",
         cross_distance=7,
+        junction_object="junction",
     )
 
     # Optional asteroid-shaped boundary mask.
@@ -547,7 +553,7 @@ class RandomTransform(Scene[RandomTransformConfig]):
         ]
 
 
-class EnvNodeVariant[T](MissionVariant, ABC):
+class EnvNodeVariant[T](CoGameMissionVariant, ABC):
     @abstractmethod
     def extract_node(self, env: MettaGridConfig) -> T: ...
 
@@ -590,7 +596,7 @@ class MapSeedVariant(MapGenVariant):
 
 class BaseHubVariant(EnvNodeVariant[BaseHubConfig]):
     @override
-    def compat(self, mission: Mission) -> bool:
+    def compat(self, mission: CvCMission) -> bool:
         env = mission.make_env()
         if not isinstance(env.game.map_builder, MapGen.Config):
             return False
@@ -618,7 +624,7 @@ class BaseHubVariant(EnvNodeVariant[BaseHubConfig]):
 
 
 class MachinaArenaVariant(EnvNodeVariant[MachinaArenaConfig]):
-    def compat(self, mission: Mission) -> bool:
+    def compat(self, mission: CvCMission) -> bool:
         env = mission.make_env()
         return isinstance(env.game.map_builder, MapGen.Config) and isinstance(
             env.game.map_builder.instance, MachinaArena.Config
@@ -632,7 +638,7 @@ class MachinaArenaVariant(EnvNodeVariant[MachinaArenaConfig]):
 
 
 class SequentialMachinaArenaVariant(EnvNodeVariant[SequentialMachinaArenaConfig]):
-    def compat(self, mission: Mission) -> bool:
+    def compat(self, mission: CvCMission) -> bool:
         env = mission.make_env()
         return isinstance(env.game.map_builder, MapGen.Config) and isinstance(
             env.game.map_builder.instance, SequentialMachinaArena.Config