Add the menorah and small candles to put in it (#78795)

* Initial commit * The pocket method * Increase max box count * Fix amount for box volume * Fix spelling * Kick tests * Kick tests * Change wax to 100 but "turns_per_charge" to 63 so you can blow it out and relight it if you want
CleverRaven · Dec 29, 2024 · 25f11da · 25f11da
1 parent 52e013b
commit 25f11da
Show file tree

Hide file tree

Showing 6 changed files with 159 additions and 2 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1803,7 +1803,9 @@
       { "item": "kittel", "prob": 25 },
       { "item": "kippah", "prob": 50 },
       { "item": "tallit_gadol", "prob": 45 },
-      { "item": "tallit_katan", "prob": 20 }
+      { "item": "tallit_katan", "prob": 20 },
+      { "item": "menorah", "prob": 5 },
+      { "group": "small_candles_in_box", "prob": 2 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -102,6 +102,7 @@
       [ "thread", 20 ],
       { "group": "ammo_pocket_batteries_full", "prob": 25 },
       { "item": "candle", "prob": 25, "charges": [ 0, 100 ] },
+      { "group": "small_candles_in_box", "prob": 10 },
       [ "hammer", 20 ],
       [ "screwdriver", 20 ],
       { "item": "lighter", "prob": 25, "charges": [ 0, 100 ] },

diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -136,6 +136,7 @@
       { "item": "corkscrew", "prob": 60 },
       { "item": "bottle_opener", "prob": 75 },
       { "item": "candle", "prob": 75, "charges": [ 10, -1 ] },
+      { "group": "small_candles_in_box", "prob": 50 },
       { "item": "extension_cable", "prob": 45 },
       { "item": "long_extension_cable", "prob": 20 },
       { "item": "RPG_die", "prob": 10 },
@@ -395,6 +396,7 @@
       { "item": "hairbrush", "prob": 80 },
       { "item": "office_letter_opener", "prob": 75 },
       { "item": "candle", "count": [ 1, 2 ], "prob": 75, "charges": [ 70, -1 ] },
+      { "group": "small_candles_in_box", "prob": 25 },
       { "item": "corkscrew", "prob": 70 },
       { "group": "adhesive_bandages_box_used", "prob": 60 },
       { "item": "duct_tape", "prob": 40, "charges": [ 100, 400 ] },

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -1333,6 +1333,7 @@
       [ "pearl_collar", 10 ],
       [ "pocketwatch", 50 ],
       [ "candlestick", 50 ],
+      { "item": "menorah", "prob": 3 },
       [ "ring_signet", 40 ],
       [ "cufflinks_intricate", 50 ],
       [ "boxing_gloves", 25 ],
@@ -2455,5 +2456,12 @@
     "subtype": "collection",
     "container-item": "bag_plastic_small",
     "entries": [ { "item": "insecticide", "container-item": "null", "count": 9 } ]
+  },
+  {
+    "type": "item_group",
+    "id": "small_candles_in_box",
+    "subtype": "collection",
+    "container-item": "box_small",
+    "entries": [ { "item": "candle_small", "container-item": "null", "count": [ 20, 45 ] } ]
   }
 ]
diff --git a/data/json/itemgroups/shops_trades.json b/data/json/itemgroups/shops_trades.json
@@ -148,7 +148,9 @@
           { "item": "candlestick", "prob": 40, "count": [ 1, 5 ] },
           { "item": "incense", "prob": 75, "count": [ 5, 20 ], "container-item": "box_small" },
           { "item": "lighter", "prob": 90, "charges": 100, "count": [ 3, 10 ] },
-          { "item": "marble", "prob": 30, "charges": [ 10, 50 ] }
+          { "item": "marble", "prob": 30, "charges": [ 10, 50 ] },
+          { "item": "menorah", "prob": 3 },
+          { "group": "small_candles_in_box", "prob": 35 }
         ]
       },
       {

diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json
@@ -1085,5 +1085,147 @@
       { "type": "firestarter", "moves": 100 }
     ],
     "flags": [ "LIGHT_15", "TRADER_AVOID", "ALLOWS_REMOTE_USE", "FIRESTARTER", "FIRE" ]
