cp

Author: daveey

packages/cogames/src/cogames/cli/mission.py

@@ -533,6 +533,6 @@ def describe_mission(mission_name: str, game_config: MettaGridConfig, mission_cf
 
     # Display agent configuration
     console.print("\n[bold]Agent Configuration:[/bold]")
-    console.print(f"  • Default resource limit: {game_config.game.agent.default_resource_limit}")
-    if game_config.game.agent.resource_limits:
-        console.print(f"  • Resource limits: {game_config.game.agent.resource_limits}")
+    console.print(f"  • Default resource limit: {game_config.game.agent.inventory.default_limit}")
+    if game_config.game.agent.inventory.limits:
+        console.print(f"  • Resource limits: {game_config.game.agent.inventory.limits}")

packages/cogames/src/cogames/cogs_vs_clips/evals/diagnostic_evals.py

@@ -166,24 +166,24 @@ def _post(cfg: MettaGridConfig) -> None:
     def _apply_inventory_seed(self, cfg: MettaGridConfig) -> None:
         if not self.inventory_seed:
             return
-        seed = dict(cfg.game.agent.initial_inventory)
+        seed = dict(cfg.game.agent.inventory.initial)
         seed.update(self.inventory_seed)
-        cfg.game.agent.initial_inventory = seed
+        cfg.game.agent.inventory.initial = seed
 
     def _apply_communal_chest(self, cfg: MettaGridConfig) -> None:
         if self.communal_chest_hearts is None:
             return
         chest = cfg.game.objects.get("communal_chest")
         if isinstance(chest, ChestConfig):
-            chest.initial_inventory = {"heart": self.communal_chest_hearts}
+            chest.inventory.initial = {"heart": self.communal_chest_hearts}
 
     def _apply_resource_chests(self, cfg: MettaGridConfig) -> None:
         if not self.resource_chest_stock:
             return
         for resource, amount in self.resource_chest_stock.items():
             chest_cfg = cfg.game.objects.get(f"chest_{resource}")
             if isinstance(chest_cfg, ChestConfig):
-                chest_cfg.initial_inventory = {resource: amount}
+                chest_cfg.inventory.initial = {resource: amount}
 
     def _apply_extractor_settings(self, cfg: MettaGridConfig) -> None:
         for resource in RESOURCE_NAMES:
@@ -250,9 +250,9 @@ def _apply_heart_reward_cap(self, cfg: MettaGridConfig) -> None:
             if not isinstance(obj, ChestConfig):
                 continue
             # Find existing heart limit or create new one
-            heart_limit = obj.resource_limits.get("heart", ResourceLimitsConfig(limit=1, resources=["heart"]))
+            heart_limit = obj.inventory.limits.get("heart", ResourceLimitsConfig(limit=1, resources=["heart"]))
             heart_limit.limit = 1
-            obj.resource_limits["heart"] = heart_limit
+            obj.inventory.limits["heart"] = heart_limit
 
     def _ensure_minimal_heart_recipe(self, assembler: AssemblerConfig) -> None:
         minimal_inputs = {
@@ -445,7 +445,7 @@ def configure_env(self, cfg: MettaGridConfig) -> None:
             assembler.protocols = updated_protocols
 
         agent_cfg = cfg.game.agent
-        inventory = dict(agent_cfg.initial_inventory)
+        inventory = dict(agent_cfg.inventory.initial)
         for res in resources:
             inventory.pop(res, None)
 
@@ -460,7 +460,7 @@ def configure_env(self, cfg: MettaGridConfig) -> None:
         else:
             inventory.pop("decoder", None)
 
-        agent_cfg.initial_inventory = inventory
+        agent_cfg.inventory.initial = inventory
 
 
 class DiagnosticUnclipCraft(_UnclipBase):
@@ -496,9 +496,9 @@ class DiagnosticChargeUp(_DiagnosticMissionBase):
     def configure_env(self, cfg: MettaGridConfig) -> None:
         # Set starting energy to 30 and no regen
         agent = cfg.game.agent
-        agent.initial_inventory = dict(agent.initial_inventory)
-        agent.initial_inventory["energy"] = 60
-        agent.inventory_regen_amounts = {"default": {"energy": 0}}
+        agent.inventory.initial = dict(agent.inventory.initial)
+        agent.inventory.initial["energy"] = 60
+        agent.inventory.regen_amounts = {"default": {"energy": 0}}
 
 
 class DiagnosticAgile(_DiagnosticMissionBase):
@@ -541,10 +541,10 @@ class DiagnosticRadial(_DiagnosticMissionBase):
 
     def configure_env(self, cfg: MettaGridConfig) -> None:
         agent = cfg.game.agent
-        inventory = dict(agent.initial_inventory)
+        inventory = dict(agent.inventory.initial)
         inventory["energy"] = 255
-        agent.initial_inventory = inventory
-        agent.inventory_regen_amounts = {"default": {"energy": 255}}
+        agent.inventory.initial = inventory
+        agent.inventory.regen_amounts = {"default": {"energy": 255}}
 
 
 # ----------------------------------------------------------------------
@@ -601,9 +601,9 @@ class DiagnosticChargeUpHard(_DiagnosticMissionBase):
     def configure_env(self, cfg: MettaGridConfig) -> None:
         # Set starting energy to 30 and no regen
         agent = cfg.game.agent
-        agent.initial_inventory = dict(agent.initial_inventory)
-        agent.initial_inventory["energy"] = 60
-        agent.inventory_regen_amounts = {"default": {"energy": 0}}
+        agent.inventory.initial = dict(agent.inventory.initial)
+        agent.inventory.initial["energy"] = 60
+        agent.inventory.regen_amounts = {"default": {"energy": 0}}
 
 
 class DiagnosticMemoryHard(_DiagnosticMissionBase):
@@ -690,10 +690,10 @@ class DiagnosticRadialHard(_DiagnosticMissionBase):
 
     def configure_env(self, cfg: MettaGridConfig) -> None:
         agent = cfg.game.agent
-        inventory = dict(agent.initial_inventory)
+        inventory = dict(agent.inventory.initial)
         inventory["energy"] = 255
-        agent.initial_inventory = inventory
-        agent.inventory_regen_amounts = {"default": {"energy": 255}}
+        agent.inventory.initial = inventory
+        agent.inventory.regen_amounts = {"default": {"energy": 255}}
 
 
 DIAGNOSTIC_EVALS: list[type[_DiagnosticMissionBase]] = [

packages/cogames/src/cogames/cogs_vs_clips/evals/difficulty_variants.py

@@ -206,12 +206,12 @@ def modify_env(self, mission: Mission, env: MettaGridConfig):
                 obj.max_uses = obj.max_uses * num_agents
 
         # Energy regen floor: if nonzero, keep at least 1
-        default_regen = env.game.agent.inventory_regen_amounts.get("default", {})
+        default_regen = env.game.agent.inventory.regen_amounts.get("default", {})
         current_regen = default_regen.get("energy", 1)
         if current_regen > 0:
-            if "default" not in env.game.agent.inventory_regen_amounts:
-                env.game.agent.inventory_regen_amounts["default"] = {}
-            env.game.agent.inventory_regen_amounts["default"]["energy"] = max(ENERGY_REGEN_FLOOR, current_regen)
+            if "default" not in env.game.agent.inventory.regen_amounts:
+                env.game.agent.inventory.regen_amounts["default"] = {}
+            env.game.agent.inventory.regen_amounts["default"]["energy"] = max(ENERGY_REGEN_FLOOR, current_regen)
 
     def _apply_clipping(self, cfg: MettaGridConfig) -> None:
         target = self.clip_target

packages/cogames/src/cogames/cogs_vs_clips/mission.py

@@ -26,6 +26,7 @@
     ClipperConfig,
     GameConfig,
     GlobalObsConfig,
+    InventoryConfig,
     MettaGridConfig,
     MoveActionConfig,
     NoopActionConfig,
@@ -180,25 +181,25 @@ def make_env(self) -> MettaGridConfig:
                 ),
             ),
             agent=AgentConfig(
-                resource_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"]
-                    ),
-                },
+                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"]
+                        ),
+                    },
+                    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},
                 ),
