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

cogames/cogs_vs_clips/evals/difficulty_variants.py

@@ -9,11 +9,14 @@ energy regen, move cost, and capacity limits.
 from __future__ import annotations
 
 import logging
-from typing import override
+from typing import TYPE_CHECKING, override
 
 from pydantic import Field
 
-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
 
 logger = logging.getLogger(__name__)
@@ -28,41 +31,26 @@ ENERGY_REGEN_FLOOR = 0
 # =============================================================================
 
 
-class DifficultyLevel(MissionVariant):
+class DifficultyLevel(CoGameMissionVariant):
     """Configuration for a difficulty level."""
 
     name: str = Field(description="Difficulty name (easy, medium, hard, brutal, etc.)")
     description: str = Field(description="What makes this difficulty challenging", default="")
 
-    # Energy regen multiplier (relative to mission baseline)
-    energy_regen_mult: float = Field(default=1.0)
-
-    # Absolute overrides (if set, ignore multipliers)
-    energy_regen_override: int | None = Field(default=None)
+    # Solar override (if set, overrides weather day/night deltas)
+    solar_override: int | None = Field(default=None)
     move_energy_cost_override: int | None = Field(default=None)
     energy_capacity_override: int | None = Field(default=None)
     cargo_capacity_override: int | None = Field(default=None)
     max_steps_override: int | None = Field(default=None)
 
     @override
-    def modify_mission(self, mission: Mission):
+    def modify_mission(self, mission: CvCMission):
         """Apply a difficulty level to a mission instance."""
-        # Energy regen
-        if self.energy_regen_override is not None:
-            mission.cog.energy_regen = self.energy_regen_override
-        else:
-            mission.cog.energy_regen = max(0, int(mission.cog.energy_regen * self.energy_regen_mult))
-
-        # Mission-level overrides
-        if self.move_energy_cost_override is not None:
-            mission.cog.move_energy_cost = self.move_energy_cost_override
-        if self.energy_capacity_override is not None:
-            mission.cog.energy_limit = self.energy_capacity_override
-        if self.cargo_capacity_override is not None:
-            mission.cog.cargo_limit = self.cargo_capacity_override
+        pass  # No mission-level modifications needed currently
 
     @override
-    def modify_env(self, mission: Mission, env: MettaGridConfig):
+    def modify_env(self, mission: CvCMission, env: MettaGridConfig):
         if self.max_steps_override is not None:
             env.game.max_steps = self.max_steps_override
 
