From 6bd924a6320887576ca79cd93dcb99cc674e22a9 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Wed, 2 Feb 2022 16:43:51 -0800 Subject: Fix 000 shot ordering so as to not place types before their copy-froms. Convert guns to use str_sp instead of str. Convert ammo types and materials to arrays. Various formatting changes to recipes to ease readability. Fix factory loaded 000shot uncraft from providing less materials than a reloaded. --- json/items/ammo/000shot.json | 72 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'json/items/ammo/000shot.json') diff --git a/json/items/ammo/000shot.json b/json/items/ammo/000shot.json index 1f227eb..7b9dde7 100644 --- a/json/items/ammo/000shot.json +++ b/json/items/ammo/000shot.json @@ -1,40 +1,4 @@ [ - { - "id": "reloaded_shot_000", - "copy-from": "shot_000", - "type": "AMMO", - "name": { "str": "000 shot, reloaded" }, - "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, - { - "id": "reloaded_shot_000_flechette", - "copy-from": "shot_000_flechette", - "type": "AMMO", - "name": { "str": "000 flechette shell, reloaded" }, - "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, - { - "id": "reloaded_shot_000_slug", - "copy-from": "shot_000_slug", - "type": "AMMO", - "name": { "str": "000 shotgun slug, reloaded" }, - "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, - { - "id": "reloaded_shot_000_inc", - "copy-from": "shot_000_inc", - "type": "AMMO", - "name": { "str": "000 incendiary shell, reloaded" }, - "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - }, { "id": "shot_000", "type": "AMMO", @@ -121,5 +85,41 @@ "proportional": { "damage": { "damage_type": "stab", "amount": 0.25, "armor_penetration": 0.25 } }, "delete": { "effects": [ "SHOT" ] }, "extend": { "effects": [ "EXPLOSIVE_TINY" ] } + }, + { + "id": "reloaded_shot_000", + "copy-from": "shot_000", + "type": "AMMO", + "name": { "str": "000 shot, reloaded" }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "reloaded_shot_000_flechette", + "copy-from": "shot_000_flechette", + "type": "AMMO", + "name": { "str": "000 flechette shell, reloaded" }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "reloaded_shot_000_slug", + "copy-from": "shot_000_slug", + "type": "AMMO", + "name": { "str": "000 shotgun slug, reloaded" }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } + }, + { + "id": "reloaded_shot_000_inc", + "copy-from": "shot_000_inc", + "type": "AMMO", + "name": { "str": "000 incendiary shell, reloaded" }, + "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 0.9 }, "dispersion": 1.1 }, + "extend": { "effects": [ "RECYCLED" ] }, + "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } } ] -- cgit v1.2.1