Heighten the bar for monsters to be considered LARGE (#71803)

* Update monstergenerator.cpp * Update monstergenerator.cpp * fix the test * the great size audit * Update creature.h
CleverRaven · Feb 24, 2024 · 67c658e · 67c658e
1 parent d2785ca
commit 67c658e
Show file tree

Hide file tree

Showing 29 changed files with 79 additions and 79 deletions.
diff --git a/data/json/monsters/defense_bot.json b/data/json/monsters/defense_bot.json
@@ -161,7 +161,7 @@
     "default_faction": "defense_bot",
     "species": [ "ROBOT" ],
     "diff": 2,
-    "volume": "105 L",
+    "volume": "108500 ml",
     "weight": "32700 g",
     "hp": 40,
     "speed": 130,
@@ -274,7 +274,7 @@
     "default_faction": "defense_bot",
     "species": [ "ROBOT" ],
     "diff": 20,
-    "volume": "95 L",
+    "volume": "108500 ml",
     "weight": "250 kg",
     "hp": 100,
     "speed": 100,
@@ -318,7 +318,7 @@
     "default_faction": "defense_bot",
     "species": [ "ROBOT" ],
     "diff": 30,
-    "volume": "95 L",
+    "volume": "108500 ml",
     "weight": "300 kg",
     "hp": 100,
     "speed": 100,

diff --git a/data/json/monsters/fish.json b/data/json/monsters/fish.json
@@ -8,7 +8,7 @@
     "bodytype": "crab",
     "species": [ "MUTANT" ],
     "diff": 2,
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 120,
     "speed": 95,

diff --git a/data/json/monsters/fungus.json b/data/json/monsters/fungus.json
@@ -7,7 +7,7 @@
     "default_faction": "fungus",
     "species": [ "FUNGUS" ],
     "diff": 20,
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 30,
     "speed": 100,

diff --git a/data/json/monsters/fungus_zombie.json b/data/json/monsters/fungus_zombie.json
@@ -43,8 +43,8 @@
     "bodytype": "human",
     "species": [ "FUNGUS" ],
     "diff": 5,
-    "volume": "62500 ml",
-    "weight": "81500 g",
+    "volume": "108500 ml",
+    "weight": "120 kg",
     "hp": 10,
     "speed": 50,
     "material": [ "flesh" ],
@@ -231,7 +231,7 @@
     "bodytype": "human",
     "species": [ "FUNGUS" ],
     "diff": 5,
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 30,
     "speed": 40,
@@ -667,8 +667,8 @@
     "default_faction": "fungus",
     "bodytype": "horse",
     "species": [ "FUNGUS" ],
-    "volume": "92500 ml",
-    "weight": "120 kg",
+    "volume": "386 L",
+    "weight": "386 kg",
     "hp": 170,
     "speed": 120,
     "attack_cost": 140,
@@ -785,7 +785,7 @@
     "default_faction": "fungus",
     "bodytype": "horse",
     "species": [ "FUNGUS" ],
-    "volume": "87 L",
+    "volume": "108500 ml",
     "weight": "87 kg",
     "hp": 100,
     "speed": 160,
@@ -818,8 +818,8 @@
     "default_faction": "fungus",
     "bodytype": "horse",
     "species": [ "FUNGUS" ],
-    "volume": "79 L",
-    "weight": "85 kg",
+    "volume": "889 L",
+    "weight": "240 kg",
     "hp": 160,
     "speed": 165,
     "attack_cost": 200,

diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json
@@ -36,7 +36,7 @@
     "default_faction": "dark_wyrm",
     "bodytype": "snake",
     "species": [ "MUTANT" ],
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 120,
     "speed": 100,
@@ -132,7 +132,7 @@
     "default_faction": "worm",
     "bodytype": "snake",
     "species": [ "WORM" ],
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 50,
     "speed": 80,
@@ -494,7 +494,7 @@
     "bodytype": "insect",
     "material": [ "iflesh" ],
     "species": [ "CENTIPEDE" ],
-    "volume": "80 L",
+    "volume": "108500 ml",
     "weight": "110 kg",
     "hp": 110,
     "speed": 110,
@@ -1087,7 +1087,7 @@
     "bodytype": "spider",
     "species": [ "SPIDER" ],
     "diff": 2,
-    "volume": "80 L",
+    "volume": "108500 ml",
     "weight": "40750 g",
     "hp": 60,
     "speed": 100,
@@ -1790,7 +1790,7 @@
     "bodytype": "blob",
     "material": [ "iflesh" ],
     "species": [ "INSECT" ],
-    "volume": "85 L",
+    "volume": "108500 ml",
     "weight": "90 kg",
     "hp": 100,
     "weakpoint_sets": [ "wps_arthropod" ],
@@ -3264,7 +3264,7 @@
     "default_faction": "antlion_grub",
     "bodytype": "insect",
     "species": [ "INSECT" ],
-    "volume": "80 L",
+    "volume": "108500 ml",
     "weight": "106 kg",
     "hp": 60,
     "speed": 100,
@@ -3688,7 +3688,7 @@
     "default_faction": "insect",
     "bodytype": "insect",
     "species": [ "INSECT" ],
-    "volume": "80 L",
+    "volume": "108500 ml",
     "weight": "80 kg",
     "hp": 100,
     "speed": 80,

diff --git a/data/json/monsters/jabberwock.json b/data/json/monsters/jabberwock.json
@@ -6,7 +6,7 @@
     "description": "An amalgamation of throbbing organs from various creatures have fused together into this lurching, vaguely-humanoid shape.  Its myriad roughly-formed mouths susurrate in a chorus of sibilant groans and whispers.",
     "default_faction": "jabberwock",
     "species": [ "ABERRATION" ],
-    "volume": "80000 ml",
+    "volume": "108500 ml",
     "weight": "90 kg",
     "hp": 100,
     "speed": 50,

diff --git a/data/json/monsters/kraken_spawn.json b/data/json/monsters/kraken_spawn.json
@@ -8,7 +8,7 @@
     "bodytype": "human",
     "categories": [ "WILDLIFE" ],
     "species": [ "KRAKEN" ],
-    "volume": "90 L",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 100,
     "speed": 70,

diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
@@ -295,7 +295,7 @@
     "bodytype": "pig",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
-    "volume": "100 L",
+    "volume": "108500 ml",
     "weight": "100 kg",
     "hp": 60,
     "speed": 110,
@@ -966,7 +966,7 @@
     "bodytype": "horse",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
-    "volume": "87000 ml",
+    "volume": "108500 ml",
     "weight": "87 kg",
     "hp": 60,
     "speed": 300,
@@ -2435,7 +2435,7 @@
     "bodytype": "horse",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
-    "volume": "386000 ml",
+    "volume": "386 L",
     "weight": "386 kg",
     "hp": 120,
     "speed": 200,
@@ -3213,7 +3213,7 @@
     "bodytype": "horse",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
-    "volume": "889000 ml",
+    "volume": "889 L",
     "weight": "240 kg",
     "hp": 120,
     "speed": 325,

diff --git a/data/json/monsters/mi-go.json b/data/json/monsters/mi-go.json
@@ -7,7 +7,7 @@
     "default_faction": "mi-go",
     "bodytype": "migo",
     "species": [ "MIGO" ],
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 210,
     "speed": 120,
@@ -59,7 +59,7 @@
     "bodytype": "migo",
     "species": [ "MIGO" ],
     "looks_like": "mon_mi_go",
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 240,
     "speed": 120,
@@ -117,7 +117,7 @@
     "bodytype": "migo",
     "species": [ "MIGO" ],
     "looks_like": "mon_mi_go",
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "110 kg",
     "hp": 160,
     "speed": 120,
@@ -169,7 +169,7 @@
     "bodytype": "migo",
     "species": [ "MIGO" ],
     "looks_like": "mon_mi_go",
-    "volume": "98500 ml",
+    "volume": "108500 ml",
     "weight": "190 kg",
     "hp": 350,
     "speed": 110,
@@ -329,7 +329,7 @@
     "bodytype": "migo",
     "species": [ "MIGO" ],
     "looks_like": "mon_mi_go",
-    "volume": "80500 ml",
+    "volume": "108500 ml",
     "weight": "90 kg",
     "hp": 200,
     "speed": 120,

diff --git a/data/json/monsters/misc.json b/data/json/monsters/misc.json
@@ -220,7 +220,7 @@
     "description": "Your precious generator, noisily humming away.  Defend it at all costs!",
     "default_faction": "player",
     "species": [ "UNKNOWN" ],
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 500,
     "speed": 100,

diff --git a/data/json/monsters/mollusk.json b/data/json/monsters/mollusk.json
@@ -235,7 +235,7 @@
     "bodytype": "snake",
     "species": [ "MUTANT" ],
     "diff": 2,
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 300,
     "speed": 60,

diff --git a/data/json/monsters/mutant_mammal.json b/data/json/monsters/mutant_mammal.json
@@ -270,7 +270,7 @@
     "bodytype": "horse",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
-    "volume": "90000 ml",
+    "volume": "108500 ml",
     "weight": "90000 g",
     "hp": 70,
     "speed": 450,

diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json
@@ -8,7 +8,7 @@
     "bodytype": "bear",
     "categories": [ "WILDLIFE" ],
     "species": [ "NETHER" ],
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 200,
     "speed": 50,
@@ -42,7 +42,7 @@
     "bodytype": "human",
     "species": [ "HORROR" ],
     "diff": 5,
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 250,
     "speed": 70,
@@ -975,7 +975,7 @@
     "default_faction": "mutant_with_vortex",
     "species": [ "ABERRATION" ],
     "diff": 5,
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 80,
     "speed": 50,
@@ -1188,7 +1188,7 @@
     "bodytype": "blob",
     "species": [ "NETHER" ],
     "diff": 2,
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 160,
     "speed": 140,
@@ -1932,7 +1932,7 @@
     "default_faction": "nether",
     "bodytype": "blob",
     "species": [ "NETHER" ],
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "250 kg",
     "hp": 300,
     "speed": 200,

diff --git a/data/json/monsters/power_leech.json b/data/json/monsters/power_leech.json
@@ -6,7 +6,7 @@
     "description": "A resplendent alien fern, crowned with flowers colored deep indigo.  It appears to be the centerpiece of this otherworldly bloom.",
     "default_faction": "leech_plant",
     "species": [ "LEECH_PLANT" ],
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "40 kg",
     "hp": 100,
     "speed": 100,

diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json
@@ -8,7 +8,7 @@
     "bodytype": "gator",
     "categories": [ "WILDLIFE" ],
     "species": [ "REPTILE" ],
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 90,
     "speed": 90,

diff --git a/data/json/monsters/slimes.json b/data/json/monsters/slimes.json
@@ -81,7 +81,7 @@
     "bodytype": "blob",
     "species": [ "SLIME" ],
     "diff": 1,
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 160,
     "speed": 90,
@@ -148,7 +148,7 @@
     "default_faction": "slime",
     "species": [ "SLIME" ],
     "diff": 2,
-    "volume": "92500 ml",
+    "volume": "108500 ml",
     "weight": "120 kg",
     "hp": 200,
     "speed": 40,