Wax changes (CleverRaven#62843)

* first waxing * the incredible wax * cleanup * cleanup * itemgroups * linting linting * linting more linting I love linting * density fixed hallelujah * crafting requirements * I hate syntax I hate syntax I hate syntax * please work * Update lights.json * I'm going insane here * please tell me it's over * stop stop stop * are we done yet? * material resistances * raise the white flag * bookz --------- Co-authored-by: bombasticSlacks <[email protected]>
Maleclypse · Nov 16, 2023 · 2d30f73 · 2d30f73
1 parent adf0a58
commit 2d30f73
Show file tree

Hide file tree

Showing 18 changed files with 123 additions and 67 deletions.
diff --git a/data/json/furniture_and_terrain/furniture-plumbing.json b/data/json/furniture_and_terrain/furniture-plumbing.json
@@ -97,7 +97,11 @@
       "str_max": 30,
       "sound": "porcelain breaking!",
       "sound_fail": "whunk!",
-      "items": [ { "item": "cu_pipe", "prob": 50 }, { "item": "ceramic_shard", "count": [ 2, 8 ] }, { "item": "wax", "count": 1 } ]
+      "items": [
+        { "item": "cu_pipe", "prob": 50 },
+        { "item": "ceramic_shard", "count": [ 2, 8 ] },
+        { "item": "wax_paraffin", "count": 1 }
+      ]
     }
   },
   {

diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -263,6 +263,7 @@
       { "item": "superglue", "prob": 40 },
       { "item": "knitting_needles", "prob": 40 },
       { "item": "duct_tape", "prob": 40, "charges": [ 5, 160 ] },
+      { "item": "wax_paraffin", "prob": 10 },
       { "item": "zipper_short_plastic", "prob": 35 },
       { "item": "zipper_short_plastic", "prob": 15 },
       { "item": "felt_patch", "count": [ 1, 3 ], "prob": 30 },

diff --git a/data/json/itemgroups/shops_trades.json b/data/json/itemgroups/shops_trades.json
@@ -11,6 +11,7 @@
       [ "vac_mold", 20 ],
       [ "polycarbonate_sheet", 20 ],
       [ "wax", 30 ],
+      [ "wax_paraffin", 30 ],
       [ "straw_pile", 15 ],
       { "item": "charcoal", "prob": 25, "charges": [ 200, 400 ] },
       [ "clay_lump", 100 ]

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -80,20 +80,19 @@
     "fun": 9
   },
   {
-    "type": "COMESTIBLE",
+    "type": "GENERIC",
     "id": "wax",
-    "name": { "str_pl": "waxes", "str": "wax" },
-    "weight": "97 g",
+    "name": { "str": "chunk of beeswax", "str_pl": "chunks of beeswax" },
+    "category": "spare_parts",
+    "weight": "235 g",
     "color": "white",
-    "comestible_type": "FOOD",
+    "material": [ "beeswax" ],
     "symbol": "%",
-    "quench": -4,
-    "calories": 35,
-    "description": "A large chunk of beeswax.  Not very tasty or nourishing, but okay in an emergency.",
-    "price": 1500,
+    "description": "A large chunk of beeswax.  Despite being used in some cooking recipes, beeswax in itself is indigestible to humans.",
+    "price": 1300,
     "price_postapoc": 10,
     "volume": "250 ml",
-    "fun": -5
+    "flags": [ "UNRECOVERABLE" ]
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json
@@ -312,5 +312,20 @@
     "material": [ { "type": "monolith_heavy", "portion": 19 }, { "type": "superalloy", "portion": 1 } ],
     "symbol": ",",
     "color": "dark_gray"
+  },
+  {
+    "type": "GENERIC",
+    "id": "wax_paraffin",
+    "name": { "str": "chunk of paraffin wax", "str_pl": "chunks of paraffin wax" },
+    "category": "spare_parts",
+    "weight": "225 g",
+    "color": "white",
+    "material": [ "paraffin_wax" ],
+    "symbol": "%",
+    "description": "A large chunk of paraffin wax.",
+    "price": 500,
+    "price_postapoc": 10,
+    "volume": "250 ml",
+    "flags": [ "UNRECOVERABLE" ]
   }
 ]
diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json
@@ -93,12 +93,13 @@
     "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": "225 g",
-    "volume": "250 ml",
+    "weight": "370 g",
+    "volume": "550 ml",
+    "longest_side": "12 cm",
     "price": 100,
     "price_postapoc": 50,
     "to_hit": -2,
-    "material": [ "beeswax" ],
+    "material": [ "paraffin_wax" ],
     "symbol": ",",
     "color": "white",
     "charges_per_use": 1,
@@ -119,7 +120,7 @@
     "copy-from": "candle",
     "name": { "str": "candle" },
     "description": "A thick wax candle.  It doesn't provide very much light, but it can burn for quite a long time.  This candle is lit.",
