Merge pull request #82986 from GuardianDll/replace_flag_based_light

Replace flag based light emission with human `optional()`

Author: Maleclypse

data/json/items/armor/bespoke_armor/custom_storage.json

@@ -675,6 +675,7 @@
       "msg": "You turn the shoulder mounted flashlight off.",
       "target": "nomad_rig"
     },
-    "flags": [ "LIGHT_500", "WATER_FRIENDLY", "STURDY", "BELTED", "USES_BIONIC_POWER" ]
+    "light": 500,
+    "flags": [ "WATER_FRIENDLY", "STURDY", "BELTED", "USES_BIONIC_POWER" ]
   }
 ]

data/json/items/generic.json

@@ -909,7 +909,7 @@
     "price": "44 cent",
     "price_postapoc": "50 cent",
     "material": [ "glass" ],
-    "flags": [ "LIGHT_8" ],
+    "light": 8,
     "volume": "50 ml"
   },
   {
@@ -2995,7 +2995,8 @@
       }
     ],
     "material": [ "paper" ],
-    "flags": [ "LITCIG", "LIGHT_2", "TOBACCO", "TRADER_AVOID", "FIRESTARTER", "FRAGILE", "OVERSIZE" ],
+    "light": 8,
+    "flags": [ "LITCIG", "TOBACCO", "TRADER_AVOID", "FIRESTARTER", "FRAGILE", "OVERSIZE" ],
     "warmth": 6,
     "armor": [
       {
@@ -3043,7 +3044,8 @@
       }
     ],
     "material": [ "paper" ],
-    "flags": [ "LITCIG", "LIGHT_2", "TOBACCO", "TRADER_AVOID", "FIRESTARTER", "FRAGILE", "OVERSIZE" ],
+    "light": 2,
+    "flags": [ "LITCIG", "TOBACCO", "TRADER_AVOID", "FIRESTARTER", "FRAGILE", "OVERSIZE" ],
     "warmth": 3,
     "armor": [
       {
@@ -3091,7 +3093,8 @@
       }
     ],
     "material": [ "paper" ],
-    "flags": [ "LITCIG", "LIGHT_2", "TRADER_AVOID", "FIRESTARTER", "FRAGILE", "OVERSIZE" ],
+    "light": 2,
+    "flags": [ "LITCIG", "TRADER_AVOID", "FIRESTARTER", "FRAGILE", "OVERSIZE" ],
     "warmth": 3,
     "armor": [
       {

data/json/items/items_holiday.json

@@ -49,7 +49,8 @@
       "msg": "The LED winks out inside the lantern.",
       "menu_text": "Extinguish"
     },
-    "extend": { "flags": [ "LIGHT_6", "TRADER_AVOID" ] }
+    "light": 6,
+    "extend": { "flags": [ "TRADER_AVOID" ] }
   },
   {
     "id": "jackolantern",
@@ -92,7 +93,8 @@
       "msg": "You blow out the jack-o'-lantern.",
       "menu_text": "Extinguish"
     },
-    "extend": { "flags": [ "LIGHT_8", "WATER_EXTINGUISH", "TRADER_AVOID", "WIND_EXTINGUISH" ] }
+    "light": 8,
+    "extend": { "flags": [ "WATER_EXTINGUISH", "TRADER_AVOID", "WIND_EXTINGUISH" ] }
   },
   {
     "id": "decorative_wreath",

data/json/items/melee/bludgeons.json

@@ -458,7 +458,8 @@
       "target": "wizard_cane_cheap",
       "ammo_scale": 0
     },
-    "extend": { "flags": [ "LIGHT_4", "CHARGEDIM", "TRADER_AVOID", "WATER_BREAK" ] },
+    "light": 4,
+    "extend": { "flags": [ "CHARGEDIM", "TRADER_AVOID", "WATER_BREAK" ] },
     "delete": { "flags": [ "WATER_BREAK_ACTIVE" ] }
   },
   {
@@ -511,7 +512,8 @@
       "target": "wizard_cane",
       "ammo_scale": 0
     },