-                initial_inventory={
-                    "energy": self.energy_capacity,
-                },
                 vibe_transfers={"charger": {"energy": 20}},
-                inventory_regen_amounts={"default": {"energy": self.energy_regen_amount}},
                 diversity_tracked_resources=["energy", "carbon", "oxygen", "germanium", "silicon", "heart"],
             ),
             inventory_regen_interval=self.inventory_regen_interval,

packages/cogames/src/cogames/cogs_vs_clips/stations.py

@@ -2,7 +2,14 @@
 
 from mettagrid.base_config import Config
 from mettagrid.config import vibes
-from mettagrid.config.mettagrid_config import AssemblerConfig, ChestConfig, GridObjectConfig, ProtocolConfig, WallConfig
+from mettagrid.config.mettagrid_config import (
+    AssemblerConfig,
+    ChestConfig,
+    GridObjectConfig,
+    InventoryConfig,
+    ProtocolConfig,
+    WallConfig,
+)
 
 resources = [
     "energy",
@@ -190,7 +197,7 @@ def station_cfg(self) -> ChestConfig:
                 "silicon_a": {"silicon": -25},
                 "silicon_b": {"silicon": 25},
             },
-            initial_inventory=self.initial_inventory,
+            inventory=InventoryConfig(initial=self.initial_inventory),
         )
 
 

packages/cogames/src/cogames/cogs_vs_clips/variants.py

@@ -336,24 +336,24 @@ def modify_env(self, mission, env) -> None:
 
         if hearts > 0:
             agent_cfg = env.game.agent
