cp

Author: daveey

packages/cogames/TECHNICAL_MANUAL.md

@@ -173,7 +173,7 @@ Example command names:
 - `change_vibe_sad`
 - `change_vibe_neutral`
 
-> **Note**: The number of available vibes is configurable via `change_vibe.number_of_vibes`.
+> **Note**: The available vibes are configurable via `change_vibe.vibes`.
 
 ---
 

packages/cogames/scripts/run_evaluation.py

@@ -66,8 +66,11 @@ def _ensure_vibe_supports_gear(env_cfg) -> None:
                 break
     if uses_gear:
         change_vibe = env_cfg.game.actions.change_vibe
-        if getattr(change_vibe, "number_of_vibes", 0) < 8:
-            change_vibe.number_of_vibes = 8
+        has_gear = any(v.name == "gear" for v in change_vibe.vibes)
+        if not has_gear:
+            from mettagrid.config.vibes import VIBE_BY_NAME
+
+            change_vibe.vibes = list(change_vibe.vibes) + [VIBE_BY_NAME["gear"]]
 
 
 # Cache for policy action space sizes to avoid reloading checkpoints
@@ -139,7 +142,7 @@ def _configure_env_for_action_space(env_cfg, num_actions: int) -> None:
     if env_cfg.game.actions:
         # Configure vibe action count
         if env_cfg.game.actions.change_vibe:
-            env_cfg.game.actions.change_vibe.number_of_vibes = len(vibe_names)
+            env_cfg.game.actions.change_vibe.vibes = [vibes_module.VIBE_BY_NAME[name] for name in vibe_names]
             # Filter initial vibe if out of range
             if env_cfg.game.agent.initial_vibe >= len(vibe_names):
                 env_cfg.game.agent.initial_vibe = 0

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

@@ -33,6 +33,7 @@
     ProtocolConfig,
     ResourceLimitsConfig,
 )
+from mettagrid.config.vibes import Vibe
 from mettagrid.map_builder.map_builder import AnyMapBuilderConfig
 
 
@@ -134,7 +135,7 @@ class Mission(Config):
     heart_capacity: int = Field(default=1)
     # Control vibe swapping in variants
     enable_vibe_change: bool = Field(default=True)
-    vibe_count: int | None = Field(default=None)
+    vibes: list[Vibe] | None = Field(default=None)
     compass_enabled: bool = Field(default=True)
 
     def __init__(self, **kwargs):
@@ -173,10 +174,10 @@ def make_env(self) -> MettaGridConfig:
                 move=MoveActionConfig(consumed_resources={"energy": self.move_energy_cost}),
                 noop=NoopActionConfig(),
                 change_vibe=ChangeVibeActionConfig(
-                    number_of_vibes=(
-                        0
+                    vibes=(
+                        []
                         if not self.enable_vibe_change
-                        else (self.vibe_count if self.vibe_count is not None else len(vibes.VIBES))
+                        else (self.vibes if self.vibes is not None else list(vibes.VIBES))
                     )
                 ),
             ),

packages/cogames/src/cogames/policy/nim_agents/thinky_eval.py

@@ -144,8 +144,11 @@ def _ensure_vibe_supports_gear(env_cfg) -> None:
                     break
         if uses_gear:
             change_vibe = env_cfg.game.actions.change_vibe
-            if getattr(change_vibe, "number_of_vibes", 0) < 8:
-                change_vibe.number_of_vibes = 8
+            has_gear = any(v.name == "gear" for v in change_vibe.vibes)
+            if not has_gear:
+                from mettagrid.config.vibes import VIBE_BY_NAME
+
+                change_vibe.vibes = list(change_vibe.vibes) + [VIBE_BY_NAME["gear"]]
     except Exception:
         pass
 

packages/cogames/src/cogames/policy/scripted_agent/utils.py

