Snippets tweak

CleverRaven · Jun 15, 2024 · 512594b · 512594b
1 parent 459ec63
commit 512594b
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 57 deletions.
diff --git a/data/json/snippets/art/general_art.json b/data/json/snippets/art/general_art.json
@@ -57,23 +57,6 @@
       { "id": "artist_identifying_info_0004", "text": "The artist's name is signed in ink, \"<given_name>\"" }
     ]
   },
-  {
-    "type": "snippet",
-    "category": "<random_color>",
-    "//": "There can potentially be hundreds of these if so desired, with how many different colors there are.  A list can be found here: https://en.wikipedia.org/wiki/List_of_colors:_A%E2%80%93F",
-    "text": [
-      { "id": "random_color_0001", "text": { "ctxt": "random_color", "str": "red" } },
-      { "id": "random_color_0002", "text": { "ctxt": "random_color", "str": "white" } },
-      { "id": "random_color_0003", "text": { "ctxt": "random_color", "str": "blue" } },
-      { "id": "random_color_0004", "text": { "ctxt": "random_color", "str": "green" } },
-      { "id": "random_color_0005", "text": { "ctxt": "random_color", "str": "orange" } },
-      { "id": "random_color_0006", "text": { "ctxt": "random_color", "str": "brown" } },
-      { "id": "random_color_0007", "text": { "ctxt": "random_color", "str": "pink" } },
-      { "id": "random_color_0008", "text": { "ctxt": "random_color", "str": "purple" } },
-      { "id": "random_color_0009", "text": { "ctxt": "random_color", "str": "gray" } },
-      { "id": "random_color_0010", "text": { "ctxt": "random_color", "str": "black" } }
-    ]
-  },
   {
     "type": "snippet",
     "category": "<random_shape_any>",

diff --git a/data/json/snippets/art/paintings_and_sketches/abstract.json b/data/json/snippets/art/paintings_and_sketches/abstract.json
@@ -3,31 +3,28 @@
     "type": "snippet",
     "category": "<abstract_art_type>",
     "text": [
-      { "id": "abstract_art_type_0001", "text": "a <random_color> <random_shape_any> on a <random_color> background" },
+      { "id": "abstract_art_type_0001", "text": "a <color> <random_shape_any> on a <color> background" },
       {
         "id": "abstract_art_type_0002",
-        "text": "a series <random_color> <random_shape_any>s which connect together on a <random_color> background"
+        "text": "a series <color> <random_shape_any>s which connect together on a <color> background"
       },
       {
         "id": "abstract_art_type_0003",
-        "text": "a multitude of <random_color> <random_shape_any>s which form a gradient pattern, covering the canvas"
+        "text": "a multitude of <color> <random_shape_any>s which form a gradient pattern, covering the canvas"
       },
       {
         "id": "abstract_art_type_0004",
-        "text": "a <random_color> <random_shape_any> with a <random_color> <random_shape_any> running through it, on a <random_color> background"
+        "text": "a <color> <random_shape_any> with a <color> <random_shape_any> running through it, on a <color> background"
       },
       {
         "id": "abstract_art_type_0005",
-        "text": "a <random_color> <random_shape_any> with a <random_color> <random_shape_any> behind it, on a <random_color> background"
+        "text": "a <color> <random_shape_any> with a <color> <random_shape_any> behind it, on a <color> background"
       },
       {
         "id": "abstract_art_type_0006",
-        "text": "a <random_color> <random_shape_any> with a <random_color> <random_shape_any> in front of it, on a <random_color> background"
+        "text": "a <color> <random_shape_any> with a <color> <random_shape_any> in front of it, on a <color> background"
       },
-      {
-        "id": "abstract_art_type_0007",
-        "text": "a series of <random_color> squiggling lines on a <random_color> background"
-      }
+      { "id": "abstract_art_type_0007", "text": "a series of <color> squiggling lines on a <color> background" }
     ]
   }
 ]