-    "extend": { "flags": [ "LIGHT_300", "CHARGEDIM", "TRADER_AVOID", "WATER_BREAK" ] },
+    "light": 300,
+    "extend": { "flags": [ "CHARGEDIM", "TRADER_AVOID", "WATER_BREAK" ] },
     "delete": { "flags": [ "WATER_BREAK_ACTIVE" ] }
   },
   {
@@ -1846,7 +1848,8 @@
     "to_hit": { "grip": "weapon", "length": "short", "surface": "every", "balance": "good" },
     "revert_to": "shocktonfa_off",
     "use_action": [ "SHOCKTONFA_ON" ],
-    "flags": [ "LIGHT_450", "CHARGEDIM", "DURABLE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "BELT_CLIP" ],
+    "light": 450,
+    "flags": [ "CHARGEDIM", "DURABLE_MELEE", "TRADER_AVOID", "NONCONDUCTIVE", "BELT_CLIP" ],
     "weapon_category": [ "BATONS" ]
   },
   {

data/json/items/tool/electronics.json

@@ -195,7 +195,8 @@
       { "type": "link_up", "cable_length": 3, "charge_rate": "20 W" }
     ],
     "faults": [ { "fault_group": "electronic_general" } ],
-    "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATCH", "LIGHT_8", "CHARGEDIM", "TRADER_AVOID", "WATER_BREAK", "ELECTRONIC" ]
+    "light": 8,
+    "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATCH", "CHARGEDIM", "TRADER_AVOID", "WATER_BREAK", "ELECTRONIC" ]
   },
   {
     "id": "directional_antenna",
@@ -295,9 +296,10 @@
       },
       { "type": "link_up", "cable_length": 4, "charge_rate": "10 W" }
     ],
-    "//": "LIGHT_10 is the bare minimum for reading without penalties",
+    "//": "light 10 is the bare minimum for reading without penalties",
+    "light": 10,
     "faults": [ { "fault_group": "electronic_general" } ],
-    "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATCH", "WATER_BREAK", "ELECTRONIC", "LIGHT_10", "TRADER_AVOID" ]
+    "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATCH", "WATER_BREAK", "ELECTRONIC", "TRADER_AVOID" ]
   },
   {
     "id": "usb_drive",
@@ -650,7 +652,8 @@
       { "type": "link_up", "cable_length": 5, "charge_rate": "140 W" }
     ],
     "faults": [ { "fault_group": "electronic_general" } ],
-    "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATCH", "LIGHT_10", "TRADER_AVOID", "WATER_BREAK", "ELECTRONIC", "ALLOWS_REMOTE_USE" ]
+    "light": 10,
+    "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATCH", "TRADER_AVOID", "WATER_BREAK", "ELECTRONIC", "ALLOWS_REMOTE_USE" ]
   },
   {
     "id": "mp3",
@@ -907,7 +910,8 @@
       },
       { "type": "link_up", "cable_length": 3, "charge_rate": "20 W" }
     ],
-    "extend": { "flags": [ "LIGHT_20", "CHARGEDIM", "TRADER_AVOID" ] }
+    "light": 20,
+    "extend": { "flags": [ "CHARGEDIM", "TRADER_AVOID" ] }
   },
   {
     "id": "smart_phone_locked",
@@ -969,7 +973,8 @@
       },
       { "type": "link_up", "cable_length": 3, "charge_rate": "20 W" }
     ],
-    "extend": { "flags": [ "LIGHT_20", "CHARGEDIM", "TRADER_AVOID" ] }
+    "light": 20,
+    "extend": { "flags": [ "CHARGEDIM", "TRADER_AVOID" ] }
   },
   {
     "id": "UPS_off",

data/json/items/tool/explosives.json

@@ -745,7 +745,8 @@
     "symbol": "*",
     "color": "light_gray",
     "tick_action": [ "MOLOTOV_LIT" ],
-    "flags": [ "LIGHT_15", "TRADER_AVOID", "NPC_THROW_NOW", "NO_REPAIR", "WATER_EXTINGUISH", "DESTROY_ON_CHARGE_USE" ],
+    "light": 15,
+    "flags": [ "TRADER_AVOID", "NPC_THROW_NOW", "NO_REPAIR", "WATER_EXTINGUISH", "DESTROY_ON_CHARGE_USE" ],
     "melee_damage": { "bash": 5 }
   },
   {

data/json/items/tool/fire.json

@@ -301,7 +301,8 @@
         "type": "transform"
       }
     ],
-    "flags": [ "FIRE", "FIRESTARTER", "LIGHT_8", "FLAMING", "TRADER_AVOID", "WATER_EXTINGUISH" ],
+    "light": 8,
+    "flags": [ "FIRE", "FIRESTARTER", "FLAMING", "TRADER_AVOID", "WATER_EXTINGUISH" ],
     "tool_ammo": [ "lamp_oil" ]
   },
   {