Skip to content

Commit 4551df2

Browse files
authored
Merge pull request #73204 from Lumi-Virtual/candle-edit
Edit candles to be slightly more realistic
2 parents e135486 + a6145fb commit 4551df2

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed

data/json/items/items_holiday.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"copy-from": "jackolantern",
8383
"name": { "str": "lit jack-o'-lantern" },
8484
"description": "A carved pumpkin with a lit candle inside. Spooky and festive!",
85-
"turns_per_charge": 1350,
85+
"turns_per_charge": 1260,
8686
"use_action": {
8787
"ammo_scale": 0,
8888
"type": "transform",

data/json/items/resources/misc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
"id": "wax_paraffin",
294294
"name": { "str": "chunk of paraffin wax", "str_pl": "chunks of paraffin wax" },
295295
"category": "spare_parts",
296-
"weight": "225 g",
296+
"weight": "215 g",
297297
"color": "white",
298298
"material": [ "paraffin_wax" ],
299299
"symbol": "%",

data/json/items/tool/lighting.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,10 @@
9393
"type": "TOOL",
9494
"name": { "str": "candle" },
9595
"description": "A thick wax candle. 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.",
96-
"weight": "370 g",
97-
"volume": "550 ml",
98-
"longest_side": "12 cm",
96+
"//": "Based on this: https://www.amazon.com/dp/B0843HQMZ1",
97+
"weight": "400 g",
98+
"volume": "466 ml",
99+
"longest_side": "102 mm",
99100
"price": "1 USD",
100101
"price_postapoc": "50 cent",
101102
"to_hit": -2,

data/json/materials.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1542,7 +1542,7 @@
15421542
"type": "material",
15431543
"id": "paraffin_wax",
15441544
"name": "Paraffin Wax",
1545-
"density": 0.9,
1545+
"density": 0.86,
15461546
"specific_heat_liquid": 2.9,
15471547
"specific_heat_solid": 3.7,
15481548
"latent_heat": 210,

data/json/recipes/tools/lights.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"flags": [ "FULL_MAGAZINE" ],
1313
"tools": [ [ [ "lighter", 5 ], [ "ref_lighter", 5 ], [ "surface_heat", 2, "LIST" ] ] ],
1414
"components": [
15-
[ [ "wax_any", 1, "LIST" ], [ "any_tallow", 4, "LIST" ], [ "edible_lard", 1, "LIST" ] ],
15+
[ [ "wax_any", 2, "LIST" ], [ "any_tallow", 8, "LIST" ], [ "edible_lard", 8, "LIST" ] ],
1616
[ [ "cordage_short", 1, "LIST" ] ]
1717
]
1818
},

data/mods/Magiclysm/items/caster_level_boosters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"copy-from": "kelvinist_booster_1",
139139
"name": { "str": "kelvinist's candle" },
140140
"description": "A thick candle of magically treated tallow with a kelvinist rune artfully inscribed on the side. It doesn't burn for quite as long as a regular candle, but it will boost your caster level of kelvinist spells by 1 while burning. The magic of the candle protects it from the wind and from setting your backpack aflame. This candle is lit.",
141-
"turns_per_charge": 675,
141+
"turns_per_charge": 630,
142142
"use_action": [
143143
{ "type": "firestarter", "moves": 100 },
144144
{

0 commit comments

Comments
 (0)