From 6f0a584a7600043c313e81e5f049850cf3e8df3d Mon Sep 17 00:00:00 2001
From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com>
Date: Sat, 30 Dec 2023 17:47:06 -0500
Subject: [PATCH 1/6] Everything but Speech.json

Third times the charm
---
 data/json/monstergroups/amphibian.json        | 131 +++++++-----
 data/json/monsters/reptile_amphibian.json     | 193 +++++++++++++-----
 .../Tamable_Wildlife/reptile_amphibian.json   |  21 ++
 3 files changed, 243 insertions(+), 102 deletions(-)

diff --git a/data/json/monstergroups/amphibian.json b/data/json/monstergroups/amphibian.json
index 3d6b0854afa3a..e64156189553c 100644
--- a/data/json/monstergroups/amphibian.json
+++ b/data/json/monstergroups/amphibian.json
@@ -26,10 +26,10 @@
       { "monster": "mon_vocal_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_gray_tadpole", "weight": 100, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_shift_tadpole", "weight": 20, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_foul_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_odd_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" }
+      { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_foul_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_odd_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" }
     ]
   },
   {
@@ -45,10 +45,10 @@
       { "monster": "mon_foul_tadpole", "weight": 40, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_freedom_tadpole", "weight": 60, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_odd_tadpole", "weight": 40, "pack_size": [ 4, 8 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_foul_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_odd_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" }
+      { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_foul_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_odd_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" }
     ]
   },
   {
@@ -65,8 +65,8 @@
         "conditions": [ "SPRING", "SUMMER" ]
       },
       { "monster": "mon_strange_tadpole", "weight": 40, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" }
+      { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" }
     ]
   },
   {
@@ -91,10 +91,10 @@
       { "monster": "mon_vocal_tadpole", "weight": 40, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_gray_tadpole", "weight": 60, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
       { "monster": "mon_shift_tadpole", "weight": 40, "pack_size": [ 6, 12 ], "conditions": [ "SPRING", "SUMMER" ] },
-      { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_foul_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_odd_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "90 days" }
+      { "monster": "mon_pattern_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_strange_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_foul_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" },
+      { "monster": "mon_odd_bigtad", "weight": 10, "pack_size": [ 1, 4 ], "starts": "28 days" }
     ]
   },
   {
@@ -462,17 +462,20 @@
     "type": "monstergroup",
     "default": "mon_strange_bigfrog",
     "monsters": [
-      { "monster": "mon_pattern_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "60 days" },
-      { "monster": "mon_pattern_giganfrog", "weight": 30, "pack_size": [ 1, 2 ], "starts": "90 days" },
-      { "monster": "mon_strange_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "60 days" },
-      { "monster": "mon_strange_giganfrog", "weight": 40, "pack_size": [ 1, 3 ], "starts": "90 days" },
+      { "monster": "mon_pattern_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" },
+      { "monster": "mon_pattern_giganfrog", "weight": 30, "pack_size": [ 1, 2 ], "starts": "30 days" },
+      { "monster": "mon_strange_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "16 days" },
+      { "monster": "mon_strange_giganfrog", "weight": 40, "pack_size": [ 1, 3 ], "starts": "30 days" },
       { "monster": "mon_strange_megafrog", "weight": 10, "starts": "120 days" },
-      { "monster": "mon_foul_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "60 days" },
-      { "monster": "mon_foul_giganfrog", "weight": 40, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_foul_megafrog", "weight": 20, "pack_size": [ 1, 2 ], "starts": "120 days" },
-      { "monster": "mon_odd_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "60 days" },
-      { "monster": "mon_odd_giganfrog", "weight": 40, "pack_size": [ 1, 2 ], "starts": "90 days" },
-      { "monster": "mon_odd_megafrog", "weight": 10, "starts": "120 days" }
+      { "monster": "mon_foul_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "15 days" },
+      { "monster": "mon_foul_giganfrog", "weight": 40, "pack_size": [ 1, 4 ], "starts": "30 days" },
+      { "monster": "mon_foul_megafrog", "weight": 20, "pack_size": [ 1, 2 ], "starts": "60 days" },
+      { "monster": "mon_odd_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" },
+      { "monster": "mon_odd_giganfrog", "weight": 40, "pack_size": [ 1, 2 ], "starts": "30 days" },
+      { "monster": "mon_odd_megafrog", "weight": 10, "starts": "60 days" },
+      { "monster": "mon_jumbo_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" },
+      { "monster": "mon_vocal_bigfrog", "weight": 100, "pack_size": [ 1, 5 ], "starts": "15 days" },
+      { "monster": "mon_shift_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" }
     ]
   },
   {
@@ -480,10 +483,13 @@
     "type": "monstergroup",
     "default": "mon_strange_bigfrog",
     "monsters": [
-      { "monster": "mon_pattern_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "60 days" },
-      { "monster": "mon_strange_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "60 days" },
-      { "monster": "mon_foul_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "60 days" },
-      { "monster": "mon_odd_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "60 days" }
+      { "monster": "mon_pattern_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" },
+      { "monster": "mon_strange_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "15 days" },
+      { "monster": "mon_foul_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "15 days" },
+      { "monster": "mon_odd_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" },
+      { "monster": "mon_jumbo_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" },
+      { "monster": "mon_vocal_bigfrog", "weight": 100, "pack_size": [ 1, 5 ], "starts": "15 days" },
+      { "monster": "mon_shift_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" }
     ]
   },
   {
@@ -491,10 +497,10 @@
     "type": "monstergroup",
     "default": "mon_strange_giganfrog",
     "monsters": [
-      { "monster": "mon_pattern_giganfrog", "weight": 30, "pack_size": [ 1, 2 ], "starts": "90 days" },
-      { "monster": "mon_strange_giganfrog", "weight": 40, "pack_size": [ 1, 3 ], "starts": "90 days" },
-      { "monster": "mon_foul_giganfrog", "weight": 40, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_odd_giganfrog", "weight": 40, "pack_size": [ 1, 2 ], "starts": "90 days" }
+      { "monster": "mon_pattern_giganfrog", "weight": 30, "pack_size": [ 1, 2 ], "starts": "30 days" },
+      { "monster": "mon_strange_giganfrog", "weight": 40, "pack_size": [ 1, 3 ], "starts": "30 days" },
+      { "monster": "mon_foul_giganfrog", "weight": 40, "pack_size": [ 1, 4 ], "starts": "30 days" },
+      { "monster": "mon_odd_giganfrog", "weight": 40, "pack_size": [ 1, 2 ], "starts": "30 days" }
     ]
   },
   {
@@ -502,9 +508,9 @@
     "type": "monstergroup",
     "default": "mon_strange_megafrog",
     "monsters": [
-      { "monster": "mon_strange_megafrog", "weight": 10, "starts": "120 days" },
-      { "monster": "mon_foul_megafrog", "weight": 20, "pack_size": [ 1, 2 ], "starts": "120 days" },
-      { "monster": "mon_odd_megafrog", "weight": 10, "starts": "120 days" }
+      { "monster": "mon_strange_megafrog", "weight": 10, "starts": "60 days" },
+      { "monster": "mon_foul_megafrog", "weight": 20, "pack_size": [ 1, 2 ], "starts": "60 days" },
+      { "monster": "mon_odd_megafrog", "weight": 10, "starts": "60 days" }
     ]
   },
   {
@@ -512,8 +518,8 @@
     "type": "monstergroup",
     "default": "mon_pattern_bigfrog",
     "monsters": [
-      { "monster": "mon_pattern_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "60 days" },
-      { "monster": "mon_pattern_giganfrog", "weight": 30, "pack_size": [ 1, 2 ], "starts": "90 days" }
+      { "monster": "mon_pattern_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" },
+      { "monster": "mon_pattern_giganfrog", "weight": 30, "pack_size": [ 1, 2 ], "starts": "30 days" }
     ]
   },
   {
@@ -521,9 +527,9 @@
     "type": "monstergroup",
     "default": "mon_strange_bigfrog",
     "monsters": [
-      { "monster": "mon_strange_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "60 days" },
-      { "monster": "mon_strange_giganfrog", "weight": 40, "pack_size": [ 1, 3 ], "starts": "90 days" },
-      { "monster": "mon_strange_megafrog", "weight": 10, "starts": "120 days" }
+      { "monster": "mon_strange_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "15 days" },
+      { "monster": "mon_strange_giganfrog", "weight": 40, "pack_size": [ 1, 3 ], "starts": "30 days" },
+      { "monster": "mon_strange_megafrog", "weight": 10, "starts": "60 days" }
     ]
   },
   {
@@ -531,9 +537,9 @@
     "type": "monstergroup",
     "default": "mon_foul_bigfrog",
     "monsters": [
-      { "monster": "mon_foul_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "60 days" },
-      { "monster": "mon_foul_giganfrog", "weight": 40, "pack_size": [ 1, 4 ], "starts": "90 days" },
-      { "monster": "mon_foul_megafrog", "weight": 20, "pack_size": [ 1, 2 ], "starts": "120 days" }
+      { "monster": "mon_foul_bigfrog", "weight": 100, "pack_size": [ 1, 4 ], "starts": "15 days" },
+      { "monster": "mon_foul_giganfrog", "weight": 40, "pack_size": [ 1, 4 ], "starts": "30 days" },
+      { "monster": "mon_foul_megafrog", "weight": 20, "pack_size": [ 1, 2 ], "starts": "60 days" }
     ]
   },
   {
@@ -541,9 +547,18 @@
     "type": "monstergroup",
     "default": "mon_odd_bigfrog",
     "monsters": [
-      { "monster": "mon_odd_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "60 days" },
-      { "monster": "mon_odd_giganfrog", "weight": 40, "pack_size": [ 1, 2 ], "starts": "90 days" },
-      { "monster": "mon_odd_megafrog", "weight": 10, "starts": "120 days" }
+      { "monster": "mon_odd_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" },
+      { "monster": "mon_odd_giganfrog", "weight": 40, "pack_size": [ 1, 2 ], "starts": "30 days" },
+      { "monster": "mon_odd_megafrog", "weight": 10, "starts": "60 days" }
+    ]
+  },
+  {
+    "name": "GROUP_MUTAFROGS_VOCAL",
+    "type": "monstergroup",
+    "default": "mon_jumbo_bigfrog",
+    "monsters": [
+      { "monster": "mon_jumbo_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" },
+      { "monster": "mon_vocal_bigfrog", "weight": 100, "pack_size": [ 1, 3 ], "starts": "15 days" }
     ]
   },
   {
@@ -565,7 +580,9 @@
       { "group": "GROUP_MUTAFROGS_PATTERN", "weight": 40 },
       { "group": "GROUP_MUTAFROGS_STRANGE", "weight": 20 },
       { "group": "GROUP_MUTAFROGS_FOUL", "weight": 100 },
-      { "group": "GROUP_MUTAFROGS_ODD", "weight": 100 }
+      { "group": "GROUP_MUTAFROGS_ODD", "weight": 100 },
+      { "group": "GROUP_MUTAFROGS_VOCAL", "weight": 100 },
+      { "monster": "mon_shift_bigfrog", "weight": 30, "pack_size": [ 1, 3 ], "starts": "15 days" }
     ]
   },
   {
@@ -576,7 +593,9 @@
       { "group": "GROUP_MUTAFROGS_PATTERN", "weight": 100 },
       { "group": "GROUP_MUTAFROGS_STRANGE", "weight": 100 },
       { "group": "GROUP_MUTAFROGS_FOUL", "weight": 100 },
-      { "group": "GROUP_MUTAFROGS_ODD", "weight": 100 }
+      { "group": "GROUP_MUTAFROGS_ODD", "weight": 100 },
+      { "group": "GROUP_MUTAFROGS_VOCAL", "weight": 100 },
+      { "monster": "mon_shift_bigfrog", "weight": 30, "pack_size": [ 1, 3 ], "starts": "15 days" }
     ]
   },
   {
@@ -626,5 +645,21 @@
     "type": "monstergroup",
     "default": "mon_odd_giganfrog",
     "monsters": [ { "monster": "mon_odd_giganfrog", "weight": 100 }, { "monster": "mon_odd_megafrog", "weight": 10 } ]
+  },
+  {
+    "name": "GROUP_FROGS_UPGRADE_VOCAL",
+    "type": "monstergroup",
+    "default": "mon_vocal_frog",
+    "monsters": [
+      { "monster": "mon_vocal_frog", "weight": 100 },
+      { "monster": "mon_vocal_bigfrog", "weight": 50 },
+      { "monster": "mon_jumbo_bigfrog", "weight": 50 }
+    ]
+  },
+  {
+    "name": "GROUP_FROGS_UPGRADE_SHIFT",
+    "type": "monstergroup",
+    "default": "mon_shift_frog",
+    "monsters": [ { "monster": "mon_shift_frog", "weight": 70 }, { "monster": "mon_shift_bigfrog", "weight": 30 } ]
   }
 ]
diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json
index 96724f9441afb..959ccc96487e6 100644
--- a/data/json/monsters/reptile_amphibian.json
+++ b/data/json/monsters/reptile_amphibian.json
@@ -293,7 +293,7 @@
   {
     "abstract": "mon_proxy_tadpole",
     "type": "MONSTER",
-    "description": "The larval form of some species of frog.  Soon enough it will undergo metamorphosis into its adult form.",
+    "description": "The larval form of some species of frog.  This one is only hypothetical and you shouldn't be seeing it without debug.",
     "name": { "str": "tadpole" },
     "default_faction": "fish",
     "bodytype": "fish",
@@ -313,7 +313,7 @@
     "harvest": "mammal_tiny",
     "vision_night": 30,
     "fear_triggers": [ "PLAYER_CLOSE", "FIRE", "HURT", "FRIEND_ATTACKED", "SOUND" ],
-    "flags": [ "FISHABLE", "SEES", "SMELLS", "HEARS", "SWIMS", "AQUATIC", "WATER_CAMOUFLAGE" ]
+    "flags": [ "FISHABLE", "SEES", "SMELLS", "HEARS", "SWIMS", "AQUATIC", "WATER_CAMOUFLAGE", "SWARMS" ]
   },
   {
     "id": "mon_leo_tadpole",
@@ -329,6 +329,7 @@
     "type": "MONSTER",
     "copy-from": "mon_leo_tadpole",
     "name": { "str": "tadpole" },
+    "categories": [ "NULL" ],
     "harvest": "mutant_tiny",
     "upgrades": { "age_grow": 22, "into": "mon_pattern_frog" }
   },
@@ -340,7 +341,7 @@
     "description": "Every part of this speckled, green-brown tadpole is thick and broad.  It must be from some larger species of frog.",
     "color": "green",
     "volume": "240 ml",
-    "weight": "40 g",
+    "weight": "120 g",
     "hp": 2,
     "upgrades": { "age_grow": 91, "into": "mon_bullfrog_frog" }
   },
@@ -349,6 +350,7 @@
     "type": "MONSTER",
     "copy-from": "mon_bullfrog_tadpole",
     "name": { "str": "tadpole" },
+    "categories": [ "NULL" ],
     "harvest": "mutant_tiny",
     "upgrades": { "age_grow": 22, "into": "mon_strange_frog" }
   },
@@ -358,13 +360,15 @@
     "copy-from": "mon_proxy_tadpole",
     "name": { "str": "tadpole" },
     "description": "The larval form of some species of frog.  Soon enough it will undergo metamorphosis into its adult form.  This dark, speckled one has a rather large, bulbous body compared to its thin, tapered tail.",
-    "upgrades": { "age_grow": 8, "into": "mon_fowler_toad" }
+    "upgrades": { "age_grow": 8, "into": "mon_fowler_toad" },
+    "extend": { "flags": [ "POISON" ] }
   },
   {
     "id": "mon_foul_tadpole",
     "type": "MONSTER",
     "copy-from": "mon_fowler_tadpole",
     "name": { "str": "tadpole" },
+    "categories": [ "NULL" ],
     "harvest": "mutant_tiny",
     "upgrades": { "age_grow": 8, "into": "mon_foul_toad" }
   },
@@ -374,15 +378,17 @@
     "copy-from": "mon_proxy_tadpole",
     "name": { "str": "tadpole" },
     "description": "The larval form of some species of frog.  Soon enough it will undergo metamorphosis into its adult form.  This dark, speckled one has a rather large, bulbous body compared to its thin, tapered tail.",
-    "upgrades": { "age_grow": 15, "into": "mon_freedom_toad" }
+    "upgrades": { "age_grow": 15, "into": "mon_freedom_toad" },
+    "extend": { "flags": [ "POISON" ] }
   },
   {
     "id": "mon_odd_tadpole",
     "type": "MONSTER",
     "copy-from": "mon_freedom_tadpole",
     "name": { "str": "tadpole" },
+    "categories": [ "NULL" ],
     "volume": "240 ml",
-    "weight": "40 g",
+    "weight": "120 g",
     "hp": 2,
     "harvest": "mutant_tiny",
     "upgrades": { "age_grow": 15, "into": "mon_odd_toad" }
@@ -401,6 +407,7 @@
     "type": "MONSTER",
     "copy-from": "mon_peeper_tadpole",
     "name": { "str": "tadpole" },
+    "categories": [ "NULL" ],
     "harvest": "mutant_tiny",
     "upgrades": { "age_grow": 15, "into": "mon_vocal_frog" }
   },
@@ -418,6 +425,7 @@
     "type": "MONSTER",
     "copy-from": "mon_gray_tadpole",
     "name": { "str": "tadpole" },
+    "categories": [ "NULL" ],
     "harvest": "mutant_tiny",
     "upgrades": { "age_grow": 15, "into": "mon_shift_frog" }
   },
@@ -432,7 +440,7 @@
     "volume": "2 L",
     "weight": "1500 g",
     "hp": 10,
-    "speed": 150,
+    "speed": 120,
     "material": [ "flesh" ],
     "symbol": "J",
     "color": "brown",
@@ -474,7 +482,8 @@
     "copy-from": "mon_proxy_bigtad",
     "description": "This big tadpole has already grown some warty bumps on its softball-sized body.  Its nearly whip-thin tail appears to have no trouble propelling its much larger core.",
     "name": { "str": "giant tadpole" },
-    "upgrades": { "age_grow": 8, "into": "mon_foul_bigfrog" }
+    "upgrades": { "age_grow": 8, "into": "mon_foul_bigfrog" },
+    "extend": { "flags": [ "POISON" ] }
   },
   {
     "id": "mon_odd_bigtad",
@@ -482,7 +491,8 @@
     "copy-from": "mon_proxy_bigtad",
     "description": "Some kind of giant tadpole.  This speckled one has a body the size of a grapefruit and a thin, tapered tail.  It flits about the water in quick bursts.",
     "name": { "str": "giant tadpole" },
-    "upgrades": { "age_grow": 10, "into": "mon_odd_bigfrog" }
+    "upgrades": { "age_grow": 10, "into": "mon_odd_bigfrog" },
+    "extend": { "flags": [ "POISON" ] }
   },
   {
     "abstract": "mon_proxy_frog",
@@ -500,7 +510,7 @@
     "speed": 80,
     "material": [ "flesh" ],
     "symbol": "b",
-    "color": "green",
+    "color": "brown",
     "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
     "dodge": 6,
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_basic_amphibian" ],
@@ -509,8 +519,8 @@
     "harvest": "mammal_tiny",
     "vision_night": 30,
     "special_attacks": [ { "type": "leap", "cooldown": 32, "max_range": 4, "allow_no_target": true } ],
-    "fear_triggers": [ "PLAYER_CLOSE", "FIRE", "HURT", "FRIEND_ATTACKED" ],
-    "flags": [ "FISHABLE", "SEES", "SMELLS", "HEARS", "SWIMS", "WATER_CAMOUFLAGE", "SMALL_HIDER" ]
+    "fear_triggers": [ "PLAYER_CLOSE", "FIRE", "HURT", "FRIEND_ATTACKED", "SOUND" ],
+    "flags": [ "FISHABLE", "SEES", "SMELLS", "HEARS", "SWIMS", "WATER_CAMOUFLAGE", "SMALL_HIDER", "SWARMS" ]
   },
   {
     "id": "mon_leo_frog",
@@ -527,9 +537,9 @@
     "copy-from": "mon_leo_frog",
     "description": "This large frog is covered in chaotic markings like a fractal river map over a background of tv static.  While most lose their gills during metamorphosis, this frog seems to have retained them, or something like them.",
     "name": { "str": "strangely-patterned frog" },
+    "categories": [ "NULL" ],
     "harvest": "mutant_tiny",
     "upgrades": { "age_grow": 15, "into": "mon_pattern_bigfrog" },
-    "reproduction": { "baby_egg": "egg_pattern_frog", "baby_count": 6, "baby_timer": 20 },
     "//": "When possible, add effect for rare flicker of very low luminance."
   },
   {
@@ -541,6 +551,7 @@
     "volume": "1000 ml",
     "weight": "750 g",
     "hp": 4,
+    "color": "green",
     "reproduction": { "baby_egg": "egg_bullfrog_frog", "baby_count": 16, "baby_timer": 26 },
     "baby_flags": [ "SPRING", "SUMMER" ]
   },
@@ -550,12 +561,12 @@
     "copy-from": "mon_bullfrog_frog",
     "description": "Based on its vestigial tail, you would surmise that this bullfrog still has some growing to do.  That is if it weren't already larger than any adult frog.",
     "name": { "str": "strange bullfrog" },
+    "categories": [ "NULL" ],
     "volume": "4 L",
     "weight": "3 kg",
     "hp": 12,
     "harvest": "mutant_tiny",
-    "upgrades": { "age_grow": 15, "into": "mon_strange_bigfrog" },
-    "reproduction": { "baby_egg": "egg_strange_frog", "baby_count": 16, "baby_timer": 26 }
+    "upgrades": { "age_grow": 15, "into": "mon_strange_bigfrog" }
   },
   {
     "id": "mon_fowler_toad",
@@ -564,7 +575,8 @@
     "description": "Fowler's toads secrete a harmful and distasteful compound from their backs.  This helps safeguard them from predators and also gives them a distinctive odor like boiled peanuts.",
     "name": { "str": "fowler's toad" },
     "reproduction": { "baby_egg": "egg_fowler_toad", "baby_count": 8, "baby_timer": 36 },
-    "baby_flags": [ "SPRING", "SUMMER" ]
+    "baby_flags": [ "SPRING", "SUMMER" ],
+    "extend": { "flags": [ "POISON" ] }
   },
   {
     "id": "mon_foul_toad",
@@ -572,10 +584,10 @@
     "copy-from": "mon_fowler_toad",
     "description": "You could almost smell it before you saw it.  This toad reeks.  You're not quite sure what like, but it's hot and musky and it sticks in your nose until you're tasting it.",
     "name": { "str": "foul toad" },
+    "categories": [ "NULL" ],
     "harvest": "mutant_tiny",
     "upgrades": { "age_grow": 15, "into": "mon_foul_bigfrog" },
-    "reproduction": { "baby_egg": "egg_foul_toad", "baby_count": 8, "baby_timer": 36 },
-    "extend": { "flags": [ "NO_BREATHE" ] },
+    "extend": { "flags": [ "POISON", "NO_BREATHE" ] },
     "//": "NO_BREATHE flag is to prevent gassing by other 'foul' toads.  When possible, add effect for aoe morale debuff around toad. Possibly stack up until triggering nausea/vomitting."
   },
   {
@@ -585,7 +597,8 @@
     "description": "American toads can vary greatly in appearance.  Individual toads will shift their coloration and patterning throughout the seasons to better camouflage.",
     "name": { "str": "american toad" },
     "reproduction": { "baby_egg": "egg_freedom_toad", "baby_count": 8, "baby_timer": 36 },
-    "baby_flags": [ "SPRING", "SUMMER" ]
+    "baby_flags": [ "SPRING", "SUMMER" ],
+    "extend": { "flags": [ "POISON" ] }
   },
   {
     "id": "mon_odd_toad",
@@ -593,12 +606,12 @@
     "copy-from": "mon_freedom_toad",
     "description": "Wide as a watermelon and halfway up to your knee, this toad's size is alarming.  So too are its odd proportions.  It's as if it hasn't fully grown.",
     "name": { "str": "odd toad" },
+    "categories": [ "NULL" ],
     "volume": "4 L",
     "weight": "3 kg",
     "hp": 12,
     "harvest": "mutant_tiny",
-    "upgrades": { "age_grow": 15, "into": "mon_odd_bigfrog" },
-    "reproduction": { "baby_egg": "egg_odd_toad", "baby_count": 8, "baby_timer": 36 }
+    "upgrades": { "age_grow": 15, "into": "mon_odd_bigfrog" }
   },
   {
     "id": "mon_peeper_frog",
@@ -609,6 +622,7 @@
     "volume": "20 ml",
     "weight": "4 g",
     "hp": 1,
+    "special_attacks": [ [ "PARROT", 100 ] ],
     "reproduction": { "baby_egg": "egg_peeper_frog", "baby_count": 8, "baby_timer": 20 },
     "baby_flags": [ "SPRING", "SUMMER" ]
   },
@@ -616,11 +630,12 @@
     "id": "mon_vocal_frog",
     "type": "MONSTER",
     "copy-from": "mon_peeper_frog",
-    "description": "Like a powered machine, this frog never seems to stop making noise.  When it calls, its whole torso expands like an inflatable suit.",
+    "description": "A small brown frog with a very big voice.  When it calls, its whole criss-crossed torso expands and trembles like an inflatable suit.  The loud squeeky sound it makes is more charming than troubling.  The frequency can be exhausting.",
     "name": { "str": "vocal treefrog" },
+    "categories": [ "NULL" ],
     "harvest": "mutant_tiny",
-    "reproduction": { "baby_egg": "egg_vocal_frog", "baby_count": 8, "baby_timer": 20 },
-    "//": "When possible, add frequent parroting."
+    "special_attacks": [ [ "PARROT", 30 ] ],
+    "upgrades": { "age_grow": 15, "into_group": "GROUP_FROGS_UPGRADE_VOCAL" }
   },
   {
     "id": "mon_gray_frog",
@@ -631,6 +646,7 @@
     "volume": "150 ml",
     "weight": "10 g",
     "hp": 2,
+    "color": "light_gray",
     "reproduction": { "baby_egg": "egg_gray_frog", "baby_count": 8, "baby_timer": 26 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "extend": { "flags": [ "CAMOUFLAGE" ] }
@@ -641,8 +657,9 @@
     "copy-from": "mon_gray_frog",
     "description": "You've seen it wrinkle its skin into bark and disappear on a tree; settle on a toadstool and take its spots.  It's no trick of the light, this frog's skin shifts not just color but texture.",
     "name": { "str": "shifting treefrog" },
+    "categories": [ "NULL" ],
     "harvest": "mutant_tiny",
-    "reproduction": { "baby_egg": "egg_shift_frog", "baby_count": 8, "baby_timer": 26 }
+    "upgrades": { "age_grow": 15, "into": "mon_shift_bigfrog" }
   },
   {
     "abstract": "mon_proxy_bigfrog",
@@ -658,7 +675,8 @@
     "speed": 100,
     "material": [ "flesh" ],
     "symbol": "m",
-    "color": "light_green",
+    "color": "brown",
+    "aggression": -10,
     "morale": 20,
     "aggro_character": false,
     "melee_skill": 5,
@@ -684,11 +702,11 @@
         "condition": { "not": { "u_has_effect": "maimed_leg" } }
       }
     ],
-    "fear_triggers": [ "FRIEND_DIED", "FIRE" ],
+    "fear_triggers": [ "FRIEND_DIED", "FIRE", "SOUND" ],
     "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE", "MATING_SEASON" ],
     "zombify_into": "mon_zombullfrog",
     "baby_flags": [ "SPRING", "SUMMER" ],
-    "flags": [ "FISHABLE", "SEES", "SMELLS", "HEARS", "SWIMS", "WATER_CAMOUFLAGE" ]
+    "flags": [ "FISHABLE", "SEES", "SMELLS", "HEARS", "SWARMS", "SWIMS", "WATER_CAMOUFLAGE", "CLIMBS" ]
   },
   {
     "id": "mon_strange_bigfrog",
@@ -696,8 +714,11 @@
     "name": { "str": "mutant bullfrog" },
     "description": "A mutant bullfrog larger than most dogs.  It looks unwell, as if this growth spurt was less than comfortable.",
     "copy-from": "mon_proxy_bigfrog",
+    "color": "light_green",
+    "aggression": 0,
     "upgrades": { "age_grow": 30, "into_group": "GROUP_FROGS_UPGRADE_STRANGE" },
-    "reproduction": { "baby_egg": "egg_strange_bigfrog", "baby_count": 12, "baby_timer": 20 }
+    "reproduction": { "baby_egg": "egg_strange_bigfrog", "baby_count": 12, "baby_timer": 20 },
+    "delete": { "flags": [ "SWARMS" ] }
   },
   {
     "id": "mon_odd_bigfrog",
@@ -705,9 +726,11 @@
     "name": { "str": "oversized toad" },
     "description": "This toad seems to have been mutated to absurd size by the Cataclysm.  It's only half your size but that hardly feels comforting.",
     "copy-from": "mon_proxy_bigfrog",
-    "color": "brown",
+    "aggression": 0,
     "upgrades": { "age_grow": 30, "into_group": "GROUP_FROGS_UPGRADE_ODD" },
-    "reproduction": { "baby_egg": "egg_odd_bigfrog", "baby_count": 12, "baby_timer": 20 }
+    "reproduction": { "baby_egg": "egg_odd_bigfrog", "baby_count": 12, "baby_timer": 20 },
+    "extend": { "flags": [ "POISON" ] },
+    "delete": { "flags": [ "SWARMS" ] }
   },
   {
     "id": "mon_pattern_bigfrog",
@@ -721,9 +744,8 @@
     "speed": 80,
     "symbol": "x",
     "color": "light_blue",
-    "aggression": -10,
     "melee_dice_sides": 4,
-    "melee_damage": [ { "damage_type": "electric", "amount": 2 }, { "damage_type": "cut", "amount": 1 } ],
+    "melee_damage": [ { "damage_type": "electric", "amount": 3 }, { "damage_type": "cut", "amount": 1 } ],
     "armor": { "bash": 2, "acid": 2, "heat": 1, "electric": 4 },
     "weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog", "wps_amphibian_electric" ],
     "luminance": 3,
@@ -739,10 +761,9 @@
     "copy-from": "mon_proxy_bigfrog",
     "volume": "30 L",
     "weight": "20 kg",
+    "hp": 40,
     "speed": 70,
     "symbol": "g",
-    "color": "brown",
-    "aggression": -10,
     "melee_dice_sides": 4,
     "armor": { "bash": 2, "acid": 4, "heat": 1 },
     "emit_fields": [ { "emit_id": "emit_tear_gas_toad", "delay": "1 s" } ],
@@ -758,9 +779,74 @@
     ],
     "upgrades": { "age_grow": 30, "into_group": "GROUP_FROGS_UPGRADE_FOUL" },
     "reproduction": { "baby_egg": "egg_foul_bigfrog", "baby_count": 12, "baby_timer": 20 },
-    "extend": { "flags": [ "NO_BREATHE" ] },
+    "extend": { "flags": [ "POISON", "NO_BREATHE" ] },
     "//": "When possible, add an AOE burst & temporary trail of slippery, toxic grease on several hour cooldown.  The toad can expel grease like a squid with ink.  The grease offgasses into something between tear gas and a blister agent, hence the smell.  NO_BREATHE flag is to prevent self-gassing."
   },
+  {
+    "id": "mon_jumbo_bigfrog",
+    "type": "MONSTER",
+    "name": { "str": "jumbo treefrog" },
+    "description": "On, thick over-proportioned legs this large treefrog slings its weight with notable force.  It doesn't seem a danger, but its size is still cause for concern.  Even scrunched up, it is as large as a Thanksgiving turkey.",
+    "copy-from": "mon_proxy_bigfrog",
+    "volume": "20 L",
+    "weight": "14 kg",
+    "hp": 20,
+    "speed": 110,
+    "symbol": "k",
+    "morale": 10,
+    "melee_dice_sides": 2,
+    "dodge": 3,
+    "grab_strength": 1,
+    "special_attacks": [
+      {
+        "type": "leap",
+        "cooldown": 8,
+        "move_cost": 0,
+        "max_range": 12,
+        "min_consider_range": 2,
+        "condition": { "not": { "u_has_effect": "maimed_leg" } }
+      }
+    ],
+    "fear_triggers": [ "HURT", "FRIEND_DIED", "FIRE", "SOUND" ],
+    "anger_triggers": [ "PLAYER_CLOSE", "MATING_SEASON" ],
+    "reproduction": { "baby_egg": "egg_vocal_frog", "baby_count": 12, "baby_timer": 20 },
+    "delete": { "flags": [ "SWARMS" ] },
+    "//": "Give climbing (Z axis) ability when available."
+  },
+  {
+    "id": "mon_vocal_bigfrog",
+    "type": "MONSTER",
+    "name": { "str": "wailing treefrog" },
+    "description": "Now the size of a dog, this tan, speckled tree frog will not stop making noise.  Its increased size has only boosted its volume.  It belts out sound in a relentless series of piercing, grinding chirps.",
+    "copy-from": "mon_jumbo_bigfrog",
+    "special_attacks": [
+      [ "PARROT", 30 ],
+      {
+        "type": "leap",
+        "cooldown": 8,
+        "move_cost": 0,
+        "max_range": 12,
+        "min_consider_range": 2,
+        "condition": { "not": { "u_has_effect": "maimed_leg" } }
+      }
+    ],
+    "//": "Give climbing (Z axis) ability when available."
+  },
+  {
+    "id": "mon_shift_bigfrog",
+    "type": "MONSTER",
+    "name": { "str": "mimic treefrog" },
+    "description": "You've seen enough to gather that this is a frog with some very specialized camouflage.  Its skin appears able to reactively change texture and color to match its surroundings.  Like a morphing ghillie suit it can extend filamints to mimic individual leaves and blades of grass.  It is keen enough to match the swaying of brush in the wind.",
+    "copy-from": "mon_jumbo_bigfrog",
+    "speed": 130,
+    "color": "light_gray",
+    "dodge": 6,
+    "armor": { "bash": 5, "acid": 2, "heat": 5, "electric": 4 },
+    "vision_night": 35,
+    "reproduction": { "baby_egg": "egg_shift_frog", "baby_count": 12, "baby_timer": 20 },
+    "extend": { "flags": [ "CAMOUFLAGE" ] },
+    "//": "Give climbing (Z axis) ability when available."
+  },
   {
     "abstract": "mon_proxy_giganfrog",
     "type": "MONSTER",
@@ -775,7 +861,7 @@
     "speed": 90,
     "material": [ "flesh" ],
     "symbol": "M",
-    "color": "light_green",
+    "color": "brown",
     "aggression": 10,
     "morale": 100,
     "aggro_character": false,
@@ -818,7 +904,7 @@
     "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE", "MATING_SEASON" ],
     "zombify_into": "mon_zombullfrog",
     "baby_flags": [ "SPRING", "SUMMER" ],
-    "flags": [ "FISHABLE", "SEES", "SMELLS", "HEARS", "GRABS", "SWIMS", "WATER_CAMOUFLAGE" ]
+    "flags": [ "FISHABLE", "SEES", "SMELLS", "HEARS", "GRABS", "SWIMS", "WATER_CAMOUFLAGE", "CLIMBS", "BASHES" ]
   },
   {
     "id": "mon_strange_giganfrog",
@@ -826,6 +912,7 @@
     "name": { "str": "giant bullfrog" },
     "description": "A mutated bullfrog taller than you are.  It stares with amber eyes as it considers the easiest way to swallow you whole.",
     "copy-from": "mon_proxy_giganfrog",
+    "color": "light_green",
     "upgrades": { "age_grow": 45, "into_group": "GROUP_FROGS_UPGRADE_STRANGE_MEGA" },
     "reproduction": { "baby_egg": "egg_strange_bigfrog", "baby_count": 18, "baby_timer": 20 }
   },
@@ -835,10 +922,10 @@
     "name": { "str": "giant toad" },
     "description": "This toad has grown bigger than a human.  It looks uninterested in eating you but you better not give it a chance.",
     "copy-from": "mon_proxy_giganfrog",
-    "color": "brown",
     "upgrades": { "age_grow": 45, "into_group": "GROUP_FROGS_UPGRADE_ODD_MEGA" },
     "zombify_into": "mon_gastro_bufo",
-    "reproduction": { "baby_egg": "egg_odd_bigfrog", "baby_count": 18, "baby_timer": 20 }
+    "reproduction": { "baby_egg": "egg_odd_bigfrog", "baby_count": 18, "baby_timer": 20 },
+    "extend": { "flags": [ "POISON" ] }
   },
   {
     "id": "mon_pattern_giganfrog",
@@ -848,15 +935,13 @@
     "copy-from": "mon_proxy_giganfrog",
     "volume": "200 L",
     "weight": "180 kg",
-    "hp": 80,
-    "speed": 70,
+    "hp": 100,
     "symbol": "P",
     "color": "light_blue",
     "aggression": -1,
-    "morale": 40,
+    "morale": 50,
     "melee_skill": 4,
-    "melee_damage": [ { "damage_type": "electric", "amount": 4 }, { "damage_type": "cut", "amount": 1 } ],
-    "dodge": 1,
+    "melee_damage": [ { "damage_type": "electric", "amount": 6 }, { "damage_type": "cut", "amount": 1 } ],
     "armor": { "bash": 6, "cut": 2, "acid": 3, "heat": 3, "electric": 6 },
     "weakpoint_sets": [ "wps_amphibian_body", "wps_amphibian_frog", "wps_amphibian_electric" ],
     "luminance": 2,
@@ -884,9 +969,10 @@
         "condition": { "not": { "u_has_effect": "maimed_leg" } }
       }
     ],
-    "special_when_hit": [ "ZAPBACK", 75 ],
+    "special_when_hit": [ "ZAPBACK", 100 ],
     "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE", "MATING_SEASON", "FRIEND_ATTACKED" ],
-    "reproduction": { "baby_egg": "egg_pattern_frog", "baby_count": 18, "baby_timer": 20 }
+    "reproduction": { "baby_egg": "egg_pattern_frog", "baby_count": 18, "baby_timer": 20 },
+    "extend": { "flags": [ "SWARMS" ] }
   },
   {
     "id": "mon_foul_giganfrog",
@@ -896,7 +982,6 @@
     "copy-from": "mon_proxy_giganfrog",
     "speed": 100,
     "symbol": "G",
-    "color": "brown",
     "melee_dice_sides": 20,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
     "armor": { "bash": 6, "cut": 3, "acid": 5, "heat": 2, "electric": 2 },
@@ -929,7 +1014,7 @@
     "upgrades": { "age_grow": 45, "into_group": "GROUP_FROGS_UPGRADE_FOUL_MEGA" },
     "zombify_into": "mon_gastro_bufo",
     "reproduction": { "baby_egg": "egg_foul_bigfrog", "baby_count": 18, "baby_timer": 20 },
-    "extend": { "flags": [ "NO_BREATHE" ] },
+    "extend": { "flags": [ "POISON", "NO_BREATHE", "SWARMS" ] },
     "//": "When possible, add ability to dig furrows (lines of shallow pits) and wallow.  NO_BREATHE flag is to prevent gassing by younger of its kind."
   },
   {
@@ -947,7 +1032,7 @@
     "speed": 80,
     "material": [ "flesh" ],
     "symbol": "F",
-    "color": "green",
+    "color": "brown",
     "aggression": 5,
     "morale": 100,
     "aggro_character": false,
@@ -989,7 +1074,7 @@
     "anger_triggers": [ "STALK", "PLAYER_WEAK", "PLAYER_CLOSE", "MATING_SEASON" ],
     "zombify_into": "mon_frog_dad",
     "baby_flags": [ "SPRING", "SUMMER" ],
-    "flags": [ "SEES", "SMELLS", "GRABS", "HEARS", "SWIMS" ]
+    "flags": [ "SEES", "SMELLS", "GRABS", "HEARS", "SWIMS", "DESTROYS" ]
   },
   {
     "id": "mon_strange_megafrog",
@@ -997,6 +1082,7 @@
     "name": { "str": "colossal croaker" },
     "description": "Bloated to titanic size, rivaling a moose, this mutated bullfrog takes several seconds just to blink each vacant eye.  In place of the cognition it has lost, the beast has gained an even more voracious appetite and the might to sustain it.",
     "copy-from": "mon_proxy_megafrog",
+    "color": "green",
     "special_attacks": [
       {
         "id": "ranged_pull",
@@ -1029,10 +1115,10 @@
     "name": { "str": "gargantuan toad" },
     "description": "This toad is of truly enormous stature, larger than many cars.  You can't help but wonder if it could fit as many people inside.",
     "copy-from": "mon_proxy_megafrog",
-    "color": "brown",
     "armor": { "bash": 18, "cut": 18, "bullet": 12, "electric": 4 },
     "zombify_into": "mon_gastro_bufo",
     "reproduction": { "baby_egg": "egg_odd_bigfrog", "baby_count": 32, "baby_timer": 20 },
+    "extend": { "flags": [ "POISON" ] },
     "//": "Simple wallowing, likes to create deep pits and lay in them."
   },
   {
@@ -1047,7 +1133,6 @@
     "regenerates": 2,
     "speed": 90,
     "symbol": "B",
-    "color": "brown",
     "aggression": 0,
     "melee_skill": 5,
     "melee_dice": 2,
@@ -1093,7 +1178,7 @@
     "anger_triggers": [ "PLAYER_WEAK", "PLAYER_CLOSE", "MATING_SEASON", "FRIEND_ATTACKED" ],
     "zombify_into": "mon_gastro_bufo",
     "reproduction": { "baby_egg": "egg_foul_bigfrog", "baby_count": 32, "baby_timer": 20 },
-    "extend": { "flags": [ "NO_BREATHE" ] },
+    "extend": { "flags": [ "POISON", "NO_BREATHE" ] },
     "//": "When possible, add ability to dig furrows (lines of shallow pits) and wallow.  NO_BREATHE flag is to prevent gassing by younger of its kind."
   }
 ]
diff --git a/data/mods/Tamable_Wildlife/reptile_amphibian.json b/data/mods/Tamable_Wildlife/reptile_amphibian.json
index 5ed97e034c9fe..59e6fd001f6b4 100644
--- a/data/mods/Tamable_Wildlife/reptile_amphibian.json
+++ b/data/mods/Tamable_Wildlife/reptile_amphibian.json
@@ -76,6 +76,27 @@
     "name": { "str": "gargantuan toad" },
     "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] }
   },
+  {
+    "id": "mon_vocal_bigfrog",
+    "type": "MONSTER",
+    "copy-from": "mon_vocal_bigfrog",
+    "name": { "str": "wailing treefrog" },
+    "extend": { "flags": [ "CANPLAY" ] }
+  },
+  {
+    "id": "mon_jumbo_bigfrog",
+    "type": "MONSTER",
+    "copy-from": "mon_jumbo_bigfrog",
+    "name": { "str": "jumbo treefrog" },
+    "extend": { "flags": [ "CANPLAY" ] }
+  },
+  {
+    "id": "mon_shift_bigfrog",
+    "type": "MONSTER",
+    "copy-from": "mon_shift_bigfrog",
+    "name": { "str": "mimic treefrog" },
+    "extend": { "flags": [ "CANPLAY" ] }
+  },
   {
     "id": "mon_leo_frog",
     "type": "MONSTER",

From a3a6b4d88fc547d19692f885a1de98950b8e471c Mon Sep 17 00:00:00 2001
From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com>
Date: Sat, 30 Dec 2023 23:24:01 -0500
Subject: [PATCH 2/6] Update speech.json

Keeping speech.json to its own commit.
Less crowded this time.
---
 data/json/speech.json | 44 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/data/json/speech.json b/data/json/speech.json
index 69412d093573b..063e3bacbf929 100644
--- a/data/json/speech.json
+++ b/data/json/speech.json
@@ -2824,8 +2824,50 @@
   },
   {
     "type": "speech",
-    "speaker": [ "mon_star_vampire" ],
+    "speaker": [ "mon_star_vampire", "mon_vocal_frog", "mon_vocal_bigfrog" ],
     "sound": "a high-pitched tittering.",
     "volume": 20
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_peeper_frog", "mon_vocal_frog", "mon_vocal_bigfrog" ],
+    "sound": "a series of rising peeps.",
+    "volume": 20
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_peeper_frog", "mon_vocal_frog", "mon_vocal_bigfrog" ],
+    "sound": "a steady patter of light, whistling chirps.",
+    "volume": 20
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_vocal_frog" ],
+    "sound": "a long, soft squeek.",
+    "volume": 20
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_vocal_bigfrog" ],
+    "sound": "a loud and guttural wailing.",
+    "volume": 40
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_vocal_bigfrog" ],
+    "sound": "a deep glottal shout.",
+    "volume": 40
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_vocal_bigfrog" ],
+    "sound": "a quick, rising yell.",
+    "volume": 50
+  },
+  {
+    "type": "speech",
+    "speaker": [ "mon_vocal_bigfrog" ],
+    "sound": "a reverberating, open-throated scream.",
+    "volume": 70
   }
 ]

