From 10036046d6159e17e6981abd2c6dd6bf0da25d44 Mon Sep 17 00:00:00 2001 From: osuphobia Date: Tue, 3 Sep 2024 23:00:54 +0800 Subject: [PATCH] Fix overlook in #76290 --- data/json/items/tool/electronics.json | 22 +++++----- data/json/items/tool/lighting.json | 60 ++++++++++++++++++++++----- data/json/items/tool_armor.json | 36 +++++++--------- 3 files changed, 76 insertions(+), 42 deletions(-) diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index 4a41673396002..6f87b64b74c88 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -12,7 +12,7 @@ "symbol": ";", "color": "yellow", "ammo": [ "battery" ], - "flags": [ "WATER_BREAK_ACTIVE", "ELECTRONIC" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATER_BREAK_ACTIVE", "ELECTRONIC" ], "charges_per_use": 1, "use_action": [ "CAMERA" ], "//": "swappable, but proprietary 80g Li-Ion battery", @@ -34,7 +34,7 @@ "ammo": [ "battery" ], "charges_per_use": 5, "use_action": [ "CAMERA" ], - "flags": [ "CAMERA_PRO", "ALWAYS_TWOHAND", "WATER_BREAK_ACTIVE", "ELECTRONIC" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "CAMERA_PRO", "ALWAYS_TWOHAND", "WATER_BREAK_ACTIVE", "ELECTRONIC" ], "//": "swappable, but proprietary 160g Li-Ion battery", "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 100 } } ], "melee_damage": { "bash": 1 } @@ -62,7 +62,7 @@ "need_charges_msg": "The cellphone's batteries need more charge.", "type": "transform" }, - "flags": [ "WATCH", "ALARMCLOCK", "WATER_BREAK", "ELECTRONIC" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATCH", "ALARMCLOCK", "WATER_BREAK", "ELECTRONIC" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 17 } } ] }, { @@ -79,7 +79,7 @@ "menu_text": "Turn off", "type": "transform" }, - "flags": [ "WATCH", "LIGHT_8", "CHARGEDIM", "TRADER_AVOID", "WATER_BREAK", "ELECTRONIC" ] + "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATCH", "LIGHT_8", "CHARGEDIM", "TRADER_AVOID", "WATER_BREAK", "ELECTRONIC" ] }, { "id": "directional_antenna", @@ -150,7 +150,7 @@ }, { "type": "link_up", "cable_length": 4, "charge_rate": "10 W" } ], - "flags": [ "WATCH", "WATER_BREAK", "ELECTRONIC" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATCH", "WATER_BREAK", "ELECTRONIC" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 85 } }, { @@ -184,7 +184,7 @@ ], "tick_action": [ "EPIC_MUSIC" ], "//": "LIGHT_10 is the bare minimum for reading without penalties", - "flags": [ "LIGHT_10", "TRADER_AVOID", "WATCH", "WATER_BREAK", "ELECTRONIC" ] + "flags": [ "NO_UNLOAD", "NO_RELOAD", "LIGHT_10", "TRADER_AVOID", "WATCH", "WATER_BREAK", "ELECTRONIC" ] }, { "id": "electrohack", @@ -376,7 +376,7 @@ }, { "type": "link_up", "cable_length": 5, "charge_rate": "140 W" } ], - "flags": [ "WATCH", "WATER_BREAK", "ELECTRONIC", "ALLOWS_REMOTE_USE" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATCH", "WATER_BREAK", "ELECTRONIC", "ALLOWS_REMOTE_USE" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 200 } }, { @@ -419,7 +419,7 @@ { "type": "link_up", "cable_length": 5, "charge_rate": "140 W" } ], "tick_action": [ "EPIC_MUSIC" ], - "flags": [ "WATCH", "LIGHT_10", "TRADER_AVOID", "WATER_BREAK", "ELECTRONIC", "ALLOWS_REMOTE_USE" ] + "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATCH", "LIGHT_10", "TRADER_AVOID", "WATER_BREAK", "ELECTRONIC", "ALLOWS_REMOTE_USE" ] }, { "id": "mp3", @@ -438,7 +438,7 @@ "ammo": [ "battery" ], "use_action": [ "MP3", { "type": "link_up", "cable_length": 2, "charge_rate": "5 W" } ], "charges_per_use": 1, - "flags": [ "WATER_BREAK_ACTIVE", "ELECTRONIC" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATER_BREAK_ACTIVE", "ELECTRONIC" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 50 } } ] }, { @@ -451,7 +451,7 @@ "revert_to": "mp3", "tick_action": [ "MP3_ON" ], "use_action": [ "MP3_DEACTIVATE", { "type": "link_up", "cable_length": 2, "charge_rate": "5 W" } ], - "flags": [ "TRADER_AVOID", "WATER_BREAK", "ELECTRONIC" ] + "flags": [ "NO_UNLOAD", "NO_RELOAD", "TRADER_AVOID", "WATER_BREAK", "ELECTRONIC" ] }, { "id": "noise_emitter", @@ -573,7 +573,7 @@ "color": "light_gray", "ammo": [ "battery" ], "charges_per_use": 1, - "flags": [ "WATER_BREAK", "ELECTRONIC" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATER_BREAK", "ELECTRONIC" ], "use_action": [ "PORTABLE_GAME", { "type": "link_up", "cable_length": 4, "charge_rate": "39 W" } ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 48 } } ] }, diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index 90b4ed91a8d89..9f8eef28baa2c 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -154,7 +154,7 @@ }, { "type": "link_up", "cable_length": 2, "charge_rate": "20 W" } ], - "flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "ALLOWS_REMOTE_USE", "WATER_BREAK" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "RADIO_MODABLE", "RADIO_INVOKE_PROC", "ALLOWS_REMOTE_USE", "WATER_BREAK" ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 58 } } ], "melee_damage": { "bash": 1 } }, @@ -175,7 +175,7 @@ }, { "type": "link_up", "cable_length": 2, "charge_rate": "20 W" } ], - "flags": [ "RADIO_MODABLE", "RADIO_INVOKE_PROC", "LIGHT_15", "TRADER_AVOID", "ALLOWS_REMOTE_USE" ] + "flags": [ "NO_UNLOAD", "NO_RELOAD", "RADIO_MODABLE", "RADIO_INVOKE_PROC", "LIGHT_15", "TRADER_AVOID", "ALLOWS_REMOTE_USE" ] }, { "id": "flashlight", @@ -348,7 +348,7 @@ "price_postapoc": "1 USD", "charges_per_use": 1, "ammo": [ "battery" ], - "flags": [ "BELT_CLIP", "HELMET_HEAD_ATTACHMENT", "HEAD_STRAP_MOUNT", "WRIST_MOUNT_ATTACHMENT" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "BELT_CLIP", "HELMET_HEAD_ATTACHMENT", "HEAD_STRAP_MOUNT", "WRIST_MOUNT_ATTACHMENT" ], "use_action": [ { "type": "transform", @@ -393,7 +393,16 @@ "charge_rate": "20 W" } ], - "flags": [ "LIGHT_500", "CHARGEDIM", "TRADER_AVOID", "BELT_CLIP", "HELMET_HEAD_ATTACHMENT", "HEAD_STRAP_MOUNT" ] + "flags": [ + "NO_UNLOAD", + "NO_RELOAD", + "LIGHT_500", + "CHARGEDIM", + "TRADER_AVOID", + "BELT_CLIP", + "HELMET_HEAD_ATTACHMENT", + "HEAD_STRAP_MOUNT" + ] }, { "id": "diving_flashlight_variable_on_med", @@ -423,7 +432,16 @@ "charge_rate": "20 W" } ], - "flags": [ "LIGHT_200", "CHARGEDIM", "TRADER_AVOID", "BELT_CLIP", "HELMET_HEAD_ATTACHMENT", "HEAD_STRAP_MOUNT" ] + "flags": [ + "NO_UNLOAD", + "NO_RELOAD", + "LIGHT_200", + "CHARGEDIM", + "TRADER_AVOID", + "BELT_CLIP", + "HELMET_HEAD_ATTACHMENT", + "HEAD_STRAP_MOUNT" + ] }, { "id": "diving_flashlight_variable_on_low", @@ -450,7 +468,16 @@ "charge_rate": "20 W" } ], - "flags": [ "LIGHT_80", "CHARGEDIM", "TRADER_AVOID", "BELT_CLIP", "HELMET_HEAD_ATTACHMENT", "HEAD_STRAP_MOUNT" ] + "flags": [ + "NO_UNLOAD", + "NO_RELOAD", + "LIGHT_80", + "CHARGEDIM", + "TRADER_AVOID", + "BELT_CLIP", + "HELMET_HEAD_ATTACHMENT", + "HEAD_STRAP_MOUNT" + ] }, { "id": "gasoline_lantern", @@ -626,7 +653,7 @@ "armor_data": { "armor": [ { "covers": [ "torso" ], "coverage": 5, "encumbrance": 2, "specifically_covers": [ "torso_hanging_front" ] } ] }, - "flags": [ "BELT_CLIP", "BELTED" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "BELT_CLIP", "BELTED" ], "use_action": [ { "type": "transform", @@ -658,7 +685,7 @@ }, { "type": "link_up", "cable_length": 3, "charge_rate": "20 W" } ], - "flags": [ "LIGHT_500", "CHARGEDIM", "BELT_CLIP", "BELTED" ] + "flags": [ "NO_UNLOAD", "NO_RELOAD", "LIGHT_500", "CHARGEDIM", "BELT_CLIP", "BELTED" ] }, { "id": "lightstrip", @@ -847,7 +874,7 @@ "material": [ "plastic", "aluminum" ], "symbol": ";", "color": "white", - "flags": [ "WATER_BREAK" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATER_BREAK" ], "ammo": [ "battery" ], "charges_per_use": 1, "use_action": { @@ -875,7 +902,7 @@ "menu_text": "Turn off", "type": "transform" }, - "flags": [ "LIGHT_15", "CHARGEDIM" ] + "flags": [ "NO_UNLOAD", "NO_RELOAD", "WATER_BREAK", "LIGHT_15", "CHARGEDIM" ] }, { "id": "smart_lamp", @@ -905,7 +932,16 @@ { "type": "link_up", "cable_length": 3, "charge_rate": "6 W" } ], "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 33 } } ], - "flags": [ "ALLOWS_REMOTE_USE", "RADIO_ACTIVATION", "RADIO_INVOKE_PROC", "RADIOSIGNAL_2", "WATER_BREAK", "ELECTRONIC" ], + "flags": [ + "NO_UNLOAD", + "NO_RELOAD", + "ALLOWS_REMOTE_USE", + "RADIO_ACTIVATION", + "RADIO_INVOKE_PROC", + "RADIOSIGNAL_2", + "WATER_BREAK", + "ELECTRONIC" + ], "melee_damage": { "bash": 1 } }, { @@ -924,6 +960,8 @@ "type": "transform" }, "flags": [ + "NO_UNLOAD", + "NO_RELOAD", "ALLOWS_REMOTE_USE", "RADIO_ACTIVATION", "RADIO_INVOKE_PROC", diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 002af39381a74..7d42da19c7fae 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -918,20 +918,13 @@ "price": "200 USD", "price_postapoc": "50 cent", "material": [ "plastic", "steel" ], - "flags": [ "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS", "WATER_BREAK", "ELECTRONIC" ], + "flags": [ "NO_UNLOAD", "NO_RELOAD", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS", "WATER_BREAK", "ELECTRONIC" ], "weight": "520 g", "volume": "500 ml", - "charges_per_use": 5, + "charges_per_use": 1, "ammo": "battery", "use_action": [ "CAMERA" ], - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "rigid": true, - "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ], - "default_magazine": "light_battery_cell" - } - ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 50 } } ], "armor": [ { "encumbrance": 2, "coverage": 15, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_front" ] } ], "melee_damage": { "bash": 1 } }, @@ -946,20 +939,23 @@ "price": "8 kUSD", "price_postapoc": "1 USD", "material": [ "plastic", "steel" ], - "flags": [ "CAMERA_PRO", "ALWAYS_TWOHAND", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS", "WATER_BREAK", "ELECTRONIC" ], + "flags": [ + "NO_UNLOAD", + "NO_RELOAD", + "CAMERA_PRO", + "ALWAYS_TWOHAND", + "OVERSIZE", + "BELTED", + "ALLOWS_NATURAL_ATTACKS", + "WATER_BREAK", + "ELECTRONIC" + ], "weight": "520 g", "volume": "500 ml", - "charges_per_use": 5, + "charges_per_use": 1, "ammo": "battery", "use_action": [ "CAMERA" ], - "pocket_data": [ - { - "pocket_type": "MAGAZINE_WELL", - "rigid": true, - "flag_restriction": [ "BATTERY_LIGHT", "BATTERY_ULTRA_LIGHT" ], - "default_magazine": "light_battery_cell" - } - ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 100 } } ], "armor": [ { "encumbrance": 2, "coverage": 15, "covers": [ "torso" ], "specifically_covers": [ "torso_hanging_front" ] } ], "melee_damage": { "bash": 1 } },