-    "turns_per_charge": 1350,
+    "turns_per_charge": 1260,
     "use_action": [
       { "type": "firestarter", "moves": 100 },
       {

diff --git a/data/json/materials.json b/data/json/materials.json
@@ -1440,16 +1440,16 @@
     "type": "material",
     "id": "beeswax",
     "name": "Beeswax",
-    "density": 1.0,
+    "density": 0.97,
     "//": "https://www.tainstruments.com/pdf/literature/TA405.pdf",
     "specific_heat_liquid": 2.9,
     "specific_heat_solid": 3.7,
     "latent_heat": 210,
     "edible": true,
-    "conductive": true,
     "chip_resist": 0,
     "dmg_adj": [ "lightly damaged", "damaged", "very damaged", "thoroughly damaged" ],
     "repaired_with": "wax",
+    "salvaged_into": "wax",
     "bash_dmg_verb": "damaged",
     "cut_dmg_verb": "damaged",
     "//1": "Basically as flammable as a candle.",
@@ -1460,6 +1460,27 @@
     ],
     "resist": { "bash": 0, "cut": 0, "acid": 0, "heat": 0, "bullet": 0 }
   },
+  {
+    "type": "material",
+    "id": "paraffin_wax",
+    "name": "Paraffin Wax",
+    "density": 0.9,
+    "specific_heat_liquid": 2.9,
+    "specific_heat_solid": 3.7,
+    "latent_heat": 210,
+    "chip_resist": 0,
+    "dmg_adj": [ "lightly damaged", "damaged", "very damaged", "thoroughly damaged" ],
+    "repaired_with": "wax_paraffin",
+    "salvaged_into": "wax_paraffin",
+    "bash_dmg_verb": "damaged",
+    "cut_dmg_verb": "damaged",
+    "burn_data": [
+      { "fuel": 150, "smoke": 0, "burn": 1 },
+      { "fuel": 300, "smoke": 0, "burn": 2 },
+      { "fuel": 450, "smoke": 0, "burn": 3 }
+    ],
+    "resist": { "bash": 0, "cut": 0, "acid": 0, "heat": 0, "bullet": 0 }
+  },
   {
     "type": "material",
     "id": "paper",

diff --git a/data/json/recipes/ammo/40x46mm.json b/data/json/recipes/ammo/40x46mm.json
@@ -20,7 +20,7 @@
     "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "gunpowder_shotgun", 2 ] ],
       [ [ "40x46mm_m118_casing", 1 ] ],
       [ [ "smpistol_primer", 1 ] ]
@@ -47,7 +47,7 @@
     "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.",
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "gunpowder_shotgun", 2 ] ],
       [ [ "40x46mm_m199_casing", 1 ] ],
       [ [ "lgpistol_primer", 1 ] ]
@@ -108,7 +108,7 @@
     "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.",
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "gunpowder_shotgun", 2 ] ],
       [ [ "40x46mm_m118_casing", 1 ] ],
       [ [ "smpistol_primer", 1 ] ]
@@ -135,7 +135,7 @@
     "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.",
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "gunpowder_shotgun", 2 ] ],
       [ [ "40x46mm_m199_casing", 1 ] ],
       [ [ "lgpistol_primer", 1 ] ]
@@ -161,7 +161,7 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "combatnail", 10 ] ],
       [ [ "gunpowder_shotgun", 2 ] ],
       [ [ "40x46mm_m118_casing", 1 ] ],
@@ -188,7 +188,7 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "combatnail", 10 ] ],
       [ [ "gunpowder_shotgun", 2 ] ],
       [ [ "40x46mm_m199_casing", 1 ] ],
@@ -215,7 +215,7 @@
     "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "chem_black_powder", 2 ] ],
       [ [ "40x46mm_m118_casing", 1 ] ],
       [ [ "smpistol_primer", 1 ] ]
@@ -241,7 +241,7 @@
     "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "chem_black_powder", 2 ] ],
       [ [ "40x46mm_m199_casing", 1 ] ],
       [ [ "lgpistol_primer", 1 ] ]
@@ -267,7 +267,7 @@
     "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "chem_black_powder", 2 ] ],
       [ [ "40x46mm_m118_casing", 1 ] ],
       [ [ "smpistol_primer", 1 ] ]
@@ -293,7 +293,7 @@
     "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "chem_black_powder", 2 ] ],
       [ [ "40x46mm_m199_casing", 1 ] ],
       [ [ "lgpistol_primer", 1 ] ]
@@ -318,7 +318,7 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "combatnail", 10 ] ],
       [ [ "chem_black_powder", 2 ] ],
       [ [ "40x46mm_m118_casing", 1 ] ],
@@ -344,7 +344,7 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "combatnail", 10 ] ],
       [ [ "chem_black_powder", 2 ] ],
       [ [ "40x46mm_m199_casing", 1 ] ],

diff --git a/data/json/recipes/ammo/40x53mm.json b/data/json/recipes/ammo/40x53mm.json
@@ -20,7 +20,7 @@
     "//": "11.5x the propellant and 11.5x the payload of 12 gauge 00 shot load. 13409 mg gunpowder rounded to 134 100 mg 'pieces'",
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "gunpowder_shotgun", 134 ] ],
       [ [ "40x53mm_m169_casing", 1 ] ],
       [ [ "lgrifle_primer", 1 ] ]
