Replace weight ints with strings

CleverRaven · Dec 22, 2019 · 6e39761 · 6e39761
1 parent 29f4edc
commit 6e39761
Show file tree

Hide file tree

Showing 11 changed files with 283 additions and 283 deletions.
diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
diff --git a/data/json/monsters/monsters.json b/data/json/monsters/monsters.json
diff --git a/data/json/monsters/obsolete.json b/data/json/monsters/obsolete.json
@@ -7,7 +7,7 @@
     "default_faction": "vermin",
     "species": [ "INSECT" ],
     "volume": "62500 ml",
-    "weight": 81500,
+    "weight": "81500 g",
     "hp": 1,
     "speed": 90,
     "material": [ "iflesh" ],
@@ -29,7 +29,7 @@
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 4,
     "speed": 100,
     "material": [ "flesh" ],
@@ -53,7 +53,7 @@
     "default_faction": "vermin",
     "species": [ "INSECT" ],
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 1,
     "speed": 180,
     "material": [ "iflesh" ],
@@ -77,7 +77,7 @@
     "default_faction": "vermin",
     "species": [ "AMPHIBIAN" ],
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 3,
     "speed": 80,
     "material": [ "flesh" ],
@@ -99,7 +99,7 @@
     "default_faction": "vermin",
     "species": [ "INSECT" ],
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 1,
     "speed": 120,
     "material": [ "iflesh" ],
@@ -120,7 +120,7 @@
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 4,
     "speed": 70,
     "material": [ "flesh" ],
@@ -143,7 +143,7 @@
     "default_faction": "vermin",
     "species": [ "MOLLUSK" ],
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 1,
     "speed": 90,
     "material": [ "flesh" ],
@@ -164,7 +164,7 @@
     "default_faction": "vermin",
     "species": [ "SPIDER" ],
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 1,
     "speed": 20,
     "material": [ "iflesh" ],
@@ -185,7 +185,7 @@
     "default_faction": "vermin",
     "species": [ "SPIDER" ],
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 1,
     "speed": 20,
     "material": [ "iflesh" ],
@@ -205,7 +205,7 @@
     "default_faction": "vermin",
     "species": [ "SPIDER" ],
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 1,
     "speed": 30,
     "material": [ "iflesh" ],
@@ -225,7 +225,7 @@
     "default_faction": "vermin",
     "species": [ "SPIDER" ],
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 1,
     "speed": 120,
     "material": [ "iflesh" ],
@@ -245,7 +245,7 @@
     "default_faction": "vermin",
     "species": [ "INSECT" ],
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 1,
     "speed": 150,
     "material": [ "iflesh" ],

diff --git a/data/json/monsters/reptile_amphibian.json b/data/json/monsters/reptile_amphibian.json
@@ -8,7 +8,7 @@
     "bodytype": "frog",
     "species": [ "AMPHIBIAN" ],
     "volume": "92500 ml",
-    "weight": 120000,
+    "weight": "120 kg",
     "hp": 70,
     "speed": 90,
     "material": [ "flesh" ],
@@ -39,7 +39,7 @@
     "categories": [ "WILDLIFE" ],
     "species": [ "REPTILE" ],
     "volume": "92500 ml",
-    "weight": 120000,
+    "weight": "120 kg",
     "hp": 90,
     "speed": 90,
     "material": [ "flesh" ],
@@ -88,7 +88,7 @@
     "species": [ "REPTILE" ],
     "diff": 2,
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 12,
     "speed": 90,
     "material": [ "flesh" ],
@@ -122,7 +122,7 @@
     "species": [ "REPTILE" ],
     "diff": 2,
     "volume": "62500 ml",
-    "weight": 81500,
+    "weight": "81500 g",
     "hp": 48,
     "speed": 100,
     "material": [ "flesh" ],
@@ -165,7 +165,7 @@
     "species": [ "REPTILE" ],
     "diff": 2,
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 10,
     "speed": 90,
     "material": [ "flesh" ],

diff --git a/data/json/monsters/triffid.json b/data/json/monsters/triffid.json
@@ -6,7 +6,7 @@
     "name": "biollante sprig",
     "description": "A short fat stalk with broad leaves and tiny flower buds.",
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 20,
     "special_attacks": [ [ "SPIT_SAP", 10 ] ],
     "upgrades": { "age_grow": 14, "into": "mon_biollante_sprout" },
@@ -19,7 +19,7 @@
     "name": "biollante sprout",
     "description": "A thick stalk that rises five feet from the ground and has heavy broad leaves at its base.  Purple flower buds adorn the top.",
     "volume": "62500 ml",
-    "weight": 81500,
+    "weight": "81500 g",
     "hp": 60,
     "special_attacks": [ [ "SPIT_SAP", 6 ] ],
     "upgrades": { "age_grow": 14, "into": "mon_biollante" },
@@ -34,7 +34,7 @@
     "species": [ "PLANT" ],
     "diff": 2,
     "volume": "92500 ml",
-    "weight": 120000,
+    "weight": "120 kg",
     "hp": 120,
     "speed": 100,
     "material": [ "veggy" ],
@@ -57,7 +57,7 @@
     "default_faction": "triffid",
     "species": [ "PLANT" ],
     "volume": "62500 ml",
