Merge pull request #163 from chizmw/fix-yaggababble-content-after-rev…

…ert-insanity

Fix yaggababble content after revert insanity

.changeset/unlucky-otters-greet.md

@@ -0,0 +1,5 @@
+---
+'json-on-the-clocktower': patch
+---
+
+fix: mixup with yaggababble content, changeset info, reverting, missing content :facepalm:

.github/workflows/python-test.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.10', '3.11', '3.12']
+        python-version: ['3.10', '3.12']
         poetry-version: [1.7.1]
 
     steps:

.gitignore

@@ -300,3 +300,4 @@ data/generated/roles-combined-v?.json
 bloodq.sh
 .tours
 test-results.xml
+.envrc

data/external/md5sum

@@ -1,4 +1,4 @@
 579faaf8b0c2d58e736318c99ddff97e bra1n-fabled.json
 6fc37b45670f0794539a6df2113ea203 bra1n-roles.json
-23786d2be9ca6c22db2d1d6e8950d339 script-jinx.json
-552984133f5994197d4557c2c3b34caf script-nightorder.json
+3e4e2bbf4e097456fe9b4e39c8b0633f script-jinx.json
+ab3cf46f5bc420ef2b719f5deac034dc script-nightorder.json

data/extra-characters/yaggababble.json

@@ -0,0 +1,14 @@
+[
+  {
+    "id": "yaggababble",
+    "image": "your direct url here",
+    "firstNight": 2.2,
+    "firstNightReminder": "Show the Yaggababble their secret phrase.",
+    "otherNight": 35.1,
+    "otherNightReminder": "Choose a number of players up to the total number of times the Yaggababble said their secret phrase publicly, those players die.",
+    "reminders": ["Dead"],
+    "name": "Yaggababble",
+    "team": "demon",
+    "ability": "You start knowing a secret phrase. For each time you said it publicly today, a player might die."
+  }
+]

data/role-edition.json

@@ -159,5 +159,6 @@
   "widow": "experimental",
   "witch": "snv",
   "zombuul": "bmr",
-  "plaguedoctor": "experimental"
+  "plaguedoctor": "experimental",
+  "yaggababble": ""
 }

morph/tests/test_sanity.py

@@ -148,6 +148,7 @@ def test_some_edition_experimental_keys(self):
             "organgrinder",
             "ojo",
             "villageidiot",
+            "yaggababble",
             "widow",
         ]
         # ).issubset(set(data["editions"]["experimental"].keys()))

new-character.sh

@@ -4,9 +4,9 @@
 # so we'll crete a script function (code-open) to do that for us
 code-open() {
     if [ -x "$(command -v code-insiders)" ]; then
-        code-insiders "$@"
+        code-insiders --wait "$@"
     else
-        code "$@"
+        code --wait "$@"
     fi
 }
 
@@ -20,6 +20,13 @@ else
     SLUG=$1
 fi
 
+# do we have the image in place?
+if [ ! -f "data/images/${SLUG}.png" ]; then
+    echo "Please provide an image in data/images/${SLUG}.png"
+    exit 1
+fi
+git add "data/images/${SLUG}.png" || true
+
 # if the second or third argument is force, set FORCE to true
 if [ "$2" = "force" ] || [ "$3" = "force" ]; then
     FORCE=true