From cc1edd26602b85bf5f8b95a6d6afb10edccf7790 Mon Sep 17 00:00:00 2001 From: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com> Date: Wed, 9 Oct 2019 12:42:35 +0000 Subject: [PATCH 1/2] Lint items_holiday.json --- data/json/items/items_holiday.json | 95 ++++++++++++++++-------------- 1 file changed, 50 insertions(+), 45 deletions(-) diff --git a/data/json/items/items_holiday.json b/data/json/items/items_holiday.json index 6b559e432b92b..132db34f56709 100644 --- 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" ] + } ] From 1c4ccbb5cdf3dfdfeb78a87726d3b45999b61438 Mon Sep 17 00:00:00 2001 From: Alexey Mostovoy <1931904+AMurkin@users.noreply.github.com> Date: Wed, 9 Oct 2019 12:44:35 +0000 Subject: [PATCH 2/2] Lint recipes_holiday.json --- data/json/recipes/recipes_holiday.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipes_holiday.json b/data/json/recipes/recipes_holiday.json index b1a4ee67e2dd8..4d15c626759e2 100644 --- 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 ] ] + ] } ]