diff --git a/README.ipynb b/README.ipynb index e3d4ee448..029ec8a2e 100644 --- a/README.ipynb +++ b/README.ipynb @@ -456,7 +456,7 @@ "data": { "text/html": [ "
╭─ Describe ──────────────────────────────────────────────────────────────────────────────────────────────────────╮\n",
-       "│ --game             TEXT         Game whose missions to list or describe. [default: cogs_vs_clips]               │\n",
+       "│ --game             TEXT         Game whose missions to list or describe. [default: cogsguard]               │\n",
        "│ --mission  -m      MISSION      Mission to describe.                                                            │\n",
        "│ --cogs     -c      INTEGER      Override agent count (requires -m).                                             │\n",
        "│ --variant  -v      VARIANT      Apply variant (requires -m, repeatable).                                        │\n",
@@ -467,7 +467,7 @@
       ],
       "text/plain": [
        "\u001b[2m╭─\u001b[0m\u001b[2m Describe \u001b[0m\u001b[2m─────────────────────────────────────────────────────────────────────────────────────────────────────\u001b[0m\u001b[2m─╮\u001b[0m\n",
-       "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-game\u001b[0m             \u001b[1mTEXT       \u001b[0m  Game whose missions to list or describe. \u001b[2m[default: cogs_vs_clips]\u001b[0m               \u001b[2m│\u001b[0m\n",
+       "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-game\u001b[0m             \u001b[1mTEXT       \u001b[0m  Game whose missions to list or describe. \u001b[2m[default: cogsguard]\u001b[0m               \u001b[2m│\u001b[0m\n",
        "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-mission\u001b[0m  \u001b[1m-m\u001b[0m      \u001b[1mMISSION    \u001b[0m  Mission to describe.                                                            \u001b[2m│\u001b[0m\n",
        "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-cogs\u001b[0m     \u001b[1m-c\u001b[0m      \u001b[1mINTEGER    \u001b[0m  Override agent count (requires \u001b[1m-m\u001b[0m).                                             \u001b[2m│\u001b[0m\n",
        "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-variant\u001b[0m  \u001b[1m-v\u001b[0m      \u001b[1mVARIANT    \u001b[0m  Apply variant (requires \u001b[1m-m\u001b[0m, repeatable).                                        \u001b[2m│\u001b[0m\n",
@@ -1019,7 +1019,7 @@
      "data": {
       "text/html": [
        "
╭─ Game Setup ────────────────────────────────────────────────────────────────────────────────────────────────────╮\n",
-       "│ --game             GAME     Game to play (default: cogs_vs_clips). [default: cogs_vs_clips]                     │\n",
+       "│ --game             GAME     Game to play (default: cogsguard). [default: cogsguard]                     │\n",
        "│ --mission  -m      MISSION  Mission to play (run cogames missions to list).                                     │\n",
        "│ --variant  -v      VARIANT  Apply variant modifier (repeatable).                                                │\n",
        "│ --cogs     -c      N        Number of cogs/agents. [default: (from mission)]                                    │\n",
@@ -1028,7 +1028,7 @@
       ],
       "text/plain": [
        "\u001b[2m╭─\u001b[0m\u001b[2m Game Setup \u001b[0m\u001b[2m───────────────────────────────────────────────────────────────────────────────────────────────────\u001b[0m\u001b[2m─╮\u001b[0m\n",
-       "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-game\u001b[0m             \u001b[1mGAME   \u001b[0m  Game to play (default: cogs_vs_clips). \u001b[2m[default: cogs_vs_clips]\u001b[0m                     \u001b[2m│\u001b[0m\n",
+       "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-game\u001b[0m             \u001b[1mGAME   \u001b[0m  Game to play (default: cogsguard). \u001b[2m[default: cogsguard]\u001b[0m                     \u001b[2m│\u001b[0m\n",
        "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-mission\u001b[0m  \u001b[1m-m\u001b[0m      \u001b[1mMISSION\u001b[0m  Mission to play (run \u001b[1mcogames missions\u001b[0m to list).                                     \u001b[2m│\u001b[0m\n",
        "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-variant\u001b[0m  \u001b[1m-v\u001b[0m      \u001b[1mVARIANT\u001b[0m  Apply variant modifier (repeatable).                                                \u001b[2m│\u001b[0m\n",
        "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-cogs\u001b[0m     \u001b[1m-c\u001b[0m      \u001b[1mN      \u001b[0m  Number of cogs/agents. \u001b[2m[default: (from mission)]\u001b[0m                                    \u001b[2m│\u001b[0m\n",
@@ -3937,12 +3937,12 @@
     {
      "data": {
       "text/html": [
-       "
 Create a new policy from a template. Requires --trainable or --scripted.                                          \n",
+       "
 Create a new policy from a template. Requires exactly one policy type.                                            \n",
        "                                                                                                                   \n",
        "
\n"
       ],
       "text/plain": [
-       " Create a new policy from a template. Requires \u001b[1m-\u001b[0m\u001b[1m-trainable\u001b[0m or \u001b[1m-\u001b[0m\u001b[1m-scripted\u001b[0m.                                          \n",
+       " Create a new policy from a template. Requires exactly one policy type.                                            \n",
        "                                                                                                                   \n"
       ]
      },
@@ -3955,6 +3955,7 @@
        "
╭─ Policy Type ───────────────────────────────────────────────────────────────────────────────────────────────────╮\n",
        "│ --trainable          Create a trainable (neural network) policy.                                                │\n",
        "│ --scripted           Create a scripted (rule-based) policy.                                                     │\n",
+       "│ --amongthem          Create an AmongThem BitWorld scripted practice policy.                                     │\n",
        "╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯\n",
        "
\n"
       ],
@@ -3962,6 +3963,7 @@
        "\u001b[2m╭─\u001b[0m\u001b[2m Policy Type \u001b[0m\u001b[2m──────────────────────────────────────────────────────────────────────────────────────────────────\u001b[0m\u001b[2m─╮\u001b[0m\n",
        "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-trainable\u001b[0m          Create a trainable (neural network) policy.                                                \u001b[2m│\u001b[0m\n",
        "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-scripted\u001b[0m           Create a scripted (rule-based) policy.                                                     \u001b[2m│\u001b[0m\n",
+       "\u001b[2m│\u001b[0m \u001b[1m-\u001b[0m\u001b[1m-amongthem\u001b[0m          Create an AmongThem BitWorld scripted practice policy.                                     \u001b[2m│\u001b[0m\n",
        "\u001b[2m╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯\u001b[0m\n"
       ]
      },
diff --git a/README.md b/README.md
index 10cefa5fc..aa63e5334 100644
--- a/README.md
+++ b/README.md
@@ -316,7 +316,7 @@ cogames [COMMAND] --help
 
 
 
╭─ Describe ──────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ --game             TEXT         Game whose missions to list or describe. [default: cogs_vs_clips]               │
+│ --game             TEXT         Game whose missions to list or describe. [default: cogsguard]               │
 │ --mission  -m      MISSION      Mission to describe.                                                            │
 │ --cogs     -c      INTEGER      Override agent count (requires -m).                                             │
 │ --variant  -v      VARIANT      Apply variant (requires -m, repeatable).                                        │
@@ -571,7 +571,7 @@ cogames [COMMAND] --help
 
 
 
╭─ Game Setup ────────────────────────────────────────────────────────────────────────────────────────────────────╮
-│ --game             GAME     Game to play (default: cogs_vs_clips). [default: cogs_vs_clips]                     │
+│ --game             GAME     Game to play (default: cogsguard). [default: cogsguard]                     │
 │ --mission  -m      MISSION  Mission to play (run cogames missions to list).                                     │
 │ --variant  -v      VARIANT  Apply variant modifier (repeatable).                                                │
 │ --cogs     -c      N        Number of cogs/agents. [default: (from mission)]                                    │
@@ -1904,7 +1904,7 @@ cogames [COMMAND] --help
 
 
 
-
 Create a new policy from a template. Requires --trainable or --scripted.                                          
+
 Create a new policy from a template. Requires exactly one policy type.                                            
 
 

 
@@ -1914,6 +1914,7 @@ cogames [COMMAND] --help
 
╭─ Policy Type ───────────────────────────────────────────────────────────────────────────────────────────────────╮
 │ --trainable          Create a trainable (neural network) policy.                                                │
 │ --scripted           Create a scripted (rule-based) policy.                                                     │
+│ --amongthem          Create an AmongThem BitWorld scripted practice policy.                                     │
 ╰─────────────────────────────────────────────────────────────────────────────────────────────────────────────────╯
 

 
diff --git a/pyproject.toml b/pyproject.toml
index f9b4383db..c9ed337d9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ readme = "README.md"
 requires-python = ">=3.12,<3.13"
 classifiers = ["Programming Language :: Python :: 3", "Programming Language :: Python :: 3.12"]
 dependencies = [
-  "mettagrid==0.26.12",
+  "mettagrid==0.26.13",
   "softmax-cli==0.26.5",
   "packaging>=24.0.0",
   "pydantic>=2.11.5",
@@ -75,8 +75,8 @@ testpaths = ["tests"]
 source = ["cogames"]
 
 [tool.uv.sources]
-mettagrid = { workspace = true }
-softmax-cli = { workspace = true }
+mettagrid = {git = "https://github.com/Metta-AI/mettagrid.git"}
+softmax-cli = {git = "https://github.com/Metta-AI/softmax-cli.git"}
 diplomacog = { git = "https://github.com/Metta-AI/cogame-diplomacog.git" }
 hungercog = { git = "https://github.com/Metta-AI/cogame-hungercog.git" }
 overcogged = { git = "https://github.com/Metta-AI/cogame-overcogged.git" }