@@ -47,7 +47,7 @@
     "//": "11.5x the propellant and 11.5x the payload of 12 gauge slug load. 19366 mg gunpowder rounded to 194 100 mg 'pieces'",
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "gunpowder_shotgun", 194 ] ],
       [ [ "40x53mm_m169_casing", 1 ] ],
       [ [ "lgrifle_primer", 1 ] ]
@@ -73,7 +73,7 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "combatnail", 115 ] ],
       [ [ "gunpowder_shotgun", 86 ] ],
       [ [ "40x53mm_m169_casing", 1 ] ],
@@ -100,7 +100,7 @@
     "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "chem_black_powder", 134 ] ],
       [ [ "40x53mm_m169_casing", 1 ] ],
       [ [ "lgrifle_primer", 1 ] ]
@@ -126,7 +126,7 @@
     "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "chem_black_powder", 194 ] ],
       [ [ "40x53mm_m169_casing", 1 ] ],
       [ [ "lgrifle_primer", 1 ] ]
@@ -151,7 +151,7 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
       [ [ "sheet_metal_small", 1 ] ],
-      [ [ "paper", 1 ], [ "wax", 1 ] ],
+      [ [ "paper", 1 ], [ "wax_any", 1, "LIST" ] ],
       [ [ "combatnail", 115 ] ],
       [ [ "chem_black_powder", 86 ] ],
       [ [ "40x53mm_m169_casing", 1 ] ],

diff --git a/data/json/recipes/ammo/weldgas.json b/data/json/recipes/ammo/weldgas.json
@@ -88,7 +88,7 @@
         [ "bone_glue", 1 ],
         [ "sugar", 1 ],
         [ "plastic_chunk", 1 ],
-        [ "wax", 1 ],
+        [ "wax_any", 1, "LIST" ],
         [ "candle", 1 ]
       ]
     ]

diff --git a/data/json/recipes/armor/other.json b/data/json/recipes/armor/other.json
@@ -662,7 +662,7 @@
     "autolearn": true,
     "qualities": [ { "id": "CONTAIN", "level": 1 } ],
     "tools": [ [ [ "lighter", 5 ], [ "ref_lighter", 5 ], [ "surface_heat", 2, "LIST" ] ] ],
-    "components": [ [ [ "wax", 1 ], [ "candle", 1 ] ], [ [ "cordage_short", 1, "LIST" ] ] ]
+    "components": [ [ [ "wax_any", 1, "LIST" ], [ "candle", 1 ] ], [ [ "cordage_short", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/recipes/armor/pets_cow.json b/data/json/recipes/armor/pets_cow.json
@@ -98,26 +98,29 @@
     "result": "leather_armor_cow",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "copy-from": "armor_blarmor",
     "id_suffix": "from_scratch",
     "category": "CC_ANIMALS",
     "subcategory": "CSC_ANIMALS_BOVINE ARMOR",
+    "skill_used": "chemistry",
+    "difficulty": 4,
     "skills_required": [ "tailor", 6 ],
     "time": "12 h 30 m",
+    "book_learn": [
+      [ "textbook_tailor", 4 ],
+      [ "tailor_portfolio", 5 ],
+      [ "textbook_survival", 3 ],
+      [ "trappers_companion", 3 ],
+      [ "survival_book", 3 ],
+      [ "textbook_armwest", 6 ],
+      [ "textbook_armschina", 6 ]
+    ],
     "reversible": true,
     "using": [ [ "tailoring_leather_patchwork", 66 ], [ "tailoring_cotton_patchwork", 66 ], [ "surface_heat", 60 ], [ "clasps", 5 ] ],
+    "qualities": [ { "id": "COOK", "level": 3 }, { "id": "LEATHER_AWL", "level": 1 } ],
+    "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
     "components": [
       [ [ "water", 36 ], [ "water_clean", 36 ] ],
-      [
-        [ "wax", 7 ],
-        [ "tallow", 28 ],
-        [ "mutant_tallow", 28 ],
-        [ "human_tallow", 28 ],
-        [ "demihuman_tallow", 28 ],
-        [ "tallow_tainted", 28 ],
-        [ "vinegar", 36 ],
-        [ "pine_bough", 66 ]
-      ],
+      [ [ "wax_any", 7, "LIST" ], [ "any_tallow", 28, "LIST" ], [ "vinegar", 36 ], [ "pine_bough", 66 ] ],
       [ [ "salt", 180 ] ]
     ],
     "proficiencies": [
@@ -182,7 +185,7 @@
     "tools": [ [ [ "surface_heat", 60, "LIST" ] ] ],
     "components": [
       [ [ "water", 36 ], [ "water_clean", 36 ] ],
-      [ [ "wax", 7 ], [ "any_tallow", 28, "LIST" ], [ "vinegar", 36 ], [ "pine_bough", 72 ] ],
+      [ [ "wax_any", 7, "LIST" ], [ "any_tallow", 28, "LIST" ], [ "vinegar", 36 ], [ "pine_bough", 72 ] ],
       [ [ "salt", 180 ] ],
       [ [ "bone_sturdy", 45, "LIST" ] ]
     ],