diff options
Diffstat (limited to 'json')
| -rw-r--r-- | json/items/armor/arms_armor.json | 38 | ||||
| -rw-r--r-- | json/items/armor/boots.json | 18 | ||||
| -rw-r--r-- | json/items/armor/coats.json | 141 | ||||
| -rw-r--r-- | json/items/armor/helmets.json | 94 | ||||
| -rw-r--r-- | json/items/armor/holster.json | 14 | ||||
| -rw-r--r-- | json/items/armor/legs_clothes.json | 56 | ||||
| -rw-r--r-- | json/items/armor/power_armor.json | 209 | ||||
| -rw-r--r-- | json/items/armor/storage.json | 167 | ||||
| -rw-r--r-- | json/items/armor/suits_protection.json | 99 | ||||
| -rw-r--r-- | json/items/armor/torso_armor.json | 2 | ||||
| -rw-r--r-- | json/items/armor/torso_clothes.json | 4 | ||||
| -rw-r--r-- | json/items/power_armor/power_armor_frame.json | 51 | ||||
| -rw-r--r-- | json/items/power_armor/power_armor_heavy.json | 49 | ||||
| -rw-r--r-- | json/items/power_armor/power_armor_light.json | 49 | ||||
| -rw-r--r-- | json/items/power_armor/power_armor_medium.json | 49 | ||||
| -rw-r--r-- | json/items/power_armor/power_armor_salvaged.json | 19 | ||||
| -rw-r--r-- | json/items/power_armor/readme.txt | 11 |
17 files changed, 543 insertions, 527 deletions
diff --git a/json/items/armor/arms_armor.json b/json/items/armor/arms_armor.json index c76be5d..21e7b3e 100644 --- a/json/items/armor/arms_armor.json +++ b/json/items/armor/arms_armor.json @@ -1,11 +1,20 @@ [ { - "id": "elbow_pads", - "copy-from": "elbow_pads", + "id": "armguard_chitin", + "copy-from": "armguard_chitin", "type": "ARMOR", - "name": { "str": "pair of elbow pads", "str_pl": "pairs of elbow pads" }, - "extend": { "flags": [ "COMPACT", "ONLY_ONE" ] }, - "//": "Add the ONLY_ONE flag to prevent stacking this 0 encumbrance item." + "name": { "str": "pair of chitin arm guards", "str_pl": "pairs of chitin arm guards" }, + "coverage": 90, + "encumbrance": 4, + "material_thickness": 3 + }, + { + "id": "armguard_acidchitin", + "copy-from": "armguard_acidchitin", + "type": "ARMOR", + "name": { "str": "pair of biosilicified chitin arm guards", "str_pl": "pairs of biosilicified chitin arm guards" }, + "material_thickness": 4, + "extend": { "flags": [ "NO_REPAIR" ] } }, { "id": "armguard_hard", @@ -34,20 +43,11 @@ "encumbrance": 15 }, { - "id": "armguard_chitin", - "copy-from": "armguard_chitin", - "type": "ARMOR", - "name": { "str": "pair of chitin arm guards", "str_pl": "pairs of chitin arm guards" }, - "coverage": 90, - "encumbrance": 4, - "material_thickness": 3 - }, - { - "id": "armguard_acidchitin", - "copy-from": "armguard_acidchitin", + "id": "elbow_pads", + "copy-from": "elbow_pads", "type": "ARMOR", - "name": { "str": "pair of biosilicified chitin arm guards", "str_pl": "pairs of biosilicified chitin arm guards" }, - "material_thickness": 4, - "extend": { "flags": [ "NO_REPAIR" ] } + "name": { "str": "pair of elbow pads", "str_pl": "pairs of elbow pads" }, + "extend": { "flags": [ "COMPACT", "ONLY_ONE" ] }, + "//": "Add the ONLY_ONE flag to prevent stacking this 0 encumbrance item." } ] diff --git a/json/items/armor/boots.json b/json/items/armor/boots.json index 8dc3d89..2ef2241 100644 --- a/json/items/armor/boots.json +++ b/json/items/armor/boots.json @@ -1,5 +1,14 @@ [ { + "id": "boots_combat", + "copy-from": "boots_combat", + "type": "ARMOR", + "name": { "str": "pair of combat boots", "str_pl": "pairs of combat boots" }, + "encumbrance": 12, + "//": "Add the mising 'pair of' to the name.", + "//2": "Reduce the encumbrance." + }, + { "id": "stockings", "type": "ARMOR", "name": { "str": "pair of stockings", "str_pl": "pairs of stockings" }, @@ -21,15 +30,6 @@ "flags": [ "VARSIZE", "SKINTIGHT", "POWERARMOR_COMPATIBLE" ] }, { - "id": "boots_combat", - "copy-from": "boots_combat", - "type": "ARMOR", - "name": { "str": "pair of combat boots", "str_pl": "pairs of combat boots" }, - "encumbrance": 12, - "//": "Add the mising 'pair of' to the name.", - "//2": "Reduce the encumbrance." - }, - { "id": "sandal_armor", "copy-from": "sandal_armor", "type": "ARMOR", diff --git a/json/items/armor/coats.json b/json/items/armor/coats.json index 6a7444f..8ae1b79 100644 --- a/json/items/armor/coats.json +++ b/json/items/armor/coats.json @@ -1,5 +1,64 @@ [ { + "id": "coat_lab", + "copy-from": "coat_lab", + "type": "ARMOR", + "name": { "str": "lab coat" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 2, 5 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 2, 2 ] } + ], + "storage": "4 L" + }, + { + "id": "coat_winter", + "copy-from": "coat_winter", + "type": "ARMOR", + "name": { "str": "winter coat" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 18, 27 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 18, 21 ] } + ], + "storage": "4 L" + }, + { + "id": "duster", + "copy-from": "duster", + "type": "ARMOR", + "name": { "str": "duster" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, + { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] } + ], + "storage": "6600 ml" + }, + { + "id": "duster_leather", + "copy-from": "duster_leather", + "type": "ARMOR", + "name": { "str": "leather duster" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, + { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] } + ], + "storage": "6600 ml" + }, + { + "id": "duster_survivor", + "copy-from": "duster_survivor", + "type": "ARMOR", + "name": { "str": "survivor duster" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 13 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 8, 8 ] }, + { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 5, 6 ] } + ], + "material_thickness": 4, + "storage": "8600 ml" + }, + { "id": "greatcoat", "copy-from": "greatcoat", "type": "ARMOR", @@ -11,6 +70,18 @@ ] }, { + "id": "jacket_army", + "copy-from": "jacket_army", + "type": "ARMOR", + "name": { "str": "army jacket" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] } + ], + "storage": "5 L", + "//": "Fix incorrect vanilla use of str_sp." + }, + { "id": "jacket_leather", "copy-from": "jacket_leather", "type": "ARMOR", @@ -74,65 +145,6 @@ "storage": "8600 ml" }, { - "id": "coat_winter", - "copy-from": "coat_winter", - "type": "ARMOR", - "name": { "str": "winter coat" }, - "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 18, 27 ] }, - { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 18, 21 ] } - ], - "storage": "4 L" - }, - { - "id": "duster", - "copy-from": "duster", - "type": "ARMOR", - "name": { "str": "duster" }, - "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] }, - { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, - { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] } - ], - "storage": "6600 ml" - }, - { - "id": "duster_leather", - "copy-from": "duster_leather", - "type": "ARMOR", - "name": { "str": "leather duster" }, - "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 13 ] }, - { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, - { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] } - ], - "storage": "6600 ml" - }, - { - "id": "duster_survivor", - "copy-from": "duster_survivor", - "type": "ARMOR", - "name": { "str": "survivor duster" }, - "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 13 ] }, - { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 8, 8 ] }, - { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 5, 6 ] } - ], - "material_thickness": 4, - "storage": "8600 ml" - }, - { - "id": "jacket_army", - "copy-from": "jacket_army", - "type": "ARMOR", - "name": { "str": "army jacket" }, - "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] }, - { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] } - ], - "storage": "5 L" - }, - { "id": "winter_jacket_army", "copy-from": "winter_jacket_army", "type": "ARMOR", @@ -142,16 +154,5 @@ { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 10, 10 ] } ], "storage": "5 L" - }, - { - "id": "coat_lab", - "copy-from": "coat_lab", - "type": "ARMOR", - "name": { "str": "lab coat" }, - "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 2, 5 ] }, - { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 2, 2 ] } - ], - "storage": "4 L" } ] diff --git a/json/items/armor/helmets.json b/json/items/armor/helmets.json index 28e9dce..564a7eb 100644 --- a/json/items/armor/helmets.json +++ b/json/items/armor/helmets.json @@ -1,5 +1,43 @@ [ { + "id": "helmet_army", + "copy-from": "helmet_army", + "type": "ARMOR", + "category": "armor", + "name": { "str": "army helmet" }, + "material": [ "kevlar_rigid", "plastic" ], + "//": "Fix the material from kevlar to rigid kevlar." + }, + { + "id": "tac_fullhelmet", + "copy-from": "tac_fullhelmet", + "type": "ARMOR", + "category": "armor", + "name": { "str": "tactical full helmet" }, + "material": [ "kevlar_rigid", "plastic" ], + "material_thickness": 8, + "armor_portion_data": [ + { "covers": [ "head" ], "coverage": 100, "encumbrance": 20 }, + { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 20 }, + { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 15 } + ], + "extend": { "flags": [ "WATERPROOF" ] }, + "//": "Fix the material from kevlar to rigid kevlar.", + "//2": "Also buff the thickness to make it a viable option compared to the army helmet.", + "//3": "Also add WATERPROOF" + }, + { + "id": "tac_helmet", + "copy-from": "tac_helmet", + "type": "ARMOR", + "category": "armor", + "name": { "str": "tactical helmet" }, + "material": [ "kevlar_rigid", "plastic" ], + "material_thickness": 8, + "//": "Fix the material from kevlar to rigid kevlar.", + "//2": "Also buff the thickness to make it a viable option compared to the army helmet." + }, + { "id": "helmet_survivor", "type": "ARMOR", "name": { "str": "survivor helmet" }, @@ -53,66 +91,14 @@ }, { "id": "helmet_sasurvivor", + "copy-from": "helmet_hsurvivor", "type": "ARMOR", "name": { "str": "superalloy survivor helmet" }, "description": "A customized, heavily armored superalloy and Kevlar helmet, modified to provide maximum comfort and protection from harm. All the added material has made it rather heavy.", - "weight": "2649 g", - "volume": "2500 ml", - "price": "0 cent", - "price_postapoc": "65 USD", - "to_hit": -1, - "bashing": 10, "material": [ "kevlar_rigid", "superalloy" ], - "symbol": "[", - "looks_like": "helmet_survivor", "color": "light_cyan", - "covers": [ "head" ], - "coverage": 100, "encumbrance": 35, - "warmth": 15, - "material_thickness": 8, - "environmental_protection": 5, - "techniques": [ "WBLOCK_1" ], - "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ], - "//": "Overwrite because I disagree with BN's balancing." - }, - - { - "id": "helmet_army", - "copy-from": "helmet_army", - "type": "ARMOR", - "category": "armor", - "name": { "str": "army helmet" }, - "material": [ "kevlar_rigid", "plastic" ], + "proportional": { "weight": 0.6, "price_postapoc": 2 }, "//": "Fix the material from kevlar to rigid kevlar." - }, - { - "id": "tac_helmet", - "copy-from": "tac_helmet", - "type": "ARMOR", - "category": "armor", - "name": { "str": "tactical helmet" }, - "material": [ "kevlar_rigid", "plastic" ], - "material_thickness": 8, - "//": "Fix the material from kevlar to rigid kevlar.", - "//2": "Also buff the thickness to make it a viable option compared to the army helmet." - }, - { - "id": "tac_fullhelmet", - "copy-from": "tac_fullhelmet", - "type": "ARMOR", - "category": "armor", - "name": { "str": "tactical full helmet" }, - "material": [ "kevlar_rigid", "plastic" ], - "material_thickness": 8, - "armor_portion_data": [ - { "covers": [ "head" ], "coverage": 100, "encumbrance": 20 }, - { "covers": [ "eyes" ], "coverage": 100, "encumbrance": 20 }, - { "covers": [ "mouth" ], "coverage": 100, "encumbrance": 15 } - ], - "extend": { "flags": [ "WATERPROOF" ] }, - "//": "Fix the material from kevlar to rigid kevlar.", - "//2": "Also buff the thickness to make it a viable option compared to the army helmet.", - "//3": "Also add WATERPROOF" } ] diff --git a/json/items/armor/holster.json b/json/items/armor/holster.json index 0cd2011..f54aeba 100644 --- a/json/items/armor/holster.json +++ b/json/items/armor/holster.json @@ -1,21 +1,21 @@ [ { - "id": "XL_holster", - "copy-from": "XL_holster", + "id": "survivor_vest", + "copy-from": "survivor_vest", "type": "ARMOR", - "name": { "str": "large holster" }, + "name": { "str": "survivor harness" }, "rigid": false, + "storage": "4500 ml", "encumbrance": 1, "max_encumbrance": 4, "//": "Reduce the encumbrance when empty." }, { - "id": "survivor_vest", - "copy-from": "survivor_vest", + "id": "XL_holster", + "copy-from": "XL_holster", "type": "ARMOR", - "name": { "str": "survivor harness" }, + "name": { "str": "large holster" }, "rigid": false, - "storage": "4500 ml", "encumbrance": 1, "max_encumbrance": 4, "//": "Reduce the encumbrance when empty." diff --git a/json/items/armor/legs_clothes.json b/json/items/armor/legs_clothes.json index 5b36a25..938c41a 100644 --- a/json/items/armor/legs_clothes.json +++ b/json/items/armor/legs_clothes.json @@ -1,14 +1,5 @@ [ - { - "id": "pants", - "copy-from": "pants", - "type": "ARMOR", - "name": { "str_sp": "pants" }, - "encumbrance": 7, - "max_encumbrance": 11, - "storage": "4500 ml" - }, - { + { "id": "jeans", "copy-from": "jeans", "type": "ARMOR", @@ -18,16 +9,16 @@ "max_encumbrance": 11, "storage": "4500 ml" }, - { - "id": "pants_leather", - "copy-from": "pants_leather", + { + "id": "pants", + "copy-from": "pants", "type": "ARMOR", - "name": { "str_sp": "leather pants" }, - "encumbrance": 15, - "max_encumbrance": 17, - "storage": "1600 ml" + "name": { "str_sp": "pants" }, + "encumbrance": 7, + "max_encumbrance": 11, + "storage": "4500 ml" }, - { + { "id": "pants_army", "copy-from": "pants_army", "type": "ARMOR", @@ -36,16 +27,7 @@ "max_encumbrance": 7, "storage": "7 L" }, - { - "id": "winter_pants_army", - "copy-from": "winter_pants_army", - "type": "ARMOR", - "name": { "str_sp": "army winter pants" }, - "encumbrance": 11, - "max_encumbrance": 22, - "storage": "7 L" - }, - { + { "id": "pants_cargo", "copy-from": "pants_cargo", "type": "ARMOR", @@ -54,5 +36,23 @@ "max_encumbrance": 6, "storage": "7 L", "coverage": 100 + }, + { + "id": "pants_leather", + "copy-from": "pants_leather", + "type": "ARMOR", + "name": { "str_sp": "leather pants" }, + "encumbrance": 15, + "max_encumbrance": 17, + "storage": "1600 ml" + }, + { + "id": "winter_pants_army", + "copy-from": "winter_pants_army", + "type": "ARMOR", + "name": { "str_sp": "army winter pants" }, + "encumbrance": 11, + "max_encumbrance": 22, + "storage": "7 L" } ] diff --git a/json/items/armor/power_armor.json b/json/items/armor/power_armor.json new file mode 100644 index 0000000..b1904de --- /dev/null +++ b/json/items/armor/power_armor.json @@ -0,0 +1,209 @@ +[ + { + "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" ] } + }, + { + "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_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_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_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" + ] + } + }, + { + "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" + ] + } + }, + { + "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" + ] + } + }, + { + "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/armor/storage.json b/json/items/armor/storage.json index 938b644..8d677b0 100644 --- a/json/items/armor/storage.json +++ b/json/items/armor/storage.json @@ -1,90 +1,87 @@ [ - { - "id": "mbag", - "copy-from": "mbag", - "type": "ARMOR", - "name": { "str": "messenger bag" }, - "encumbrance": 4, - "max_encumbrance": 8, - "storage": "15 L", - "flags": [ "BELTED", "WATER_FRIENDLY" ] - }, - { + { "id": "backpack", "copy-from": "backpack", "type": "ARMOR", "name": { "str": "backpack" }, "encumbrance": 4, "max_encumbrance": 19, - "storage": "35500 ml" + "storage": "25510 ml" + }, + { + "id": "backpack_hiking", + "copy-from": "backpack_hiking", + "type": "ARMOR", + "name": { "str": "hiking backpack" }, + "volume": "14700 ml", + "encumbrance": 10, + "max_encumbrance": 40, + "storage": "63 L" }, - { + { "id": "backpack_leather", "copy-from": "backpack_leather", "type": "ARMOR", "name": { "str": "leather backpack" }, "encumbrance": 2, - "max_encumbrance": 25, - "storage": "35500 ml" - }, - { - "id": "duffelbag", - "copy-from": "duffelbag", - "type": "ARMOR", - "name": { "str": "duffel bag" }, - "encumbrance": 5, - "max_encumbrance": 15, - "storage": "39 L" + "max_encumbrance": 20, + "storage": "25 L" }, - { - "id": "molle_pack", - "copy-from": "molle_pack", - "type": "ARMOR", - "name": { "str": "MOLLE pack" }, - "weight": "1450 g", - "volume": "6 L", - "encumbrance": 5, - "max_encumbrance": 11, - "storage": "38 L" - }, - { + { "id": "backpack_tactical_large", "copy-from": "backpack_tactical_large", "type": "ARMOR", "name": { "str": "large tactical backpack" }, "encumbrance": 10, "max_encumbrance": 55, - "storage": "81 L" + "storage": "66 L" }, - { - "id": "legrig", - "copy-from": "legrig", - "type": "ARMOR", - "name": { "str": "pair of drop leg pouches", "str_pl": "pairs of drop leg pouches" }, - "storage": "5 L", - "encumbrance": 2, - "max_encumbrance": 3, - "flags": [ "WATER_FRIENDLY", "BELTED" ], - "//": "Changed to strapped layer since knee pads no longer hard conflict." - }, - { + { "id": "daypack", "copy-from": "daypack", "type": "ARMOR", "name": { "str": "daypack" }, - "storage": "39 L", + "storage": "24510 ml", "encumbrance": 2, "max_encumbrance": 18 }, - { - "id": "runner_bag", - "copy-from": "runner_bag", + { + "id": "dive_bag", + "copy-from": "dive_bag", "type": "ARMOR", - "name": { "str": "runner pack" }, - "weight": "360 g", - "storage": "7 L", + "name": { "str": "dive bag" }, + "storage": "30 L", + "encumbrance": 3, + "max_encumbrance": 24 + }, + { + "id": "duffelbag", + "copy-from": "duffelbag", + "type": "ARMOR", + "name": { "str": "duffel bag" }, + "encumbrance": 5, + "max_encumbrance": 40, + "storage": "35 L" + }, + { + "id": "dump_pouch", + "copy-from": "dump_pouch", + "type": "ARMOR", + "name": { "str": "tactical dump pouch", "str_pl": "tactical dump pouches" }, "encumbrance": 1, - "max_encumbrance": 2 + "max_encumbrance": 3, + "storage": "2 L" + }, + { + "id": "legrig", + "copy-from": "legrig", + "type": "ARMOR", + "name": { "str": "pair of drop leg pouches", "str_pl": "pairs of drop leg pouches" }, + "storage": "4500 ml", + "encumbrance": 1, + "max_encumbrance": 4, + "flags": [ "WATER_FRIENDLY", "BELTED" ], + "//": "Changed to strapped layer since knee pads no longer hard conflict." }, { "id": "armrig", @@ -108,13 +105,65 @@ "flags": [ "VARSIZE", "WATER_FRIENDLY", "BELTED" ], "//": "Psuedo-ported from dda." }, - { + { + "id": "mbag", + "copy-from": "mbag", + "type": "ARMOR", + "name": { "str": "messenger bag" }, + "encumbrance": 4, + "max_encumbrance": 19, + "storage": "15 L", + "flags": [ "BELTED", "WATER_FRIENDLY" ] + }, + { + "id": "molle_pack", + "copy-from": "molle_pack", + "type": "ARMOR", + "name": { "str": "MOLLE pack" }, + "weight": "1450 g", + "volume": "6 L", + "encumbrance": 5, + "max_encumbrance": 19, + "storage": "23 L" + }, + { + "id": "rucksack", + "copy-from": "rucksack", + "type": "ARMOR", + "name": { "str": "military rucksack" }, + "volume": "11 L", + "encumbrance": 10, + "max_encumbrance": 50, + "storage": "54 L" + }, + { + "id": "runner_bag", + "copy-from": "runner_bag", + "type": "ARMOR", + "name": { "str": "runner pack" }, + "weight": "360 g", + "storage": "7 L", + "encumbrance": 1, + "max_encumbrance": 5 + }, + { + "id": "travelpack", + "copy-from": "travelpack", + "type": "ARMOR", + "name": { "str": "travelpack" }, + "volume": "5 L", + "storage": "31510 ml", + "encumbrance": 3, + "max_encumbrance": 25 + }, + { "id": "vest", "copy-from": "vest", "type": "ARMOR", "name": { "str": "utility vest" }, + "storage": "3 L", "encumbrance": 2, - "max_encumbrance": 5, + "max_encumbrance": 4, "extend": { "flags": [ "BELTED" ] }, "//": "Changed to strapped layer because this is not a shirt." } diff --git a/json/items/armor/suits_protection.json b/json/items/armor/suits_protection.json index 81655f2..a28800c 100644 --- a/json/items/armor/suits_protection.json +++ b/json/items/armor/suits_protection.json @@ -1,31 +1,33 @@ [ - { - "id": "lsurvivor_suit", - "copy-from": "lsurvivor_suit", + { + "id": "armor_larmor", + "copy-from": "armor_larmor", "type": "ARMOR", - "name": { "str": "light survivor suit" }, - "material": [ "kevlar", "cotton" ], + "name": { "str": "leather body armor" }, "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] }, - { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 7, 10 ] }, - { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] } - ], - "storage": "7 L", - "//": "Reduced the carrying volume from 7.5 to 7 litres." + { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 16, 16 ] }, + { "covers": [ "arms" ], "coverage": 90, "encumbrance": [ 14, 14 ] }, + { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 14, 14 ] } + ] }, - { - "id": "survivor_suit", - "copy-from": "survivor_suit", + { + "id": "armor_riot", + "copy-from": "armor_riot", "type": "ARMOR", - "name": { "str": "survivor suit" }, - "material": [ "kevlar", "leather" ], + "name": { "str": "riot armor" }, + "description": "A full suit of black plastic body armor plates used by riot police. Cleverly placed velcro straps secure each piece, resulting in slightly less encumbrance then its constituent parts. The word POLICE is emblazoned across the front.", + "weight": "3000 g", + "volume": "12500 ml", + "material": [ "plastic" ], "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 12, 20 ] }, - { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 12, 17 ] }, - { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 12, 12 ] } - ] + { "covers": [ "torso" ], "coverage": 85, "encumbrance": 6 }, + { "covers": [ "legs", "arms" ], "coverage": 75, "encumbrance": 4 }, + { "covers": [ "feet" ], "coverage": 75, "encumbrance": 2 } + ], + "flags": [ "STURDY", "BELTED", "WATER_FRIENDLY" ], + "//": "Rebalance this based on dda's concept of it being a strapped on set of armor pads. Essentially a step up in quality from the individual hard plastic armor pieces." }, - { + { "id": "hsurvivor_suit", "copy-from": "hsurvivor_suit", "type": "ARMOR", @@ -50,44 +52,41 @@ ] }, { - "id": "wsurvivor_suit", - "copy-from": "wsurvivor_suit", + "id": "lsurvivor_suit", + "copy-from": "lsurvivor_suit", "type": "ARMOR", - "name": { "str": "winter survivor suit" }, - "material": [ "kevlar", "fur" ], + "name": { "str": "light survivor suit" }, + "material": [ "kevlar", "cotton" ], "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 17, 31 ] }, - { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 17, 21 ] }, - { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 17, 17 ] } - ] + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] }, + { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 7, 10 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] } + ], + "storage": "7 L", + "//": "Reduced the carrying volume from 7.5 to 7 litres." }, - { - "id": "armor_riot", - "copy-from": "armor_riot", + { + "id": "survivor_suit", + "copy-from": "survivor_suit", "type": "ARMOR", - "name": { "str": "riot armor" }, - "description": "A full suit of black plastic body armor plates used by riot police. Cleverly placed velcro straps secure each piece, resulting in slightly less encumbrance then its constituent parts. The word POLICE is emblazoned across the front.", - "weight": "3000 g", - "volume": "12500 ml", - "material": [ "plastic" ], + "name": { "str": "survivor suit" }, + "material": [ "kevlar", "leather" ], "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 85, "encumbrance": 6 }, - { "covers": [ "legs", "arms" ], "coverage": 75, "encumbrance": 4 }, - { "covers": [ "feet" ], "coverage": 75, "encumbrance": 2 } - ], - "flags": [ "STURDY", "BELTED", "WATER_FRIENDLY" ], - "//": "Rebalance this based on dda's concept of it being a strapped on set of armor pads. Essentially a step up in quality from the individual hard plastic armor pieces." + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 12, 20 ] }, + { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 12, 17 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 12, 12 ] } + ] }, { - "id": "armor_larmor", - "copy-from": "armor_larmor", + "id": "wsurvivor_suit", + "copy-from": "wsurvivor_suit", "type": "ARMOR", - "name": { "str": "leather body armor" }, + "name": { "str": "winter survivor suit" }, + "material": [ "kevlar", "fur" ], "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 95, "encumbrance": [ 16, 16 ] }, - { "covers": [ "arms" ], "coverage": 90, "encumbrance": [ 14, 14 ] }, - { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 14, 14 ] } + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 17, 31 ] }, + { "covers": [ "legs" ], "coverage": 100, "encumbrance": [ 17, 21 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 17, 17 ] } ] } - ] diff --git a/json/items/armor/torso_armor.json b/json/items/armor/torso_armor.json index e82ed7c..6b2824f 100644 --- a/json/items/armor/torso_armor.json +++ b/json/items/armor/torso_armor.json @@ -1,5 +1,5 @@ [ - { + { "id": "chestguard_hard", "copy-from": "chestguard_hard", "type": "ARMOR", diff --git a/json/items/armor/torso_clothes.json b/json/items/armor/torso_clothes.json index 9210461..fef38b1 100644 --- a/json/items/armor/torso_clothes.json +++ b/json/items/armor/torso_clothes.json @@ -1,5 +1,5 @@ [ - { + { "id": "dress_shirt", "copy-from": "dress_shirt", "type": "ARMOR", @@ -9,7 +9,7 @@ { "covers": [ "arms" ], "coverage": 90, "encumbrance": [ 4, 4 ] } ] }, - { + { "id": "polo_shirt", "copy-from": "polo_shirt", "type": "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. |