Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lint #3

Merged
merged 2 commits into from
Oct 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 50 additions & 45 deletions data/json/items/items_holiday.json
Original file line number Diff line number Diff line change
@@ -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" ]
}
]
9 changes: 7 additions & 2 deletions data/json/recipes/recipes_holiday.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[ {
[
{
"type": "recipe",
"result": "plastic_jack_o_lantern",
"category": "CC_OTHER",
Expand All @@ -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 ] ]
]
}
]