cp

Author: daveey

packages/mettagrid/cpp/bindings/mettagrid_c.cpp

@@ -626,15 +626,8 @@ void MettaGrid::_step() {
   if (_inventory_regen_interval > 0 && current_step % _inventory_regen_interval == 0) {
     for (auto* agent : _agents) {
       if (!agent->inventory_regen_amounts.empty()) {
-        // Look up regen amounts for agent's current vibe, fall back to "default" (vibe ID 0)
-        auto vibe_it = agent->inventory_regen_amounts.find(agent->vibe);
-        if (vibe_it == agent->inventory_regen_amounts.end()) {
-          vibe_it = agent->inventory_regen_amounts.find(0);  // "default" is vibe ID 0
-        }
-        if (vibe_it != agent->inventory_regen_amounts.end()) {
-          for (const auto& [item, amount] : vibe_it->second) {
-            agent->inventory.update(item, amount);
-          }
+        for (const auto& [item, amount] : agent->inventory_regen_amounts) {
+          agent->inventory.update(item, amount);
         }
       }
     }

packages/mettagrid/cpp/include/mettagrid/objects/agent.hpp

@@ -13,6 +13,7 @@
 #include "objects/agent_config.hpp"
 #include "objects/constants.hpp"
 #include "objects/has_inventory.hpp"
+#include "objects/inventory_config.hpp"
 #include "objects/usable.hpp"
 #include "systems/stats_tracker.hpp"
 
@@ -42,6 +43,8 @@ class Agent : public GridObject, public HasInventory, public Usable {
   std::unordered_map<ObservationType, std::unordered_map<InventoryItem, InventoryQuantity>> inventory_regen_amounts;
   // Damage configuration
   DamageConfig damage_config;
+  // Inventory configuration (limits and modifiers)
+  InventoryConfig inventory_config;
 
   Agent(GridCoord r,
         GridCoord c,
@@ -51,7 +54,8 @@ class Agent : public GridObject, public HasInventory, public Usable {
 
   void init(RewardType* reward_ptr);
 
-  void populate_initial_inventory(const std::unordered_map<InventoryItem, InventoryQuantity>& initial_inventory);
+  void populate_initial_inventory(const std::unordered_map<InventoryItem, InventoryQuantity>& initial_inventory,
+                                  const std::vector<InventoryItem>& inventory_deps = {});
 
   void set_inventory(const std::unordered_map<InventoryItem, InventoryQuantity>& inventory);
 

packages/mettagrid/cpp/src/mettagrid/objects/agent.cpp

@@ -90,6 +90,7 @@ void Agent::populate_initial_inventory(const std::unordered_map<InventoryItem, I
 
   // Then add remaining items
   for (const auto& [item, amount] : initial_inventory) {
+    if (added.count(item)) continue;  // Skip items already added
     this->inventory.update(item, amount, /*ignore_limits=*/true);
   }
 }

packages/mettagrid/python/src/mettagrid/config/mettagrid_c_config.py

@@ -394,14 +394,14 @@ def convert_to_cpp_game_config(game_config: GameConfig):
                 initial_inventory_cpp[resource_id] = amount
 
             # Create inventory config with limits from nested inventory config
-            limits_list = []
+            inventory_config = CppInventoryConfig()
+            limit_defs = []
             for resource_limit in object_config.inventory.limits.values():
                 resource_list = resource_limit.resources
                 resource_ids = [resource_name_to_id[name] for name in resource_list if name in resource_name_to_id]
                 if resource_ids:
-                    limits_list.append((resource_ids, resource_limit.limit))
-
-            inventory_config = CppInventoryConfig(limits_list)
+                    limit_defs.append(CppLimitDef(resources=resource_ids, base_limit=resource_limit.limit))
+            inventory_config.limit_defs = limit_defs
 
             # Get currency resource ID
             currency_resource_id = resource_name_to_id.get(object_config.currency_resource, 0)

packages/mettagrid/python/src/mettagrid/config/mettagrid_config.py

@@ -194,11 +194,11 @@ class ChangeVibeActionConfig(ActionConfig):
 
     action_handler: str = Field(default="change_vibe")
     number_of_vibes: int = Field(default=0, ge=0, le=255)
-    vibes: list[str] | None = Field(default=None)
+    vibes: list[Vibe] | None = Field(default=None)
 
     def _actions(self) -> list[Action]:
         if self.vibes is not None:
-            return [self.ChangeVibe(Vibe(name=vibe)) for vibe in self.vibes]
+            return [self.ChangeVibe(vibe) for vibe in self.vibes]
         return [self.ChangeVibe(vibe) for vibe in VIBES[: self.number_of_vibes]]
 
     def ChangeVibe(self, vibe: Vibe) -> Action:
@@ -268,6 +268,17 @@ class AttackActionConfig(ActionConfig):
         default_factory=dict,
         description="Per-vibe armor bonus. Maps vibe name to bonus amount.",
     )
+    loot: list[str] = Field(
+        default_factory=list,
+        description="Convenience field: resources to steal (merged into success.loot).",
+    )
+
+    @model_validator(mode="after")
+    def _merge_loot_into_success(self) -> "AttackActionConfig":
+        """Merge top-level loot into success.loot for convenience."""
+        if self.loot:
+            self.success.loot = list(set(self.success.loot + self.loot))
+        return self
 
     def _actions(self) -> list[Action]:
         # Attack only triggers via move, no standalone actions
@@ -305,6 +316,10 @@ class TransferActionConfig(ActionConfig):
         default_factory=list,
         description="List of vibe transfer configs specifying actor/target resource effects",
     )
+    vibes: list[str] = Field(
+        default_factory=list,
+        description="Convenience field: vibes that can trigger transfer (used with vibe_transfers)",
+    )
 
     def _actions(self) -> list[Action]:
         # Transfer doesn't create standalone actions - it's triggered by move
@@ -653,7 +668,9 @@ class GameConfig(Config):
     @model_validator(mode="after")
     def _compute_feature_ids(self) -> "GameConfig":
         self.actions.change_vibe.number_of_vibes = self.actions.change_vibe.number_of_vibes or len(VIBES)
-        self.vibe_names = [vibe.name for vibe in VIBES[: self.actions.change_vibe.number_of_vibes]]
+        # Only set vibe_names from VIBES if not already provided by user
+        if not self.vibe_names:
+            self.vibe_names = [vibe.name for vibe in VIBES[: self.actions.change_vibe.number_of_vibes]]
         return self
 
     def id_map(self) -> "IdMap":