From c0c569c8c0b6b6189e845a8157254030d4845aa2 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 8 Nov 2023 19:37:06 -0800 Subject: Clean up numerous entries. --- json/items/ammo/9x18.json | 62 +++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 32 deletions(-) (limited to 'json/items/ammo/9x18.json') diff --git a/json/items/ammo/9x18.json b/json/items/ammo/9x18.json index bb28127..b36744a 100644 --- a/json/items/ammo/9x18.json +++ b/json/items/ammo/9x18.json @@ -45,37 +45,6 @@ "price_postapoc": 3100, "relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 8 } } }, - { - "id": "reloaded_9x18mm", - "copy-from": "9x18mm", - "type": "AMMO", - "name": { "str_sp": "9x18mm 57-N-181S, reloaded" }, - "description": "9x18mm Makarov ammunition with a 93gr steel core FMJ bullet. The 9x18mm round was very common in the Eastern Bloc during the 20th century, and remained in Russian military service into the 21st century. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", - "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_9x18mmP2", - "copy-from": "9x18mmP2", - "type": "AMMO", - "name": { "str_sp": "9x18mm SP-7, reloaded" }, - "description": "9x18mm Makarov SP-7 ammunition. The 9x18mm round was very common in the Eastern Bloc during the 20th century and remained in Russian military service into the 21st century. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", - "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_9x18mmfmj", - "copy-from": "9x18mmfmj", - "type": "AMMO", - "name": { "str_sp": "9x18mm RG028, reloaded" }, - "description": "9x18mm Makarov RG028 ammunition. The RG028 round uses a bullet with a hardened steel core to improve armor penetration. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", - "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, - "relative": { "damage": { "damage_type": "bullet", "amount": 0, "armor_penetration": -4 } }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, { "id": "bp_9x18mm", "copy-from": "9x18mm", @@ -103,8 +72,37 @@ "recoil": 0.76, "dispersion": 1.2 }, - "relative": { "damage": { "damage_type": "bullet", "amount": 0, "armor_penetration": -4 } }, "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "reloaded_9x18mm", + "copy-from": "9x18mm", + "type": "AMMO", + "name": { "str_sp": "9x18mm 57-N-181S, reloaded" }, + "description": "9x18mm Makarov ammunition with a 93gr steel core FMJ bullet. The 9x18mm round was very common in the Eastern Bloc during the 20th century, and remained in Russian military service into the 21st century. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", + "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_9x18mmP2", + "copy-from": "9x18mmP2", + "type": "AMMO", + "name": { "str_sp": "9x18mm SP-7, reloaded" }, + "description": "9x18mm Makarov SP-7 ammunition. The 9x18mm round was very common in the Eastern Bloc during the 20th century and remained in Russian military service into the 21st century. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", + "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_9x18mmfmj", + "copy-from": "9x18mmfmj", + "type": "AMMO", + "name": { "str_sp": "9x18mm RG028, reloaded" }, + "description": "9x18mm Makarov RG028 ammunition. The RG028 round uses a bullet with a hardened steel core to improve armor penetration. This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.", + "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