@@ -291,7 +291,7 @@ def change_vibe_action(
         return actions.noop.Noop()
     if not getattr(change_vibe_cfg, "enabled", True):
         return actions.noop.Noop()
-    num_vibes = int(getattr(change_vibe_cfg, "number_of_vibes", 0))
+    num_vibes = len(getattr(change_vibe_cfg, "vibes", []))
     if num_vibes <= 1:
         return actions.noop.Noop()
     # Raise loudly if the requested vibe isn't registered instead of silently

packages/cogames/tests/test_cvc_assembler_hearts.py

@@ -42,7 +42,6 @@ def _make_simulation() -> Simulation:
     cfg.game.actions.noop.enabled = True
     cfg.game.actions.move.enabled = True
     cfg.game.actions.change_vibe.enabled = True
-    cfg.game.actions.change_vibe.number_of_vibes = 32
 
     assembler_cfg = CvCAssemblerConfig(
         first_heart_cost=FIRST_HEART_COST, additional_heart_cost=ADDITIONAL_HEART_COST

packages/mettagrid/docs/actions.md

@@ -97,7 +97,7 @@ Example action names:
 - `change_vibe_sad`
 - `change_vibe_neutral`
 
-> **Note**: The number of available vibes is configurable via `change_vibe.number_of_vibes`.
+> **Note**: The available vibes are configurable via `change_vibe.vibes`.
 
 ### Attack Actions
 

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

@@ -6,7 +6,6 @@
     GameConfig,
     WallConfig,
 )
-from mettagrid.config.vibes import VIBES
 from mettagrid.mettagrid_c import ActionConfig as CppActionConfig
 from mettagrid.mettagrid_c import AgentConfig as CppAgentConfig
 from mettagrid.mettagrid_c import AssemblerConfig as CppAssemblerConfig
@@ -36,15 +35,12 @@ def convert_to_cpp_game_config(mettagrid_config: dict | GameConfig):
         if "obs" in config_dict and "features" in config_dict["obs"]:
             config_dict["obs"] = config_dict["obs"].copy()
             config_dict["obs"].pop("features", None)
-        # Keep vibe_names in sync with number_of_vibes; favor the explicit count.
+        # Keep vibe_names in sync with vibes; favor the vibes list.
         config_dict.pop("vibe_names", None)
-        change_vibe_cfg = config_dict.setdefault("actions", {}).setdefault("change_vibe", {})
-        change_vibe_cfg["number_of_vibes"] = change_vibe_cfg.get("number_of_vibes") or len(VIBES)
         game_config = GameConfig(**config_dict)
 
     # Ensure runtime object has consistent vibes.
-    game_config.actions.change_vibe.number_of_vibes = game_config.actions.change_vibe.number_of_vibes or len(VIBES)
-    game_config.vibe_names = [vibe.name for vibe in VIBES[: game_config.actions.change_vibe.number_of_vibes]]
+    game_config.vibe_names = [vibe.name for vibe in game_config.actions.change_vibe.vibes]
 
     # Set up resource mappings
     resource_names = list(game_config.resource_names)
@@ -56,8 +52,7 @@ def convert_to_cpp_game_config(mettagrid_config: dict | GameConfig):
 
     # Set up vibe mappings from the change_vibe action config.
     # The C++ bindings expect dense uint8 identifiers, so keep a name->id lookup.
-    num_vibes = game_config.actions.change_vibe.number_of_vibes
-    supported_vibes = VIBES[:num_vibes]
+    supported_vibes = game_config.actions.change_vibe.vibes
     vibe_name_to_id = {vibe.name: i for i, vibe in enumerate(supported_vibes)}
 
     objects_cpp_params = {}  # params for CppWallConfig
@@ -462,9 +457,8 @@ def process_action_config(action_name: str, action_config):
 
     # Process change_vibe - always add to map
     action_params = process_action_config("change_vibe", actions_config.change_vibe)
-    action_params["number_of_vibes"] = (
-        actions_config.change_vibe.number_of_vibes if actions_config.change_vibe.enabled else 0
-    )
+    num_vibes = len(actions_config.change_vibe.vibes) if actions_config.change_vibe.enabled else 0
+    action_params["number_of_vibes"] = num_vibes
     actions_cpp_params["change_vibe"] = CppChangeVibeActionConfig(**action_params)
 
     game_cpp_params["actions"] = actions_cpp_params

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

@@ -195,10 +195,10 @@ class ChangeVibeActionConfig(ActionConfig):
     """Change vibe action configuration."""
 
     action_handler: str = Field(default="change_vibe")
-    number_of_vibes: int = Field(default=0, ge=0, le=255)
+    vibes: list[Vibe] = Field(default_factory=lambda: list(VIBES))
 
     def _actions(self) -> list[Action]:
-        return [self.ChangeVibe(vibe) for vibe in VIBES[: self.number_of_vibes]]
+        return [self.ChangeVibe(vibe) for vibe in self.vibes]
 
     def ChangeVibe(self, vibe: Vibe) -> Action:
         return Action(name=f"change_vibe_{vibe.name}")
@@ -459,8 +459,7 @@ 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]]
+        self.vibe_names = [vibe.name for vibe in self.actions.change_vibe.vibes]
         return self
 
     def id_map(self) -> "IdMap":
@@ -488,7 +487,7 @@ def EmptyRoom(
     ) -> "MettaGridConfig":
         """Create an empty room environment configuration."""
         map_builder = RandomMapBuilder.Config(agents=num_agents, width=width, height=height, border_width=border_width)
-        actions = ActionsConfig(move=MoveActionConfig(), change_vibe=ChangeVibeActionConfig(number_of_vibes=len(VIBES)))
+        actions = ActionsConfig(move=MoveActionConfig(), change_vibe=ChangeVibeActionConfig())
         objects = {}
         if border_width > 0 or with_walls:
             objects["wall"] = WallConfig(render_symbol="⬛")

packages/mettagrid/python/src/mettagrid/demo.py

@@ -65,7 +65,9 @@ def main():
 
     # Enable change_vibe for GUI control, but create a policy config without it for random actions
     cfg.game.actions.change_vibe.enabled = True
-    cfg.game.actions.change_vibe.number_of_vibes = 10
+    from mettagrid.config.vibes import VIBES as ALL_VIBES
+
+    cfg.game.actions.change_vibe.vibes = list(ALL_VIBES[:10])
 
     # Define objects used in the map
     cfg.game.objects = {