+  },
+  {
+    "id": "candle_small",
+    "type": "TOOL",
+    "name": { "str": "small candle" },
+    "description": "A thin wax candle.  It doesn't provide very much light and will burn relatively quickly.  You'll need a lighter or matches to light it.",
+    "weight": "4 g",
+    "volume": "45 ml",
+    "longest_side": "150 mm",
+    "price": "50 cent",
+    "price_postapoc": "2 cent",
+    "material": [ "paraffin_wax" ],
+    "symbol": ",",
+    "color": "blue_white",
+    "charges_per_use": 1,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "candle_wax": 100 }, "rigid": true } ],
+    "use_action": {
+      "target": "candle_small_lit",
+      "msg": "You light the candle.",
+      "active": true,
+      "need_fire": 1,
+      "menu_text": "Light",
+      "type": "transform"
+    },
+    "flags": [ "BURNOUT", "NO_RELOAD", "NO_UNLOAD" ]
+  },
+  {
+    "id": "candle_small_lit",
+    "type": "TOOL",
+    "copy-from": "candle_small",
+    "name": { "str": "small candle" },
+    "description": "A thin wax candle.  It doesn't provide very much light and will burn relatively quickly.  This candle is lit.",
+    "turns_per_charge": 63,
+    "use_action": [
+      { "type": "firestarter", "moves": 100 },
+      {
+        "ammo_scale": 0,
+        "target": "candle_small",
+        "msg": "The candle winks out.",
+        "menu_text": "Extinguish",
+        "type": "transform"
+      }
+    ],
+    "extend": { "flags": [ "LIGHT_6", "WATER_EXTINGUISH", "TRADER_AVOID", "WIND_EXTINGUISH", "FIRESTARTER" ] }
+  },
+  {
+    "id": "menorah",
+    "type": "TOOL",
+    "name": { "str": "menorah" },
+    "description": "An eight-branched candelabra more properly called a 'hanukkiah', the menorah is used to celebrate the Jewish festival of Hanukkah.",
+    "weight": "229 g",
+    "volume": "1931 ml",
+    "longest_side": "184 mm",
+    "price": "15 USD",
+    "price_postapoc": "50 cent",
+    "material": [ "steel" ],
+    "symbol": ",",
+    "color": "light_gray",
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "//1": "It's specifically not rigid because volume of candlestick and candle should be additive.",
+        "max_contains_weight": "4 g",
+        "max_contains_volume": "350 ml",
+        "max_item_length": "151 mm",
+        "item_restriction": [ "candle_small", "candle_small_lit" ],
+        "transparent": true
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_weight": "4 g",
+        "max_contains_volume": "350 ml",
+        "max_item_length": "151 mm",
+        "item_restriction": [ "candle_small", "candle_small_lit" ],
+        "transparent": true
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_weight": "4 g",
+        "max_contains_volume": "350 ml",
+        "max_item_length": "151 mm",
+        "item_restriction": [ "candle_small", "candle_small_lit" ],
+        "transparent": true
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_weight": "4 g",
+        "max_contains_volume": "350 ml",
+        "max_item_length": "151 mm",
+        "item_restriction": [ "candle_small", "candle_small_lit" ],
+        "transparent": true
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_weight": "4 g",
+        "max_contains_volume": "350 ml",
+        "max_item_length": "151 mm",
+        "item_restriction": [ "candle_small", "candle_small_lit" ],
+        "transparent": true
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_weight": "4 g",
+        "max_contains_volume": "350 ml",
+        "max_item_length": "151 mm",
+        "item_restriction": [ "candle_small", "candle_small_lit" ],
+        "transparent": true
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_weight": "4 g",
+        "max_contains_volume": "350 ml",
+        "max_item_length": "151 mm",
+        "item_restriction": [ "candle_small", "candle_small_lit" ],
+        "transparent": true
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_weight": "4 g",
+        "max_contains_volume": "350 ml",
+        "max_item_length": "151 mm",
+        "item_restriction": [ "candle_small", "candle_small_lit" ],
+        "transparent": true
+      },
+      {
+        "pocket_type": "CONTAINER",
+        "holster": true,
+        "max_contains_weight": "4 g",
+        "max_contains_volume": "350 ml",
+        "max_item_length": "151 mm",
+        "item_restriction": [ "candle_small", "candle_small_lit" ],
+        "transparent": true
+      }
+    ]
   }
 ]