-    "weight": 81500,
+    "weight": "81500 g",
     "hp": 100,
     "speed": 100,
     "material": [ "veggy" ],
@@ -80,7 +80,7 @@
     "default_faction": "triffid",
     "species": [ "PLANT" ],
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 2,
     "speed": 75,
     "material": [ "veggy" ],
@@ -103,7 +103,7 @@
     "default_faction": "triffid",
     "species": [ "PLANT" ],
     "volume": "750 ml",
-    "weight": 1000,
+    "weight": "1 kg",
     "hp": 3,
     "speed": 50,
     "material": [ "veggy" ],
@@ -128,7 +128,7 @@
     "default_faction": "triffid",
     "species": [ "PLANT" ],
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 40,
     "speed": 50,
     "material": [ "veggy" ],
@@ -153,7 +153,7 @@
     "default_faction": "triffid",
     "species": [ "PLANT" ],
     "volume": "62500 ml",
-    "weight": 81500,
+    "weight": "81500 g",
     "hp": 80,
     "speed": 50,
     "material": [ "veggy" ],
@@ -179,7 +179,7 @@
     "default_faction": "triffid",
     "species": [ "PLANT" ],
     "volume": "92500 ml",
-    "weight": 120000,
+    "weight": "120 kg",
     "hp": 280,
     "speed": 85,
     "material": [ "veggy" ],
@@ -206,7 +206,7 @@
     "default_faction": "triffid",
     "species": [ "PLANT" ],
     "volume": "92500 ml",
-    "weight": 120000,
+    "weight": "120 kg",
     "hp": 100,
     "speed": 100,
     "material": [ "veggy" ],
@@ -232,7 +232,7 @@
     "default_faction": "triffid",
     "species": [ "PLANT" ],
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 60,
     "speed": 50,
     "material": [ "veggy" ],
@@ -266,7 +266,7 @@
     "species": [ "PLANT" ],
     "diff": 50,
     "volume": "875000 ml",
-    "weight": 200000,
+    "weight": "200 kg",
     "hp": 500,
     "speed": 100,
     "material": [ "veggy" ],

diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json
@@ -8,7 +8,7 @@
     "species": [ "ROBOT" ],
     "diff": 20,
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 30,
     "speed": 100,
     "material": [ "steel" ],
@@ -55,7 +55,7 @@
     "species": [ "ROBOT" ],
     "diff": 20,
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 30,
     "speed": 100,
     "material": [ "steel" ],
@@ -91,7 +91,7 @@
     "species": [ "ROBOT" ],
     "diff": 40,
     "volume": "62500 ml",
-    "weight": 172000,
+    "weight": "172 kg",
     "hp": 40,
     "speed": 100,
     "material": [ "steel" ],
@@ -139,7 +139,7 @@
     "species": [ "ROBOT" ],
     "diff": 30,
     "volume": "60000 ml",
-    "weight": 172000,
+    "weight": "172 kg",
     "hp": 40,
     "speed": 100,
     "material": [ "steel" ],
@@ -187,7 +187,7 @@
     "species": [ "ROBOT" ],
     "diff": 35,
     "volume": "60000 ml",
-    "weight": 172000,
+    "weight": "172 kg",
     "hp": 40,
     "speed": 100,
     "material": [ "steel" ],

diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json
@@ -8,7 +8,7 @@
     "bodytype": "human",
     "species": [ "ZOMBIE" ],
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 35,
     "speed": 105,
     "material": [ "flesh" ],
@@ -41,7 +41,7 @@
     "categories": [ "CLASSIC" ],
     "species": [ "ZOMBIE" ],
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 40,
     "speed": 65,
     "material": [ "flesh" ],
@@ -91,7 +91,7 @@
     "species": [ "ZOMBIE" ],
     "diff": 2,
     "volume": "62500 ml",
-    "weight": 81500,
+    "weight": "81500 g",
     "hp": 35,
     "speed": 90,
     "material": [ "flesh" ],
@@ -136,7 +136,7 @@
     "bodytype": "human",
     "species": [ "ZOMBIE" ],
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 25,
     "speed": 55,
     "material": [ "flesh" ],
@@ -182,7 +182,7 @@
     "species": [ "ZOMBIE" ],
     "diff": 2,
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 20,
     "speed": 95,
     "material": [ "flesh" ],
@@ -227,7 +227,7 @@
     "bodytype": "human",
     "species": [ "ZOMBIE" ],
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 25,
     "speed": 65,
     "material": [ "flesh" ],
@@ -260,7 +260,7 @@
     "bodytype": "human",
     "species": [ "ZOMBIE" ],
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 30,
     "speed": 85,
     "material": [ "flesh" ],
@@ -306,7 +306,7 @@
     "species": [ "ZOMBIE" ],
     "diff": 2,
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 15,
     "speed": 65,
     "material": [ "bone" ],
@@ -353,7 +353,7 @@
     "species": [ "FUNGUS" ],
     "diff": 2,
     "volume": "30000 ml",
-    "weight": 40750,
+    "weight": "40750 g",
     "hp": 35,
     "speed": 50,
     "material": [ "flesh" ],