-            agent_cfg.initial_inventory = dict(agent_cfg.initial_inventory)
+            agent_cfg.inventory.initial = dict(agent_cfg.inventory.initial)
 
             def _limit_for(resource: str) -> int:
-                return agent_cfg.get_limit_for_resource(resource)
+                return agent_cfg.inventory.get_limit(resource)
 
             for resource_name, per_heart_value in per_heart.items():
-                current = int(agent_cfg.initial_inventory.get(resource_name, 0))
+                current = int(agent_cfg.inventory.initial.get(resource_name, 0))
                 target = current + per_heart_value * hearts
                 cap = _limit_for(resource_name)
-                agent_cfg.initial_inventory[resource_name] = min(cap, target)
+                agent_cfg.inventory.initial[resource_name] = min(cap, target)
 
         if self.heart_capacity is not None:
             agent_cfg = env.game.agent
-            hearts_limit = agent_cfg.resource_limits.get("heart")
+            hearts_limit = agent_cfg.inventory.limits.get("heart")
             if hearts_limit is None:
                 hearts_limit = ResourceLimitsConfig(limit=self.heart_capacity, resources=["heart"])
             hearts_limit.limit = max(int(hearts_limit.limit), int(self.heart_capacity))
-            agent_cfg.resource_limits["heart"] = hearts_limit
+            agent_cfg.inventory.limits["heart"] = hearts_limit
 
 
 class ChestHeartTuneVariant(MissionVariant):
@@ -376,10 +376,10 @@ def modify_env(self, mission, env) -> None:
         chest_cfg = env.game.objects["chest"]
         if not isinstance(chest_cfg, ChestConfig):
             raise TypeError("Expected 'chest' to be ChestConfig")
-        start = dict(chest_cfg.initial_inventory)
+        start = dict(chest_cfg.inventory.initial)
         for k, v in per_heart.items():
             start[k] = start.get(k, 0) + v * hearts
-        chest_cfg.initial_inventory = start
+        chest_cfg.inventory.initial = start
 
 
 class ExtractorHeartTuneVariant(MissionVariant):

packages/cogames/tests/test_cogs_vs_clips.py

@@ -54,9 +54,9 @@ def test_inventory_heart_tune_caps_initial_inventory_to_limits():
     env = mission.make_env()
     agent = env.game.agent
 
-    # Find energy limit from resource_limits list
-    energy_limit = agent.get_limit_for_resource("energy")
-    assert agent.initial_inventory["energy"] == energy_limit
+    # Find energy limit from inventory.limits
+    energy_limit = agent.inventory.get_limit("energy")
+    assert agent.inventory.initial["energy"] == energy_limit
 
 
 def _station_configs(mission: Mission) -> list[CvCStationConfig]:

packages/cogames/tests/test_cvc_assembler_hearts.py

@@ -35,9 +35,9 @@
 def _make_simulation() -> Simulation:
     cfg = MettaGridConfig.EmptyRoom(num_agents=4, with_walls=True)
     cfg.game.resource_names = RESOURCES
-    cfg.game.agent.default_resource_limit = 255
-    cfg.game.agent.resource_limits = {name: ResourceLimitsConfig(limit=255, resources=[name]) for name in RESOURCES}
-    cfg.game.agent.initial_inventory = {name: 0 for name in RESOURCES}
+    cfg.game.agent.inventory.default_limit = 255
+    cfg.game.agent.inventory.limits = {name: ResourceLimitsConfig(limit=255, resources=[name]) for name in RESOURCES}
+    cfg.game.agent.inventory.initial = {name: 0 for name in RESOURCES}
 
     cfg.game.actions.noop.enabled = True
     cfg.game.actions.move.enabled = True

packages/mettagrid/cpp/bindings/mettagrid_c.cpp

@@ -68,7 +68,7 @@ MettaGrid::MettaGrid(const GameConfig& game_config, const py::list map, unsigned
 
   _grid = std::make_unique<Grid>(height, width);
   _obs_encoder = std::make_unique<ObservationEncoder>(
-      game_config.protocol_details_obs, resource_names, game_config.feature_ids);
+      game_config.protocol_details_obs, resource_names, game_config.feature_ids, game_config.token_value_max);
 
   // Initialize ObservationFeature namespace with feature IDs
   ObservationFeature::Initialize(game_config.feature_ids);

packages/mettagrid/cpp/include/mettagrid/actions/attack.hpp

@@ -148,15 +148,8 @@ class Attack : public ActionHandler {
       snapshot.emplace_back(item, amount);
     }
 
-    // Transfer resources (excluding soul-bound resources)
+    // Transfer resources
     for (const auto& [item, amount] : snapshot) {
-      // Check if this resource is soul-bound for the target
-      if (std::find(target.soul_bound_resources.begin(), target.soul_bound_resources.end(), item) !=
-          target.soul_bound_resources.end()) {
-        // Skip soul-bound resources
-        continue;
-      }
-
       InventoryDelta stolen = actor.inventory.update(item, amount);
       target.inventory.update(item, -stolen);