@@ -79,20 +67,20 @@ STANDARD = DifficultyLevel(
 HARD = DifficultyLevel(
     name="hard",
     description="Minimal passive regen and higher move cost",
-    energy_regen_override=1,  # Minimal regen prevents deadlock
+    solar_override=1,  # Minimal regen prevents deadlock
     move_energy_cost_override=2,
 )
 
 SINGLE_USE = DifficultyLevel(
     name="single_use",
     description="Minimal regen - no second chances",
-    energy_regen_override=1,
+    solar_override=1,
 )
 
 SPEED_RUN = DifficultyLevel(
     name="speed_run",
     description="Short clock, cheap movement",
-    energy_regen_override=2,
+    solar_override=2,
     move_energy_cost_override=1,
     max_steps_override=600,
 )
@@ -100,7 +88,7 @@ SPEED_RUN = DifficultyLevel(
 ENERGY_CRISIS = DifficultyLevel(
     name="energy_crisis",
     description="Minimal passive regen - plan every move",
-    energy_regen_override=1,  # Minimal regen prevents deadlock
+    solar_override=1,  # Minimal regen prevents deadlock
 )
 
 # Export variants for use with --variant CLI flag.
@@ -125,7 +113,7 @@ def list_difficulties() -> None:
     print("=" * 80)
     for diff in DIFFICULTY_VARIANTS:
         print(f"\n{diff.name.upper()}: {diff.description}")
-        print(f"  Energy regen mult: {diff.energy_regen_mult}")
+        print(f"  Solar override: {diff.solar_override}")
 
 
 if __name__ == "__main__":

cogames/cogs_vs_clips/evals/integrated_evals.py

@@ -2,22 +2,18 @@ from __future__ import annotations
 
 import logging
 
-from cogames.cogs_vs_clips.mission import Mission, Site
-from cogames.cogs_vs_clips.procedural import MachinaArena
+from cogames.cogs_vs_clips.mission import CvCMission
 from cogames.cogs_vs_clips.sites import HELLO_WORLD
+from cogames.cogs_vs_clips.terrain import MachinaArena
 from cogames.cogs_vs_clips.variants import (
     DarkSideVariant,
-    DistantResourcesVariant,
-    EmptyBaseVariant,
-    PackRatVariant,
-    QuadrantBuildingsVariant,
-    SingleResourceUniformVariant,
 )
+from cogames.core import CoGameSite
 from mettagrid.mapgen.mapgen import MapGen
 
 logger = logging.getLogger(__name__)
 
-SMALL_HELLO_WORLD = Site(
+SMALL_HELLO_WORLD = CoGameSite(
     name="small_hello_world",
     description="Small hello world map.",
     map_builder=MapGen.Config(width=50, height=50, instance=MachinaArena.Config(spawn_count=20)),
@@ -25,7 +21,7 @@ SMALL_HELLO_WORLD = Site(
     max_cogs=20,
 )
 
-MEDIUM_HELLO_WORLD = Site(
+MEDIUM_HELLO_WORLD = CoGameSite(
     name="medium_hello_world",
     description="Medium hello world map.",
     map_builder=MapGen.Config(width=100, height=100, instance=MachinaArena.Config(spawn_count=20)),
@@ -33,7 +29,7 @@ MEDIUM_HELLO_WORLD = Site(
     max_cogs=20,
 )
 
-LARGE_HELLO_WORLD = Site(
+LARGE_HELLO_WORLD = CoGameSite(
     name="large_hello_world",
     description="Large hello world map.",
     map_builder=MapGen.Config(width=150, height=150, instance=MachinaArena.Config(spawn_count=20)),
@@ -41,65 +37,17 @@ LARGE_HELLO_WORLD = Site(
     max_cogs=20,
 )
 
-# Resource Bottleneck evals
-OxygenBottleneck = Mission(
-    name="oxygen_bottleneck",
-    description="Oxygen is the limiting resource; agents must prioritize oxygen over other resources.",
-    site=HELLO_WORLD,
-    variants=[
-        EmptyBaseVariant(missing=["oxygen_extractor"]),
-        SingleResourceUniformVariant(building_name="oxygen_extractor"),
-        PackRatVariant(),
-    ],
-)
-
 # Energy Starved evals
-EnergyStarved = Mission(
+EnergyStarved = CvCMission(
     name="energy_starved",
     description="Energy is the limiting resource; agents must prioritize energy over other resources.",
     site=HELLO_WORLD,
     variants=[
-        EmptyBaseVariant(),
         DarkSideVariant(),
     ],
 )
 
-# Collect Distant Resources evals
-DistantResources = Mission(
-    name="distant_resources",
-    description="Resources scattered far from base; heavy routing coordination.",
-    site=HELLO_WORLD,
-    variants=[
-        EmptyBaseVariant(),
-        DistantResourcesVariant(),
-    ],
-)
-
-# Divide and Conquer evals
-QuadrantBuildings = Mission(
-    name="quadrant_buildings",
-    description="Place buildings in the four quadrants of the map.",
-    site=HELLO_WORLD,
-    variants=[
-        EmptyBaseVariant(),
-        QuadrantBuildingsVariant(),
-    ],
-)
-
-EasyHeartsMission = Mission(
-    name="easy_hearts",
-    description="Simplified heart crafting with generous caps and extractor base.",
-    site=HELLO_WORLD,
-    variants=[
-        PackRatVariant(),
-    ],
-)
-
 
-EVAL_MISSIONS: list[Mission] = [
-    OxygenBottleneck,
+EVAL_MISSIONS: list[CvCMission] = [
     EnergyStarved,
-    DistantResources,
-    QuadrantBuildings,
-    EasyHeartsMission,
 ]

cogames/cogs_vs_clips/evals/spanning_evals.py

@@ -5,26 +5,24 @@ from __future__ import annotations
 
 import logging
 
-from cogames.cogs_vs_clips.mission import Mission, Site
-from cogames.cogs_vs_clips.procedural import MachinaArena
+from cogames.cogs_vs_clips.mission import CvCMission
 from cogames.cogs_vs_clips.sites import HELLO_WORLD, TRAINING_FACILITY
+from cogames.cogs_vs_clips.terrain import MachinaArena
 from cogames.cogs_vs_clips.variants import (
-    CompassVariant,
     DarkSideVariant,
     DistantResourcesVariant,
     EmptyBaseVariant,
     EnergizedVariant,
-    PackRatVariant,
     QuadrantBuildingsVariant,
-    RoughTerrainVariant,
     SingleResourceUniformVariant,
     SuperChargedVariant,
 )
+from cogames.core import CoGameSite
 from mettagrid.mapgen.mapgen import MapGen
 
 logger = logging.getLogger(__name__)
 
-SMALL_HELLO_WORLD = Site(
+SMALL_HELLO_WORLD = CoGameSite(
     name="small_hello_world",
     description="Small hello world map.",
     map_builder=MapGen.Config(width=50, height=50, instance=MachinaArena.Config(spawn_count=20)),
@@ -32,7 +30,7 @@ SMALL_HELLO_WORLD = Site(
     max_cogs=20,
 )
 
-MEDIUM_HELLO_WORLD = Site(
+MEDIUM_HELLO_WORLD = CoGameSite(
     name="medium_hello_world",
     description="Medium hello world map.",
     map_builder=MapGen.Config(width=100, height=100, instance=MachinaArena.Config(spawn_count=20)),
@@ -40,7 +38,7 @@ MEDIUM_HELLO_WORLD = Site(
     max_cogs=20,
 )
 
-LARGE_HELLO_WORLD = Site(
+LARGE_HELLO_WORLD = CoGameSite(
     name="large_hello_world",
     description="Large hello world map.",
     map_builder=MapGen.Config(width=500, height=500, instance=MachinaArena.Config(spawn_count=20)),
@@ -49,19 +47,19 @@ LARGE_HELLO_WORLD = Site(
 )
 
 # Resource Bottleneck evals
-OxygenBottleneck = Mission(
+OxygenBottleneck = CvCMission(
     name="oxygen_bottleneck",
     description="Oxygen is the limiting resource; agents must prioritize oxygen over other resources.",
     site=HELLO_WORLD,
     variants=[
         EmptyBaseVariant(missing=["oxygen_extractor"]),
         SingleResourceUniformVariant(building_name="oxygen_extractor"),
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
 # Energy Starved evals
-EnergyStarved = Mission(
+EnergyStarved = CvCMission(
     name="energy_starved",
     description="Energy is the limiting resource; agents must prioritize energy over other resources.",
     site=HELLO_WORLD,
@@ -74,17 +72,17 @@ EnergyStarved = Mission(
 # Curated difficulty tiers per mission
 # ------------------------------------------------------------
 # Oxygen Bottleneck
-OxygenBottleneckEasy = Mission(
+OxygenBottleneckEasy = CvCMission(
     name="oxygen_bottleneck_easy",
     description="Easy: tuned oxygen focus with simple layout and generous capacities.",
     site=HELLO_WORLD,
     variants=[
         SingleResourceUniformVariant(building_name="oxygen_extractor"),
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-OxygenBottleneckStandard = Mission(
+OxygenBottleneckStandard = CvCMission(
     name="oxygen_bottleneck_standard",
     description="Standard: oxygen is the bottleneck; extractor missing at base.",
     site=HELLO_WORLD,
@@ -93,18 +91,18 @@ OxygenBottleneckStandard = Mission(
     ],
 )
 
-OxygenBottleneckHard = Mission(
+OxygenBottleneckHard = CvCMission(
     name="oxygen_bottleneck_hard",
-    description="Hard: oxygen bottleneck plus rough terrain.",
+    description="Hard: oxygen bottleneck with dark side.",
     site=HELLO_WORLD,
     variants=[
         EmptyBaseVariant(missing=["oxygen_extractor"]),
-        RoughTerrainVariant(),
+        DarkSideVariant(),
     ],
 )
 
 # Energy Starved
-EnergyStarvedEasy = Mission(
+EnergyStarvedEasy = CvCMission(
     name="energy_starved_easy",
     description="Easy: abundant energy regen and capacity.",
     site=HELLO_WORLD,
@@ -114,7 +112,7 @@ EnergyStarvedEasy = Mission(
     ],
 )
 
-EnergyStarvedStandard = Mission(
+EnergyStarvedStandard = CvCMission(
     name="energy_starved_standard",
     description="Standard: energy is the limiting resource with dark-side regen.",
     site=HELLO_WORLD,
@@ -123,18 +121,17 @@ EnergyStarvedStandard = Mission(
     ],
 )
 
-EnergyStarvedHard = Mission(
+EnergyStarvedHard = CvCMission(
     name="energy_starved_hard",
-    description="Hard: energy bottleneck with dark side and rough terrain.",
+    description="Hard: energy bottleneck with dark side.",
     site=HELLO_WORLD,
     variants=[
         DarkSideVariant(),
-        RoughTerrainVariant(),
     ],
 )
 
 # Collect Distant Resources evals
-DistantResources = Mission(
+DistantResources = CvCMission(
     name="distant_resources",
     description="Resources scattered far from base; heavy routing coordination.",
     site=HELLO_WORLD,
@@ -145,39 +142,37 @@ DistantResources = Mission(
 )
 
 # Distant Resources tiers
-DistantResourcesEasy = Mission(
+DistantResourcesEasy = CvCMission(
     name="distant_resources_easy",
-    description="Easy: simplified distribution and navigation aids.",
+    description="Easy: simplified distribution with generous capacity.",
     site=HELLO_WORLD,
     variants=[
-        CompassVariant(),
-        PackRatVariant(),
+        EnergizedVariant(),
         DistantResourcesVariant(),
     ],
 )
 
-DistantResourcesStandard = Mission(
+DistantResourcesStandard = CvCMission(
     name="distant_resources_standard",
     description="Standard: resources scattered far from base.",
     site=HELLO_WORLD,
     variants=[
-        CompassVariant(),
         DistantResourcesVariant(),
     ],
 )
 
-DistantResourcesHard = Mission(
+DistantResourcesHard = CvCMission(
     name="distant_resources_hard",
-    description="Hard: distant resources with rough terrain.",
+    description="Hard: distant resources with dark side.",
     site=HELLO_WORLD,
     variants=[
         DistantResourcesVariant(),
-        RoughTerrainVariant(),
+        DarkSideVariant(),
     ],
 )
 
 # Divide and Conquer evals
-QuadrantBuildings = Mission(
+QuadrantBuildings = CvCMission(
     name="quadrant_buildings",
     description="Place buildings in the four quadrants of the map.",
     site=HELLO_WORLD,
@@ -188,18 +183,17 @@ QuadrantBuildings = Mission(
 )
 
 # Quadrant Buildings tiers
-QuadrantBuildingsEasy = Mission(
+QuadrantBuildingsEasy = CvCMission(
     name="quadrant_buildings_easy",
-    description="Easy: buildings in quadrants with navigation aid and inventory boost.",
+    description="Easy: buildings in quadrants with energy boost.",
     site=HELLO_WORLD,
     variants=[
         QuadrantBuildingsVariant(),
-        CompassVariant(),
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-QuadrantBuildingsStandard = Mission(
+QuadrantBuildingsStandard = CvCMission(
     name="quadrant_buildings_standard",
     description="Standard: buildings placed in quadrants.",
     site=HELLO_WORLD,
@@ -209,54 +203,54 @@ QuadrantBuildingsStandard = Mission(
     ],
 )
 
-QuadrantBuildingsHard = Mission(
+QuadrantBuildingsHard = CvCMission(
     name="quadrant_buildings_hard",
-    description="Hard: quadrant distribution with empty base and rough terrain.",
+    description="Hard: quadrant distribution with empty base and dark side.",
     site=HELLO_WORLD,
     variants=[
         QuadrantBuildingsVariant(),
         EmptyBaseVariant(),
-        RoughTerrainVariant(),
+        DarkSideVariant(),
     ],
 )
 
-EasyHeartsTraining = Mission(
+EasyHeartsTraining = CvCMission(
     name="easy_hearts_training",
-    description="Simplified heart crafting with generous caps and extractor base.",
+    description="Simplified heart crafting with generous energy.",
     site=TRAINING_FACILITY,
     variants=[
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-EasyHeartsSmallWorld = Mission(
+EasyHeartsSmallWorld = CvCMission(
     name="easy_small_hearts",
-    description="Simplified heart crafting with generous caps and extractor base.",
+    description="Simplified heart crafting with generous energy.",
     site=SMALL_HELLO_WORLD,
     variants=[
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-EasyHeartsMediumWorld = Mission(
+EasyHeartsMediumWorld = CvCMission(
     name="easy_medium_hearts",
-    description="Simplified heart crafting with generous caps and extractor base.",
+    description="Simplified heart crafting with generous energy.",
     site=MEDIUM_HELLO_WORLD,
     variants=[
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-EasyHeartsLargeWorld = Mission(
+EasyHeartsLargeWorld = CvCMission(
     name="easy_large_hearts",
-    description="Simplified heart crafting with generous caps and extractor base.",
+    description="Simplified heart crafting with generous energy.",
     site=LARGE_HELLO_WORLD,
     variants=[
-        PackRatVariant(),
+        EnergizedVariant(),
     ],
 )
 
-EVAL_MISSIONS: list[Mission] = [
+EVAL_MISSIONS: list[CvCMission] = [
     # Oxygen bottleneck tiers
     OxygenBottleneckEasy,
     OxygenBottleneckStandard,