Merge pull request #73204 from Lumi-Virtual/candle-edit

Edit candles to be slightly more realistic
CleverRaven · Apr 24, 2024 · 4551df2 · 4551df2
2 parents e135486 + a6145fb
commit 4551df2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/data/json/items/items_holiday.json b/data/json/items/items_holiday.json
@@ -82,7 +82,7 @@
     "copy-from": "jackolantern",
     "name": { "str": "lit jack-o'-lantern" },
     "description": "A carved pumpkin with a lit candle inside.  Spooky and festive!",
-    "turns_per_charge": 1350,
+    "turns_per_charge": 1260,
     "use_action": {
       "ammo_scale": 0,
       "type": "transform",

diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json
@@ -293,7 +293,7 @@
     "id": "wax_paraffin",
     "name": { "str": "chunk of paraffin wax", "str_pl": "chunks of paraffin wax" },
     "category": "spare_parts",
-    "weight": "225 g",
+    "weight": "215 g",
     "color": "white",
     "material": [ "paraffin_wax" ],
     "symbol": "%",

diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json
@@ -93,9 +93,10 @@
     "type": "TOOL",
     "name": { "str": "candle" },
     "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.",
-    "weight": "370 g",
-    "volume": "550 ml",
-    "longest_side": "12 cm",
+    "//": "Based on this: https://www.amazon.com/dp/B0843HQMZ1",
+    "weight": "400 g",
+    "volume": "466 ml",
+    "longest_side": "102 mm",
     "price": "1 USD",
     "price_postapoc": "50 cent",
     "to_hit": -2,

diff --git a/data/json/materials.json b/data/json/materials.json
@@ -1542,7 +1542,7 @@
     "type": "material",
     "id": "paraffin_wax",
     "name": "Paraffin Wax",
-    "density": 0.9,
+    "density": 0.86,
     "specific_heat_liquid": 2.9,
     "specific_heat_solid": 3.7,
     "latent_heat": 210,

diff --git a/data/json/recipes/tools/lights.json b/data/json/recipes/tools/lights.json
@@ -12,7 +12,7 @@
     "flags": [ "FULL_MAGAZINE" ],
     "tools": [ [ [ "lighter", 5 ], [ "ref_lighter", 5 ], [ "surface_heat", 2, "LIST" ] ] ],
     "components": [
-      [ [ "wax_any", 1, "LIST" ], [ "any_tallow", 4, "LIST" ], [ "edible_lard", 1, "LIST" ] ],
+      [ [ "wax_any", 2, "LIST" ], [ "any_tallow", 8, "LIST" ], [ "edible_lard", 8, "LIST" ] ],
       [ [ "cordage_short", 1, "LIST" ] ]
     ]
   },

diff --git a/data/mods/Magiclysm/items/caster_level_boosters.json b/data/mods/Magiclysm/items/caster_level_boosters.json
@@ -138,7 +138,7 @@
     "copy-from": "kelvinist_booster_1",
     "name": { "str": "kelvinist's candle" },
     "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.",
-    "turns_per_charge": 675,
+    "turns_per_charge": 630,
     "use_action": [
       { "type": "firestarter", "moves": 100 },
       {