From 39d0504950bd00d1423de11e107dcf0c44dd77f7 Mon Sep 17 00:00:00 2001
From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com>
Date: Sun, 31 Dec 2023 17:29:44 -0500
Subject: [PATCH 3/6] Spelling fixes

Correct typos and add terms to dictionary
---
 data/json/monsters/reptile_amphibian.json | 4 ++--
 data/json/speech.json                     | 2 +-
 tools/spell_checker/dictionary.txt        | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json
index 959ccc96487e6..82769e590f2ba 100644
--- a/data/json/monsters/reptile_amphibian.json
+++ b/data/json/monsters/reptile_amphibian.json
@@ -630,7 +630,7 @@
     "id": "mon_vocal_frog",
     "type": "MONSTER",
     "copy-from": "mon_peeper_frog",
-    "description": "A small brown frog with a very big voice.  When it calls, its whole criss-crossed torso expands and trembles like an inflatable suit.  The loud squeeky sound it makes is more charming than troubling.  The frequency can be exhausting.",
+    "description": "A small brown frog with a very big voice.  When it calls, its whole criss-crossed torso expands and trembles like an inflatable suit.  The loud squeaky sound it makes is more charming than troubling.  The frequency can be exhausting.",
     "name": { "str": "vocal treefrog" },
     "categories": [ "NULL" ],
     "harvest": "mutant_tiny",