diff --git a/data/json/snippets/art/statues/statue_abstract.json b/data/json/snippets/art/statues/statue_abstract.json
@@ -3,30 +3,30 @@
     "type": "snippet",
     "category": "<abstract_statue_type>",
     "text": [
-      { "id": "abstract_statue_type_0001", "text": "a <random_color> <random_shape_any>" },
+      { "id": "abstract_statue_type_0001", "text": "a <color> <random_shape_any>" },
       {
         "id": "abstract_statue_type_0002",
-        "text": "a series <random_color> <random_shape_any>s which connect together at odd angles"
+        "text": "a series <color> <random_shape_any>s which connect together at odd angles"
       },
       {
         "id": "abstract_statue_type_0003",
-        "text": "a multitude of <random_color> <random_shape_any>s which form a gradient pattern, covering a variety of flat folds"
+        "text": "a multitude of <color> <random_shape_any>s which form a gradient pattern, covering a variety of flat folds"
       },
       {
         "id": "abstract_statue_type_0004",
-        "text": "a <random_color> <random_shape_any> with a <random_color> <random_shape_any> running through it"
+        "text": "a <color> <random_shape_any> with a <color> <random_shape_any> running through it"
       },
       {
         "id": "abstract_statue_type_0005",
-        "text": "a <random_color> <random_shape_any> with a <random_color> <random_shape_any> behind it"
+        "text": "a <color> <random_shape_any> with a <color> <random_shape_any> behind it"
       },
       {
         "id": "abstract_statue_type_0006",
-        "text": "a <random_color> <random_shape_any> with a <random_color> <random_shape_any> in front of it"
+        "text": "a <color> <random_shape_any> with a <color> <random_shape_any> in front of it"
       },
       {
         "id": "abstract_statue_type_0007",
-        "text": "a series of <random_color> squiggling tubes, intertwined with each other"
+        "text": "a series of <color> squiggling tubes, intertwined with each other"
       }
     ]
   }

diff --git a/data/json/snippets/snippets.json b/data/json/snippets/snippets.json
@@ -404,10 +404,10 @@
       { "id": "dog_name_0007", "text": "Archie" },
       { "id": "dog_name_0008", "text": "Ava" },
       { "id": "dog_name_0009", "text": "Bailey" },
-      { "id": "dog_name_0010", "text": "Bandit" },
+      { "id": "dog_name_0010", "text": { "ctxt": "dog_name", "str": "Bandit" } },
       { "id": "dog_name_0011", "text": "Basil" },
       { "id": "dog_name_0012", "text": "Baxter" },
-      { "id": "dog_name_0013", "text": "Bear" },
+      { "id": "dog_name_0013", "text": { "ctxt": "dog_name", "str": "Bear" } },
       { "id": "dog_name_0014", "text": "Beau" },
       { "id": "dog_name_0015", "text": "Bella" },
       { "id": "dog_name_0016", "text": "Benji" },
@@ -441,7 +441,7 @@
       { "id": "dog_name_0044", "text": "Dakota" },
       { "id": "dog_name_0045", "text": "Darcy" },
       { "id": "dog_name_0046", "text": "Dexter" },
-      { "id": "dog_name_0047", "text": "Diesel" },
+      { "id": "dog_name_0047", "text": { "ctxt": "dog_name", "str": "Diesel" } },
       { "id": "dog_name_0048", "text": "Dixie" },
       { "id": "dog_name_0049", "text": "Dolly" },
       { "id": "dog_name_0050", "text": "Dozer" },
@@ -471,8 +471,8 @@
       { "id": "dog_name_0074", "text": "Hazel" },
       { "id": "dog_name_0075", "text": "Henry" },
       { "id": "dog_name_0076", "text": "Holly" },
-      { "id": "dog_name_0077", "text": "Honey" },
-      { "id": "dog_name_0078", "text": "Hunter" },
+      { "id": "dog_name_0077", "text": { "ctxt": "dog_name", "str": "Honey" } },
+      { "id": "dog_name_0078", "text": { "ctxt": "dog_name", "str": "Hunter" } },
       { "id": "dog_name_0079", "text": "Izzy" },
       { "id": "dog_name_0080", "text": "Jack" },
       { "id": "dog_name_0081", "text": "Jackson" },
