From 97a6f6a9a41541a84aac44a2fb376ebcb9a69715 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 12 Mar 2024 01:13:39 -0700 Subject: Re-order against base json to ease diffing. Also fix a few minor bugs. --- json/items/power_armor/power_armor_frame.json | 51 ------------------------ json/items/power_armor/power_armor_heavy.json | 49 ----------------------- json/items/power_armor/power_armor_light.json | 49 ----------------------- json/items/power_armor/power_armor_medium.json | 49 ----------------------- json/items/power_armor/power_armor_salvaged.json | 19 --------- json/items/power_armor/readme.txt | 11 ----- 6 files changed, 228 deletions(-) delete mode 100644 json/items/power_armor/power_armor_frame.json delete mode 100644 json/items/power_armor/power_armor_heavy.json delete mode 100644 json/items/power_armor/power_armor_light.json delete mode 100644 json/items/power_armor/power_armor_medium.json delete mode 100644 json/items/power_armor/power_armor_salvaged.json delete mode 100644 json/items/power_armor/readme.txt (limited to 'json/items/power_armor') diff --git a/json/items/power_armor/power_armor_frame.json b/json/items/power_armor/power_armor_frame.json deleted file mode 100644 index c6739e1..0000000 --- a/json/items/power_armor/power_armor_frame.json +++ /dev/null @@ -1,51 +0,0 @@ -[ - { - "id": "power_armor_frame", - "copy-from": "power_armor_frame", - "type": "ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton hauling frame" } - }, - { - "id": "power_armor_back_holster", - "copy-from": "power_armor_back_holster", - "type": "ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton back holster" } - }, - { - "id": "power_armor_holster", - "copy-from": "power_armor_holster", - "type": "ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton holster" } - }, - { - "id": "power_armor_chest_rig", - "copy-from": "power_armor_chest_rig", - "type": "ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton magazine carrier" } - }, - { - "id": "power_armor_bscabbard", - "copy-from": "power_armor_bscabbard", - "type": "ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton back scabbard" } - }, - { - "id": "power_armor_scabbard", - "copy-from": "power_armor_scabbard", - "type": "ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton scabbard" } - }, - { - "id": "power_armor_sheath", - "copy-from": "power_armor_sheath", - "type": "ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton sheath" } - } -] diff --git a/json/items/power_armor/power_armor_heavy.json b/json/items/power_armor/power_armor_heavy.json deleted file mode 100644 index 49a5235..0000000 --- a/json/items/power_armor/power_armor_heavy.json +++ /dev/null @@ -1,49 +0,0 @@ -[ - { - "id": "power_armor_heavy", - "copy-from": "power_armor_heavy", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton Mk I", "str_pl": "combat exoskeleton Mk Is" }, - "description": "Colloquially known as a 'tank suit' in the media, these bulky exoskeletons, covered in thick segmented armor plates, were tested in military service a few years back and determined to be too heavy and expensive for regular use. Now that it's in your hands, though, you have a massive suit of power armor capable of resisting almost any small arms fire and most other forms of attack. On the other hand, it doubles your effective weight, and it's almost impossible not to bump into things. An integrated chemical resistant bodyglove precludes wearing clothing aside from most undergarments.", - "weight": "54420 g", - "extend": { "flags": [ "RAINPROOF" ] } - }, - { - "id": "power_armor_heavy_on", - "copy-from": "power_armor_heavy_on", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton Mk I (on)", "str_pl": "combat exoskeleton Mk Is (on)" }, - "description": "Colloquially known as a 'tank suit' in the media, these bulky exoskeletons, covered in thick segmented armor plates, were tested in military service a few years back and determined to be too heavy and expensive for regular use. Now that it's in your hands, though, you have a massive suit of power armor capable of resisting almost any small arms fire and most other forms of attack. On the other hand, it doubles your effective weight, and it's almost impossible not to bump into things. An integrated chemical resistant bodyglove precludes wearing clothing aside from most undergarments. It is currently turned on, activate it to turn it off.", - "weight": "54420 g", - "weight_capacity_bonus": "54420 g" - }, - { - "id": "power_armor_helmet_heavy", - "copy-from": "power_armor_helmet_heavy", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "environmental combat helmet Mk I", "str_pl": "environmental combat helmet Mk Is" }, - "weight": "6046 g", - "extend": { "flags": [ "RAINPROOF", "SWIM_GOGGLES" ] }, - "delete": { "flags": [ "PARTIAL_DEAF" ] } - }, - { - "id": "power_armor_helmet_heavy_on", - "copy-from": "power_armor_helmet_heavy_on", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "environmental combat helmet Mk I (on)", "str_pl": "environmental combat helmet Mk Is (on)" }, - "weight": "6046 g", - "weight_capacity_bonus": "6046 g", - "extend": { - "flags": [ - "THERMOMETER", - "CLIMATE_CONTROL", - "TRADER_AVOID", - "PARTIAL_DEAF" - ] - } - } -] diff --git a/json/items/power_armor/power_armor_light.json b/json/items/power_armor/power_armor_light.json deleted file mode 100644 index f4485da..0000000 --- a/json/items/power_armor/power_armor_light.json +++ /dev/null @@ -1,49 +0,0 @@ -[ - { - "id": "power_armor_light", - "copy-from": "power_armor_light", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton Mk III", "str_pl": "combat exoskeleton Mk IIIs" }, - "description": "The final iteration of military power armor before the fall of civilization, this type - a powered exoskeleton with high-tech segmented plating - was designed for actual widespread combat use and was seen on the front lines during the last days of the cataclysm. Like the heavier suits, it is resistant to most modern weaponry, but it is much more light and maneuverable. Unfortunately, the world ended before it could roll out in significant numbers. An integrated chemical resistant bodyglove precludes wearing clothing aside from most undergarments.", - "weight": "18670 g", - "extend": { "flags": [ "RAINPROOF" ] } - }, - { - "id": "power_armor_light_on", - "copy-from": "power_armor_light_on", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton Mk III (on)", "str_pl": "combat exoskeleton Mk IIIs (on)" }, - "description": "The final iteration of military power armor before the fall of civilization, this type - a powered exoskeleton with high-tech segmented plating - was designed for actual widespread combat use and was seen on the front lines during the last days of the cataclysm. Like the heavier suits, it is resistant to most modern weaponry, but it is much more light and maneuverable. Unfortunately, the world ended before it could roll out in significant numbers. An integrated chemical resistant bodyglove precludes wearing clothing aside from most undergarments. It is currently turned on, activate it to turn it off.", - "weight": "18670 g", - "weight_capacity_bonus": "18670 g" - }, - { - "id": "power_armor_helmet_light", - "copy-from": "power_armor_helmet_light", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "environmental combat helmet Mk III", "str_pl": "environmental combat helmet Mk IIIs" }, - "weight": "2074 g", - "extend": { "flags": [ "RAINPROOF", "SWIM_GOGGLES" ] }, - "delete": { "flags": [ "PARTIAL_DEAF" ] } - }, - { - "id": "power_armor_helmet_light_on", - "copy-from": "power_armor_helmet_light_on", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "environmental combat helmet Mk III (on)", "str_pl": "environmental combat helmet Mk IIIs (on)" }, - "weight": "2074 g", - "weight_capacity_bonus": "2074 g", - "extend": { - "flags": [ - "THERMOMETER", - "CLIMATE_CONTROL", - "TRADER_AVOID", - "PARTIAL_DEAF" - ] - } - } -] diff --git a/json/items/power_armor/power_armor_medium.json b/json/items/power_armor/power_armor_medium.json deleted file mode 100644 index 43b6ca7..0000000 --- a/json/items/power_armor/power_armor_medium.json +++ /dev/null @@ -1,49 +0,0 @@ -[ - { - "id": "power_armor_basic", - "copy-from": "power_armor_basic", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton Mk II", "str_pl": "combat exoskeletons Mk IIs" }, - "description": "These were the second wave of military combat exoskeleton, and got a lot of media attention, with popular Navy commercials featuring them heavily. It consists of a muscle-boosting exoskeleton frame with overlayed segmented alloy plating. Despite advancements over the original bulky 'tank suits', it's still highly cumbersome when inactive. An integrated chemical resistant bodyglove precludes wearing clothing aside from most undergarments.", - "weight": "36280 g", - "extend": { "flags": [ "RAINPROOF" ] } - }, - { - "id": "power_armor_basic_on", - "copy-from": "power_armor_basic_on", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton Mk II (on)", "str_pl": "combat exoskeleton Mk IIs (on)" }, - "description": "These were the second wave of military combat exoskeleton, and got a lot of media attention, with popular Navy commercials featuring them heavily. It consists of a muscle-boosting exoskeleton frame with overlayed segmented alloy plating. Despite advancements over the original bulky 'tank suits', it's still highly cumbersome when inactive. An integrated chemical resistant bodyglove precludes wearing clothing aside from most undergarments. It is currently turned on, activate it to turn it off.", - "weight": "36280 g", - "weight_capacity_bonus": "36280 g" - }, - { - "id": "power_armor_helmet_basic", - "copy-from": "power_armor_helmet_basic", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "environmental combat helmet Mk II", "str_pl": "environmental combat helmet Mk IIs" }, - "weight": "4031 g", - "extend": { "flags": [ "RAINPROOF", "SWIM_GOGGLES" ] }, - "delete": { "flags": [ "PARTIAL_DEAF" ] } - }, - { - "id": "power_armor_helmet_basic_on", - "copy-from": "power_armor_helmet_basic_on", - "type": "TOOL_ARMOR", - "category": "clothing", - "name": { "str": "environmental combat helmet Mk II (on)", "str_pl": "environmental combat helmet Mk IIs (on)" }, - "weight": "4031 g", - "weight_capacity_bonus": "4031 g", - "extend": { - "flags": [ - "THERMOMETER", - "CLIMATE_CONTROL", - "TRADER_AVOID", - "PARTIAL_DEAF" - ] - } - } -] diff --git a/json/items/power_armor/power_armor_salvaged.json b/json/items/power_armor/power_armor_salvaged.json deleted file mode 100644 index 6c023d4..0000000 --- a/json/items/power_armor/power_armor_salvaged.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "id": "depowered_armor", - "copy-from": "depowered_armor", - "type": "ARMOR", - "category": "clothing", - "name": { "str": "combat exoskeleton Mk II (salvaged)", "str_pl": "combat exoskeleton Mk IIs (salvaged)" }, - "weight": "11214 g" - }, - { - "id": "depowered_helmet", - "copy-from": "depowered_helmet", - "type": "ARMOR", - "category": "clothing", - "name": { "str": "environmental combat helmet Mk II (salvaged)", "str_pl": "environmental combat helmet Mk IIs (salvaged)" }, - "weight": "1246 g", - "extend": { "flags": [ "SWIM_GOGGLES" ] } - } -] diff --git a/json/items/power_armor/readme.txt b/json/items/power_armor/readme.txt deleted file mode 100644 index 54fcbca..0000000 --- a/json/items/power_armor/readme.txt +++ /dev/null @@ -1,11 +0,0 @@ -Tweak the BN power armor. (Previously Port power armor improvements from DDA to BN.) - -Rename several items still using the old term power armor to use the newer term combat exoskeleton. --And rename the salvaged power armor helmet to salvaged environmental combat helmet. - -Add Swim Goggles flag to helmets. - -Add Partial Deaf flag to helmets while active. --This allows the suit to be used by non-cyborgs without going deaf. - -Fix light/medium/heavy exoskeletons and helmets being mis-categorized as tools instead of clothing. -- cgit v1.2.1