From 657bdd1cc65b70a0ec98ecf923d531bfd17ab0e9 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Tue, 12 Mar 2024 14:40:59 -0700 Subject: Add more items in need of specific coverage. And fix some oversights. --- json/items/armor/ammo_pouch.json | 46 ++++++++- json/items/armor/arms_armor.json | 14 +++ json/items/armor/belts.json | 59 ++++++++++- json/items/armor/boots.json | 40 +++++++- json/items/armor/coats.json | 204 ++++++++++++++++++++++++++++++++++++--- 5 files changed, 342 insertions(+), 21 deletions(-) (limited to 'json/items') diff --git a/json/items/armor/ammo_pouch.json b/json/items/armor/ammo_pouch.json index 22f0b65..fb1cc13 100644 --- a/json/items/armor/ammo_pouch.json +++ b/json/items/armor/ammo_pouch.json @@ -13,9 +13,42 @@ "copy-from": "ammo_satchel", "type": "ARMOR", "name": { "str": "magazine satchel" }, + "description": "A fabric ammo pouch that can be strapped to your chest which is capable of holding a one large magazine or speedloader close at hand.", "rigid": false, "encumbrance": 1, - "max_encumbrance": 2 + "max_encumbrance": 4, + "//": "Add explicit encumbrance.", + "//2": "Fix the description to note it now supports a large magazine." + }, + { + "id": "chestpouch", + "copy-from": "chestpouch", + "type": "ARMOR", + "name": { "str": "chest magazine pouch" }, + "description": "A fabric ammo pouch that can be strapped to your chest which is capable of holding a two magazines or speedloaders close at hand.", + "rigid": false, + "encumbrance": 1, + "max_encumbrance": 4, + "//": "Add explicit encumbrance.", + "//2": "Fix the description to note it now supports two magazines." + }, + { + "id": "chestrig", + "copy-from": "chestrig", + "type": "ARMOR", + "name": { "str": "chest rig" }, + "rigid": false, + "encumbrance": 1, + "max_encumbrance": 8, + "//": "Add explicit encumbrance.", + "//2": "Fix the incorrect vanilla use of str_sp." + }, + { + "id": "legpouch", + "copy-from": "legpouch", + "type": "ARMOR", + "name": { "str": "ankle magazine pouch", "str_pl": "ankle magazine pouches" }, + "extend": { "flags": [ "COMPACT" ] } }, { "id": "legpouch_large", @@ -69,7 +102,7 @@ "type": "ARMOR", "name": { "str": "tac vest" }, "encumbrance": 2, - "max_encumbrance": 5, + "max_encumbrance": 10, "use_action": { "type": "holster", "holster_prompt": "Stash ammo", @@ -81,5 +114,14 @@ "flags": [ "MAG_COMPACT", "MAG_BULKY" ] }, "//": "Increase the magazine capacity to five." + }, + { + "id": "ammo_satchel_leg", + "copy-from": "ammo_satchel_leg", + "type": "ARMOR", + "name": { "str": "leg ammo satchel" }, + "rigid": false, + "encumbrance": 1, + "max_encumbrance": 3 } ] diff --git a/json/items/armor/arms_armor.json b/json/items/armor/arms_armor.json index 21e7b3e..3cd6894 100644 --- a/json/items/armor/arms_armor.json +++ b/json/items/armor/arms_armor.json @@ -42,6 +42,13 @@ "name": { "str": "pair of steel arm guards", "str_pl": "pairs of steel arm guards" }, "encumbrance": 15 }, + { + "id": "armguard_lightplate_superalloy", + "copy-from": "armguard_lightplate_superalloy", + "type": "ARMOR", + "name": { "str": "pair of superalloy arm guards", "str_pl": "pairs of superalloy arm guards" }, + "encumbrance": 10 + }, { "id": "elbow_pads", "copy-from": "elbow_pads", @@ -49,5 +56,12 @@ "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." + }, + { + "id": "vambrace_larmor", + "copy-from": "vambrace_larmor", + "type": "ARMOR", + "name": { "str": "pair of leather vambraces", "str_pl": "pairs of leather vambraces" }, + "encumbrance": 5 } ] diff --git a/json/items/armor/belts.json b/json/items/armor/belts.json index ddb0fdc..b977910 100644 --- a/json/items/armor/belts.json +++ b/json/items/armor/belts.json @@ -1,13 +1,53 @@ [ + { + "id": "fireman_belt", + "copy-from": "fireman_belt", + "type": "ARMOR", + "name": { "str": "firefighter belt" }, + "rigid": false, + "encumbrance": 2, + "max_encumbrance": 5 + }, + { + "id": "leather_belt", + "copy-from": "leather_belt", + "type": "ARMOR", + "name": { "str": "leather belt" }, + "description": "A leather belt. Designed to look good and hold up a pair of pants, but you should be able to attach a small tool or weapon to one of the belt loops.", + "rigid": false, + "encumbrance": 0, + "max_encumbrance": 1, + }, + { + "id": "tool_belt", + "copy-from": "tool_belt", + "type": "ARMOR", + "name": { "str": "tool belt" }, + "rigid": false, + "storage": "0 L", + "encumbrance": 2, + "max_encumbrance": 12, + "use_action": { + "type": "holster", + "holster_prompt": "Store tool or blade", + "holster_msg": "You put your %1$s in your %2$s", + "multi": 5, + "min_volume": "40 ml", + "max_volume": "1500 ml", + "max_weight": "1500 g", + "flags": [ "BELT_CLIP", "SHEATH_KNIFE" ] + }, + "//": "Reduce to 5 item slots." + }, { "id": "police_belt", "copy-from": "police_belt", "type": "ARMOR", "name": { "str": "police duty belt" }, "rigid": false, - "encumbrance": 1, - "max_encumbrance": 6, - "//": "Reduce base encumbrance, with the old value becoming max_encumbrance when items are stored." + "storage": "2 L", + "encumbrance": 0, + "max_encumbrance": 4 }, { "id": "webbing_belt", @@ -16,7 +56,16 @@ "name": { "str": "webbing belt" }, "rigid": false, "encumbrance": 1, - "max_encumbrance": 3, - "//": "Slightly increase encumbrance when an item is stored." + "max_encumbrance": 4, + "use_action": { + "type": "holster", + "holster_prompt": "Stick what into your belt", + "holster_msg": "You tuck your %s into your %s", + "max_volume": "1500 ml", + "max_weight": "1000 g", + "flags": [ "BELT_CLIP" ] + }, + "//": "Set a fixed encumbrance of 1.", + "//2": "Increase stored item max volume to 1500 ml, but reduce its weight to 1 kg." } ] diff --git a/json/items/armor/boots.json b/json/items/armor/boots.json index 2ef2241..565c33d 100644 --- a/json/items/armor/boots.json +++ b/json/items/armor/boots.json @@ -8,6 +8,44 @@ "//": "Add the mising 'pair of' to the name.", "//2": "Reduce the encumbrance." }, + { + "id": "boots_scrap", + "copy-from": "boots_scrap", + "type": "ARMOR", + "name": { "str": "pair of scrap boots", "str_pl": "pairs of scrap boots" }, + "encumbrance": 6, + "//": "Reduce the encumbrance." + }, + { + "id": "knee_high_boots", + "copy-from": "knee_high_boots", + "type": "ARMOR", + "name": { "str": "pair of knee-high boots", "str_pl": "pairs of knee-high boots" }, + "armor_portion_data": [ + { "covers": [ "legs" ], "coverage": 50, "encumbrance": 15 }, + { "covers": [ "feet" ], "coverage": 100, "encumbrance": 20 } + ], + "//": "Reduce the encumbrance." + }, + { + "id": "leathersandals", + "copy-from": "leathersandals", + "type": "ARMOR", + "name": { "str": "pair of leather sandals", "str_pl": "pairs of leather sandals" }, + "encumbrance": 8, + "//": "Increase the encumbrance." + }, + { + "id": "thigh_high_boots", + "copy-from": "thigh_high_boots", + "type": "ARMOR", + "name": { "str": "pair of thigh-high boots", "str_pl": "pairs of thigh-high boots" }, + "armor_portion_data": [ + { "covers": [ "legs" ], "coverage": 75, "encumbrance": 20 }, + { "covers": [ "feet" ], "coverage": 100, "encumbrance": 20 } + ], + "//": "Reduce the encumbrance." + }, { "id": "stockings", "type": "ARMOR", @@ -22,7 +60,7 @@ "looks_like": "leg_warmers", "color": "dark_gray", "armor_portion_data": [ - { "covers": [ "legs" ], "coverage": 75, "encumbrance": 5 }, + { "covers": [ "legs" ], "coverage": 80, "encumbrance": 5 }, { "covers": [ "feet" ], "coverage": 100, "encumbrance": 5 } ], "warmth": 10, diff --git a/json/items/armor/coats.json b/json/items/armor/coats.json index 8ae1b79..374d4ae 100644 --- a/json/items/armor/coats.json +++ b/json/items/armor/coats.json @@ -1,4 +1,16 @@ [ + { + "id": "bunker_coat", + "copy-from": "bunker_coat", + "type": "ARMOR", + "name": { "str": "turnout coat" }, + "material": [ "nomex", "kevlar", "nylon" ], + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 22, 26 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 22, 22 ] } + ], + "storage": "7400 ml" + }, { "id": "coat_lab", "copy-from": "coat_lab", @@ -10,6 +22,17 @@ ], "storage": "4 L" }, + { + "id": "coat_rain", + "copy-from": "coat_rain", + "type": "ARMOR", + "name": { "str": "rain coat" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] } + ], + "storage": "3 L" + }, { "id": "coat_winter", "copy-from": "coat_winter", @@ -19,7 +42,7 @@ { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 18, 27 ] }, { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 18, 21 ] } ], - "storage": "4 L" + "storage": "4300 ml" }, { "id": "duster", @@ -33,13 +56,25 @@ ], "storage": "6600 ml" }, + { + "id": "duster_fur", + "copy-from": "duster_fur", + "type": "ARMOR", + "name": { "str": "fur duster" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 9, 17 ] }, + { "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": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 15 ] }, { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] }, { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] } ], @@ -67,7 +102,8 @@ { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 11, 20 ] }, { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 11, 11 ] }, { "covers": [ "legs" ], "coverage": 79, "encumbrance": [ 11, 13 ] } - ] + ], + "storage": "5300 ml" }, { "id": "jacket_army", @@ -78,9 +114,31 @@ { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] }, { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] } ], - "storage": "5 L", + "storage": "4800 ml", "//": "Fix incorrect vanilla use of str_sp." }, + { + "id": "jacket_evac", + "copy-from": "jacket_evac", + "type": "ARMOR", + "name": { "str": "emergency jacket" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 13, 15 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 13, 13 ] } + ], + "storage": "1600 ml" + }, + { + "id": "jacket_jean", + "copy-from": "jacket_jean", + "type": "ARMOR", + "name": { "str": "jean jacket" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 9, 11 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 9, 9 ] } + ], + "storage": "1600 ml" + }, { "id": "jacket_leather", "copy-from": "jacket_leather", @@ -92,15 +150,27 @@ ], "storage": "1600 ml" }, + { + "id": "jacket_leather_red", + "copy-from": "jacket_leather_red", + "type": "ARMOR", + "name": { "str": "red leather jacket" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 10, 15 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 10, 10 ] } + ], + "storage": "1600 ml" + }, { "id": "jacket_light", "copy-from": "jacket_light", "type": "ARMOR", "name": { "str": "light jacket" }, "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 6, 8 ] }, - { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 6, 6 ] } - ] + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 4, 8 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 4, 4 ] } + ], + "storage": "1400 ml" }, { "id": "jacket_windbreaker", @@ -108,29 +178,137 @@ "type": "ARMOR", "name": { "str": "windbreaker" }, "armor_portion_data": [ - { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 12 ] }, - { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 8, 8 ] } - ] + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 6, 9 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 6, 7 ] } + ], + "storage": "2900 ml" + }, + { + "id": "peacoat", + "copy-from": "peacoat", + "type": "ARMOR", + "name": { "str": "peacoat" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 10, 20 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 10, 10 ] } + ], + "storage": "4600 ml" + }, + { + "id": "ski_jacket", + "copy-from": "ski_jacket", + "type": "ARMOR", + "name": { "str": "ski jacket" }, + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 15, 22 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 15, 15 ] } + ], + "storage": "3600 ml" + }, + { + "id": "sleeveless_duster", + "copy-from": "sleeveless_duster", + "type": "ARMOR", + "name": { "str": "sleeveless duster" }, + "weight": "2380 g", + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 12 ] }, + { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] } + ], + "storage": "6600 ml" + }, + { + "id": "sleeveless_duster_fur", + "copy-from": "sleeveless_duster_fur", + "type": "ARMOR", + "name": { "str": "sleeveless fur duster" }, + "weight": "2007 g", + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 9, 17 ] }, + { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] } + ], + "storage": "6600 ml" + }, + { + "id": "sleeveless_duster_leather", + "copy-from": "sleeveless_duster_leather", + "type": "ARMOR", + "name": { "str": "sleeveless leather duster" }, + "weight": "2257 g", + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 15 ] }, + { "covers": [ "legs" ], "coverage": 85, "encumbrance": [ 4, 5 ] } + ], + "storage": "6600 ml" + }, + { + "id": "sleeveless_trenchcoat", + "copy-from": "sleeveless_trenchcoat", + "type": "ARMOR", + "name": { "str": "sleeveless trenchcoat" }, + "weight": "1904 g", + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] } + ], + "storage": "6 L" + }, + { + "id": "sleeveless_trenchcoat_fur", + "copy-from": "sleeveless_trenchcoat_fur", + "type": "ARMOR", + "name": { "str": "sleeveless fur trenchcoat" }, + "weight": "1487 g", + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 9, 19 ] } + ], + "storage": "6 L" + }, + { + "id": "sleeveless_trenchcoat_leather", + "copy-from": "sleeveless_trenchcoat_leather", + "type": "ARMOR", + "name": { "str": "sleeveless leather trenchcoat" }, + "weight": "1672 g", + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 9, 19 ] } + ], + "storage": "6 L" }, { "id": "trenchcoat", "copy-from": "trenchcoat", "type": "ARMOR", "name": { "str": "trenchcoat" }, + "weight": "2240 g", "armor_portion_data": [ { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 7, 15 ] }, { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 7, 7 ] } - ] + ], + "storage": "6 L" + }, + { + "id": "trenchcoat_fur", + "copy-from": "trenchcoat_fur", + "type": "ARMOR", + "name": { "str": "fur trenchcoat" }, + "weight": "1750 g", + "armor_portion_data": [ + { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 9, 19 ] }, + { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 9, 9 ] } + ], + "storage": "6 L" }, { "id": "trenchcoat_leather", "copy-from": "trenchcoat_leather", "type": "ARMOR", "name": { "str": "leather trenchcoat" }, + "weight": "1967 g", "armor_portion_data": [ { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 8, 17 ] }, { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 8, 8 ] } - ] + ], + "storage": "6 L" }, { "id": "trenchcoat_survivor", @@ -153,6 +331,6 @@ { "covers": [ "torso" ], "coverage": 100, "encumbrance": [ 10, 20 ] }, { "covers": [ "arms" ], "coverage": 100, "encumbrance": [ 10, 10 ] } ], - "storage": "5 L" + "storage": "4600 ml" } ] -- cgit v1.2.1