From 7a30b62df05af1077d43f09c5af36466f48e16b9 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 2 Feb 2022 16:54:21 -0800 Subject: Set ammo types to arrays. Fix AT4 prices. Fix packed AT4 name to use str like the packed LAW does. Remove some extraneous whitespace. Template the packed AT4 from the packed LAW. --- json/items/gun/84x246mm.json | 5 +++-- json/items/tool/explosives.json | 19 +++++++------------ 2 files changed, 10 insertions(+), 14 deletions(-) (limited to 'json/items') diff --git a/json/items/gun/84x246mm.json b/json/items/gun/84x246mm.json index 8652bb5..ea39bab 100644 --- a/json/items/gun/84x246mm.json +++ b/json/items/gun/84x246mm.json @@ -6,10 +6,11 @@ "name": { "str": "AT4" }, "description": "Mil-Spec rocket launcher. An 84-mm unguided, portable, single-shot recoilless smoothbore weapon used primarily by the US military.", "extend": { "flags": [ "FIRE_TWOHAND", "NO_REPAIR", "NO_UNLOAD", "NO_RELOAD", "TRADER_AVOID" ] }, - "ammo": "84x246mm", + "ammo": [ "84x246mm" ], "weight": "6803 g", "volume": "3500 ml", - "price_postapoc": 6000, + "price": 400000, + "price_postapoc": 5000, "bashing": 4, "dispersion": 200, "durability": 7 diff --git a/json/items/tool/explosives.json b/json/items/tool/explosives.json index 42249c3..0da1852 100644 --- a/json/items/tool/explosives.json +++ b/json/items/tool/explosives.json @@ -5,26 +5,23 @@ "looks_like": "LAW", "type": "TOOL", "category": "guns", - "name": { "str_sp": "packed M72 LAW" }, + "name": { "str": "packed M72 LAW" }, "weight": "2831 g", "armor_data": { "covers": [ "torso" ], "coverage": 5, "material_thickness": 2, "encumbrance": 5 }, "extend": { "flags": [ "BELTED", "OVERSIZE" ] } }, - { + { "id": "AT4_Packed", + "copy-from": "LAW_Packed", "looks_like": "AT4", - "type": "TOOL", + "type": "TOOL", "category": "guns", "name": { "str": "packed AT4" }, "description": "This is an AT4, packed in its storage form. Use it to pop it out and make it ready to fire. Once it is activated, it cannot be repacked.", "weight": "10103 g", "volume": "2500 ml", - "price": 1300000, - "price_postapoc": 7500, - "bashing": 6, - "material": "aluminum", - "symbol": ")", - "color": "green", + "price": 400000, + "price_postapoc": 5000, "use_action": { "target": "AT4", "msg": "You pull the activating lever, readying the LAW to fire.", @@ -32,8 +29,6 @@ "target_ammo": "84x246mm_hedp", "menu_text": "Activate", "type": "transform" - }, - "armor_data": { "covers": [ "torso" ], "coverage": 5, "material_thickness": 2, "encumbrance": 5 }, - "extend": { "flags": [ "BELTED", "OVERSIZE" ] } + } } ] -- cgit v1.2.1