Adjust heavyduty lights

data/json/items/tool/lighting.json

@@ -637,15 +637,15 @@
     "id": "heavy_flashlight",
     "type": "TOOL",
     "name": { "str": "heavy-duty flashlight (off)", "str_pl": "heavy-duty flashlights (off)" },
-    "description": "A heavy-duty aluminum LED flashlight, often used by security guards.  It even works underwater, and it's not bad for smacking hooligans.  It also has a shoulder strap on it's handle, for easier transportation.",
-    "//": "https://www.amazon.com/dp/B00Y8AHZYC, todo add low brightness mode",
-    "//2": "volume is average between cylinder volume (without handle) and entire unit as rectangular. Should be fine since handle is big and hollow, and it can be strapped anyway.",
-    "weight": "720 g",
-    "volume": "4267 ml",
-    "longest_side": "25 cm",
-    "price": "46 USD",
-    "price_postapoc": "15 cent",
-    "material": [ "aluminum" ],
+    "description": "A heavy-duty LED flashlight with a durable polymer housing.  It's impact resistant, chemical resistant, waterproof and certified for use in hazardous environments.  Designed for firefighters, rescue personnel and miners but it can also be used for smacking hooligans.  It has a spring-loaded clip that can be attached to your torso.",
+    "//1": "https://www.nightstick.com/collections/fire/products/xpp-5564rxa",
+    "//2": "volume is a 159 mm * 70 mm * 64 mm rectangle",
+    "weight": "290 g",
+    "volume": "712 ml",
+    "longest_side": "16 cm",
+    "price": "65 USD",
+    "price_postapoc": "2 USD",
+    "material": [ "thermo_resin", "aluminum" ],
     "symbol": ";",
     "color": "blue",
     "charges_per_use": 1,
@@ -665,15 +665,15 @@
       },
       { "type": "link_up", "cable_length": 3, "charge_rate": "20 W" }
     ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 48 } } ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 112 } } ],
     "melee_damage": { "bash": 8 }
   },
   {
     "id": "heavy_flashlight_on",
     "copy-from": "heavy_flashlight",
     "type": "TOOL",
     "name": { "str": "heavy-duty flashlight (on)", "str_pl": "heavy-duty flashlights (on)" },
-    "power_draw": "6 W",
+    "power_draw": "4 W",
     "revert_to": "heavy_flashlight",
     "use_action": [
       {
@@ -685,7 +685,7 @@
       },
       { "type": "link_up", "cable_length": 3, "charge_rate": "20 W" }
     ],
-    "flags": [ "NO_UNLOAD", "NO_RELOAD", "LIGHT_500", "CHARGEDIM", "BELT_CLIP", "BELTED" ]
+    "flags": [ "NO_UNLOAD", "NO_RELOAD", "LIGHT_650", "CHARGEDIM", "BELT_CLIP", "BELTED" ]
   },
   {
     "id": "lightstrip",

data/json/items/tool_armor.json

@@ -977,9 +977,9 @@
     "copy-from": "wearable_big_light",
     "type": "TOOL_ARMOR",
     "name": { "str": "heavy-duty headlamp (on)", "str_pl": "heavy-duty headlamps (on)" },
-    "description": "A large and unwieldy homemade headlamp with an overpowered LED array and adjustable strap so as to be worn on your head or attached to your helmet while being as comfortable as possible.  It is turned on, and continually draining batteries.  Use it to turn it off.",
-    "flags": [ "LIGHT_500", "CHARGEDIM", "OVERSIZE", "BELTED", "PADDED", "ALLOWS_NATURAL_ATTACKS", "TRADER_AVOID" ],
-    "power_draw": "15 W",
+    "description": "A heavy-duty LED headlamp with a durable polymer housing.  It's impact resistant, chemical resistant, waterproof and certified for use in hazardous environments.  Designed for firefighters, rescue personnel and miners.  Use it to turn it off.",
+    "flags": [ "LIGHT_650", "CHARGEDIM", "OVERSIZE", "BELTED", "PADDED", "ALLOWS_NATURAL_ATTACKS", "TRADER_AVOID" ],
+    "power_draw": "4 W",
     "revert_to": "wearable_big_light",
     "use_action": {
       "ammo_scale": 0,
@@ -996,12 +996,13 @@
     "symbol": "[",
     "color": "blue",
     "name": { "str": "heavy-duty headlamp" },
-    "description": "A large and unwieldy homemade headlamp with an overpowered LED array and adjustable strap so as to be worn on your head or attached to your helmet while being as comfortable as possible.  Use it to turn it on.",
-    "price": "40 USD",
+    "description": "A heavy-duty LED headlamp with a durable polymer housing.  It's impact resistant, chemical resistant, waterproof and certified for use in hazardous environments.  Designed for firefighters, rescue personnel and miners.  Use it to turn it on.",
+    "//": "see heavy_flashlight. Based on https://www.nightstick.com/collections/fire/products/xpp-5462rx",
+    "price": "65 USD",
     "price_postapoc": "2 USD",
-    "material": [ "plastic", "aluminum" ],
+    "material": [ "thermo_resin", "aluminum" ],
     "flags": [ "OVERSIZE", "BELTED", "PADDED", "ALLOWS_NATURAL_ATTACKS" ],
-    "weight": "830 g",
+    "weight": "300 g",
     "volume": "750 ml",
     "charges_per_use": 1,
     "ammo": "battery",
@@ -1014,15 +1015,8 @@
       "need_charges_msg": "The headlamp batteries are dead."
     },
     "material_thickness": 1,
-    "pocket_data": [
-      {
-        "pocket_type": "MAGAZINE_WELL",
-        "rigid": true,
-        "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ],
-        "default_magazine": "light_battery_cell"
-      }
-    ],
-    "armor": [ { "encumbrance": 5, "coverage": 50, "covers": [ "head" ], "specifically_covers": [ "head_crown", "head_forehead" ] } ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 112 } } ],
+    "armor": [ { "encumbrance": 2, "coverage": 50, "covers": [ "head" ], "specifically_covers": [ "head_crown", "head_forehead" ] } ],
     "melee_damage": { "bash": 1 },
     "looks_like": "wearable_light"
   },

data/mods/TEST_DATA/expected_dps_data/tools_dps.json

@@ -7,6 +7,8 @@
       "bronze_hoe": 5.6,
       "grapnel": 5.64,
       "honey_scraper": 5.58,
+      "heavy_flashlight": 5.66,
+      "heavy_flashlight_on": 5.66,
       "swage": 5.71,
       "hammer_bronze": 5.78,
       "bronze_sickle": 6.13,