Fixup some syntax issues.

ExLeper · Sep 7, 2013 · a636c27 · a636c27
2 parents d087ac7 + c544691
commit a636c27
Show file tree

Hide file tree

Showing 6 changed files with 299 additions and 53 deletions.
diff --git a/data/raw/item_groups.json b/data/raw/item_groups.json
@@ -185,7 +185,8 @@
       ["vinegar", 15],
       ["veggy_pickled", 8],
       ["meat_pickled", 4],
-      ["tongs", 25]
+      ["tongs", 25],
+      ["charcoal", 5]
     ]
   },
   { "id":"knifeblock",
@@ -272,7 +273,8 @@
       ["jar_glass", 50],
       ["jar_3l_glass", 40],
       ["flotation_vest", 1],
-      ["bearing", 1]
+      ["bearing", 1],
+      ["charcoal", 20]
     ]
   },
   { "id":"bedroom",
@@ -719,7 +721,8 @@
       ["rag", 1],
       ["scissors", 50],
       ["string_36", 40],
-      ["vinegar", 10]
+      ["vinegar", 10],
+      ["charcoal", 5]
     ]
   },
   { "id":"hardware",
@@ -749,14 +752,17 @@
       ["jack", 10],
       ["permanent_marker", 50],
       ["forge", 1],
+      ["char_forge", 1],
+      ["char_kiln", 1],
       ["crucible", 1],
       ["tongs", 1],
       ["chisel", 2],
       ["swage", 1],
       ["anvil", 2],
       ["apron_leather", 10],
       ["tool_belt", 30],
-      ["knee_pads", 20]
+      ["knee_pads", 20],
+      ["charcoal", 5]
     ]
   },
   { "id":"tools",
@@ -794,6 +800,8 @@
       ["welder", 25],
       ["ax", 8],
       ["forge", 2],
+      ["char_forge", 2],
+      ["char_kiln", 1],
       ["crucible", 2],
       ["anvil", 4],
       ["apron_leather", 10],
@@ -968,7 +976,8 @@
       ["dart", 5],
       ["pocketwatch", 5],
       ["boots_hiking", 20],
-      ["pur_tablets", 10]
+      ["pur_tablets", 10],
+      ["charcoal", 20]
     ]
   },
   { "id":"allsporting",
@@ -2058,6 +2067,8 @@
       ["nodachi", 1],
       ["swage", 2],
       ["forge", 5],
+      ["char_forge", 5],
+      ["char_kiln", 2],
       ["armor_lightplate", 1],
       ["armor_samurai", 1],
       ["helmet_kabuto", 1],
@@ -2234,7 +2245,8 @@
       ["jar_glass", 20],
       ["jar_3l_glass", 15],
       ["apron_leather", 2],
-      ["pur_tablets", 5]
+      ["pur_tablets", 5],
+      ["charcoal", 10]
     ]
   },
   { "id":"teleport",
@@ -2762,7 +2774,8 @@
       ["quiver", 3],
       ["pocketwatch", 2],
       ["pur_tablets", 10],
-      ["quikclot", 10]
+      ["quikclot", 10],
+      ["charcoal", 5]
     ]
   },
   { "id":"sewage_plant",

diff --git a/data/raw/items/ammo.json b/data/raw/items/ammo.json
@@ -2325,6 +2325,28 @@
         "dispersion" : 0,
         "recoil" : 0,
         "count" : 1
+    },
+    {   "type" : "AMMO",
+        "id" : "charcoal",
+        "price" : 10,
+        "name" : "charcoal",
+        "symbol" : "=",
+        "color" : "dark_gray",
+        "description" : "Charcoal is a flammable carbon based material obtained by removing water and other volatile constituents from animal and vegetation substances. It is produced by slowly heating wood or other substances in the absence of oxygen.",
+        "material" : "wood",
+        "volume" : 0,
+        "weight" : 200,
+        "phase" : "solid",
+        "bashing" : 1,
+        "cutting" : 0,
+        "to_hit" : 0,
+        "ammo_type" : "charcoal",
+        "damage" : 0,
+        "pierce" : 0,
+        "range" : 0,
+        "dispersion" : 0,
+        "recoil" : 0,
+        "count" : 5
     }
 
 ]
diff --git a/data/raw/items/melee.json b/data/raw/items/melee.json
@@ -2045,13 +2045,27 @@
     "symbol": ";",
     "color": "light_blue",
     "name": "rock in a sock",
-    "description": "A sock with a rock tied into the end of it. A true weapon of desperation",
+    "description": "A sock with a rock tied into the end of it. A true weapon of desperation.",
     "price": 10,
     "material" : ["cloth", "stone"],
     "weight": 1007,
     "volume": 2,
     "bashing": 16,
     "cutting": 0,
     "to_hit": 1
+  },
+  {
+    "id": "char_kiln",
+    "symbol": ";",
+    "color": "dark_gray",
+    "name": "charcoal kiln",
+    "description": "A stout metal box used for producing charcoal via pyrolysis; the incomplete burning of organic materials in the absence of oxygen.",
+    "price": 160,
+    "material": "steel",
+    "weight": 6400,
+    "volume": 40,
+    "bashing": 10,
+    "cutting": 0,
+    "to_hit": -2
   }
 ]
diff --git a/data/raw/items/tools.json b/data/raw/items/tools.json
@@ -4689,5 +4689,49 @@
     "ammo": "gasoline",
     "revert_to": "null",
     "use_action": "LIGHTER"
+  },
+  {
+    "id": "char_forge",
+    "type": "TOOL",
+    "symbol": ";",
+    "color": "dark_gray",
+    "name": "charcoal forge",
+    "description": "A portable charcoal fired metalworking forge. Combined with the right tools, you can use this for metalworking.",
+    "price": 200,
+    "material": "steel",
+    "weight": 8600,
+    "volume": 32,
+    "bashing": 9,
+    "cutting": 0,
+    "to_hit": -2,
+    "max_charges": 100,
+    "initial_charges": 0,
+    "charges_per_use": 0,
+    "turns_per_charge": 0,
+    "ammo": "charcoal",
+    "revert_to": "null",
+    "use_action": "NONE"
+  },
+  {
+    "id": "char_purifier",
+    "type": "TOOL",
+    "symbol": ";",
+    "color": "light_gray",
+    "name": "charcoal water purifier",
+    "description": "Using this item on a container full of water will purify the water using layered charcoal. Water taken from uncertain sources like a river may be dirty.",
+    "price": 800,
+    "material": ["glass", "iron"],
+    "weight": 1820,
+    "volume": 14,
+    "bashing": 3,
+    "cutting": 0,
+    "to_hit": -3,
+    "max_charges": 10,
+    "initial_charges": 0,
+    "charges_per_use": 1,
+    "turns_per_charge": 0,
+    "ammo": "charcoal",
+    "revert_to": "null",
+    "use_action": "WATER_PURIFIER"
   }
 ]