Merge pull request CleverRaven#33144 from ampersand55/json_fixes

correct misspelt json keys
haukeschuemann · Aug 11, 2019 · cdbd895 · cdbd895
2 parents 4321998 + 3eefc28
commit cdbd895
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json
@@ -121,7 +121,7 @@
     "volume": 10,
     "weight": 250,
     "color": "black",
-    "looks-like": "feces_manure",
+    "looks_like": "feces_manure",
     "description": "Eugh.  This is a mess of dirt, excreta, connective tissue, and bits of matter like hair and claws, leftover from the butchering process.  Eating it isn't even worth thinking about, but disposing of it might be a concern as it could attract vermin.",
     "material": [ "flesh" ],
     "spoils_in": "8 hours",

diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json
@@ -138,7 +138,7 @@
     "name": "boring sandwich",
     "name_plural": "boring sandwiches",
     "copy-from": "bread",
-    "proprtional": { "weight": 2, "calories": 2, "volume": 2 },
+    "proportional": { "weight": 2, "calories": 2, "volume": 2 },
     "color": "brown",
     "spoils_in": "1 day 22 hours",
     "container": "wrapper",

diff --git a/data/json/items/generic/dining_kitchen.json b/data/json/items/generic/dining_kitchen.json
@@ -710,7 +710,7 @@
     "copy-from": "base_cookpot",
     "material": "iron",
     "color": "dark_gray",
-    "proportional": { "to-hit": 2 },
+    "proportional": { "to_hit": 2 },
     "weight": 2628,
     "volume": 4,
     "bashing": 12,
@@ -727,7 +727,7 @@
     "copy-from": "base_cookpot",
     "material": "steel",
     "color": "light_gray",
-    "proportional": { "to-hit": 2 },
+    "proportional": { "to_hit": 2 },
     "weight": 528,
     "volume": 4,
     "bashing": 8,
@@ -744,7 +744,7 @@
     "copy-from": "base_cookpot",
     "material": "copper",
     "color": "light_red",
-    "proportional": { "to-hit": 2 },
+    "proportional": { "to_hit": 2 },
     "weight": 628,
     "volume": 4,
     "bashing": 7,

diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json
@@ -915,7 +915,7 @@
     "type": "TOOL",
     "name": "kirpan",
     "description": "A ceremonial dagger carried by Sikh men.  This one is sharp and could be an effective weapon.",
-    "looks-like": "kukri",
+    "looks_like": "kukri",
     "weight": 374,
     "volume": 2,
     "price": 1800,
@@ -934,7 +934,7 @@
     "type": "TOOL",
     "name": "kirpan",
     "description": "A ceremonial dagger carried by Sikh men.  This one is not particularly well made.",
-    "looks-like": "kirpan",
+    "looks_like": "kirpan",
     "weight": 374,
     "volume": 2,
     "price": 900,

diff --git a/data/json/items/tools.json b/data/json/items/tools.json
@@ -7550,7 +7550,7 @@
     "weight": 8000,
     "volume": "3 L",
     "price": "3200",
-    "to-hit": -4,
+    "to_hit": -4,
     "bashing": 12,
     "material": "steel"
   }

diff --git a/data/json/monsters/defense_bot.json b/data/json/monsters/defense_bot.json
@@ -90,7 +90,7 @@
     "name": "experimental lab bot",
     "description": "This robot looks like a large metal spider, a bit bigger than a person, with its thorax covered in tiny holes.  An ominous buzzing emanates from it.",
     "default_faction": "defense_bot",
-    "looks-like": "mon_skitterbot",
+    "looks_like": "mon_skitterbot",
     "species": [ "ROBOT" ],
     "volume": "65000 ml",
     "weight": 100000,

diff --git a/data/mods/Magiclysm/terrain.json b/data/mods/Magiclysm/terrain.json
@@ -58,7 +58,7 @@
     "color": "brown",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "DIGGABLE", "FLAT" ],
-    "looks-like": "t_dirt",
+    "looks_like": "t_dirt",
     "bash": { "sound": "thump", "ter_set": "t_null", "str_min": 50, "str_max": 100, "str_min_supported": 100, "bash_below": true }
   }
 ]