@@ -836,7 +836,7 @@
     "id": "mon_shift_bigfrog",
     "type": "MONSTER",
     "name": { "str": "mimic treefrog" },
-    "description": "You've seen enough to gather that this is a frog with some very specialized camouflage.  Its skin appears able to reactively change texture and color to match its surroundings.  Like a morphing ghillie suit it can extend filamints to mimic individual leaves and blades of grass.  It is keen enough to match the swaying of brush in the wind.",
+    "description": "You've seen enough to gather that this is a frog with some very specialized camouflage.  Its skin appears able to reactively change texture and color to match its surroundings.  Like a morphing ghillie suit it can extend filaments to mimic individual leaves and blades of grass.  It is keen enough to match the swaying of brush in the wind.",
     "copy-from": "mon_jumbo_bigfrog",
     "speed": 130,
     "color": "light_gray",
diff --git a/data/json/speech.json b/data/json/speech.json
index 063e3bacbf929..775d3a7e3c017 100644
--- a/data/json/speech.json
+++ b/data/json/speech.json
@@ -2843,7 +2843,7 @@
   {
     "type": "speech",
     "speaker": [ "mon_vocal_frog" ],
-    "sound": "a long, soft squeek.",
+    "sound": "a long, soft squeak.",
     "volume": 20
   },
   {
diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt
index d72f9d6412be6..8495599eab265 100644
--- a/tools/spell_checker/dictionary.txt
+++ b/tools/spell_checker/dictionary.txt
@@ -1241,6 +1241,7 @@ geometries
 gesticulates
 getups
 ghast
+ghillie
 gibbous
 giganotosaurus
 github
@@ -3124,6 +3125,8 @@ travelpack
 traversal
 travois
 treatin
+treefrog
+treefrogs
 treelines
 trenchcoat
 trenchcoats

From 6de4ae7b9e46b40594c154befafea61dd9a1f4b6 Mon Sep 17 00:00:00 2001
From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com>
Date: Sun, 31 Dec 2023 17:50:25 -0500
Subject: [PATCH 4/6] Update dictionary.txt

One more dictionary entry
---
 tools/spell_checker/dictionary.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt
index 8495599eab265..aacd9b6ab3085 100644
--- a/tools/spell_checker/dictionary.txt
+++ b/tools/spell_checker/dictionary.txt
@@ -2487,6 +2487,7 @@ razorsharp
 razzin
 rd
 reachability
+reactively
 reactivity
 readme
 reagents

From 1db2bcb09d9ecb114b4cd1367006cbc6894da053 Mon Sep 17 00:00:00 2001
From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com>
Date: Sun, 31 Dec 2023 22:57:53 -0500
Subject: [PATCH 5/6] Update speech.json

Add more generic sounds for wailing treefrogs
---
 data/json/speech.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/json/speech.json b/data/json/speech.json
index 775d3a7e3c017..b48f3d51798aa 100644
--- a/data/json/speech.json
+++ b/data/json/speech.json
@@ -1705,19 +1705,19 @@
   },
   {
     "type": "speech",
-    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon" ],
+    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon", "mon_vocal_bigfrog" ],
     "sound": "a gurgling sound.",
     "volume": 10
   },
   {
     "type": "speech",
-    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon" ],
+    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon", "mon_vocal_bigfrog" ],
     "sound": "a choking sound.",
     "volume": 10
   },
   {
     "type": "speech",
-    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon" ],
+    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon", "mon_vocal_bigfrog" ],
     "sound": "a slurping sound.",
     "volume": 20
   },

