From 7b9fe6e4ea523a5e8ee37d12208b25e87cfb8b12 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Sat, 10 Sep 2022 12:42:21 -0700 Subject: Sort black powder variants to after reloaded variants. --- json/items/ammo/40.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'json/items/ammo/40.json') diff --git a/json/items/ammo/40.json b/json/items/ammo/40.json index 7e425f7..8724373 100644 --- a/json/items/ammo/40.json +++ b/json/items/ammo/40.json @@ -30,6 +30,24 @@ "description": ".40 S&W ammunition with 180gr FMJ bullets. Designed to retain the 10mm Auto cartridge's power with lower recoil, the .40 S&W round became popular for law enforcement and personal defense.", "relative": { "damage": { "damage_type": "bullet", "amount": -3, "armor_penetration": 6 } } }, + { + "id": "reloaded_40fmj", + "copy-from": "40fmj", + "type": "AMMO", + "name": { "str_sp": ".40 S&W FMJ, reloaded" }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "reloaded_40sw", + "copy-from": "40sw", + "type": "AMMO", + "name": { "str_sp": ".40 S&W JHP, reloaded" }, + "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, { "id": "bp_40fmj", "copy-from": "40fmj", @@ -57,23 +75,5 @@ }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, - { - "id": "reloaded_40fmj", - "copy-from": "40fmj", - "type": "AMMO", - "name": { "str_sp": ".40 S&W FMJ, reloaded" }, - "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, - { - "id": "reloaded_40sw", - "copy-from": "40sw", - "type": "AMMO", - "name": { "str_sp": ".40 S&W JHP, reloaded" }, - "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } } ] -- cgit v1.2.1