cp

Author: daveey

recipes/experiment/cogsguard.py

@@ -36,7 +36,6 @@
     AgentConfig,
     AgentRewards,
     AssemblerConfig,
-    AttackActionConfig,
     ChangeVibeActionConfig,
     ChestConfig,
     DamageConfig,
@@ -49,7 +48,6 @@
     NoopActionConfig,
     ProtocolConfig,
     ResourceLimitsConfig,
-    WallConfig,
 )
 from mettagrid.config.vibes import Vibe
 from mettagrid.mapgen.mapgen import MapGen
@@ -77,20 +75,23 @@
     Vibe("❤️", "heart"),
 ]
 
+
 class PylonConfig(GridObjectConfig):
     radius: int
 
+
 class RoleStationConfig(GridObjectConfig):
     role: str
 
+
 class ExtractorConfig(GridObjectConfig):
     pass
 
+
 class ColonyConfig(GridObjectConfig):
     pass
 
 
-
 class CogAssemblerConfig(CvCStationConfig):
     def station_cfg(self) -> AssemblerConfig:
         # gear = [("carbon", "decoder"), ("oxygen", "modulator"), ("germanium", "scrambler"), ("silicon", "resonator")]
@@ -136,23 +137,6 @@ def make_env(num_agents: int = 10) -> MettaGridConfig:
             ),
             noop=NoopActionConfig(),
             change_vibe=ChangeVibeActionConfig(vibes=vibes),
-            attack=AttackActionConfig(
-                consumed_resources={"energy": 7},
-                defense_resources={"energy": 0},
-                weapon_resources={"weapon": 10},
-                armor_resources={"shield": 15},
-                loot=["heart"],
-                enabled=False,
-                vibes=["weapon"],  # Attack triggered when agent has weapon vibe
-            ),
-            transfer=TransferActionConfig(
-                vibe_transfers=[
-                    VibeTransfer(vibe="battery", target={"energy": 50}, actor={"energy": -50}),
-                    VibeTransfer(vibe="heart", target={"heart": 1}, actor={"heart": -1}),
-                    VibeTransfer(vibe="gear", target={"damage": -100}, actor={"energy": -10}),
-                ],
-                vibes=["battery", "heart", "gear"],  # Transfer triggered for these vibes
-            ),
         ),
         agent=AgentConfig(
             inventory=InventoryConfig(
@@ -212,39 +196,10 @@ def make_env(num_agents: int = 10) -> MettaGridConfig:
                     "default": {"carbon": 255, "oxygen": 255, "germanium": 255, "silicon": 255},
                 }
             ),
-            "market": MarketConfig(
-                terminals={
-                    # Terminals are keyed by the direction the agent enters the market from.
-                    "north": MarketTerminalConfig(sell=False, amount=1),  # buy
-                    "south": MarketTerminalConfig(sell=True, amount=1),  # sell
-                },
-                inventory=InventoryConfig(
-                    initial={
-                        "battery": 10,
-                        "weapon": 10,
-                        "shield": 10,
-                        "gear": 4,
-                    },
-                ),
-                currency_resource="heart",
-            ),
             "carbon_extractor": CarbonExtractorConfig().station_cfg(),
             "oxygen_extractor": OxygenExtractorConfig(efficiency=200).station_cfg(),
             "germanium_extractor": GermaniumExtractorConfig().station_cfg(),
             "silicon_extractor": SiliconExtractorConfig().station_cfg(),
-            "barrier": WallConfig(
-                name="barrier",
-                render_symbol="🪨",
-                build=BuildConfig(vibe="barrier", cost={"energy": 50, "silicon": 25}),
-                demolish=DemolishConfig(
-                    cost={"energy": 100},
-                    scrap={"silicon": 12},
-                ),
-                aoe=AOEEffectConfig(
-                    range=1,
-                    resource_deltas={"damage": 1},
-                ),
-            ),
         },
     )