Merge pull request #3 from AMurkin/patch-1

Lint
Maleclypse · Oct 9, 2019 · 88d08a9 · 88d08a9
2 parents 3ae4efa + 1c4ccbb
commit 88d08a9
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 47 deletions.
diff --git a/data/json/items/items_holiday.json b/data/json/items/items_holiday.json
@@ -1,47 +1,52 @@
 [
-{
-  "id": "plastic_jack_o_lantern",
-  "type": "TOOL",
-  "name": "jack o'lantern",
-  "description": "This is a plastic lantern that is painted to look like a pumpkin with a face. It has a candle inside it, that can be replaced when burnt down. It doesn't provide very much light, but it can burn for quite a long time.  You'll need a lighter or matches to light it.",
-  "weight": "113 g",
-  "volume": "3964 ml",
-  "price": 100,
-  "to_hit": -2,
-  "material": "plastic",
-  "symbol": "0",
-  "color": "yellow",
-  "looks_like": "pumpkin",
-  "initial_charges": 100,
-  "max_charges": 100,
-  "charges_per_use": 1,
-  "revert_to": "can_food_unsealed",
-  "use_action": {
-    "target": "plastic_jack_o_lantern",
-    "msg": "You light the candle in the jack o'lantern.",
-    "active": true,
-    "need_fire": 1,
-    "menu_text": "Light",
-    "type": "transform"
-  },
-  "id": "plastic_jack_o_lantern_lit",
-  "type": "TOOL",
-  "name": "spooky jack o'lantern",
-  "name_plural": "candles",
-  "description": "There is a thick candle.  It doesn't provide very much light, but it can burn for quite a long time.  This candle is lit. The face shifts.",
-  "weight": "113 g",
-  "volume": "3964 ml",
-  "price": 0,
-  "to_hit": -2,
-  "material": "plastic",
-  "symbol": "0",
-  "looks_like": "pumpkin",
-  "color": "yellow",
-  "initial_charges": 100,
-  "max_charges": 100,
-  "charges_per_use": 1,
-  "turns_per_charge": 1350,
-  "use_action": { "target": "plastic_jack_o_lantern_lit", "msg": "The candle winks out.", "menu_text": "Extinguish", "type": "transform" },
-  "flags": [ "LIGHT_6", "WATER_EXTINGUISH", "TRADER_AVOID" ]
-}
+  {
+    "id": "plastic_jack_o_lantern",
+    "type": "TOOL",
+    "name": "jack o'lantern",
+    "description": "This is a plastic lantern that is painted to look like a pumpkin with a face. It has a candle inside it, that can be replaced when burnt down. It doesn't provide very much light, but it can burn for quite a long time.  You'll need a lighter or matches to light it.",
+    "weight": "113 g",
+    "volume": "3964 ml",
+    "price": 100,
+    "to_hit": -2,
+    "material": "plastic",
+    "symbol": "0",
+    "color": "yellow",
+    "looks_like": "pumpkin",
+    "initial_charges": 100,
+    "max_charges": 100,
+    "charges_per_use": 1,
+    "revert_to": "can_food_unsealed",
+    "use_action": {
+      "target": "plastic_jack_o_lantern",
+      "msg": "You light the candle in the jack o'lantern.",
+      "active": true,
+      "need_fire": 1,
+      "menu_text": "Light",
+      "type": "transform"
+    },
+    "id": "plastic_jack_o_lantern_lit",
+    "type": "TOOL",
+    "name": "spooky jack o'lantern",
+    "name_plural": "candles",
+    "description": "There is a thick candle.  It doesn't provide very much light, but it can burn for quite a long time.  This candle is lit. The face shifts.",
+    "weight": "113 g",
+    "volume": "3964 ml",
+    "price": 0,
+    "to_hit": -2,
+    "material": "plastic",
+    "symbol": "0",
+    "looks_like": "pumpkin",
+    "color": "yellow",
+    "initial_charges": 100,
+    "max_charges": 100,
+    "charges_per_use": 1,
+    "turns_per_charge": 1350,
+    "use_action": {
+      "target": "plastic_jack_o_lantern_lit",
+      "msg": "The candle winks out.",
+      "menu_text": "Extinguish",
+      "type": "transform"
+    },
+    "flags": [ "LIGHT_6", "WATER_EXTINGUISH", "TRADER_AVOID" ]
+  }
 ]
diff --git a/data/json/recipes/recipes_holiday.json b/data/json/recipes/recipes_holiday.json
@@ -1,4 +1,5 @@
-[  {
+[
+  {
     "type": "recipe",
     "result": "plastic_jack_o_lantern",
     "category": "CC_OTHER",
@@ -9,6 +10,10 @@
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 5, "LIST" ] ] ],
-    "components": [ [ [ "jug_plastic", 1 ], [ "bottle_plastic", 3 ], [ "bottle_plastic_small", 6 ] ], [ ["candle", 1] ], [ ["y_paint", 1] ] ]
+    "components": [
+      [ [ "jug_plastic", 1 ], [ "bottle_plastic", 3 ], [ "bottle_plastic_small", 6 ] ],
+      [ [ "candle", 1 ] ],
+      [ [ "y_paint", 1 ] ]
+    ]
   }
 ]