@@ -580,7 +580,7 @@
       { "id": "dog_name_0183", "text": "Sparky" },
       { "id": "dog_name_0184", "text": "Spud" },
       { "id": "dog_name_0185", "text": "Stella" },
-      { "id": "dog_name_0186", "text": "Sugar" },
+      { "id": "dog_name_0186", "text": { "ctxt": "dog_name", "str": "Sugar" } },
       { "id": "dog_name_0187", "text": "Suki" },
       { "id": "dog_name_0188", "text": "Sully" },
       { "id": "dog_name_0189", "text": "Summer" },
@@ -643,28 +643,31 @@
     "type": "snippet",
     "category": "<given_name_army>",
     "//": "weighted according to <https://en.wikipedia.org/wiki/Women_in_the_United_States_Army>",
-    "text": [ { "text": "<male_given_name>", "weight": 16 }, { "text": "<female_given_name>", "weight": 84 } ]
+    "text": [ { "text": "<male_given_name>", "weight": 84 }, { "text": "<female_given_name>", "weight": 16 } ]
   },
   {
     "type": "snippet",
     "category": "<color>",
     "text": [
-      { "id": "black", "text": "black" },
-      { "id": "white", "text": "white" },
-      { "id": "red", "text": "red" },
-      { "id": "lime", "text": "lime" },
-      { "id": "blue", "text": "blue" },
-      { "id": "yellow", "text": "yellow" },
-      { "id": "cyan", "text": "cyan" },
-      { "id": "magenta", "text": "magenta" },
-      { "id": "silver", "text": "silver" },
-      { "id": "gray", "text": "gray" },
-      { "id": "maroon", "text": "maroon" },
-      { "id": "olive", "text": "olive" },
-      { "id": "green", "text": "green" },
-      { "id": "purple", "text": "purple" },
-      { "id": "teal", "text": "teal" },
-      { "id": "navy", "text": "navy" }
+      { "id": "random_color_pink", "text": { "ctxt": "<color>", "str": "pink" } },
+      { "id": "random_color_red", "text": { "ctxt": "<color>", "str": "red" } },
+      { "id": "random_color_orange", "text": { "ctxt": "<color>", "str": "orange" } },
+      { "id": "random_color_yellow", "text": { "ctxt": "<color>", "str": "yellow" } },
+      { "id": "random_color_maroon", "text": { "ctxt": "<color>", "str": "maroon" } },
+      { "id": "random_color_brown", "text": { "ctxt": "<color>", "str": "brown" } },
+      { "id": "random_color_purple", "text": { "ctxt": "<color>", "str": "purple" } },
+      { "id": "random_color_magenta", "text": { "ctxt": "<color>", "str": "magenta" } },
+      { "id": "random_color_navy", "text": { "ctxt": "<color>", "str": "navy" } },
+      { "id": "random_color_blue", "text": { "ctxt": "<color>", "str": "blue" } },
+      { "id": "random_color_teal", "text": { "ctxt": "<color>", "str": "teal" } },
+      { "id": "random_color_cyan", "text": { "ctxt": "<color>", "str": "cyan" } },
+      { "id": "random_color_green", "text": { "ctxt": "<color>", "str": "green" } },
+      { "id": "random_color_olive", "text": { "ctxt": "<color>", "str": "olive" } },
+      { "id": "random_color_lime", "text": { "ctxt": "<color>", "str": "lime" } },
+      { "id": "random_color_black", "text": { "ctxt": "<color>", "str": "black" } },
+      { "id": "random_color_gray", "text": { "ctxt": "<color>", "str": "gray" } },
+      { "id": "random_color_silver", "text": { "ctxt": "<color>", "str": "silver" } },
+      { "id": "random_color_white", "text": { "ctxt": "<color>", "str": "white" } }
     ]
   }
 ]