diff options
Diffstat (limited to 'revert-07_Remove-handload-quality-distinction-1481.patch')
| -rw-r--r-- | revert-07_Remove-handload-quality-distinction-1481.patch | 4291 |
1 files changed, 0 insertions, 4291 deletions
diff --git a/revert-07_Remove-handload-quality-distinction-1481.patch b/revert-07_Remove-handload-quality-distinction-1481.patch deleted file mode 100644 index 696bfbe..0000000 --- a/revert-07_Remove-handload-quality-distinction-1481.patch +++ /dev/null @@ -1,4291 +0,0 @@ -From 6f1c6c6edbb2f9f958b9585ead80e5bbb09a5a7e Mon Sep 17 00:00:00 2001 -From: KheirFerrum <102964889+KheirFerrum@users.noreply.github.com> -Date: Tue, 3 May 2022 04:51:35 +0100 -Subject: [PATCH 06/10] Remove handload quality distinction (#1481) - ---- - .../itemgroups/Weapons_Mods_Ammo/ammo.json | 118 ++-- - data/json/items/ammo/10mm.json | 9 - - data/json/items/ammo/22.json | 18 - - data/json/items/ammo/223.json | 27 - - data/json/items/ammo/270win.json | 9 - - data/json/items/ammo/300.json | 10 - - data/json/items/ammo/3006.json | 27 - - data/json/items/ammo/300blk.json | 10 - - data/json/items/ammo/308.json | 27 - - data/json/items/ammo/32.json | 9 - - data/json/items/ammo/357mag.json | 14 - - data/json/items/ammo/357sig.json | 18 - - data/json/items/ammo/38.json | 18 - - data/json/items/ammo/380.json | 27 - - data/json/items/ammo/38super.json | 18 - - data/json/items/ammo/40.json | 18 - - data/json/items/ammo/410shot.json | 9 - - data/json/items/ammo/44.json | 18 - - data/json/items/ammo/45.json | 27 - - data/json/items/ammo/454.json | 9 - - data/json/items/ammo/4570.json | 40 -- - data/json/items/ammo/45colt.json | 9 - - data/json/items/ammo/46.json | 10 - - data/json/items/ammo/460.json | 19 - - data/json/items/ammo/50.json | 30 - - data/json/items/ammo/500.json | 9 - - data/json/items/ammo/545x39.json | 20 - - data/json/items/ammo/57.json | 10 - - data/json/items/ammo/5x50.json | 11 - - data/json/items/ammo/700nx.json | 9 - - data/json/items/ammo/762.json | 19 - - data/json/items/ammo/762R.json | 9 - - data/json/items/ammo/762x25.json | 7 - - data/json/items/ammo/9mm.json | 36 - - data/json/items/ammo/9x18.json | 31 - - data/json/items/ammo/shot.json | 45 -- - data/json/items/migration.json | 348 +++++++++- - data/json/obsoletion/items.json | 626 ++++++++++++++++++ - data/json/obsoletion/recipes.json | 340 ++++++++++ - data/json/recipes/ammo/pistol.json | 173 +++-- - data/json/recipes/ammo/rifle.json | 111 ++-- - data/json/recipes/ammo/shot.json | 17 +- - data/json/uncraft/ammo/30-06.json | 19 +- - data/json/uncraft/ammo/300.json | 2 +- - data/json/uncraft/ammo/300blk.json | 2 +- - data/json/uncraft/ammo/357mag.json | 8 +- - data/json/uncraft/ammo/357sig.json | 10 +- - data/json/uncraft/ammo/38.json | 10 +- - data/json/uncraft/ammo/380.json | 6 +- - data/json/uncraft/ammo/38super.json | 16 +- - data/json/uncraft/ammo/40.json | 2 +- - data/json/uncraft/ammo/44.json | 10 +- - data/json/uncraft/ammo/45.json | 2 +- - data/json/uncraft/ammo/454.json | 8 +- - data/json/uncraft/ammo/4570.json | 22 +- - data/json/uncraft/ammo/45colt.json | 2 +- - data/json/uncraft/ammo/460.json | 10 +- - data/json/uncraft/ammo/500.json | 8 +- - data/json/uncraft/ammo/50bmg.json | 2 +- - data/json/uncraft/ammo/545.json | 4 +- - data/json/uncraft/ammo/556.json | 4 +- - data/json/uncraft/ammo/5x50.json | 18 +- - data/json/uncraft/ammo/700nx.json | 6 +- - data/json/uncraft/ammo/762x39.json | 4 +- - data/json/uncraft/ammo/762x51.json | 5 +- - data/json/uncraft/ammo/762x54.json | 6 +- - data/json/uncraft/ammo/9mm.json | 2 +- - data/json/uncraft/ammo/9x18mm.json | 2 +- - .../Generic_Guns/recipes/recipe_obsolete.json | 580 +--------------- - 71 files changed, 1632 insertions(+), 1517 deletions(-) - -diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json -index 5d03f226d2..c10de498fb 100644 ---- a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json -+++ b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json -@@ -87,42 +87,42 @@ - "//": "Reloaded pistol ammo balanced according to rarity.", - "subtype": "distribution", - "entries": [ -- { "item": "reloaded_10mm_fmj", "prob": 10 }, -- { "item": "reloaded_22_cphp", "prob": 20 }, -- { "item": "reloaded_22_lr", "prob": 70 }, -- { "item": "reloaded_32_acp", "prob": 50 }, -- { "item": "reloaded_38_fmj", "prob": 30 }, -- { "item": "reloaded_38_special", "prob": 80 }, -- { "item": "reloaded_38super_fmj", "prob": 40 }, -- { "item": "reloaded_357mag_fmj", "prob": 30 }, -- { "item": "reloaded_357mag_jhp", "prob": 30 }, -- { "item": "reloaded_380_JHP", "prob": 10 }, -- { "item": "reloaded_380_FMJ", "prob": 15 }, -- { "item": "reloaded_380_p", "prob": 5 }, -- { "item": "reloaded_357sig_fmj", "prob": 70 }, -- { "item": "reloaded_357sig_jhp", "prob": 70 }, -- { "item": "reloaded_40fmj", "prob": 20 }, -- { "item": "reloaded_40sw", "prob": 50 }, -- { "item": "reloaded_44magnum", "prob": 60 }, -- { "item": "reloaded_44fmj", "prob": 30 }, -- { "item": "reloaded_45_acp", "prob": 80 }, -- { "item": "reloaded_45_jhp", "prob": 100 }, -- { "item": "reloaded_45_super", "prob": 40 }, -- { "item": "reloaded_46mm", "prob": 20 }, -- { "item": "reloaded_454_Casull", "prob": 5 }, -- { "item": "reloaded_45colt_jhp", "prob": 10 }, -- { "item": "reloaded_460_fmj", "prob": 5 }, -- { "item": "reloaded_460_rowland", "prob": 5 }, -- { "item": "reloaded_500_Magnum", "prob": 5 }, -- { "item": "reloaded_57mm", "prob": 50 }, -- { "item": "reloaded_9mm", "prob": 160 }, -- { "item": "reloaded_9mmfmj", "prob": 80 }, -- { "item": "reloaded_9mmP", "prob": 80 }, -- { "item": "reloaded_9mmP2", "prob": 40 }, -- { "item": "reloaded_9x18mm", "prob": 20 }, -- { "item": "reloaded_9x18mmfmj", "prob": 10 }, -- { "item": "reloaded_9x18mmP2", "prob": 5 }, -- { "item": "reloaded_762_25", "prob": 10 } -+ { "item": "10mm_fmj", "prob": 10 }, -+ { "item": "22_cphp", "prob": 20 }, -+ { "item": "22_lr", "prob": 70 }, -+ { "item": "32_acp", "prob": 50 }, -+ { "item": "38_fmj", "prob": 30 }, -+ { "item": "38_special", "prob": 80 }, -+ { "item": "38super_fmj", "prob": 40 }, -+ { "item": "357mag_fmj", "prob": 30 }, -+ { "item": "357mag_jhp", "prob": 30 }, -+ { "item": "380_JHP", "prob": 10 }, -+ { "item": "380_FMJ", "prob": 15 }, -+ { "item": "380_p", "prob": 5 }, -+ { "item": "357sig_fmj", "prob": 70 }, -+ { "item": "357sig_jhp", "prob": 70 }, -+ { "item": "40fmj", "prob": 20 }, -+ { "item": "40sw", "prob": 50 }, -+ { "item": "44magnum", "prob": 60 }, -+ { "item": "44fmj", "prob": 30 }, -+ { "item": "45_acp", "prob": 80 }, -+ { "item": "45_jhp", "prob": 100 }, -+ { "item": "45_super", "prob": 40 }, -+ { "item": "46mm", "prob": 20 }, -+ { "item": "454_Casull", "prob": 5 }, -+ { "item": "45colt_jhp", "prob": 10 }, -+ { "item": "460_fmj", "prob": 5 }, -+ { "item": "460_rowland", "prob": 5 }, -+ { "item": "500_Magnum", "prob": 5 }, -+ { "item": "57mm", "prob": 50 }, -+ { "item": "9mm", "prob": 160 }, -+ { "item": "9mmfmj", "prob": 80 }, -+ { "item": "9mmP", "prob": 80 }, -+ { "item": "9mmP2", "prob": 40 }, -+ { "item": "9x18mm", "prob": 20 }, -+ { "item": "9x18mmfmj", "prob": 10 }, -+ { "item": "9x18mmP2", "prob": 5 }, -+ { "item": "762_25", "prob": 10 } - ] - }, - { -@@ -274,25 +274,25 @@ - "//": "Reloaded rifle ammo balanced according to rarity.", - "subtype": "distribution", - "entries": [ -- { "item": "reloaded_223", "prob": 60 }, -- { "item": "reloaded_22_cphp", "prob": 20 }, -- { "item": "reloaded_22_lr", "prob": 70 }, -- { "item": "reloaded_270win_jsp", "prob": 15 }, -- { "item": "reloaded_300_winmag", "prob": 15 }, -- { "item": "reloaded_3006", "prob": 70 }, -- { "item": "reloaded_3006fmj", "prob": 10 }, -- { "item": "reloaded_3006_incendiary", "prob": 5 }, -- { "item": "reloaded_308", "prob": 40 }, -- { "item": "reloaded_556", "prob": 10 }, -- { "item": "reloaded_556_incendiary", "prob": 5 }, -- { "item": "reloaded_4570_sp", "prob": 15 }, -- { "item": "reloaded_4570_pen", "prob": 5 }, -- { "item": "reloaded_4570_low", "prob": 15 }, -- { "item": "reloaded_762_51", "prob": 10 }, -- { "item": "reloaded_762_51_incendiary", "prob": 5 }, -- { "item": "reloaded_762_54R", "prob": 40 }, -- { "item": "reloaded_762_m43", "prob": 20 }, -- { "item": "reloaded_300blk", "prob": 10 } -+ { "item": "223", "prob": 60 }, -+ { "item": "22_cphp", "prob": 20 }, -+ { "item": "22_lr", "prob": 70 }, -+ { "item": "270win_jsp", "prob": 15 }, -+ { "item": "300_winmag", "prob": 15 }, -+ { "item": "3006", "prob": 70 }, -+ { "item": "3006fmj", "prob": 10 }, -+ { "item": "3006_incendiary", "prob": 5 }, -+ { "item": "308", "prob": 40 }, -+ { "item": "556", "prob": 10 }, -+ { "item": "556_incendiary", "prob": 5 }, -+ { "item": "4570_sp", "prob": 15 }, -+ { "item": "4570_pen", "prob": 5 }, -+ { "item": "4570_low", "prob": 15 }, -+ { "item": "762_51", "prob": 10 }, -+ { "item": "762_51_incendiary", "prob": 5 }, -+ { "item": "762_54R", "prob": 40 }, -+ { "item": "762_m43", "prob": 20 }, -+ { "item": "300blk", "prob": 10 } - ] - }, - { -@@ -380,13 +380,13 @@ - "//": "Reloaded shotgun ammo balanced according to rarity.", - "subtype": "distribution", - "entries": [ -- { "item": "reloaded_shot_00", "prob": 200 }, -- { "item": "reloaded_shot_bird", "prob": 30 }, -- { "item": "reloaded_shot_dragon", "prob": 20 }, -- { "item": "reloaded_shot_flechette", "prob": 5 }, -- { "item": "reloaded_shot_slug", "prob": 30 }, -+ { "item": "shot_00", "prob": 200 }, -+ { "item": "shot_bird", "prob": 30 }, -+ { "item": "shot_dragon", "prob": 20 }, -+ { "item": "shot_flechette", "prob": 5 }, -+ { "item": "shot_slug", "prob": 30 }, - { "item": "shot_scrap", "prob": 80 }, -- { "item": "reloaded_410shot_000", "prob": 25 } -+ { "item": "410shot_000", "prob": 25 } - ] - }, - { -diff --git a/data/json/items/ammo/10mm.json b/data/json/items/ammo/10mm.json -index 668ae34781..f86c20c8e4 100644 ---- a/data/json/items/ammo/10mm.json -+++ b/data/json/items/ammo/10mm.json -@@ -36,14 +36,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_10mm_fmj", -- "copy-from": "10mm_fmj", -- "type": "AMMO", -- "name": { "str": "10mm Auto 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" ] } - } - ] -diff --git a/data/json/items/ammo/22.json b/data/json/items/ammo/22.json -index d0d6f14aa5..268637c10b 100644 ---- a/data/json/items/ammo/22.json -+++ b/data/json/items/ammo/22.json -@@ -69,23 +69,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_22_lr", -- "copy-from": "22_lr", -- "type": "AMMO", -- "name": { "str": ".22 LR, 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_22_cphp", -- "copy-from": "22_cphp", -- "type": "AMMO", -- "name": { "str": ".22 CPHP, 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" ] } - } - ] -diff --git a/data/json/items/ammo/223.json b/data/json/items/ammo/223.json -index 0920cde8c0..22c55429c5 100644 ---- a/data/json/items/ammo/223.json -+++ b/data/json/items/ammo/223.json -@@ -84,32 +84,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_223", -- "copy-from": "223", -- "type": "AMMO", -- "name": { "str": ".223 Remington, 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_556", -- "copy-from": "556", -- "type": "AMMO", -- "name": { "str": "5.56 NATO, 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_556_incendiary", -- "copy-from": "556_incendiary", -- "type": "AMMO", -- "name": { "str": "5.56 NATO tracer, 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" ] } - } - ] -diff --git a/data/json/items/ammo/270win.json b/data/json/items/ammo/270win.json -index d9812da22a..bc2f5e826e 100644 ---- a/data/json/items/ammo/270win.json -+++ b/data/json/items/ammo/270win.json -@@ -35,14 +35,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_270win_jsp", -- "copy-from": "270win_jsp", -- "type": "AMMO", -- "name": { "str": ".270 Winchester JSP, 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" ] } - } - ] -diff --git a/data/json/items/ammo/300.json b/data/json/items/ammo/300.json -index 6c69fe4e4d..95fcb846f5 100644 ---- a/data/json/items/ammo/300.json -+++ b/data/json/items/ammo/300.json -@@ -35,15 +35,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_300_winmag", -- "copy-from": "300_winmag", -- "type": "AMMO", -- "name": { "str": ".300 Winchester Magnum, reloaded" }, -- "description": "The .300 Winchester Magnum is extremely versatile and has been adopted by many shooting disciplines. The cartridge has found use by hunters, military units, and law enforcement departments.", -- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, -- "extend": { "effects": [ "RECYCLED" ] }, -- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - } - ] -diff --git a/data/json/items/ammo/3006.json b/data/json/items/ammo/3006.json -index d8abccb9b4..222ccaad66 100644 ---- a/data/json/items/ammo/3006.json -+++ b/data/json/items/ammo/3006.json -@@ -79,32 +79,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_3006", -- "copy-from": "3006", -- "type": "AMMO", -- "name": { "str": ".30-06 Springfield, 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_3006_incendiary", -- "copy-from": "3006_incendiary", -- "type": "AMMO", -- "name": { "str": ".30-06 incendiary, 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_3006fmj", -- "copy-from": "3006fmj", -- "type": "AMMO", -- "name": { "str": ".30-06 M2 AP, 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" ] } - } - ] -diff --git a/data/json/items/ammo/300blk.json b/data/json/items/ammo/300blk.json -index acf9dc62cc..bdff5be36f 100644 ---- a/data/json/items/ammo/300blk.json -+++ b/data/json/items/ammo/300blk.json -@@ -46,15 +46,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_300blk", -- "copy-from": "300blk", -- "type": "AMMO", -- "name": { "str": ".300 AAC Blackout, reloaded" }, -- "description": ".300 AAC Blackout is an intermediate cartridge that achieves ballistics similar to the 7.62x39 but allows use on the AR-15 platform. The round is necked-up from the 5.56mm NATO, but feeds from a STANAG magazine. It requires a specific barrel, so will not work in a standard M4 or similar carbine.", -- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, -- "extend": { "effects": [ "RECYCLED" ] }, -- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - } - ] -diff --git a/data/json/items/ammo/308.json b/data/json/items/ammo/308.json -index 3691c8269a..8d25222a91 100644 ---- a/data/json/items/ammo/308.json -+++ b/data/json/items/ammo/308.json -@@ -82,32 +82,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_308", -- "copy-from": "308", -- "type": "AMMO", -- "name": { "str": ".308 Winchester, 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_762_51", -- "copy-from": "762_51", -- "type": "AMMO", -- "name": { "str": "7.62x51mm, 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_762_51_incendiary", -- "copy-from": "762_51_incendiary", -- "type": "AMMO", -- "name": { "str": "7.62x51mm incendiary, 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" ] } - } - ] -diff --git a/data/json/items/ammo/32.json b/data/json/items/ammo/32.json -index b500f7f5b4..52e96900ea 100644 ---- a/data/json/items/ammo/32.json -+++ b/data/json/items/ammo/32.json -@@ -36,14 +36,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_32_acp", -- "copy-from": "32_acp", -- "type": "AMMO", -- "name": { "str": ".32 ACP, 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" ] } - } - ] -diff --git a/data/json/items/ammo/357mag.json b/data/json/items/ammo/357mag.json -index b00d90a5d8..c5324f076e 100644 ---- a/data/json/items/ammo/357mag.json -+++ b/data/json/items/ammo/357mag.json -@@ -58,19 +58,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_357mag_fmj", -- "copy-from": "357mag_fmj", -- "type": "AMMO", -- "name": { "str_sp": ".357 Magnum FMJ, reloaded" }, -- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 } -- }, -- { -- "id": "reloaded_357mag_jhp", -- "copy-from": "357mag_jhp", -- "type": "AMMO", -- "name": { "str_sp": ".357 Magnum JHP, reloaded" }, -- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 } - } - ] -diff --git a/data/json/items/ammo/357sig.json b/data/json/items/ammo/357sig.json -index 6f2cd83e49..99473a7653 100644 ---- a/data/json/items/ammo/357sig.json -+++ b/data/json/items/ammo/357sig.json -@@ -30,23 +30,5 @@ - "name": { "str": ".357 SIG JHP" }, - "description": "Jacketed hollow point .357 SIG ammunition. The .357 SIG round is a high velocity pistol cartridge, giving it a flatter trajectory than many handgun rounds.", - "damage": { "damage_type": "bullet", "amount": 42, "armor_penetration": 0 } -- }, -- { -- "id": "reloaded_357sig_fmj", -- "copy-from": "357sig_fmj", -- "type": "AMMO", -- "name": { "str": ".357 SIG 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_357sig_jhp", -- "copy-from": "357sig_jhp", -- "type": "AMMO", -- "name": { "str": ".357 SIG 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" ] } - } - ] -diff --git a/data/json/items/ammo/38.json b/data/json/items/ammo/38.json -index f4b08dfaaa..798b35db5d 100644 ---- a/data/json/items/ammo/38.json -+++ b/data/json/items/ammo/38.json -@@ -32,24 +32,6 @@ - "recoil": 250, - "effects": [ "COOKOFF" ] - }, -- { -- "id": "reloaded_38_fmj", -- "copy-from": "38_fmj", -- "type": "AMMO", -- "name": { "str": ".38 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_38_special", -- "copy-from": "38_special", -- "type": "AMMO", -- "name": { "str": ".38 Special, 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_38_fmj", - "copy-from": "38_fmj", -diff --git a/data/json/items/ammo/380.json b/data/json/items/ammo/380.json -index 395772a3fa..9667b74813 100644 ---- a/data/json/items/ammo/380.json -+++ b/data/json/items/ammo/380.json -@@ -73,32 +73,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_380_FMJ", -- "copy-from": "380_FMJ", -- "type": "AMMO", -- "name": { "str": ".380 ACP 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_380_JHP", -- "copy-from": "380_JHP", -- "type": "AMMO", -- "name": { "str": ".380 ACP 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": "reloaded_380_p", -- "copy-from": "380_p", -- "type": "AMMO", -- "name": { "str": ".380 ACP +P, 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" ] } - } - ] -diff --git a/data/json/items/ammo/38super.json b/data/json/items/ammo/38super.json -index 06ac5f021a..2b576f3bf9 100644 ---- a/data/json/items/ammo/38super.json -+++ b/data/json/items/ammo/38super.json -@@ -34,23 +34,5 @@ - "count": 20, - "//": "Hollowpoint damage increase of 25%.", - "damage": { "damage_type": "bullet", "amount": 40, "armor_penetration": 0 } -- }, -- { -- "id": "reloaded_38super_fmj", -- "copy-from": "38super_fmj", -- "type": "AMMO", -- "name": { "str": ".38 Super 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_38_super", -- "copy-from": "38_super", -- "type": "AMMO", -- "name": { "str": ".38 Super, 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" ] } - } - ] -diff --git a/data/json/items/ammo/40.json b/data/json/items/ammo/40.json -index 8cb513d33c..227f270ad0 100644 ---- a/data/json/items/ammo/40.json -+++ b/data/json/items/ammo/40.json -@@ -59,23 +59,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_40fmj", -- "copy-from": "40fmj", -- "type": "AMMO", -- "name": { "str": ".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": ".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" ] } - } - ] -diff --git a/data/json/items/ammo/410shot.json b/data/json/items/ammo/410shot.json -index 757b9b403a..ffb7db6072 100644 ---- a/data/json/items/ammo/410shot.json -+++ b/data/json/items/ammo/410shot.json -@@ -21,14 +21,5 @@ - "recoil": 1350, - "loudness": 90, - "effects": [ "COOKOFF", "SHOT" ] -- }, -- { -- "id": "reloaded_410shot_000", -- "copy-from": "410shot_000", -- "type": "AMMO", -- "name": { "str": ".410 000 shot, 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" ] } - } - ] -diff --git a/data/json/items/ammo/44.json b/data/json/items/ammo/44.json -index 5c014350eb..1082652bf7 100644 ---- a/data/json/items/ammo/44.json -+++ b/data/json/items/ammo/44.json -@@ -32,24 +32,6 @@ - "recoil": 1570, - "effects": [ "COOKOFF" ] - }, -- { -- "id": "reloaded_44fmj", -- "copy-from": "44fmj", -- "type": "AMMO", -- "name": { "str": ".44 Magnum 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_44magnum", -- "copy-from": "44magnum", -- "type": "AMMO", -- "name": { "str": ".44 Magnum, 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_44magnum", - "copy-from": "44magnum", -diff --git a/data/json/items/ammo/45.json b/data/json/items/ammo/45.json -index 76d92daa6c..3c78bef870 100644 ---- a/data/json/items/ammo/45.json -+++ b/data/json/items/ammo/45.json -@@ -71,32 +71,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_45_acp", -- "copy-from": "45_acp", -- "type": "AMMO", -- "name": { "str": ".45 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_45_jhp", -- "copy-from": "45_jhp", -- "type": "AMMO", -- "name": { "str": ".45 ACP 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": "reloaded_45_super", -- "copy-from": "45_super", -- "type": "AMMO", -- "name": { "str": ".45 ACP +P, 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" ] } - } - ] -diff --git a/data/json/items/ammo/454.json b/data/json/items/ammo/454.json -index d46502dbd2..ac93acc229 100644 ---- a/data/json/items/ammo/454.json -+++ b/data/json/items/ammo/454.json -@@ -22,15 +22,6 @@ - "recoil": 2500, - "effects": [ "COOKOFF" ] - }, -- { -- "id": "reloaded_454_Casull", -- "copy-from": "454_Casull", -- "type": "AMMO", -- "name": { "str": ".454 Casull, 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_454_Casull", - "copy-from": "454_Casull", -diff --git a/data/json/items/ammo/4570.json b/data/json/items/ammo/4570.json -index 94082b3805..360afcdb1c 100644 ---- a/data/json/items/ammo/4570.json -+++ b/data/json/items/ammo/4570.json -@@ -44,45 +44,5 @@ - "price_postapoc": "4 USD", - "flags": [ "IRREPLACEABLE_CONSUMABLE" ], - "relative": { "range": -8, "damage": { "damage_type": "bullet", "amount": -14, "armor_penetration": -25 }, "recoil": -900 } -- }, -- { -- "id": "reloaded_4570_sp", -- "copy-from": "4570_sp", -- "type": "AMMO", -- "name": { "str": ".45-70 SP, reloaded" }, -- "description": ".45-70 Government ammunition loaded with a 305 grain soft point round. One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges.", -- "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_4570_pen", -- "copy-from": "4570_pen", -- "type": "AMMO", -- "name": { "str": ".45-70 +P penetrator, reloaded" }, -- "description": ".45-70 Government +P ammunition loaded with a 305 grain solid copper penetrator projectile. Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics.", -- "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_4570_low", -- "copy-from": "4570_low", -- "type": "AMMO", -- "name": { "str": ".45-70 LFN cowboy, reloaded" }, -- "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms. Quite a bit less powerful than modern ammo, but still packs a punch.", -- "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_4570_bp", -- "copy-from": "4570_low", -- "type": "AMMO", -- "name": { "str": ".45-70, black powder" }, -- "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet using black powder to original specifications. Quite a bit less powerful and a lot dirtier than modern ammo, but still packs a punch.", -- "proportional": { "price": 0.6, "damage": { "damage_type": "bullet", "amount": 0.8 }, "dispersion": 1.2 }, -- "extend": { "effects": [ "RECYCLED", "MUZZLE_SMOKE", "BLACKPOWDER" ] }, -- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - } - ] -diff --git a/data/json/items/ammo/45colt.json b/data/json/items/ammo/45colt.json -index 713c49c5b4..99a289404c 100644 ---- a/data/json/items/ammo/45colt.json -+++ b/data/json/items/ammo/45colt.json -@@ -23,15 +23,6 @@ - "recoil": 600, - "effects": [ "COOKOFF" ] - }, -- { -- "id": "reloaded_45colt_jhp", -- "copy-from": "45colt_jhp", -- "type": "AMMO", -- "name": { "str": ".45 Colt 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_45colt_jhp", - "copy-from": "45colt_jhp", -diff --git a/data/json/items/ammo/46.json b/data/json/items/ammo/46.json -index 477702dcdb..3a63dddaf4 100644 ---- a/data/json/items/ammo/46.json -+++ b/data/json/items/ammo/46.json -@@ -37,15 +37,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_46mm", -- "copy-from": "46mm", -- "type": "AMMO", -- "name": { "str": "4.6x30mm, reloaded" }, -- "description": "4.6x30mm ammunition with 31gr copper plated lead bullets. The 4.6x30mm round was developed by H&K to compete with FN Herstal's 5.7x28mm cartridge. It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.", -- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.2 }, "dispersion": 1.1 }, -- "extend": { "effects": [ "RECYCLED" ] }, -- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - } - ] -diff --git a/data/json/items/ammo/460.json b/data/json/items/ammo/460.json -index c21480727c..087ec1ba8f 100644 ---- a/data/json/items/ammo/460.json -+++ b/data/json/items/ammo/460.json -@@ -44,24 +44,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_460_fmj", -- "copy-from": "460_fmj", -- "type": "AMMO", -- "name": { "str": ".460 Rowland FMJ, reloaded" }, -- "description": "A brass-jacketed variant of the .460 Rowland round. This increases penetration slightly at the cost of reduced damage from expansion.", -- "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_460_rowland", -- "copy-from": "460_rowland", -- "type": "AMMO", -- "name": { "str": ".460 Rowland, 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" ] } - } - ] -diff --git a/data/json/items/ammo/50.json b/data/json/items/ammo/50.json -index 928f5c94a1..058da3c560 100644 ---- a/data/json/items/ammo/50.json -+++ b/data/json/items/ammo/50.json -@@ -65,35 +65,5 @@ - "//": "mk 211 is estimated to be as effective as 20mm, which would have 65kJ energy, or 255 damage. ~181 damage is fair.", - "relative": { "damage": { "damage_type": "bullet", "amount": 50, "armor_penetration": 25 } }, - "dispersion": 100 -- }, -- { -- "id": "reloaded_50_incendiary", -- "copy-from": "50_incendiary", -- "type": "AMMO", -- "name": { "str": ".50 BMG tracer, reloaded" }, -- "description": "A tracer variant of the powerful .50 BMG round. Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances.", -- "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_50bmg", -- "copy-from": "50match", -- "type": "AMMO", -- "name": { "str": ".50 BMG Match, reloaded" }, -- "description": ".50 BMG ammunition with lead-cored FMJ bullets. The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles. Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.", -- "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_50ss", -- "copy-from": "50ss", -- "type": "AMMO", -- "name": { "str": ".50 BMG AP, reloaded" }, -- "description": "Variant of the .50 BMG round that uses a core hardened steel. Penetration is increased, but damage is reduced.", -- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, -- "extend": { "effects": [ "RECYCLED" ] }, -- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - } - ] -diff --git a/data/json/items/ammo/500.json b/data/json/items/ammo/500.json -index 1f115ef477..e13aec49f2 100644 ---- a/data/json/items/ammo/500.json -+++ b/data/json/items/ammo/500.json -@@ -35,14 +35,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_500_Magnum", -- "copy-from": "500_Magnum", -- "type": "AMMO", -- "name": { "str": ".500 S&W Magnum, 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" ] } - } - ] -diff --git a/data/json/items/ammo/545x39.json b/data/json/items/ammo/545x39.json -index 67b9e40515..13b13adcf2 100644 ---- a/data/json/items/ammo/545x39.json -+++ b/data/json/items/ammo/545x39.json -@@ -35,25 +35,5 @@ - "color": "yellow", - "//": "Balanced as AP, 7/8 damage, arpen 6/7 that value.", - "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 12 } } -- }, -- { -- "id": "reloaded_545", -- "copy-from": "545", -- "type": "AMMO", -- "name": { "str": "5.45x39mm, reloaded" }, -- "description": "The 5.45x39mm was the standard ammunition for the AK series from 1974. Its designers were inspired by the 5.56x45mm NATO cartridge.", -- "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_545_ap", -- "copy-from": "545_ap", -- "type": "AMMO", -- "name": { "str": "5.45x39mm AP, reloaded" }, -- "description": "Armor piercing 5.45x39mm ammunition with hand-reloaded bullets containing a steel penetrator. Developed in 1998 by the Russian military.", -- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, -- "extend": { "effects": [ "RECYCLED" ] }, -- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - } - ] -diff --git a/data/json/items/ammo/57.json b/data/json/items/ammo/57.json -index e9ada36514..0cde40d396 100644 ---- a/data/json/items/ammo/57.json -+++ b/data/json/items/ammo/57.json -@@ -37,15 +37,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_57mm", -- "copy-from": "57mm", -- "type": "AMMO", -- "name": { "str": "5.7x28mm, reloaded" }, -- "description": "5.7x28mm ammunition with 31gr AP FMJ bullets. The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use. Although the project to replace 9x19mm Parabellum was effectively canceled the 5.7x28mm round has seen action in many conflicts and has proven to be reliable. It has very low recoil but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.", -- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.2 }, "dispersion": 1.1 }, -- "extend": { "effects": [ "RECYCLED" ] }, -- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - } - ] -diff --git a/data/json/items/ammo/5x50.json b/data/json/items/ammo/5x50.json -index c1a285cb91..5a8901e578 100644 ---- a/data/json/items/ammo/5x50.json -+++ b/data/json/items/ammo/5x50.json -@@ -33,16 +33,5 @@ - "//": "Balanced as AP, with 25% higher damage and 50% higher arpen" - "relative": { "range": -10, "damage": { "damage_type": "bullet", "amount": 8, "armor_penetration": 13 } }, - "proportional": { "dispersion": 1.5, "recoil": 1.5 } -- }, -- { -- "id": "reloaded_5x50dart", -- "copy-from": "5x50dart", -- "type": "AMMO", -- "name": { "str": "5x50mm flechette, reloaded" }, -- "price_postapoc": "12 USD", -- "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator.", -- "effects": [ "COOKOFF", "RECYCLED" ], -- "relative": { "range": -15, "dispersion": 40 }, -- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.7 }, "recoil": 0.9 } - } - ] -diff --git a/data/json/items/ammo/700nx.json b/data/json/items/ammo/700nx.json -index 7eb5b7e653..0c1502f592 100644 ---- a/data/json/items/ammo/700nx.json -+++ b/data/json/items/ammo/700nx.json -@@ -21,14 +21,5 @@ - "dispersion": 15, - "recoil": 12100, - "effects": [ "COOKOFF" ] -- }, -- { -- "id": "reloaded_700nx", -- "copy-from": "700nx", -- "type": "AMMO", -- "name": { "str": ".700 NX, 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" ] } - } - ] -diff --git a/data/json/items/ammo/762.json b/data/json/items/ammo/762.json -index 7f770d227c..685111f200 100644 ---- a/data/json/items/ammo/762.json -+++ b/data/json/items/ammo/762.json -@@ -32,24 +32,5 @@ - "price": "150 cent", - "price_postapoc": "68 USD", - "relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": 2 } } -- }, -- { -- "id": "reloaded_762_m43", -- "copy-from": "762_m43", -- "type": "AMMO", -- "name": { "str": "7.62x39mm M43, reloaded" }, -- "description": "7.62x39mm ammunition with 121.9gr bullets. Developed in WW2 by the Soviet Union the 7.62x39mm round rapidly became extremely popular all over the world. The bullet has poor wounding potential due to its stability, only beginning to yaw after 26cm.", -- "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_762_m87", -- "copy-from": "762_m87", -- "type": "AMMO", -- "name": { "str": "7.62x39mm M67, 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" ] } - } - ] -diff --git a/data/json/items/ammo/762R.json b/data/json/items/ammo/762R.json -index 805a79dc09..1d595cc200 100644 ---- a/data/json/items/ammo/762R.json -+++ b/data/json/items/ammo/762R.json -@@ -21,14 +21,5 @@ - "dispersion": 15, - "recoil": 2650, - "effects": [ "COOKOFF" ] -- }, -- { -- "id": "reloaded_762_54R", -- "copy-from": "762_54R", -- "type": "AMMO", -- "name": { "str": "7.62x54mmR, 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" ] } - } - ] -diff --git a/data/json/items/ammo/762x25.json b/data/json/items/ammo/762x25.json -index 77877e86f7..2dc22bed9e 100644 ---- a/data/json/items/ammo/762x25.json -+++ b/data/json/items/ammo/762x25.json -@@ -63,12 +63,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_762_25", -- "copy-from": "762_25hot", -- "type": "AMMO", -- "name": { "str": "7.62x25mm, reloaded" }, -- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 } - } - ] -diff --git a/data/json/items/ammo/9mm.json b/data/json/items/ammo/9mm.json -index a48e446164..420503af41 100644 ---- a/data/json/items/ammo/9mm.json -+++ b/data/json/items/ammo/9mm.json -@@ -85,41 +85,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_9mm", -- "copy-from": "9mm", -- "type": "AMMO", -- "name": { "str": "9x19mm 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": "reloaded_9mmfmj", -- "copy-from": "9mmfmj", -- "type": "AMMO", -- "name": { "str": "9x19mm 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_9mmP", -- "copy-from": "9mmP", -- "type": "AMMO", -- "name": { "str": "9x19mm +P, 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_9mmP2", -- "copy-from": "9mmP2", -- "type": "AMMO", -- "name": { "str": "9x19mm +P+, 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" ] } - } - ] -diff --git a/data/json/items/ammo/9x18.json b/data/json/items/ammo/9x18.json -index 94c130a144..63b613e9ff 100644 ---- a/data/json/items/ammo/9x18.json -+++ b/data/json/items/ammo/9x18.json -@@ -74,36 +74,5 @@ - }, - "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_9x18mm", -- "copy-from": "9x18mm", -- "type": "AMMO", -- "name": { "str": "9x18mm, reloaded" }, -- "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM. As the designation implies, it is a bit shorter in case length compared to 9mm Parabellum.", -- "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": "9x18mm +P+, reloaded" }, -- "//": "Rather than give it a military designation, this is simply handmade overpressure ammo.", -- "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM. This one has been hand-reloaded to generate higher internal pressure, boosting flight stability and damage.", -- "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": "9x18mm FMJ, reloaded" }, -- "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM. This brass-jacketed round increases penetration slightly, at the cost of reduced expansion.", -- "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, -- "extend": { "effects": [ "RECYCLED" ] }, -- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } - } - ] -diff --git a/data/json/items/ammo/shot.json b/data/json/items/ammo/shot.json -index 50f6c09d56..619ab4ab64 100644 ---- a/data/json/items/ammo/shot.json -+++ b/data/json/items/ammo/shot.json -@@ -1,49 +1,4 @@ - [ -- { -- "id": "reloaded_shot_bird", -- "copy-from": "shot_bird", -- "type": "AMMO", -- "name": { "str": "birdshot, 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_shot_dragon", -- "copy-from": "shot_dragon", -- "type": "AMMO", -- "name": { "str": "dragon's breath shell, reloaded" }, -- "proportional": { "price": 0.7, "damage": { "damage_type": "heat", "amount": 0.9 }, "dispersion": 1.1 }, -- "extend": { "effects": [ "RECYCLED" ] }, -- "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -- }, -- { -- "id": "reloaded_shot_00", -- "copy-from": "shot_00", -- "type": "AMMO", -- "name": { "str": "00 shot, 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_shot_flechette", -- "copy-from": "shot_flechette", -- "type": "AMMO", -- "name": { "str": "flechette shell, 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_shot_slug", -- "copy-from": "shot_slug", -- "type": "AMMO", -- "name": { "str": "shotgun slug, 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_shot_bird", - "copy-from": "shot_bird", -diff --git a/data/json/items/migration.json b/data/json/items/migration.json -index 13f75ba5ed..ccda62af14 100644 ---- a/data/json/obsoletion/migration.json -+++ b/data/json/obsoletion/migration.json -@@ -387,7 +387,7 @@ - { - "id": "shot_scrapslug", - "type": "MIGRATION", -- "replace": "reloaded_shot_slug" -+ "replace": "shot_slug" - }, - { - "id": "UPS_on", -@@ -792,7 +792,7 @@ - { - "id": "reloaded_10mm", - "type": "MIGRATION", -- "replace": "reloaded_10mm_fmj" -+ "replace": "10mm_fmj" - }, - { - "id": "locket", -@@ -827,7 +827,7 @@ - { - "id": "reloaded_270", - "type": "MIGRATION", -- "replace": "reloaded_270win_jsp" -+ "replace": "270win_jsp" - }, - { - "id": "afs_rolling_pin", -@@ -1247,7 +1247,7 @@ - { - "id": "reloaded_22_fmj", - "type": "MIGRATION", -- "replace": "reloaded_22_cphp" -+ "replace": "22_cphp" - }, - { - "id": "hickory_nut_unshelled", -@@ -1320,5 +1320,345 @@ - "id": "raw_butter", - "type": "MIGRATION", - "replace": "butter" -+ }, -+ { -+ "id": "reloaded_32_acp", -+ "type": "MIGRATION", -+ "replace": "32_acp" -+ }, -+ { -+ "id": "reloaded_38_fmj", -+ "type": "MIGRATION", -+ "replace": "38_fmj" -+ }, -+ { -+ "id": "reloaded_38_special", -+ "type": "MIGRATION", -+ "replace": "38_special" -+ }, -+ { -+ "id": "reloaded_38super_fmj", -+ "type": "MIGRATION", -+ "replace": "38super_fmj" -+ }, -+ { -+ "id": "reloaded_357sig_fmj", -+ "type": "MIGRATION", -+ "replace": "357sig_fmj" -+ }, -+ { -+ "id": "reloaded_357sig_jhp", -+ "type": "MIGRATION", -+ "replace": "357sig_jhp" -+ }, -+ { -+ "id": "reloaded_357mag_fmj", -+ "type": "MIGRATION", -+ "replace": "357mag_fmj" -+ }, -+ { -+ "id": "reloaded_357mag_jhp", -+ "type": "MIGRATION", -+ "replace": "357mag_jhp" -+ }, -+ { -+ "id": "reloaded_38_super", -+ "type": "MIGRATION", -+ "replace": "38_super" -+ }, -+ { -+ "id": "reloaded_40fmj", -+ "type": "MIGRATION", -+ "replace": "40fmj" -+ }, -+ { -+ "id": "reloaded_40sw", -+ "type": "MIGRATION", -+ "replace": "40sw" -+ }, -+ { -+ "id": "reloaded_10mm_fmj", -+ "type": "MIGRATION", -+ "replace": "10mm_fmj" -+ }, -+ { -+ "id": "reloaded_44fmj", -+ "type": "MIGRATION", -+ "replace": "44fmj" -+ }, -+ { -+ "id": "reloaded_44magnum", -+ "type": "MIGRATION", -+ "replace": "44magnum" -+ }, -+ { -+ "id": "reloaded_45_acp", -+ "type": "MIGRATION", -+ "replace": "45_acp" -+ }, -+ { -+ "id": "reloaded_45_jhp", -+ "type": "MIGRATION", -+ "replace": "45_jhp" -+ }, -+ { -+ "id": "reloaded_45_super", -+ "type": "MIGRATION", -+ "replace": "45_super" -+ }, -+ { -+ "id": "reloaded_454_Casull", -+ "type": "MIGRATION", -+ "replace": "454_Casull" -+ }, -+ { -+ "id": "reloaded_45colt_jhp", -+ "type": "MIGRATION", -+ "replace": "45colt_jhp" -+ }, -+ { -+ "id": "reloaded_46mm", -+ "type": "MIGRATION", -+ "replace": "46mm" -+ }, -+ { -+ "id": "reloaded_460_fmj", -+ "type": "MIGRATION", -+ "replace": "460_fmj" -+ }, -+ { -+ "id": "reloaded_460_rowland", -+ "type": "MIGRATION", -+ "replace": "460_rowland" -+ }, -+ { -+ "id": "reloaded_500_Magnum", -+ "type": "MIGRATION", -+ "replace": "500_Magnum" -+ }, -+ { -+ "id": "reloaded_57mm", -+ "type": "MIGRATION", -+ "replace": "57mm" -+ }, -+ { -+ "id": "reloaded_762_25", -+ "type": "MIGRATION", -+ "replace": "762_25" -+ }, -+ { -+ "id": "reloaded_9mm", -+ "type": "MIGRATION", -+ "replace": "9mm" -+ }, -+ { -+ "id": "reloaded_9mmP", -+ "type": "MIGRATION", -+ "replace": "9mmP" -+ }, -+ { -+ "id": "reloaded_9mmP2", -+ "type": "MIGRATION", -+ "replace": "9mmP2" -+ }, -+ { -+ "id": "reloaded_9mmfmj", -+ "type": "MIGRATION", -+ "replace": "9mmfmj" -+ }, -+ { -+ "id": "reloaded_9x18mm", -+ "type": "MIGRATION", -+ "replace": "9x18mm" -+ }, -+ { -+ "id": "reloaded_9x18mmfmj", -+ "type": "MIGRATION", -+ "replace": "9x18mmfmj" -+ }, -+ { -+ "id": "reloaded_9x18mmP2", -+ "type": "MIGRATION", -+ "replace": "9x18mmP2" -+ }, -+ { -+ "id": "reloaded_380_JHP", -+ "type": "MIGRATION", -+ "replace": "380_JHP" -+ }, -+ { -+ "id": "reloaded_380_p", -+ "type": "MIGRATION", -+ "replace": "380_p" -+ }, -+ { -+ "id": "reloaded_380_FMJ", -+ "type": "MIGRATION", -+ "replace": "380_FMJ" -+ }, -+ { -+ "id": "reloaded_22_cphp", -+ "type": "MIGRATION", -+ "replace": "22_cphp" -+ }, -+ { -+ "id": "reloaded_22_lr", -+ "type": "MIGRATION", -+ "replace": "22_lr" -+ }, -+ { -+ "id": "reloaded_223", -+ "type": "MIGRATION", -+ "replace": "223" -+ }, -+ { -+ "id": "reloaded_270win_jsp", -+ "type": "MIGRATION", -+ "replace": "270win_jsp" -+ }, -+ { -+ "id": "reloaded_300_winmag", -+ "type": "MIGRATION", -+ "replace": "300_winmag" -+ }, -+ { -+ "id": "reloaded_3006", -+ "type": "MIGRATION", -+ "replace": "3006" -+ }, -+ { -+ "id": "reloaded_3006fmj", -+ "type": "MIGRATION", -+ "replace": "3006fmj" -+ }, -+ { -+ "id": "reloaded_3006_incendiary", -+ "type": "MIGRATION", -+ "replace": "3006_incendiary" -+ }, -+ { -+ "id": "reloaded_308", -+ "type": "MIGRATION", -+ "replace": "308" -+ }, -+ { -+ "id": "reloaded_4570_sp", -+ "type": "MIGRATION", -+ "replace": "4570_sp" -+ }, -+ { -+ "id": "reloaded_4570_pen", -+ "type": "MIGRATION", -+ "replace": "4570_pen" -+ }, -+ { -+ "id": "reloaded_4570_low", -+ "type": "MIGRATION", -+ "replace": "4570_low" -+ }, -+ { -+ "id": "reloaded_50bmg", -+ "type": "MIGRATION", -+ "replace": "50bmg" -+ }, -+ { -+ "id": "reloaded_50_incendiary", -+ "type": "MIGRATION", -+ "replace": "50_incendiary" -+ }, -+ { -+ "id": "reloaded_50ss", -+ "type": "MIGRATION", -+ "replace": "50ss" -+ }, -+ { -+ "id": "reloaded_545", -+ "type": "MIGRATION", -+ "replace": "545" -+ }, -+ { -+ "id": "reloaded_545_ap", -+ "type": "MIGRATION", -+ "replace": "545_ap" -+ }, -+ { -+ "id": "reloaded_300blk", -+ "type": "MIGRATION", -+ "replace": "300blk" -+ }, -+ { -+ "id": "reloaded_556", -+ "type": "MIGRATION", -+ "replace": "556" -+ }, -+ { -+ "id": "reloaded_556_incendiary", -+ "type": "MIGRATION", -+ "replace": "556_incendiary" -+ }, -+ { -+ "id": "reloaded_700nx", -+ "type": "MIGRATION", -+ "replace": "700nx" -+ }, -+ { -+ "id": "reloaded_762_51", -+ "type": "MIGRATION", -+ "replace": "762_51" -+ }, -+ { -+ "id": "reloaded_762_51_incendiary", -+ "type": "MIGRATION", -+ "replace": "762_51_incendiary" -+ }, -+ { -+ "id": "reloaded_762_54R", -+ "type": "MIGRATION", -+ "replace": "762_54R" -+ }, -+ { -+ "id": "reloaded_762_m43", -+ "type": "MIGRATION", -+ "replace": "762_m43" -+ }, -+ { -+ "id": "reloaded_762_m87", -+ "type": "MIGRATION", -+ "replace": "762_m87" -+ }, -+ { -+ "id": "reloaded_shot_00", -+ "type": "MIGRATION", -+ "replace": "shot_00" -+ }, -+ { -+ "id": "reloaded_410shot_000", -+ "type": "MIGRATION", -+ "replace": "410shot_000" -+ }, -+ { -+ "id": "reloaded_shot_bird", -+ "type": "MIGRATION", -+ "replace": "shot_bird" -+ }, -+ { -+ "id": "reloaded_shot_dragon", -+ "type": "MIGRATION", -+ "replace": "shot_dragon" -+ }, -+ { -+ "id": "reloaded_shot_flechette", -+ "type": "MIGRATION", -+ "replace": "shot_flechette" -+ }, -+ { -+ "id": "reloaded_shot_slug", -+ "type": "MIGRATION", -+ "replace": "shot_slug" -+ }, -+ { -+ "id": "reloaded_5x50dart", -+ "type": "MIGRATION", -+ "replace": "5x50dart" - }, - { - "id": "mutant_offal_cooked", - "type": "MIGRATION", -diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json -index a3819132f6..b8c26c57dd 100644 ---- a/data/json/obsoletion/items.json -+++ b/data/json/obsoletion/items.json -@@ -3707,6 +3707,632 @@ - "transform_age": 21600, - "not_ready_msg": "The cream has not risen yet." - } -+ }, -+ { -+ "id": "reloaded_5x50dart", -+ "copy-from": "5x50dart", -+ "type": "AMMO", -+ "name": { "str": "5x50mm flechette, reloaded" }, -+ "price_postapoc": "12 USD", -+ "description": "Designed to defeat modern body armor, the Rivtech 5x50mm flechette round features a biodegradable sabot and a single, fin-stabilized penetrator. This one has been hand-reloaded.", -+ "effects": [ "COOKOFF", "RECYCLED" ], -+ "relative": { "range": -15, "dispersion": 40 }, -+ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.7 }, "recoil": 0.9 } -+ }, -+ { -+ "id": "reloaded_9mm", -+ "copy-from": "9mm", -+ "type": "AMMO", -+ "name": { "str": "9x19mm 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": "reloaded_9mmfmj", -+ "copy-from": "9mmfmj", -+ "type": "AMMO", -+ "name": { "str": "9x19mm 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_9mmP", -+ "copy-from": "9mmP", -+ "type": "AMMO", -+ "name": { "str": "9x19mm +P, 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_9mmP2", -+ "copy-from": "9mmP2", -+ "type": "AMMO", -+ "name": { "str": "9x19mm +P+, 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_9x18mm", -+ "copy-from": "9x18mm", -+ "type": "AMMO", -+ "name": { "str": "9x18mm, reloaded" }, -+ "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM. As the designation implies, it is a bit shorter in case length compared to 9mm Parabellum. This one has been hand-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_9x18mmP2", -+ "copy-from": "9x18mmP2", -+ "type": "AMMO", -+ "name": { "str": "9x18mm +P+, reloaded" }, -+ "//": "Rather than give it a military designation, this is simply handmade overpressure ammo.", -+ "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM. This one has been hand-reloaded to generate higher internal pressure, boosting flight stability and damage.", -+ "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": "9x18mm FMJ, reloaded" }, -+ "description": "9x18 millimeter Makarov, an old Soviet pistol cartridge used mainly by the Makarov PM. This brass-jacketed round increases penetration slightly, at the cost of reduced expansion. This one has been hand-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_10mm_fmj", -+ "copy-from": "10mm_fmj", -+ "type": "AMMO", -+ "name": { "str": "10mm Auto 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_22_lr", -+ "copy-from": "22_lr", -+ "type": "AMMO", -+ "name": { "str": ".22 LR, 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_22_cphp", -+ "copy-from": "22_cphp", -+ "type": "AMMO", -+ "name": { "str": ".22 CPHP, 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_32_acp", -+ "copy-from": "32_acp", -+ "type": "AMMO", -+ "name": { "str": ".32 ACP, 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_38_fmj", -+ "copy-from": "38_fmj", -+ "type": "AMMO", -+ "name": { "str": ".38 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_38_special", -+ "copy-from": "38_special", -+ "type": "AMMO", -+ "name": { "str": ".38 Special, 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_38super_fmj", -+ "copy-from": "38super_fmj", -+ "type": "AMMO", -+ "name": { "str": ".38 Super 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_38_super", -+ "copy-from": "38_super", -+ "type": "AMMO", -+ "name": { "str": ".38 Super, 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_40fmj", -+ "copy-from": "40fmj", -+ "type": "AMMO", -+ "name": { "str": ".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": ".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": "reloaded_44fmj", -+ "copy-from": "44fmj", -+ "type": "AMMO", -+ "name": { "str": ".44 Magnum 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_44magnum", -+ "copy-from": "44magnum", -+ "type": "AMMO", -+ "name": { "str": ".44 Magnum, 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_45_acp", -+ "copy-from": "45_acp", -+ "type": "AMMO", -+ "name": { "str": ".45 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_45_jhp", -+ "copy-from": "45_jhp", -+ "type": "AMMO", -+ "name": { "str": ".45 ACP 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": "reloaded_45_super", -+ "copy-from": "45_super", -+ "type": "AMMO", -+ "name": { "str": ".45 ACP +P, 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_45colt_jhp", -+ "copy-from": "45colt_jhp", -+ "type": "AMMO", -+ "name": { "str": ".45 Colt 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": "reloaded_46mm", -+ "copy-from": "46mm", -+ "type": "AMMO", -+ "name": { "str": "4.6x30mm, reloaded" }, -+ "description": "4.6x30mm ammunition with 31gr copper plated lead bullets. The 4.6x30mm round was developed by H&K to compete with FN Herstal's 5.7x28mm cartridge. It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.", -+ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.2 }, "dispersion": 1.1 }, -+ "extend": { "effects": [ "RECYCLED" ] }, -+ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -+ }, -+ { -+ "id": "reloaded_50_incendiary", -+ "copy-from": "50_incendiary", -+ "type": "AMMO", -+ "name": { "str": ".50 BMG tracer, reloaded" }, -+ "description": "A tracer variant of the powerful .50 BMG round. Tracer rounds help to keep the weapon they are fired from on target at the risk of igniting flammable substances. This one has been hand-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_50bmg", -+ "copy-from": "50match", -+ "type": "AMMO", -+ "name": { "str": ".50 BMG Match, reloaded" }, -+ "description": ".50 BMG ammunition with lead-cored FMJ bullets. The .50 BMG is a very powerful rifle round designed for anti-aircraft use, later adapted to anti-vehicular and anti-personnel roles. Its stupendous energy and armor piercing capabilities make it one of the most deadly rounds available, offset only by its drastic recoil and noise.", -+ "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_50ss", -+ "copy-from": "50ss", -+ "type": "AMMO", -+ "name": { "str": ".50 BMG AP, reloaded" }, -+ "description": "Variant of the .50 BMG round that uses a core hardened steel. Penetration is increased, but damage is reduced. This one has been hand-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_57mm", -+ "copy-from": "57mm", -+ "type": "AMMO", -+ "name": { "str": "5.7x28mm, reloaded" }, -+ "description": "5.7x28mm ammunition with 31gr AP FMJ bullets. The 5.7x28mm cartridge was designed by FN Herstal to replace the 9x19mm round in NATO use. Although the project to replace 9x19mm Parabellum was effectively canceled the 5.7x28mm round has seen action in many conflicts and has proven to be reliable. It has very low recoil but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.", -+ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.2 }, "dispersion": 1.1 }, -+ "extend": { "effects": [ "RECYCLED" ] }, -+ "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] } -+ }, -+ { -+ "id": "reloaded_223", -+ "copy-from": "223", -+ "type": "AMMO", -+ "name": { "str": ".223 Remington, 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_556", -+ "copy-from": "556", -+ "type": "AMMO", -+ "name": { "str": "5.56 NATO, 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_556_incendiary", -+ "copy-from": "556_incendiary", -+ "type": "AMMO", -+ "name": { "str": "5.56 NATO tracer, 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_270win_jsp", -+ "copy-from": "270win_jsp", -+ "type": "AMMO", -+ "name": { "str": ".270 Winchester JSP, 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_300_winmag", -+ "copy-from": "300_winmag", -+ "type": "AMMO", -+ "name": { "str": ".300 Winchester Magnum, reloaded" }, -+ "description": "The .300 Winchester Magnum is extremely versatile and has been adopted by many shooting disciplines. The cartridge has found use by hunters, military units, and law enforcement departments. This one has been hand-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_300blk", -+ "copy-from": "300blk", -+ "type": "AMMO", -+ "name": { "str": ".300 AAC Blackout, reloaded" }, -+ "description": ".300 AAC Blackout is an intermediate cartridge that achieves ballistics similar to the 7.62x39 but allows use on the AR-15 platform. The round is necked-up from the 5.56mm NATO, but feeds from a STANAG magazine. It requires a specific barrel, so will not work in a standard M4 or similar carbine. This one has been hand-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_308", -+ "copy-from": "308", -+ "type": "AMMO", -+ "name": { "str": ".308 Winchester, 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_762_51", -+ "copy-from": "762_51", -+ "type": "AMMO", -+ "name": { "str": "7.62x51mm, 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_762_51_incendiary", -+ "copy-from": "762_51_incendiary", -+ "type": "AMMO", -+ "name": { "str": "7.62x51mm incendiary, 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_357mag_fmj", -+ "copy-from": "357mag_fmj", -+ "type": "AMMO", -+ "name": { "str_sp": ".357 Magnum FMJ, reloaded" }, -+ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 } -+ }, -+ { -+ "id": "reloaded_357mag_jhp", -+ "copy-from": "357mag_jhp", -+ "type": "AMMO", -+ "name": { "str_sp": ".357 Magnum JHP, reloaded" }, -+ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1, "recoil": 0.9 } -+ }, -+ { -+ "id": "reloaded_357sig_fmj", -+ "copy-from": "357sig_fmj", -+ "type": "AMMO", -+ "name": { "str": ".357 SIG 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_357sig_jhp", -+ "copy-from": "357sig_jhp", -+ "type": "AMMO", -+ "name": { "str": ".357 SIG 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": "reloaded_380_FMJ", -+ "copy-from": "380_FMJ", -+ "type": "AMMO", -+ "name": { "str": ".380 ACP 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_380_JHP", -+ "copy-from": "380_JHP", -+ "type": "AMMO", -+ "name": { "str": ".380 ACP 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": "reloaded_380_p", -+ "copy-from": "380_p", -+ "type": "AMMO", -+ "name": { "str": ".380 ACP +P, 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_410shot_000", -+ "copy-from": "410shot_000", -+ "type": "AMMO", -+ "name": { "str": ".410 000 shot, 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_454_Casull", -+ "copy-from": "454_Casull", -+ "type": "AMMO", -+ "name": { "str": ".454 Casull, 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_460_fmj", -+ "copy-from": "460_fmj", -+ "type": "AMMO", -+ "name": { "str": ".460 Rowland FMJ, reloaded" }, -+ "description": "A brass-jacketed variant of the .460 Rowland round. This increases penetration slightly at the cost of reduced damage from expansion.", -+ "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_460_rowland", -+ "copy-from": "460_rowland", -+ "type": "AMMO", -+ "name": { "str": ".460 Rowland, 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_500_Magnum", -+ "copy-from": "500_Magnum", -+ "type": "AMMO", -+ "name": { "str": ".500 S&W Magnum, 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_545", -+ "copy-from": "545", -+ "type": "AMMO", -+ "name": { "str": "5.45x39mm, reloaded" }, -+ "description": "The 5.45x39mm was the standard ammunition for the AK series from 1974. Its designers were inspired by the 5.56x45mm NATO cartridge. This one has been hand-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_545_ap", -+ "copy-from": "545_ap", -+ "type": "AMMO", -+ "name": { "str": "5.45x39mm AP, reloaded" }, -+ "description": "Armor piercing 5.45x39mm ammunition with hand-reloaded bullets containing a steel penetrator. Developed in 1998 by the Russian military.", -+ "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_700nx", -+ "copy-from": "700nx", -+ "type": "AMMO", -+ "name": { "str": ".700 NX, 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_762_m43", -+ "copy-from": "762_m43", -+ "type": "AMMO", -+ "name": { "str": "7.62x39mm M43, reloaded" }, -+ "description": "7.62x39mm ammunition with 121.9gr bullets. Developed in WW2 by the Soviet Union the 7.62x39mm round rapidly became extremely popular all over the world. The bullet has poor wounding potential due to its stability, only beginning to yaw after 26cm.", -+ "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_762_m87", -+ "copy-from": "762_m87", -+ "type": "AMMO", -+ "name": { "str": "7.62x39mm M67, 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_762_54R", -+ "copy-from": "762_54R", -+ "type": "AMMO", -+ "name": { "str": "7.62x54mmR, 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_762_25", -+ "copy-from": "762_25hot", -+ "type": "AMMO", -+ "name": { "str": "7.62x25mm, reloaded" }, -+ "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.9 }, "dispersion": 1.1 } -+ }, -+ { -+ "id": "reloaded_3006", -+ "copy-from": "3006", -+ "type": "AMMO", -+ "name": { "str": ".30-06 Springfield, 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_3006_incendiary", -+ "copy-from": "3006_incendiary", -+ "type": "AMMO", -+ "name": { "str": ".30-06 incendiary, 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_3006fmj", -+ "copy-from": "3006fmj", -+ "type": "AMMO", -+ "name": { "str": ".30-06 M2 AP, 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_4570_sp", -+ "copy-from": "4570_sp", -+ "type": "AMMO", -+ "name": { "str": ".45-70 SP, reloaded" }, -+ "description": ".45-70 Government ammunition loaded with a 305 grain soft point round. One of the oldest cartridges still in use, it is still a favorite for large game hunting at short ranges. This one has been hand-loaded.", -+ "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_4570_pen", -+ "copy-from": "4570_pen", -+ "type": "AMMO", -+ "name": { "str": ".45-70 +P penetrator, reloaded" }, -+ "description": ".45-70 Government +P ammunition loaded with a 305 grain solid copper penetrator projectile. Designed for maximum penetration through thick hide and bone while maintaining ideal wounding characteristics. This one has been hand-loaded.", -+ "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_4570_low", -+ "copy-from": "4570_low", -+ "type": "AMMO", -+ "name": { "str": ".45-70 LFN cowboy, reloaded" }, -+ "description": ".45-70 Government ammunition loaded with a 405 grain lead flat nose bullet to original specifications for safe use in antique firearms. Quite a bit less powerful than modern ammo, but still packs a punch. This one has been hand-loaded.", -+ "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_shot_bird", -+ "copy-from": "shot_bird", -+ "type": "AMMO", -+ "name": { "str": "birdshot, 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_shot_dragon", -+ "copy-from": "shot_dragon", -+ "type": "AMMO", -+ "name": { "str": "dragon's breath shell, 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_shot_00", -+ "copy-from": "shot_00", -+ "type": "AMMO", -+ "name": { "str": "00 shot, 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_shot_flechette", -+ "copy-from": "shot_flechette", -+ "type": "AMMO", -+ "name": { "str": "flechette shell, 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_shot_slug", -+ "copy-from": "shot_slug", -+ "type": "AMMO", -+ "name": { "str": "shotgun slug, 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": "flu_shot", -diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json -index 36e24fedb5..ef04e54bbe 100644 ---- a/data/json/obsoletion/recipes.json -+++ b/data/json/obsoletion/recipes.json -@@ -2693,5 +2693,345 @@ - "type": "recipe", - "result": "milk_cream", - "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_32_acp", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_38_fmj", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_38_special", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_38super_fmj", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_357sig_fmj", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_357sig_jhp", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_357mag_fmj", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_357mag_jhp", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_38_super", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_40fmj", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_40sw", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_10mm_fmj", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_44fmj", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_44magnum", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_45_acp", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_45_jhp", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_45_super", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_454_Casull", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_45colt_jhp", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_46mm", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_460_fmj", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_460_rowland", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_500_Magnum", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_57mm", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_762_25", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_9mm", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_9mmP", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_9mmP2", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_9mmfmj", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_9x18mm", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_9x18mmfmj", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_9x18mmP2", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_380_JHP", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_380_FMJ", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_380_p", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_22_cphp", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_22_lr", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_223", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_270win_jsp", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_300_winmag", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_3006", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_3006fmj", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_3006_incendiary", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_308", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_4570_sp", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_4570_pen", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_4570_low", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_5x50dart", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_50bmg", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_50_incendiary", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_50ss", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_545", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_545_ap", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_300blk", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_556", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_556_incendiary", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_700nx", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_762_51", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_762_51_incendiary", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_762_54R", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_762_m43", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_762_m87", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_shot_00", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_410shot_000", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_shot_bird", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_shot_dragon", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_shot_flechette", -+ "obsolete": true -+ }, -+ { -+ "type": "recipe", -+ "result": "reloaded_shot_slug", -+ "obsolete": true - }, - { - "type": "recipe", -diff --git a/data/json/recipes/ammo/pistol.json b/data/json/recipes/ammo/pistol.json -index dad829873c..66c943d2d2 100644 ---- a/data/json/recipes/ammo/pistol.json -+++ b/data/json/recipes/ammo/pistol.json -@@ -125,7 +125,7 @@ - "charges": 1, - "reversible": true, - "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], -- "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "chem_black_powder", 6 ] ] ] -+ "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "chem_black_powder", 6 ] ], [ [ "copper", 2 ] ] ] - }, - { - "result": "bp_45_jhp", -@@ -338,7 +338,7 @@ - "components": [ [ [ "chem_black_powder", 4 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ] - }, - { -- "result": "reloaded_32_acp", -+ "result": "32_acp", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -349,12 +349,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 5 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "32_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ] - }, - { -- "result": "reloaded_38_fmj", -+ "result": "38_fmj", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -365,12 +364,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 2 ], [ "recipe_bullets", 3 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_38_special", -+ "result": "38_special", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -381,12 +379,26 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 1 ], [ "recipe_bullets", 2 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ] - }, - { -- "result": "reloaded_38super_fmj", -+ "result": "38_super", -+ "type": "recipe", -+ "category": "CC_AMMO", -+ "subcategory": "CSC_AMMO_PISTOL", -+ "skill_used": "fabrication", -+ "difficulty": 4, -+ "skills_required": [ "gun", 3 ], -+ "time": "2 m", -+ "batch_time_factors": [ 60, 5 ], -+ "book_learn": [ [ "manual_pistol", 3 ] ], -+ "charges": 1, -+ "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_38super", 1 ] ], -+ "components": [ [ [ "gunpowder", 3 ] ] ] -+ }, -+ { -+ "result": "38super_fmj", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -397,12 +409,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 1 ], [ "recipe_bullets", 2 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_38super", 1 ] ], -- "components": [ [ [ "gunpowder", 3 ] ] ] -+ "components": [ [ [ "gunpowder", 3 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_357sig_fmj", -+ "result": "357sig_fmj", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -413,12 +424,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357sig", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_357sig_jhp", -+ "result": "357sig_jhp", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -429,12 +439,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357sig", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ] ] - }, - { -- "result": "reloaded_357mag_fmj", -+ "result": "357mag_fmj", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -445,12 +454,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357mag", 1 ] ], -- "components": [ [ [ "gunpowder", 5 ] ] ] -+ "components": [ [ [ "gunpowder", 5 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_357mag_jhp", -+ "result": "357mag_jhp", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -461,7 +469,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357mag", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ] ] - }, -@@ -479,7 +486,7 @@ - "charges": 1, - "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357mag", 1 ] ], -- "components": [ [ [ "chem_black_powder", 8 ] ] ] -+ "components": [ [ [ "chem_black_powder", 8 ] ], [ [ "copper", 1 ] ] ] - }, - { - "result": "bp_357mag_jhp", -@@ -514,23 +521,7 @@ - "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "chem_black_powder", 3 ] ] ] - }, - { -- "result": "reloaded_38_super", -- "type": "recipe", -- "category": "CC_AMMO", -- "subcategory": "CSC_AMMO_PISTOL", -- "skill_used": "fabrication", -- "difficulty": 4, -- "skills_required": [ "gun", 3 ], -- "time": "2 m", -- "batch_time_factors": [ 60, 5 ], -- "book_learn": [ [ "manual_pistol", 3 ] ], -- "charges": 1, -- "reversible": true, -- "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], -- "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ] -- }, -- { -- "result": "reloaded_40fmj", -+ "result": "40fmj", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -541,12 +532,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_40sw", -+ "result": "40sw", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -557,12 +547,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 2 ], [ "recipe_bullets", 3 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ] - }, - { -- "result": "reloaded_10mm_fmj", -+ "result": "10mm_fmj", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -573,7 +562,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 3 ], [ "recipe_bullets", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_10mm", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ] ] - }, -@@ -594,7 +582,7 @@ - "components": [ [ [ "chem_black_powder", 8 ] ] ] - }, - { -- "result": "reloaded_44fmj", -+ "result": "44fmj", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -605,12 +593,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], - "components": [ [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ] - }, - { -- "result": "reloaded_44magnum", -+ "result": "44magnum", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -621,7 +608,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 5 ] ], - "components": [ [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ] ] - }, -@@ -642,7 +628,7 @@ - "components": [ [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "chem_black_powder", 9 ] ] ] - }, - { -- "result": "reloaded_45_acp", -+ "result": "45_acp", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -653,12 +639,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 3 ], [ "manual_smg", 3 ], [ "recipe_bullets", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], -- "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ] -+ "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 2 ] ] ] - }, - { -- "result": "reloaded_45_jhp", -+ "result": "45_jhp", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -669,12 +654,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 2 ], [ "manual_smg", 2 ], [ "recipe_bullets", 3 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ] - }, - { -- "result": "reloaded_45_super", -+ "result": "45_super", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -685,12 +669,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 4 ], [ "manual_smg", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ] - }, - { -- "result": "reloaded_454_Casull", -+ "result": "454_Casull", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -701,7 +684,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 6 ], [ "manual_pistol", 7 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], - "components": [ [ [ "454_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ] - }, -@@ -722,7 +704,7 @@ - "components": [ [ [ "454_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "chem_black_powder", 9 ] ], [ [ "copper", 2 ] ] ] - }, - { -- "result": "reloaded_45colt_jhp", -+ "result": "45colt_jhp", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -733,7 +715,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 4 ], [ "ammo_45colt", 1 ] ], - "components": [ [ [ "gunpowder", 4 ] ] ] - }, -@@ -754,7 +735,7 @@ - "components": [ [ [ "chem_black_powder", 5 ] ] ] - }, - { -- "result": "reloaded_46mm", -+ "result": "46mm", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -765,12 +746,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "46mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ] - }, - { -- "result": "reloaded_460_fmj", -+ "result": "460_fmj", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -781,12 +761,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ] - }, - { -- "result": "reloaded_460_rowland", -+ "result": "460_rowland", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -797,12 +776,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ] ] - }, - { -- "result": "reloaded_500_Magnum", -+ "result": "500_Magnum", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -813,12 +791,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 7 ], [ "manual_pistol", 8 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 6 ], [ "ammo_bullet", 5 ] ], - "components": [ [ [ "500_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 2 ] ] ] - }, - { -- "result": "reloaded_57mm", -+ "result": "57mm", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -829,12 +806,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "57mm_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ] - }, - { -- "result": "reloaded_762_25", -+ "result": "762_25", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -845,12 +821,41 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 3 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_762_25", 1 ] ], - "components": [ [ [ "gunpowder", 4 ] ] ] - }, - { -- "result": "reloaded_9mm", -+ "result": "762_25hot", -+ "type": "recipe", -+ "category": "CC_AMMO", -+ "subcategory": "CSC_AMMO_PISTOL", -+ "skill_used": "fabrication", -+ "difficulty": 5, -+ "skills_required": [ "gun", 4 ], -+ "time": "2 m", -+ "batch_time_factors": [ 60, 5 ], -+ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 3 ] ], -+ "charges": 1, -+ "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_762_25", 1 ] ], -+ "components": [ [ [ "gunpowder", 5 ] ] ] -+ }, -+ { -+ "result": "762_25typeP", -+ "type": "recipe", -+ "category": "CC_AMMO", -+ "subcategory": "CSC_AMMO_PISTOL", -+ "skill_used": "fabrication", -+ "difficulty": 5, -+ "skills_required": [ "gun", 4 ], -+ "time": "2 m", -+ "batch_time_factors": [ 60, 5 ], -+ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 3 ] ], -+ "charges": 1, -+ "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_762_25", 1 ] ], -+ "components": [ [ [ "gunpowder", 5 ] ] ] -+ }, -+ { -+ "result": "9mm", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -861,12 +866,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 1 ], [ "manual_smg", 1 ], [ "recipe_bullets", 2 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], - "components": [ [ [ "gunpowder", 3 ] ] ] - }, - { -- "result": "reloaded_9mmP", -+ "result": "9mmP", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -877,12 +881,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 3 ], [ "manual_smg", 3 ], [ "recipe_bullets", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], - "components": [ [ [ "gunpowder", 4 ] ] ] - }, - { -- "result": "reloaded_9mmP2", -+ "result": "9mmP2", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -893,12 +896,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 4 ], [ "manual_smg", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ] ] - }, - { -- "result": "reloaded_9mmfmj", -+ "result": "9mmfmj", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -909,12 +911,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 2 ], [ "manual_smg", 2 ], [ "recipe_bullets", 3 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], - "components": [ [ [ "gunpowder", 3 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_9x18mm", -+ "result": "9x18mm", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -925,12 +926,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_pistol", 2 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ] - }, - { -- "result": "reloaded_9x18mmfmj", -+ "result": "9x18mmfmj", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -941,12 +941,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_9x18mmP2", -+ "result": "9x18mmP2", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -957,12 +956,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_pistol", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ] - }, - { -- "result": "reloaded_380_JHP", -+ "result": "380_JHP", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -973,12 +971,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 1 ], [ "manual_smg", 1 ], [ "recipe_bullets", 2 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], - "components": [ [ [ "gunpowder", 2 ] ] ] - }, - { -- "result": "reloaded_380_p", -+ "result": "380_p", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -989,12 +986,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 3 ], [ "manual_smg", 3 ], [ "recipe_bullets", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], - "components": [ [ [ "gunpowder", 3 ] ] ] - }, - { -- "result": "reloaded_380_FMJ", -+ "result": "380_FMJ", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_PISTOL", -@@ -1005,7 +1001,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "manual_pistol", 2 ], [ "manual_smg", 2 ], [ "recipe_bullets", 3 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], - "components": [ [ [ "gunpowder", 2 ] ], [ [ "copper", 1 ] ] ] - } -diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json -index 84d930b02d..c1d954073c 100644 ---- a/data/json/recipes/ammo/rifle.json -+++ b/data/json/recipes/ammo/rifle.json -@@ -34,7 +34,7 @@ - "components": [ [ [ "chem_black_powder", 5 ] ], [ [ "paper", 1 ] ] ] - }, - { -- "result": "reloaded_22_cphp", -+ "result": "22_cphp", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -45,12 +45,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_pistol", 2 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 2 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_22_lr", -+ "result": "22_lr", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -61,7 +60,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_pistol", 2 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 2 ] ] ] - }, -@@ -98,7 +96,7 @@ - "components": [ [ [ "22_casing_new", 1 ] ], [ [ "chem_black_powder", 3 ] ] ] - }, - { -- "result": "reloaded_223", -+ "result": "223", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -109,7 +107,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 1 ], [ "mag_rifle", 2 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 1 ] ] ] - }, -@@ -130,7 +127,7 @@ - "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "chem_black_powder", 6 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_270win_jsp", -+ "result": "270win_jsp", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -141,7 +138,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 1 ], [ "mag_rifle", 3 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 8 ], [ "ammo_bullet", 5 ], [ "ammo_270win", 1 ] ], - "components": [ [ [ "gunpowder", 10 ] ], [ [ "copper", 3 ] ] ] - }, -@@ -162,7 +158,7 @@ - "components": [ [ [ "chem_black_powder", 15 ] ], [ [ "copper", 3 ] ] ] - }, - { -- "result": "reloaded_300_winmag", -+ "result": "300_winmag", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -173,7 +169,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 4 ], [ "mag_rifle", 5 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 8 ] ], - "components": [ [ [ "300_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 16 ] ], [ [ "copper", 4 ] ] ] - }, -@@ -194,7 +189,7 @@ - "components": [ [ [ "300_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 24 ] ], [ [ "copper", 4 ] ] ] - }, - { -- "result": "reloaded_3006", -+ "result": "3006", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -205,12 +200,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 8 ] ], - "components": [ [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ], [ [ "copper", 4 ] ] ] - }, - { -- "result": "reloaded_3006fmj", -+ "result": "3006fmj", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -221,12 +215,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 8 ] ], - "components": [ [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ], [ [ "copper", 4 ] ] ] - }, - { -- "result": "reloaded_3006_incendiary", -+ "result": "3006_incendiary", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -237,7 +230,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 8 ] ], - "components": [ - [ [ "3006_casing", 1 ] ], -@@ -302,7 +294,7 @@ - ] - }, - { -- "result": "reloaded_308", -+ "result": "308", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -313,7 +305,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], - "components": [ - [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], -@@ -344,7 +335,7 @@ - ] - }, - { -- "result": "reloaded_4570_sp", -+ "result": "4570_sp", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -356,16 +347,10 @@ - "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], - "charges": 1, - "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], -- "components": [ -- [ [ "4570_casing", 1 ] ], -- [ [ "lgrifle_primer", 1 ] ], -- [ [ "gunpowder", 15 ] ], -- [ [ "lead", 5 ] ], -- [ [ "copper", 2 ] ] -- ] -+ "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 15 ] ], [ [ "copper", 2 ] ] ] - }, - { -- "result": "reloaded_4570_pen", -+ "result": "4570_pen", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -380,7 +365,7 @@ - "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 17 ] ], [ [ "copper", 7 ] ] ] - }, - { -- "result": "reloaded_4570_low", -+ "result": "4570_low", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -406,7 +391,7 @@ - ] - }, - { -- "result": "reloaded_5x50dart", -+ "result": "5x50dart", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -433,7 +418,29 @@ - ] - }, - { -- "result": "reloaded_50bmg", -+ "result": "5x50heavy", -+ "type": "recipe", -+ "category": "CC_AMMO", -+ "subcategory": "CSC_AMMO_RIFLE", -+ "skill_used": "fabrication", -+ "difficulty": 6, -+ "skills_required": [ "gun", 5 ], -+ "time": "2 m", -+ "batch_time_factors": [ 60, 5 ], -+ "book_learn": [ [ "recipe_caseless", 4 ] ], -+ "charges": 8, -+ "using": [ [ "bullet_forming", 16 ], [ "ammo_bullet", 24 ] ], -+ "tools": [ [ [ "mold_plastic", -1 ] ] ], -+ "components": [ -+ [ [ "5x50_hull", 8 ] ], -+ [ [ "plastic_chunk", 1 ] ], -+ [ [ "smrifle_primer", 8 ] ], -+ [ [ "gunpowder", 32 ] ], -+ [ [ "scrap", 8 ] ] -+ ] -+ }, -+ { -+ "result": "50bmg", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -444,12 +451,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 6 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 18 ], [ "ammo_bullet", 12 ] ], - "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 30 ] ], [ [ "copper", 6 ] ] ] - }, - { -- "result": "reloaded_50_incendiary", -+ "result": "50_incendiary", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -460,7 +466,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 8 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 21 ], [ "ammo_bullet", 15 ] ], - "components": [ - [ [ "50_casing", 1 ] ], -@@ -471,7 +476,7 @@ - ] - }, - { -- "result": "reloaded_50ss", -+ "result": "50ss", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -482,7 +487,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 7 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 21 ] ], - "components": [ - [ [ "50_casing", 1 ] ], -@@ -493,7 +497,7 @@ - ] - }, - { -- "result": "reloaded_545", -+ "result": "545", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -504,12 +508,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 5 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_545_ap", -+ "result": "545_ap", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -520,12 +523,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_300blk", -+ "result": "300blk", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -536,7 +538,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 5 ], [ "ammo_300blk", 1 ] ], - "components": [ [ [ "gunpowder", 4 ] ], [ [ "copper", 2 ] ] ] - }, -@@ -557,7 +558,7 @@ - "components": [ [ [ "chem_black_powder", 6 ] ], [ [ "copper", 2 ] ] ] - }, - { -- "result": "reloaded_556", -+ "result": "556", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -568,12 +569,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_556_incendiary", -+ "result": "556_incendiary", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -584,7 +584,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 5 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 3 ] ], - "components": [ - [ [ "223_casing", 1 ] ], -@@ -633,7 +632,7 @@ - ] - }, - { -- "result": "reloaded_700nx", -+ "result": "700nx", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -644,12 +643,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 7 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 10 ] ], - "components": [ [ [ "700nx_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 30 ] ], [ [ "copper", 5 ] ] ] - }, - { -- "result": "reloaded_762_51", -+ "result": "762_51", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -660,7 +658,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], - "components": [ - [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], -@@ -670,7 +667,7 @@ - ] - }, - { -- "result": "reloaded_762_51_incendiary", -+ "result": "762_51_incendiary", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -681,7 +678,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 5 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], - "components": [ - [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], -@@ -735,7 +731,7 @@ - ] - }, - { -- "result": "reloaded_762_54R", -+ "result": "762_54R", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -746,12 +742,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 7 ] ], - "components": [ [ [ "762R_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 10 ] ], [ [ "copper", 3 ] ] ] - }, - { -- "result": "reloaded_762_m43", -+ "result": "762_m43", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -762,12 +757,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], - "components": [ [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 1 ] ] ] - }, - { -- "result": "reloaded_762_m87", -+ "result": "762_m87", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", -@@ -778,7 +772,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], - "components": [ [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 1 ] ] ] - } -diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json -index 76d1d3f6b4..3cd7313750 100644 ---- a/data/json/recipes/ammo/shot.json -+++ b/data/json/recipes/ammo/shot.json -@@ -317,7 +317,7 @@ - ] - }, - { -- "result": "reloaded_shot_00", -+ "result": "shot_00", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_SHOT", -@@ -328,12 +328,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_shot", 1 ] ], - "components": [ [ [ "gunpowder", 6 ] ] ] - }, - { -- "result": "reloaded_410shot_000", -+ "result": "410shot_000", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_SHOT", -@@ -344,12 +343,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 5 ], [ "ammo_410shot", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ] ] - }, - { -- "result": "reloaded_shot_bird", -+ "result": "shot_bird", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_SHOT", -@@ -360,12 +358,11 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_shotgun", 1 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_shot", 1 ] ], - "components": [ [ [ "gunpowder", 3 ] ] ] - }, - { -- "result": "reloaded_shot_dragon", -+ "result": "shot_dragon", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_SHOT", -@@ -381,7 +378,7 @@ - "components": [ [ [ "gunpowder", 3 ] ], [ [ "magnesium", 5 ] ] ] - }, - { -- "result": "reloaded_shot_flechette", -+ "result": "shot_flechette", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_SHOT", -@@ -392,13 +389,12 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 4 ], [ "manual_shotgun", 4 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "ammo_shot", 1 ] ], - "tools": [ [ [ "press", -1 ], [ "press_dowel", -1 ] ] ], - "components": [ [ [ "gunpowder", 6 ] ], [ [ "combatnail", 10 ] ] ] - }, - { -- "result": "reloaded_shot_slug", -+ "result": "shot_slug", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_SHOT", -@@ -409,7 +405,6 @@ - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], - "charges": 1, -- "reversible": true, - "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 20 ], [ "ammo_shot", 1 ] ], - "components": [ [ [ "gunpowder", 6 ] ] ] - }, -diff --git a/data/mods/Generic_Guns/recipes/recipe_obsolete.json b/data/mods/Generic_Guns/recipes/recipe_obsolete.json -index 3146c0a01c..e4e3796a10 100644 ---- a/data/mods/Generic_Guns/recipes/recipe_obsolete.json -+++ b/data/mods/Generic_Guns/recipes/recipe_obsolete.json -@@ -404,581 +404,6 @@ - "result": "40x53mm_flechette_m169", - "obsolete": true - }, -- { -- "type": "recipe", -- "result": "460_casing", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "380_casing", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "300blk_casing", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_9mm", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_9mmfmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_40sw", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_32_acp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_38_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_45_acp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_45_jhp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_46mm", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_460_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_460_rowland", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_500_Magnum", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_762_25", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_9x18mm", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_9x18mmfmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_380_JHP", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_380_FMJ", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_57mm", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "36navy", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "44army", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_32_acp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_38_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_38_special", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_38super_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_357sig_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_357sig_jhp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_357mag_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_357mag_jhp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_357mag_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_357mag_jhp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_38_special", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_38_super", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_40fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_40sw", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_10mm_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_10mm_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_44fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_44magnum", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_44magnum", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_44fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_45_acp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_45_jhp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_45_super", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_454_Casull", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_454_Casull", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_45colt_jhp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_46mm", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_460_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_460_rowland", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_500_Magnum", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_57mm", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_762_25", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_9mm", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_9mmP", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_9mmP2", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_9mmfmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_9x18mm", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_9x18mmfmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_9x18mmP2", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_380_JHP", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_380_p", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_380_FMJ", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_22_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_22_lr", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_22_fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_22_lr", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_223", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_223", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_270win_jsp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_270win_jsp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_300_winmag", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_300_winmag", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_3006", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_3006fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_3006_incendiary", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_3006", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_3006fmj", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_3006_incendiary", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_308", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_308", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_4570_sp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_4570_pen", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_4570_low", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_4570_bp", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_5x50dart", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_50bmg", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_50_incendiary", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_50ss", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_545", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_545_ap", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_300blk", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_300blk", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_556", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_556_incendiary", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_556", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_556_incendiary", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_700nx", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_762_51", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_762_51_incendiary", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_762_51", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "bp_762_51_incendiary", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_762_54R", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_762_m43", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "reloaded_762_m87", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "40x46mm_buckshot_m118", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "40x46mm_buckshot_m199", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "40x46mm_slug_m118", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "40x46mm_slug_m199", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "40x46mm_flechette_m118", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "40x46mm_flechette_m199", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "40x53mm_buckshot_m169", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "40x53mm_slug_m169", -- "obsolete": true -- }, -- { -- "type": "recipe", -- "result": "40x53mm_flechette_m169", -- "obsolete": true -- }, - { - "type": "recipe", - "result": "shot_paper_00", -@@ -1304,6 +729,11 @@ - "result": "bp_44magnum", - "obsolete": true - }, -+ { -+ "type": "recipe", -+ "result": "bp_44fmj", -+ "obsolete": true -+ }, - { - "type": "recipe", - "result": "reloaded_45_acp", --- -2.35.1 - |