From 4ffa14b609aeed234802f58add21fb2a081e0484 Mon Sep 17 00:00:00 2001
From: TheSaddestGoomba <44676850+TheSaddestGoomba@users.noreply.github.com>
Date: Sun, 31 Dec 2023 23:07:20 -0500
Subject: [PATCH 6/6] Update speech.json

Adjusting overcrowded speech entries
---
 data/json/speech.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/json/speech.json b/data/json/speech.json
index b48f3d51798aa..62830fddc94cf 100644
--- a/data/json/speech.json
+++ b/data/json/speech.json
@@ -1345,13 +1345,13 @@
   },
   {
     "type": "speech",
-    "speaker": [ "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_myrmidon" ],
+    "speaker": [ "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_myrmidon", "mon_vocal_bigfrog" ],
     "sound": "a gurgling sound.",
     "volume": 10
   },
   {
     "type": "speech",
-    "speaker": [ "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_myrmidon" ],
+    "speaker": [ "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_myrmidon", "mon_vocal_bigfrog" ],
     "sound": "a choking sound.",
     "volume": 10
   },
@@ -1705,19 +1705,19 @@
   },
   {
     "type": "speech",
-    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon", "mon_vocal_bigfrog" ],
+    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon" ],
     "sound": "a gurgling sound.",
     "volume": 10
   },
   {
     "type": "speech",
-    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon", "mon_vocal_bigfrog" ],
+    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon" ],
     "sound": "a choking sound.",
     "volume": 10
   },
   {
     "type": "speech",
-    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon", "mon_vocal_bigfrog" ],
+    "speaker": [ "mon_shoggoth", "mon_mi_go", "mon_mi_go_slaver", "mon_mi_go_surgeon", "mon_mi_go_guard", "mon_mi_go_myrmidon" ],
     "sound": "a slurping sound.",
     "volume": 20
   },