From 4746024d8b9a9648bed8f1fd7580a36eb26f5341 Mon Sep 17 00:00:00 2001 From: RoyalFox <112293514+RoyalFox2140@users.noreply.github.com> Date: Tue, 21 Jan 2025 19:53:37 -0500 Subject: [PATCH] chore: Partial clear of migrations and obsoletions (#5959) * Holy shit That was too much * BLOOD FOR THE BLOOD MACHINE * style(autofix.ci): automated formatting * more fixes * style(autofix.ci): automated formatting * Update head.json --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- data/json/itemgroups/SUS/clothes_store.json | 15 - data/json/itemgroups/misc.json | 2 +- data/json/mapgen/mall/mall_ground.json | 2 - data/json/npcs/NC_JUNK_SHOPKEEP.json | 2 - data/json/obsoletion/items.json | 1083 --------- data/json/obsoletion/migration.json | 1042 +-------- data/json/obsoletion/recipes.json | 1955 +++-------------- data/json/obsoletion/uncategorized.json | 29 - .../animals/medium_quadruped_armor.json | 9 +- data/json/recipes/other/materials.json | 1 - data/json/requirements/ammo.json | 46 +- data/json/uncraft/generic.json | 31 - data/mods/DinoMod/recipes/head.json | 18 +- data/mods/DinoMod/recipes/pets_bear.json | 2 +- 14 files changed, 315 insertions(+), 3922 deletions(-) diff --git a/data/json/itemgroups/SUS/clothes_store.json b/data/json/itemgroups/SUS/clothes_store.json index 26bbdd050058..d8c880046ab6 100644 --- a/data/json/itemgroups/SUS/clothes_store.json +++ b/data/json/itemgroups/SUS/clothes_store.json @@ -79,21 +79,6 @@ { "item": "thread", "count": [ 2, 7 ], "prob": 75 } ] }, - { - "id": "SUS_tailoring_fasteners", - "type": "item_group", - "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.", - "//2": "This group is for a container of fasteners for making clothing.", - "subtype": "collection", - "entries": [ - { "item": "button_plastic", "count": [ 1, 5 ], "prob": 75 }, - { "item": "button_steel", "count": [ 1, 5 ], "prob": 75 }, - { "item": "button_wood", "count": [ 1, 5 ], "prob": 75 }, - { "item": "snapfastener_steel", "count": [ 1, 5 ], "prob": 75 }, - { "item": "zipper_long_plastic", "count": [ 1, 8 ], "prob": 75 }, - { "item": "zipper_short_plastic", "count": [ 1, 8 ], "prob": 75 } - ] - }, { "id": "SUS_tailoring_materials", "type": "item_group", diff --git a/data/json/itemgroups/misc.json b/data/json/itemgroups/misc.json index 7530421ee2a9..1039ec4884e4 100644 --- a/data/json/itemgroups/misc.json +++ b/data/json/itemgroups/misc.json @@ -149,7 +149,7 @@ { "item": "copper", "charges": [ 800, 3200 ], "prob": 70 }, { "item": "lead", "charges": [ 800, 3200 ], "prob": 10 }, { "item": "tin", "charges": [ 800, 3200 ], "prob": 10 }, - { "item": "silver", "charges": [ 400, 1600 ], "prob": 5 }, + { "item": "silver_small", "charges": [ 400, 1600 ], "prob": 5 }, { "item": "gold_small", "charges": [ 400, 1600 ], "prob": 5 } ] }, diff --git a/data/json/mapgen/mall/mall_ground.json b/data/json/mapgen/mall/mall_ground.json index 85f003101a02..70595f1852e4 100644 --- a/data/json/mapgen/mall/mall_ground.json +++ b/data/json/mapgen/mall/mall_ground.json @@ -929,7 +929,6 @@ "K": { "item": "neckties", "chance": 30, "repeat": [ 1, 3 ] }, "T": { "item": "wedding_suits", "chance": 40, "repeat": [ 1, 2 ] }, "Ʌ": { "item": "SUS_tailoring_materials", "chance": 30, "repeat": [ 1, 2 ] }, - "~": { "item": "SUS_tailoring_fasteners", "chance": 30, "repeat": [ 1, 2 ] }, "N": { "item": "SUS_tailoring_tool_drawer", "chance": 80, "repeat": [ 1, 2 ] }, "Ŧ": { "item": "camping", "chance": 20, "repeat": [ 1, 2 ] }, "U": { "item": "cleaning", "chance": 30, "repeat": [ 1, 2 ] }, @@ -1377,7 +1376,6 @@ ":": { "item": "bed", "chance": 60, "repeat": [ 1, 2 ] }, "Ʉ": { "item": "bed", "chance": 60, "repeat": [ 1, 2 ] }, "Δ": [ { "item": "SUS_tailoring_materials", "chance": 30 }, { "item": "SUS_fur_tailoring_materials", "chance": 10 } ], - "M": { "item": "SUS_tailoring_fasteners", "chance": 30 }, "±": [ { "item": "SUS_tailoring_tool_drawer", "chance": 30 }, { "item": "SUS_tailoring_bookcase", "chance": 10 } ] }, "place_items": [ diff --git a/data/json/npcs/NC_JUNK_SHOPKEEP.json b/data/json/npcs/NC_JUNK_SHOPKEEP.json index 2d6a4636ad68..17f7a04c20ae 100644 --- a/data/json/npcs/NC_JUNK_SHOPKEEP.json +++ b/data/json/npcs/NC_JUNK_SHOPKEEP.json @@ -109,11 +109,9 @@ { "item": "223", "prob": 15 }, { "item": "308", "prob": 10 }, { "item": "3006", "prob": 10 }, - { "item": "reloaded_9mm", "prob": 30 }, { "item": "9mm", "prob": 25 }, { "item": "9mmfmj", "prob": 5 }, { "item": "45_acp", "prob": 10 }, - { "item": "reloaded_45_acp", "prob": 25 }, { "item": "45_jhp", "prob": 1 }, { "item": "rifle_9mm", "prob": 20 }, { "item": "rifle_22", "prob": 20 }, diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json index dc8bf0dcd91b..00f58f75549d 100644 --- a/data/json/obsoletion/items.json +++ b/data/json/obsoletion/items.json @@ -3210,632 +3210,6 @@ "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "id": "reloaded_223", - "copy-from": "223", - "type": "AMMO", - "name": { "str": "5.56x45mm '.223 Remington', reloaded" }, - "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "reloaded_556", - "copy-from": "556", - "type": "AMMO", - "name": { "str": "5.56x45mm NATO, reloaded" }, - "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "id": "reloaded_556_incendiary", - "copy-from": "556_incendiary", - "type": "AMMO", - "name": { "str": "5.56x45mm NATO tracer, reloaded" }, - "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "id": "reloaded_308", - "copy-from": "308", - "type": "AMMO", - "name": { "str": "7.62x51mm '.308 Winchester', reloaded" }, - "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 }, - "extend": { "effects": [ "RECYCLED" ] }, - "delete": { "effects": [ "NEVER_MISFIRES" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, - { - "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" ] } - }, { "id": "flu_shot", "type": "COMESTIBLE", @@ -3995,58 +3369,6 @@ "bashing": 3, "to_hit": 1 }, - { - "id": "lycra_patch", - "type": "TOOL", - "category": "spare_parts", - "name": { "str": "Lycra patch", "str_pl": "Lycra patches" }, - "description": "This is a small bolt of a synthetic fabric blended with stretchy Lycra fibers. It could be used to make flexible yet strong clothing. Stylish, but bad for the environment; at least you're recycling it.", - "weight": "87 g", - "volume": "250 ml", - "price": "0 cent", - "price_postapoc": "10 cent", - "material": "lycra", - "symbol": ",", - "color": "light_blue", - "flags": [ "NO_SALVAGE" ] - }, - { - "id": "scrap_lycra", - "copy-from": "scrap_cotton", - "type": "AMMO", - "name": { "str_sp": "Lycra scraps" }, - "description": "Oddly-shaped smallish bits of Lycra, waste material from tailoring projects. Not useful for much and usually disposed of.", - "price": "0 cent", - "material": "lycra" - }, - { - "id": "sheet_lycra", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "Lycra sheet" }, - "description": "A sheet of synthetic fabric blended with stretchy Lycra fibers, suitable for making flexible yet strong clothing.", - "weight": "3 g", - "volume": "300 ml", - "price": "50 USD", - "price_postapoc": "1 USD", - "material": "lycra", - "symbol": "=", - "color": "dark_gray", - "count": 100, - "ammo_type": "components" - }, - { - "id": "sheet_lycra_patchwork", - "copy-from": "sheet_lycra", - "type": "AMMO", - "name": { "str_sp": "patchwork Lycra clothing parts" }, - "description": "A selection of various clothing parts, sewn together from Lycra patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "60 g", - "volume": "60 ml", - "price": "10 USD", - "price_postapoc": "50 cent", - "count": 1 - }, { "id": "burette", "type": "GENERIC", @@ -4907,411 +4229,6 @@ "fun": 8, "vitamins": [ [ "vitC", 9 ], [ "calcium", 16 ], [ "iron", 30 ], [ "veggy_allergen", 1 ], [ "wheat_allergen", 1 ] ] }, - { - "id": "buckle_steel", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "steel buckle" }, - "description": "A steel buckle, like that usually found on belts.", - "weight": "24 g", - "volume": "5 ml", - "price": "1 USD", - "price_postapoc": "0 cent", - "material": "steel", - "symbol": "=", - "color": "dark_gray", - "ammo_type": "components" - }, - { - "id": "button_plastic", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "plastic button" }, - "description": "A plastic button, usually found on clothing.", - "weight": "1 g", - "volume": "20 ml", - "price": "1 USD", - "price_postapoc": "0 cent", - "material": "plastic", - "symbol": "=", - "color": "dark_gray", - "count": 20, - "ammo_type": "components" - }, - { - "id": "button_steel", - "copy-from": "button_plastic", - "type": "AMMO", - "name": { "str": "steel button" }, - "description": "A steel button, usually found on clothing.", - "weight": "8 g", - "price": "3 USD", - "price_postapoc": "0 cent", - "material": "steel" - }, - { - "id": "button_wood", - "copy-from": "button_plastic", - "type": "AMMO", - "name": { "str": "wooden button" }, - "description": "A crude wooden button, usually found on very old clothing.", - "material": "wood" - }, - { - "id": "snapfastener_steel", - "copy-from": "button_steel", - "type": "AMMO", - "name": { "str": "steel snap fastener" }, - "description": "A steel snap fastener, usually found on clothing." - }, - { - "id": "touch_fastener", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "touch fastener" }, - "description": "This is a pair of cloth strips, one of which has tiny hooks and another has tiny loops. Useful as a fastener for clothing and footwear.", - "weight": "2 g", - "volume": "2 ml", - "price": "1 USD", - "price_postapoc": "0 cent", - "material": "cotton", - "symbol": "=", - "color": "dark_gray", - "ammo_type": "components" - }, - { - "id": "zipper_long_plastic", - "copy-from": "zipper_short_plastic", - "type": "AMMO", - "name": { "str": "long plastic zipper" }, - "description": "A long zipper made from plastic, usually found on clothing.", - "proportional": { "weight": 3, "volume": 3, "price": 3 } - }, - { - "id": "zipper_short_plastic", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "short plastic zipper" }, - "description": "A short zipper made from plastic, usually found on footwear or clothing pockets.", - "weight": "4 g", - "volume": "4 ml", - "price": "1 USD", - "price_postapoc": "0 cent", - "material": [ "plastic", "cotton" ], - "symbol": "=", - "color": "dark_gray", - "ammo_type": "components" - }, - { - "id": "scrap_cotton", - "type": "AMMO", - "category": "other", - "name": { "str_sp": "cotton scraps" }, - "description": "Oddly-shaped smallish bits of cotton, waste material from tailoring projects. Not useful for much and usually disposed of, but can be recycled into some thread if you really want.", - "weight": "1 g", - "volume": "1 ml", - "price": "1 cent", - "price_postapoc": "5 cent", - "material": "cotton", - "symbol": "=", - "color": "dark_gray", - "ammo_type": "components", - "flags": [ "NO_SALVAGE" ] - }, - { - "id": "scrap_faux_fur", - "copy-from": "scrap_cotton", - "type": "AMMO", - "name": { "str_sp": "faux fur scraps" }, - "description": "Oddly-shaped smallish bits of faux fur, waste material from tailoring projects. Not useful for much and usually disposed of.", - "price": "0 cent", - "price_postapoc": "5 cent", - "material": "faux_fur" - }, - { - "id": "scrap_felt", - "copy-from": "scrap_cotton", - "type": "AMMO", - "name": { "str_sp": "felt scraps" }, - "description": "Oddly-shaped smallish bits of felt, waste material from tailoring projects. Not useful for much and usually disposed of, but can be recycled into some wool fiber if you really want.", - "material": "wool" - }, - { - "id": "scrap_fur", - "copy-from": "scrap_cotton", - "type": "AMMO", - "name": { "str_sp": "fur scraps" }, - "description": "Oddly-shaped smallish bits of fur, waste material from tailoring projects. Not useful for much and usually disposed of.", - "price": "0 cent", - "material": "fur" - }, - { - "id": "scrap_kevlar", - "copy-from": "scrap_cotton", - "type": "AMMO", - "name": { "str_sp": "Kevlar scraps" }, - "description": "Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring projects. Normally it's disposed of, but since Kevlar would be very difficult to make in a post-apocalyptic world, it might be worth recycling it for Kevlar thread.", - "price": "5 cent", - "material": "kevlar" - }, - { - "id": "scrap_leather", - "copy-from": "scrap_cotton", - "type": "AMMO", - "name": { "str_sp": "leather scraps" }, - "description": "Oddly-shaped smallish bits of leather, waste material from tailoring projects. Not useful for much and usually disposed of.", - "price": "0 cent", - "material": "leather" - }, - { - "id": "scrap_neoprene", - "copy-from": "scrap_cotton", - "type": "AMMO", - "name": { "str_sp": "neoprene scraps" }, - "description": "Oddly-shaped smallish bits of neoprene, waste material from tailoring projects. Not useful for much and usually disposed of.", - "price": "0 cent", - "material": "neoprene" - }, - { - "id": "scrap_nylon", - "copy-from": "scrap_cotton", - "type": "AMMO", - "name": { "str_sp": "synthetic fabric scraps" }, - "description": "Oddly-shaped smallish bits of synthetic fabric, waste material from tailoring projects. Not useful for much and usually disposed of.", - "price": "0 cent", - "material": "nylon" - }, - { - "id": "scrap_nomex", - "copy-from": "scrap_cotton", - "type": "AMMO", - "name": { "str_sp": "Nomex scraps" }, - "description": "Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material from tailoring projects. Normally it's disposed of, but since Nomex would be very difficult to make in a post-apocalyptic world, it might be worth recycling it.", - "price": "5 cent", - "material": "nomex" - }, - { - "id": "sheet_cotton", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "cotton sheet" }, - "description": "A sheet of cotton fabric, suitable for making clothing.", - "weight": "5 g", - "volume": "300 ml", - "price": "10 USD", - "price_postapoc": "1 USD", - "material": "cotton", - "symbol": "=", - "color": "dark_gray", - "count": 100, - "ammo_type": "components" - }, - { - "id": "sheet_cotton_patchwork", - "copy-from": "sheet_cotton", - "type": "AMMO", - "name": { "str_sp": "patchwork cotton clothing parts" }, - "description": "A selection of various clothing parts, sewn together from cotton patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "100 g", - "volume": "60 ml", - "price": "2 USD", - "price_postapoc": "50 cent", - "count": 1 - }, - { - "id": "sheet_faux_fur", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "faux fur sheet" }, - "description": "A sheet of fake synthetic colorful fur, suitable for making clothing.", - "weight": "10 g", - "volume": "4500 ml", - "price": "50 USD", - "price_postapoc": "1 USD", - "material": "faux_fur", - "symbol": "=", - "color": "dark_gray", - "count": 100, - "ammo_type": "components" - }, - { - "id": "sheet_faux_fur_patchwork", - "copy-from": "sheet_faux_fur", - "type": "AMMO", - "name": { "str_sp": "patchwork faux fur clothing parts" }, - "description": "A selection of various clothing parts, sewn together from faux fur patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "200 g", - "volume": "900 ml", - "price": "10 USD", - "price_postapoc": "50 cent", - "count": 1 - }, - { - "id": "sheet_felt", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "felt sheet" }, - "description": "A sheet of felt, suitable for making clothing.", - "weight": "8 g", - "volume": "1800 ml", - "price": "25 USD", - "price_postapoc": "250 cent", - "material": "wool", - "symbol": "=", - "color": "dark_gray", - "count": 100, - "ammo_type": "components" - }, - { - "id": "sheet_felt_patchwork", - "copy-from": "sheet_felt", - "type": "AMMO", - "name": { "str_sp": "patchwork felt clothing parts" }, - "description": "A selection of various clothing parts, sewn together from felt patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "160 g", - "volume": "360 ml", - "price": "5 USD", - "price_postapoc": "1 USD", - "count": 1 - }, - { - "id": "sheet_kevlar", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "Kevlar sheet" }, - "description": "A sheet of Kevlar synthetic fabric, suitable for making bulletproof armor. In this form, unlike rigid plates, it can be stitched.", - "weight": "5 g", - "volume": "300 ml", - "price": "150 USD", - "price_postapoc": "5 USD", - "material": "kevlar", - "symbol": "=", - "color": "dark_gray", - "count": 100, - "ammo_type": "components" - }, - { - "id": "sheet_neoprene", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "neoprene sheet" }, - "description": "A sheet of neoprene, a synthetic rubber, suitable for making underwater gear.", - "weight": "6 g", - "volume": "300 ml", - "price": "50 USD", - "price_postapoc": "1 USD", - "material": "neoprene", - "symbol": "=", - "color": "dark_gray", - "count": 100, - "ammo_type": "components" - }, - { - "id": "sheet_neoprene_patchwork", - "copy-from": "sheet_neoprene", - "type": "AMMO", - "name": { "str_sp": "patchwork neoprene clothing parts" }, - "description": "A selection of various clothing parts, sewn together from neoprene patches in a patchwork fashion, with waterproofed seams. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "120 g", - "volume": "60 ml", - "price": "10 USD", - "price_postapoc": "50 cent", - "count": 1 - }, - { - "id": "sheet_nomex", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "Nomex sheet" }, - "description": "A sheet of Nomex synthetic fabric, suitable for making heat-resistant clothing.", - "weight": "5 g", - "volume": "300 ml", - "price": "150 USD", - "price_postapoc": "250 cent", - "material": "nomex", - "symbol": "=", - "color": "dark_gray", - "count": 100, - "ammo_type": "components" - }, - { - "id": "sheet_nomex_patchwork", - "copy-from": "sheet_nomex", - "type": "AMMO", - "name": { "str_sp": "patchwork Nomex clothing parts" }, - "description": "A selection of various clothing parts, sewn together with Nomex thread from Nomex patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "100 g", - "volume": "60 ml", - "price": "30 USD", - "price_postapoc": "50 cent", - "count": 1 - }, - { - "id": "sheet_nylon", - "type": "AMMO", - "category": "spare_parts", - "name": { "str": "synthetic fabric sheet" }, - "description": "A sheet of synthetic fabric, suitable for making clothing.", - "weight": "3 g", - "volume": "300 ml", - "price": "50 USD", - "price_postapoc": "1 USD", - "material": "nylon", - "symbol": "=", - "color": "dark_gray", - "count": 100, - "ammo_type": "components" - }, - { - "id": "sheet_nylon_patchwork", - "copy-from": "sheet_nylon", - "type": "AMMO", - "name": { "str_sp": "patchwork synthetic fabric clothing parts" }, - "description": "A selection of various clothing parts, sewn together from synthetic fabric patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", - "weight": "60 g", - "volume": "60 ml", - "price": "10 USD", - "price_postapoc": "50 cent", - "count": 1 - }, - { - "type": "AMMO", - "id": "thread_kevlar", - "category": "spare_parts", - "price": "50 USD", - "price_postapoc": "250 cent", - "name": { "str": "Kevlar thread" }, - "symbol": "=", - "color": "light_gray", - "looks_like": "thread", - "description": "Some very durable Kevlar thread that would be particularly useful for making ballistic armor, though it's fine to use in place of normal thread too, in most cases. Making armor-grade Kevlar sheets from this would need a particularly tight weave, and so would need some specialized machinery.", - "material": "kevlar", - "flags": [ "NO_SALVAGE" ], - "volume": "200 ml", - "weight": "1 g", - "ammo_type": "thread", - "count": 50, - "stack_size": 200 - }, - { - "type": "AMMO", - "id": "thread_nomex", - "category": "spare_parts", - "price": "50 USD", - "price_postapoc": "1 USD", - "name": { "str": "Nomex thread" }, - "symbol": "=", - "color": "light_gray", - "looks_like": "thread", - "description": "Some heat-resistant Nomex thread that would be particularly useful for making heat protection gear, though it's fine to use in place of normal thread too, in most cases.", - "material": "nomex", - "flags": [ "NO_SALVAGE" ], - "volume": "200 ml", - "weight": "1 g", - "ammo_type": "thread", - "count": 50, - "stack_size": 200 - }, { "abstract": "seed_mushroom_base", "type": "COMESTIBLE", diff --git a/data/json/obsoletion/migration.json b/data/json/obsoletion/migration.json index 143776cf0a33..1dbb74c8458d 100644 --- a/data/json/obsoletion/migration.json +++ b/data/json/obsoletion/migration.json @@ -1,29 +1,4 @@ [ - { - "id": "arrowhead", - "type": "MIGRATION", - "replace": "steel_chunk" - }, - { - "id": "arrowhead_plastic", - "type": "MIGRATION", - "replace": "plastic_chunk" - }, - { - "id": "shaft_wood", - "type": "MIGRATION", - "replace": "arrow_wood" - }, - { - "id": "shaft_wood_heavy", - "type": "MIGRATION", - "replace": "arrow_wood_heavy" - }, - { - "id": "shaft_metal", - "type": "MIGRATION", - "replace": "arrow_metal" - }, { "id": "arrow_fire_hardened", "type": "MIGRATION", @@ -54,11 +29,6 @@ "type": "MIGRATION", "replace": "arrow_metal_sharpened_fletched" }, - { - "id": "shaft_plastic", - "type": "MIGRATION", - "replace": "arrow_plastic" - }, { "id": "40mm_acidbomb", "type": "MIGRATION", @@ -69,36 +39,6 @@ "type": "MIGRATION", "replace": "40x46mm_m651" }, - { - "id": "8mm_bootleg", - "type": "MIGRATION", - "replace": "8mm_jhp_reloaded" - }, - { - "id": "8mm_bootleg_jsp", - "type": "MIGRATION", - "replace": "8mm_jhp_reloaded" - }, - { - "id": "20x66_bootleg_shot", - "type": "MIGRATION", - "replace": "20x66_shot_reloaded" - }, - { - "id": "20x66_bootleg_flechette", - "type": "MIGRATION", - "replace": "20x66_flechette_reloaded" - }, - { - "id": "20x66_bootleg_slug", - "type": "MIGRATION", - "replace": "20x66_slug_reloaded" - }, - { - "id": "adv_UPS_on", - "type": "MIGRATION", - "replace": "adv_UPS_off" - }, { "id": "battery_truck", "type": "MIGRATION", @@ -109,253 +49,6 @@ "type": "MIGRATION", "replace": "knife_combat" }, - { - "id": "diamond_bayonet", - "type": "MIGRATION", - "replace": "knife_combat", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_broadsword", - "type": "MIGRATION", - "replace": "broadsword", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_katana", - "type": "MIGRATION", - "replace": "katana", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_knife", - "type": "MIGRATION", - "replace": "knife_combat", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_kukri", - "type": "MIGRATION", - "replace": "kukri", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_machete", - "type": "MIGRATION", - "replace": "machete", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_nodachi", - "type": "MIGRATION", - "replace": "nodachi", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_pistol_bayonet", - "type": "MIGRATION", - "replace": "pistol_bayonet", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_punch_dagger", - "type": "MIGRATION", - "replace": "punch_dagger", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_rapier", - "type": "MIGRATION", - "replace": "rapier", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_sword_bayonet", - "type": "MIGRATION", - "replace": "sword_bayonet", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_wakizashi", - "type": "MIGRATION", - "replace": "wakizashi", - "flags": [ "DIAMOND" ] - }, - { - "id": "diamond_zweihander", - "type": "MIGRATION", - "replace": "zweihander", - "flags": [ "DIAMOND" ] - }, - { - "id": "fish_bait_bread", - "type": "MIGRATION", - "replace": "fish_bait" - }, - { - "id": "fish_bait_fish", - "type": "MIGRATION", - "replace": "fish_bait" - }, - { - "id": "fish_bait_meat", - "type": "MIGRATION", - "replace": "fish_bait" - }, - { - "id": "fish_bait_veggy", - "type": "MIGRATION", - "replace": "fish_bait" - }, - { - "id": "gold", - "type": "MIGRATION", - "replace": "gold_small", - "charges": 1930 - }, - { - "id": "jacqueshammer", - "type": "MIGRATION", - "replace": "jackhammer" - }, - { - "id": "dogfood_canned", - "type": "MIGRATION", - "replace": "can_medium", - "contents": [ "dogfood" ] - }, - { - "id": "catfood_canned", - "type": "MIGRATION", - "replace": "can_food", - "contents": [ "catfood" ] - }, - { - "id": "jar_V8", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "V8" ] - }, - { - "id": "jar_apple_canned", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "apple_canned" ] - }, - { - "id": "jar_broth", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "broth" ] - }, - { - "id": "jar_broth_bone", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "broth_bone" ] - }, - { - "id": "jar_broth_human", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "broth_bone" ] - }, - { - "id": "jar_fish_canned", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "fish_canned" ] - }, - { - "id": "jar_fish_pickled", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "fish_pickled" ] - }, - { - "id": "jar_human_canned", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "meat_canned" ] - }, - { - "id": "jar_human_pickled", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "meat_pickled" ] - }, - { - "id": "jar_kompot", - "type": "MIGRATION", - "replace": "jar_3l_glass_sealed", - "contents": [ "kompot" ] - }, - { - "id": "jar_meat_canned", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "meat_canned" ] - }, - { - "id": "jar_meat_pickled", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "meat_pickled" ] - }, - { - "id": "jar_soup_fish", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "soup_fish" ] - }, - { - "id": "jar_soup_human", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "soup_meat" ] - }, - { - "id": "jar_soup_meat", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "soup_meat" ] - }, - { - "id": "jar_soup_mushroom", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "soup_mushroom" ] - }, - { - "id": "jar_soup_veggy", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "soup_veggy" ] - }, - { - "id": "jar_soup_woods", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "soup_woods" ] - }, - { - "id": "jar_tomato_canned", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "can_tomato" ] - }, - { - "id": "jar_veggy_canned", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "veggy_canned" ] - }, - { - "id": "jar_veggy_pickled", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "veggy_pickled" ] - }, { "id": "m14a", "type": "MIGRATION", @@ -397,22 +90,11 @@ "replace": "saiga_12", "contents": [ "barrel_small" ] }, - { - "id": "silver", - "type": "MIGRATION", - "replace": "silver_small", - "charges": 1608 - }, { "id": "shot_scrapslug", "type": "MIGRATION", "replace": "shot_slug" }, - { - "id": "UPS_on", - "type": "MIGRATION", - "replace": "UPS_off" - }, { "id": "v_curtain_item", "type": "MIGRATION", @@ -423,56 +105,11 @@ "type": "MIGRATION", "replace": "colt_navy" }, - { - "id": "pda", - "type": "MIGRATION", - "replace": "smart_phone" - }, - { - "id": "pda_flashlight", - "type": "MIGRATION", - "replace": "smart_phone" - }, - { - "id": "crude_brick", - "type": "MIGRATION", - "replace": "brick" - }, - { - "id": "jam_blueberries", - "type": "MIGRATION", - "replace": "jam_fruit" - }, - { - "id": "jam_strawberries", - "type": "MIGRATION", - "replace": "jam_fruit" - }, { "id": "acidbomb_act", "type": "MIGRATION", "replace": "acidbomb" }, - { - "id": "technician_pants_blue", - "type": "MIGRATION", - "replace": "technician_pants_gray" - }, - { - "id": "technician_pants_ltblue", - "type": "MIGRATION", - "replace": "technician_pants_gray" - }, - { - "id": "technician_shirt_blue", - "type": "MIGRATION", - "replace": "technician_shirt_gray" - }, - { - "id": "technician_shirt_ltblue", - "type": "MIGRATION", - "replace": "technician_shirt_gray" - }, { "id": "1st_aid_survivor", "type": "MIGRATION", @@ -503,56 +140,6 @@ "type": "MIGRATION", "replace": "spaghetti_cooked" }, - { - "id": "fish_vac", - "type": "MIGRATION", - "replace": "salted_fish" - }, - { - "id": "apple_vac", - "type": "MIGRATION", - "replace": "apple_sugar" - }, - { - "id": "hflesh_vac", - "type": "MIGRATION", - "replace": "meat_salted" - }, - { - "id": "meat_vac", - "type": "MIGRATION", - "replace": "meat_salted" - }, - { - "id": "veggy_vac", - "type": "MIGRATION", - "replace": "veggy_salted" - }, - { - "id": "bag_fish_vac", - "type": "MIGRATION", - "replace": "salted_fish" - }, - { - "id": "bag_apple_vac", - "type": "MIGRATION", - "replace": "apple_sugar" - }, - { - "id": "bag_hflesh_vac", - "type": "MIGRATION", - "replace": "meat_salted" - }, - { - "id": "bag_meat_vac", - "type": "MIGRATION", - "replace": "meat_salted" - }, - { - "id": "bag_veggy_vac", - "type": "MIGRATION", - "replace": "veggy_salted" - }, { "id": "potato_irradiated", "type": "MIGRATION", @@ -573,191 +160,6 @@ "type": "MIGRATION", "replace": "rehydrated_meat" }, - { - "id": "human_haggis", - "type": "MIGRATION", - "replace": "haggis" - }, - { - "id": "hfleshbologna", - "type": "MIGRATION", - "replace": "bologna" - }, - { - "id": "h_currywurst", - "type": "MIGRATION", - "replace": "currywurst" - }, - { - "id": "mannwurstgravy", - "type": "MIGRATION", - "replace": "sausagegravy" - }, - { - "id": "hflesh_aspic", - "type": "MIGRATION", - "replace": "meat_aspic" - }, - { - "id": "hflesh_pemmican", - "type": "MIGRATION", - "replace": "pemmican" - }, - { - "id": "sandwich_human", - "type": "MIGRATION", - "replace": "sandwich_t" - }, - { - "id": "sandwich_dudeluxe", - "type": "MIGRATION", - "replace": "sandwich_deluxe" - }, - { - "id": "hobo_helper", - "type": "MIGRATION", - "replace": "macaroni_helper" - }, - { - "id": "chili_human", - "type": "MIGRATION", - "replace": "chili" - }, - { - "id": "pie_human", - "type": "MIGRATION", - "replace": "pie_meat" - }, - { - "id": "pizza_human", - "type": "MIGRATION", - "replace": "pizza_meat" - }, - { - "id": "human_canned", - "type": "MIGRATION", - "replace": "meat_canned" - }, - { - "id": "hflesh_salted", - "type": "MIGRATION", - "replace": "meat_salted" - }, - { - "id": "spaghetti_human", - "type": "MIGRATION", - "replace": "spaghetti_bolognese" - }, - { - "id": "luigilasagne", - "type": "MIGRATION", - "replace": "lasagne" - }, - { - "id": "cheeseburgerhuman", - "type": "MIGRATION", - "replace": "cheeseburger" - }, - { - "id": "bobburger", - "type": "MIGRATION", - "replace": "hamburger" - }, - { - "id": "manwich", - "type": "MIGRATION", - "replace": "sloppyjoe" - }, - { - "id": "tiotaco", - "type": "MIGRATION", - "replace": "taco" - }, - { - "id": "mannwurst_raw", - "type": "MIGRATION", - "replace": "sausage_raw" - }, - { - "id": "mannwurst_cooked", - "type": "MIGRATION", - "replace": "sausage_cooked" - }, - { - "id": "mann_bratwurst", - "type": "MIGRATION", - "replace": "bratwurst_sausage" - }, - { - "id": "human_pickled", - "type": "MIGRATION", - "replace": "meat_pickled" - }, - { - "id": "human_smoked", - "type": "MIGRATION", - "replace": "meat_smoked" - }, - { - "id": "jerky_human", - "type": "MIGRATION", - "replace": "jerky" - }, - { - "id": "hflesh_drink", - "type": "MIGRATION", - "replace": "protein_drink" - }, - { - "id": "hflesh_powder", - "type": "MIGRATION", - "replace": "protein_powder" - }, - { - "id": "hflesh_shake", - "type": "MIGRATION", - "replace": "protein_shake" - }, - { - "id": "hflesh_shake_fortified", - "type": "MIGRATION", - "replace": "protein_shake_fortified" - }, - { - "id": "broth_human", - "type": "MIGRATION", - "replace": "broth_bone" - }, - { - "id": "soup_human", - "type": "MIGRATION", - "replace": "soup_meat" - }, - { - "id": "nachoshf", - "type": "MIGRATION", - "replace": "nachosm" - }, - { - "id": "nachoshc", - "type": "MIGRATION", - "replace": "nachosmc" - }, - { - "id": "chilidogs_human", - "type": "MIGRATION", - "replace": "chilidogs" - }, - { - "id": "mannwurst", - "type": "MIGRATION", - "replace": "sausage" - }, - { - "id": "lightstrip_dead", - "type": "MIGRATION", - "replace": "lightstrip_inactive" - }, { "id": "smg_9mm_mag", "type": "MIGRATION", @@ -777,32 +179,12 @@ "id": "dry_mushroom_magic", "type": "MIGRATION", "replace": "dry_mushroom", - "flags": [ "HIDDEN_HALLU" ] - }, - { - "id": "hk_ucp", - "type": "MIGRATION", - "replace": "hk_mp7" - }, - { - "id": "rechargable_battery", - "type": "MIGRATION", - "replace": "heavy_battery_cell" - }, - { - "id": "hd_battery", - "type": "MIGRATION", - "replace": "heavy_plus_battery_cell" - }, - { - "id": "frozen_burrito", - "type": "MIGRATION", - "replace": "junk_burrito" + "flags": [ "HIDDEN_HALLU" ] }, { - "id": "cooked_burrito", + "id": "hk_ucp", "type": "MIGRATION", - "replace": "junk_burrito" + "replace": "hk_mp7" }, { "id": "10mm", @@ -1264,64 +646,6 @@ "type": "MIGRATION", "replace": "22_cphp" }, - { - "id": "hickory_nut_unshelled", - "type": "MIGRATION", - "replace": "hickory_nut" - }, - { - "id": "hazelnut_unshelled", - "type": "MIGRATION", - "replace": "hazelnut" - }, - { - "id": "chestnut_unshelled", - "type": "MIGRATION", - "replace": "chestnut" - }, - { - "id": "almond_unshelled", - "type": "MIGRATION", - "replace": "almond" - }, - { - "id": "pistachio_unshelled", - "type": "MIGRATION", - "replace": "pistachio" - }, - { - "id": "pecan_unshelled", - "type": "MIGRATION", - "replace": "pecan" - }, - { - "id": "walnut_unshelled", - "type": "MIGRATION", - "replace": "walnut" - }, - { - "id": "peanut_unshelled", - "type": "MIGRATION", - "replace": "peanut" - }, - { - "id": "sourdough_young", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "sourdough_young_uncovered" ] - }, - { - "id": "sourdough_split", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "sourdough_split_uncovered" ] - }, - { - "id": "sourdough_starter", - "type": "MIGRATION", - "replace": "jar_glass_sealed", - "contents": [ "sourdough_starter_uncovered" ] - }, { "id": "1cyl_combustion_small", "type": "MIGRATION", @@ -1354,346 +678,6 @@ "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", @@ -1799,26 +783,6 @@ "type": "MIGRATION", "replace": "plut_cell" }, - { - "id": "lycra_patch", - "type": "MIGRATION", - "replace": "nylon" - }, - { - "id": "scrap_lycra", - "type": "MIGRATION", - "replace": "scrap_nylon" - }, - { - "id": "sheet_lycra", - "type": "MIGRATION", - "replace": "sheet_nylon" - }, - { - "id": "sheet_lycra_patchwork", - "type": "MIGRATION", - "replace": "sheet_nylon_patchwork" - }, { "id": "mask_fsurvivorxl", "type": "MIGRATION", diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json index af62a3c5dbdf..79b232899083 100644 --- a/data/json/obsoletion/recipes.json +++ b/data/json/obsoletion/recipes.json @@ -44,11 +44,6 @@ "result": "lightstrip_inactive", "obsolete": true }, - { - "type": "recipe", - "result": "lightstrip_dead", - "obsolete": true - }, { "type": "recipe", "result": "milk", @@ -86,16 +81,6 @@ "type": "recipe", "obsolete": true }, - { - "type": "recipe", - "result": "30gal_drum", - "obsolete": true - }, - { - "type": "recipe", - "result": "55gal_drum", - "obsolete": true - }, { "type": "recipe", "result": "anesthesia", @@ -111,11 +96,6 @@ "result": "royal_jelly", "obsolete": true }, - { - "type": "recipe", - "result": "scythe_war", - "obsolete": true - }, { "type": "recipe", "result": "laser_sight", @@ -126,16 +106,6 @@ "result": "rail_laser_sight", "obsolete": true }, - { - "type": "recipe", - "result": "goggles_nv", - "obsolete": true - }, - { - "type": "recipe", - "result": "goggles_ir", - "obsolete": true - }, { "type": "recipe", "result": "diesel", @@ -158,2784 +128,1441 @@ }, { "type": "recipe", - "result": "peanut_unshelled", + "result": "1st_aid", "obsolete": true }, { "type": "recipe", - "result": "walnut_unshelled", + "result": "2x4", "obsolete": true }, { "type": "recipe", - "result": "pecan_unshelled", + "result": "40mm_acidbomb", "obsolete": true }, { "type": "recipe", - "result": "pistachio_unshelled", + "result": "acidfrom batteries", "obsolete": true }, { "type": "recipe", - "result": "almond_unshelled", + "result": "alarmclockuncraft", "obsolete": true }, { "type": "recipe", - "result": "chestnut_unshelled", + "result": "armor_bone", "obsolete": true }, { "type": "recipe", - "result": "hazelnut_unshelled", + "result": "arrow_field_point", "obsolete": true }, { "type": "recipe", - "result": "hickory_nut_unshelled", + "result": "arrow_fire_hardened", "obsolete": true }, { "type": "recipe", - "result": "hickory_nutuncraft", + "result": "arrow_heavy_field_point", "obsolete": true }, { "type": "recipe", - "result": "hazelnutuncraft", + "result": "arrow_heavy_fire_hardened", "obsolete": true }, { "type": "recipe", - "result": "chestnutuncraft", + "result": "arrow_metal_sharpened", "obsolete": true }, { "type": "recipe", - "result": "almonduncraft", + "result": "arrow_small_game", "obsolete": true }, { "type": "recipe", - "result": "pistachiouncraft", + "result": "badge_deputyuncraft", "obsolete": true }, { "type": "recipe", - "result": "pecanuncraft", + "result": "bag_bundle_10", "obsolete": true }, { "type": "recipe", - "result": "walnutuncraft", + "result": "barrel_small", "obsolete": true }, { "type": "recipe", - "result": "peanutuncraft", + "result": "baseballuncraft", "obsolete": true }, { "type": "recipe", - "result": "bag_meat_vac", + "result": "battletorch_doneuncraft", "obsolete": true }, { "type": "recipe", - "result": "bag_fish_vac", + "result": "bayonet", "obsolete": true }, { "type": "recipe", - "result": "bag_hflesh_vac", + "result": "beret_woolknitting", "obsolete": true }, { "type": "recipe", - "result": "bag_veggy_vac", + "result": "bindleuncraft", "obsolete": true }, { "type": "recipe", - "result": "bag_apple_vac", + "result": "binocularsuncraft", "obsolete": true }, { "type": "recipe", - "result": "dry_hflesh", + "result": "bladefrom steel", "obsolete": true }, { "type": "recipe", - "result": "dry_hflesh", - "id_suffix": "frozen_ingredients", + "result": "blazerknitting", "obsolete": true }, { "type": "recipe", - "result": "rehydrated_hflesh", + "result": "blowgun", "obsolete": true }, { "type": "recipe", - "result": "human_haggis", + "result": "blueberries_cooked", "obsolete": true }, { "type": "recipe", - "result": "hfleshbologna", + "result": "boobytrapclosed_cans_such_as_drinks", "obsolete": true }, { "type": "recipe", - "result": "h_currywurst", + "result": "boobytrapopen_cans_such_as_food", "obsolete": true }, { "type": "recipe", - "result": "mannwurstgravy", + "result": "boots_bone", "obsolete": true }, { "type": "recipe", - "result": "hflesh_aspic", + "result": "boots_winterknitting", "obsolete": true }, { "type": "recipe", - "result": "hflesh_pemmican", + "result": "brew_bum_wine", "obsolete": true }, { "type": "recipe", - "result": "sandwich_human", + "result": "brew_fruit_winefrom_berries", "obsolete": true }, { "type": "recipe", - "result": "sandwich_dudeluxe", + "result": "caltropsfrom wire", "obsolete": true }, { "type": "recipe", - "result": "hobo_helper", + "result": "camera_prouncraft", "obsolete": true }, { "type": "recipe", - "result": "chili_human", + "result": "camerauncraft", "obsolete": true }, { "type": "recipe", - "result": "pie_human", + "result": "candlestickuncraft", "obsolete": true }, { "type": "recipe", - "result": "pizza_human", + "result": "cell_phoneuncraft", "obsolete": true }, { "type": "recipe", - "result": "human_canned", + "result": "ceramic_bowluncraft", "obsolete": true }, { "type": "recipe", - "result": "human_canned", - "id_suffix": "jarred", + "result": "ceramic_cupuncraft", "obsolete": true }, { "type": "recipe", - "result": "hflesh_salted", - "id_suffix": "vacuum_packed", + "result": "ceramic_plateuncraft", "obsolete": true }, { "type": "recipe", - "result": "spaghetti_human", + "result": "char_purifieruncraft", "obsolete": true }, { "type": "recipe", - "result": "luigilasagne", + "result": "charcoal", "obsolete": true }, { "type": "recipe", - "result": "cheeseburgerhuman", + "result": "clockuncraft", "obsolete": true }, { "type": "recipe", - "result": "bobburger", + "result": "copper_braceletuncraft", "obsolete": true }, { "type": "recipe", - "result": "manwich", + "result": "copper_earuncraft", "obsolete": true }, { "type": "recipe", - "result": "tiotaco", + "result": "cotton_ballby hand", "obsolete": true }, { "type": "recipe", - "result": "mannwurst_raw", + "result": "cowl_woolknitting", "obsolete": true }, { "type": "recipe", - "result": "mannwurst_cooked", + "result": "creepy_dolluncraft", "obsolete": true }, { "type": "recipe", - "result": "mann_bratwurst", + "result": "dart", "obsolete": true }, { "type": "recipe", - "result": "human_pickled", - "id_suffix": "jarred", + "result": "dynamite_radio", "obsolete": true }, { "type": "recipe", - "result": "human_pickled", - "id_suffix": "jarred_3l", + "result": "eink_tablet_pcuncraft", "obsolete": true }, { "type": "recipe", - "result": "human_smoked", + "result": "fanuncraft", "obsolete": true }, { "type": "recipe", - "result": "jerky_human", + "result": "felt_patchuncraft", "obsolete": true }, { "type": "recipe", - "result": "hflesh_drink", + "result": "fileuncraft", "obsolete": true }, { "type": "recipe", - "result": "hflesh_powder", + "result": "flamethrower_crude", "obsolete": true }, { "type": "recipe", - "result": "hflesh_powder", - "id_suffix": "with_from_food_processor", + "result": "flyeruncraft", "obsolete": true }, { "type": "recipe", - "result": "hflesh_shake", + "result": "foonuncraft", "obsolete": true }, { "type": "recipe", - "result": "hflesh_shake_fortified", + "result": "footballuncraft", "obsolete": true }, { "type": "recipe", - "result": "broth_human", + "result": "forkuncraft", "obsolete": true }, { "type": "recipe", - "result": "broth_human", - "id_suffix": "canned", + "result": "gasbomb", "obsolete": true }, { "type": "recipe", - "result": "broth_human", - "id_suffix": "jarred", + "result": "gasoline", "obsolete": true }, { "type": "recipe", - "result": "broth_human", - "id_suffix": "jarred_3l", + "result": "gauntlets_bone", "obsolete": true }, { "type": "recipe", - "result": "soup_human", + "result": "glass_bowluncraft", "obsolete": true }, { "type": "recipe", - "result": "soup_human", - "id_suffix": "canned", + "result": "glass_plateuncraft", "obsolete": true }, { "type": "recipe", - "result": "soup_human", - "id_suffix": "jarred", + "result": "glassuncraft", "obsolete": true }, { "type": "recipe", - "result": "soup_human", - "id_suffix": "jarred_3l", + "result": "gloves_fingerlessfrom patches", "obsolete": true }, { "type": "recipe", - "result": "nachoshf", + "result": "gloves_woolknitting", "obsolete": true }, { "type": "recipe", - "result": "nachoshc", + "result": "gobag", "obsolete": true }, { "type": "recipe", - "result": "chilidogs_human", + "result": "gold_braceletuncraft", "obsolete": true }, { "type": "recipe", - "result": "mannwurst", + "result": "gold_dental_grilluncraft", "obsolete": true }, { "type": "recipe", - "result": "1st_aid", + "result": "gold_earuncraft", "obsolete": true }, { "type": "recipe", - "result": "20x66_bootleg_flechette", + "result": "gold_watchuncraft", "obsolete": true }, { "type": "recipe", - "result": "20x66_bootleg_shot", + "result": "golduncraft", "obsolete": true }, { "type": "recipe", - "result": "20x66_bootleg_slug", + "result": "gunpowder", "obsolete": true }, { "type": "recipe", - "result": "2x4", + "result": "hat_huntingknitting", "obsolete": true }, { "type": "recipe", - "result": "40mm_acidbomb", + "result": "hat_knitknitting", "obsolete": true }, { "type": "recipe", - "result": "8mm_bootleg", + "result": "hd_steel_drum", "obsolete": true }, { "type": "recipe", - "result": "8mm_bootleg_jsp", + "result": "heavy_snare_kit", "obsolete": true }, { "type": "recipe", - "result": "acidfrom batteries", + "result": "helmet_netting", "obsolete": true }, { "type": "recipe", - "result": "alarmclockuncraft", + "result": "honey_bottledfrom_honey_glassed", "obsolete": true }, { "type": "recipe", - "result": "armor_bone", + "result": "honey_bottledfrom_honeycomb", "obsolete": true }, { "type": "recipe", - "result": "arrow_field_point", + "result": "inhaler_sewergas", "obsolete": true }, { "type": "recipe", - "result": "arrow_fire_hardened", + "result": "jug_plasticplastic-mod", "obsolete": true }, { "type": "recipe", - "result": "arrow_heavy_field_point", + "result": "jumpsuit_xlfrom_jumpsuit", "obsolete": true }, { "type": "recipe", - "result": "arrow_heavy_fire_hardened", + "result": "kiln_done", "obsolete": true }, { "type": "recipe", - "result": "arrow_metal_sharpened", + "result": "knife_steakuncraft", "obsolete": true }, { "type": "recipe", - "result": "arrow_small_game", + "result": "l_HFPackuncraft", "obsolete": true }, { "type": "recipe", - "result": "arrowhead", + "result": "laptop", "obsolete": true }, { "type": "recipe", - "result": "arrowhead_plastic", + "result": "lawnmoweruncraft", "obsolete": true }, { "type": "recipe", - "result": "badge_deputyuncraft", + "result": "lead", "obsolete": true }, { "type": "recipe", - "result": "bag_bundle_10", + "result": "lead_plate", "obsolete": true }, { "type": "recipe", - "result": "barrel_small", + "result": "light_snare_kit", "obsolete": true }, { "type": "recipe", - "result": "baseballuncraft", + "result": "lighteruncraft", "obsolete": true }, { "type": "recipe", - "result": "battery", + "result": "lightstrip_deaduncraft", "obsolete": true }, { "type": "recipe", - "result": "battery_truck", + "result": "locketuncraft", "obsolete": true }, { "type": "recipe", - "result": "battletorch_doneuncraft", + "result": "makeshift_crowbaruncraft", "obsolete": true }, { "type": "recipe", - "result": "bayonet", + "result": "makeshift_slinguncraft", "obsolete": true }, { "type": "recipe", - "result": "beret_woolknitting", + "result": "many_years_old_newspaperuncraft", "obsolete": true }, { "type": "recipe", - "result": "bindleuncraft", + "result": "mask_gas_xlexpand-existing", "obsolete": true }, { "type": "recipe", - "result": "binocularsuncraft", + "result": "mask_skiknitting", "obsolete": true }, { "type": "recipe", - "result": "bio_blood_filteruncraft", + "result": "metal_tank_small", "obsolete": true }, { "type": "recipe", - "result": "bio_digestionuncraft", + "result": "milkfrom powder", "obsolete": true }, { "type": "recipe", - "result": "bio_face_maskuncraft", + "result": "mininuke", "obsolete": true }, { "type": "recipe", - "result": "bio_ground_sonaruncraft", + "result": "mirrorfrom_steel", "obsolete": true }, { "type": "recipe", - "result": "bio_metabolicsuncraft", + "result": "mittensknitting", "obsolete": true }, { "type": "recipe", - "result": "bio_nanobotsuncraft", + "result": "months_old_newspaperuncraft", "obsolete": true }, { "type": "recipe", - "result": "bio_power_armor_interface_mkII", + "result": "multi_cookeruncraft", "obsolete": true }, { "type": "recipe", - "result": "bio_recycleruncraft", + "result": "necklaceuncraft", "obsolete": true }, { "type": "recipe", - "result": "bladefrom steel", + "result": "newest_newspaperuncraft", "obsolete": true }, { "type": "recipe", - "result": "blazerknitting", + "result": "noise_emitterfrom-scratch", "obsolete": true }, { "type": "recipe", - "result": "blowgun", + "result": "noise_emitterradio-mod", "obsolete": true }, { "type": "recipe", - "result": "blueberries_cooked", + "result": "nx17", "obsolete": true }, { "type": "recipe", - "result": "boobytrapclosed_cans_such_as_drinks", + "result": "omnicamerafrom-eyebots", "obsolete": true }, { "type": "recipe", - "result": "boobytrapopen_cans_such_as_food", + "result": "omnicamerafrom-scratch", "obsolete": true }, { "type": "recipe", - "result": "boots_bone", + "result": "one_year_old_newspaperuncraft", "obsolete": true }, { "type": "recipe", - "result": "boots_winterknitting", + "result": "peacoatknitting", "obsolete": true }, { "type": "recipe", - "result": "brew_bum_wine", + "result": "pillowuncraft", "obsolete": true }, { "type": "recipe", - "result": "brew_fruit_winefrom_berries", + "result": "pipe_shotgunsawn", "obsolete": true }, { "type": "recipe", - "result": "broken_copbot", + "result": "pipebomb_radio", "obsolete": true }, { "type": "recipe", - "result": "broken_eyebot", + "result": "pipeuncraft", "obsolete": true }, { "type": "recipe", - "result": "broken_manhack", + "result": "plastic_chunkfrom_milk", "obsolete": true }, { "type": "recipe", - "result": "broken_molebot", + "result": "plastic_chunkfrom_plastic_bags", "obsolete": true }, { "type": "recipe", - "result": "broken_riotbot", + "result": "pocketwatchuncraft", "obsolete": true }, { "type": "recipe", - "result": "broken_skitterbot", + "result": "ponchoknitting", "obsolete": true }, { "type": "recipe", - "result": "broken_tankbot", + "result": "power_armor_basic", "obsolete": true }, { "type": "recipe", - "result": "broken_tripod", + "result": "power_armor_helmet_basic", "obsolete": true }, { "type": "recipe", - "result": "caltropsfrom wire", + "result": "processoruncraft", "obsolete": true }, { "type": "recipe", - "result": "camera_prouncraft", + "result": "radio_car_boxuncraft", "obsolete": true }, { "type": "recipe", - "result": "camerauncraft", + "result": "rebreather_xlmod_existing", "obsolete": true }, { "type": "recipe", - "result": "candlestickuncraft", + "result": "rechargeable_battery", "obsolete": true }, { "type": "recipe", - "result": "cell_phoneuncraft", + "result": "ref_lighteruncraft", "obsolete": true }, { "type": "recipe", - "result": "ceramic_bowluncraft", + "result": "reloaded_signal_flare", "obsolete": true }, { "type": "recipe", - "result": "ceramic_cupuncraft", + "result": "restaurantmapuncraft", "obsolete": true }, { "type": "recipe", - "result": "ceramic_plateuncraft", + "result": "ringuncraft", "obsolete": true }, { "type": "recipe", - "result": "char_purifieruncraft", + "result": "roadmapuncraft", "obsolete": true }, { "type": "recipe", - "result": "charcoal", + "result": "robot_controls", "obsolete": true }, { "type": "recipe", - "result": "clockuncraft", + "result": "rope_6from_cloth", "obsolete": true }, { "type": "recipe", - "result": "copper_braceletuncraft", + "result": "rope_6from_string", "obsolete": true }, { "type": "recipe", - "result": "copper_earuncraft", + "result": "saiga_sawn", "obsolete": true }, { "type": "recipe", - "result": "cotton_ballby hand", + "result": "saltfrom_salt_water", "obsolete": true }, { "type": "recipe", - "result": "cowl_woolknitting", + "result": "scarf_fur_longmerge_scarves", "obsolete": true }, { "type": "recipe", - "result": "creepy_dolluncraft", + "result": "scarf_longknitting", "obsolete": true }, { "type": "recipe", - "result": "crude_brick", + "result": "scarfknitting", "obsolete": true }, { "type": "recipe", - "result": "cured_hidescraped", + "result": "sf_watchuncraft", "obsolete": true }, { "type": "recipe", - "result": "dart", + "result": "shelter_kitrepair", "obsolete": true }, { "type": "recipe", - "result": "diamond_bayonet", + "result": "shorts_denimfrom fabric", "obsolete": true }, { "type": "recipe", - "result": "diamond_broadsword", + "result": "shot_scrapbag", "obsolete": true }, { "type": "recipe", - "result": "diamond_dental_grilluncraft", + "result": "shot_scrapslug", "obsolete": true }, { "type": "recipe", - "result": "diamond_katana", + "result": "shotgun_sawn", "obsolete": true }, { "type": "recipe", - "result": "diamond_knife", + "result": "silver_braceletuncraft", "obsolete": true }, { "type": "recipe", - "result": "diamond_kukri", + "result": "silver_earuncraft", "obsolete": true }, { "type": "recipe", - "result": "diamond_machete", + "result": "silveruncraft", "obsolete": true }, { "type": "recipe", - "result": "diamond_nodachi", + "result": "sleeping_bag", "obsolete": true }, { "type": "recipe", - "result": "diamond_pistol_bayonet", + "result": "sleeping_bag_fur", "obsolete": true }, { "type": "recipe", - "result": "diamond_rapier", + "result": "sleeveless_duster_furfrom_duster_fur", "obsolete": true }, { "type": "recipe", - "result": "diamond_ringuncraft", + "result": "sleeveless_duster_furfrom_fur", "obsolete": true }, { "type": "recipe", - "result": "diamond_sword_bayonet", + "result": "sleeveless_duster_leatherfrom_duster_leather", "obsolete": true }, { "type": "recipe", - "result": "diamond_wakizashi", + "result": "sleeveless_duster_leatherfrom_leather", "obsolete": true }, { "type": "recipe", - "result": "diamond_zweihander", + "result": "sleeveless_duster_survivorfrom_duster_survivor", "obsolete": true }, { "type": "recipe", - "result": "down_blanketuncraft", + "result": "sleeveless_duster_survivorfrom_stuff", "obsolete": true }, { "type": "recipe", - "result": "down_pillowuncraft", + "result": "sleeveless_dusterfrom_duster", "obsolete": true }, { "type": "recipe", - "result": "dynamite_radio", + "result": "sleeveless_dusterfrom_rags", "obsolete": true }, { "type": "recipe", - "result": "eink_tablet_pcuncraft", + "result": "sleeveless_trenchcoat_furfrom_fur", "obsolete": true }, { "type": "recipe", - "result": "fanuncraft", + "result": "sleeveless_trenchcoat_furfrom_trenchcoat_fur", "obsolete": true }, { "type": "recipe", - "result": "felt_patchuncraft", + "result": "sleeveless_trenchcoat_leatherfrom_leather", "obsolete": true }, { "type": "recipe", - "result": "fileuncraft", + "result": "sleeveless_trenchcoat_leatherfrom_trenchcoat_leather", "obsolete": true }, { "type": "recipe", - "result": "fish_bait_bread", + "result": "sleeveless_trenchcoat_survivorfrom_stuff", "obsolete": true }, { "type": "recipe", - "result": "fish_bait_fish", + "result": "sleeveless_trenchcoat_survivorfrom_trenchcoat_survivor", "obsolete": true }, { "type": "recipe", - "result": "fish_bait_meat", + "result": "sleeveless_trenchcoatfrom_rags", "obsolete": true }, { "type": "recipe", - "result": "fish_bait_veggy", + "result": "sleeveless_trenchcoatfrom_trenchcoat", "obsolete": true }, { "type": "recipe", - "result": "flamethrower_crude", - "obsolete": true - }, - { - "type": "recipe", - "result": "fletching", - "obsolete": true - }, - { - "type": "recipe", - "result": "fletchingmakeshift", - "obsolete": true - }, - { - "type": "recipe", - "result": "flyeruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "foonuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "footballuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "forkuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "gasbomb", - "obsolete": true - }, - { - "type": "recipe", - "result": "gasoline", - "obsolete": true - }, - { - "type": "recipe", - "result": "gauntlets_bone", - "obsolete": true - }, - { - "type": "recipe", - "result": "glass_bowluncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "glass_plateuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "glassuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "gloves_fingerlessfrom patches", - "obsolete": true - }, - { - "type": "recipe", - "result": "gloves_woolknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "gobag", - "obsolete": true - }, - { - "type": "recipe", - "result": "gold_braceletuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "gold_dental_grilluncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "gold_earuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "gold_watchuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "golduncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "gunpowder", - "obsolete": true - }, - { - "type": "recipe", - "result": "hat_huntingknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "hat_knitknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "hd_steel_drum", - "obsolete": true - }, - { - "type": "recipe", - "result": "heavy_snare_kit", - "obsolete": true - }, - { - "type": "recipe", - "result": "helmet_netting", - "obsolete": true - }, - { - "type": "recipe", - "result": "honey_bottledfrom_honey_glassed", - "obsolete": true - }, - { - "type": "recipe", - "result": "honey_bottledfrom_honeycomb", - "obsolete": true - }, - { - "type": "recipe", - "result": "inhaler_sewergas", - "obsolete": true - }, - { - "type": "recipe", - "result": "jam_blueberries", - "obsolete": true - }, - { - "type": "recipe", - "result": "jam_strawberries", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_V8", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_apple_canned", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_broth", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_broth_bone", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_fish_canned", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_fish_pickled", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_human_canned", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_human_pickled", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_kompot", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_meat_canned", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_meat_pickled", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_soup_fish", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_soup_human", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_soup_meat", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_soup_veggy", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_soup_woods", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_tomato_canned", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_veggy_canned", - "obsolete": true - }, - { - "type": "recipe", - "result": "jar_veggy_pickled", - "obsolete": true - }, - { - "type": "recipe", - "result": "jug_plasticplastic-mod", - "obsolete": true - }, - { - "type": "recipe", - "result": "jumpsuit_xlfrom_jumpsuit", - "obsolete": true - }, - { - "type": "recipe", - "result": "kiln_done", - "obsolete": true - }, - { - "type": "recipe", - "result": "knife_steakuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "l_HFPackuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "laptop", - "obsolete": true - }, - { - "type": "recipe", - "result": "lawnmoweruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "lead", - "obsolete": true - }, - { - "type": "recipe", - "result": "lead_plate", - "obsolete": true - }, - { - "type": "recipe", - "result": "light_snare_kit", - "obsolete": true - }, - { - "type": "recipe", - "result": "lighteruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "lightstrip_deaduncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "locketuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "makeshift_crowbaruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "makeshift_slinguncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "many_years_old_newspaperuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "mask_gas_xlexpand-existing", - "obsolete": true - }, - { - "type": "recipe", - "result": "mask_skiknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "material_shrd_limestoneuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "mess_kituncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "metal_tank_small", - "obsolete": true - }, - { - "type": "recipe", - "result": "microwave", - "obsolete": true - }, - { - "type": "recipe", - "result": "mil_mess_kituncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "militarymapuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "milkfrom powder", - "obsolete": true - }, - { - "type": "recipe", - "result": "mininuke", - "obsolete": true - }, - { - "type": "recipe", - "result": "mirrorfrom_steel", - "obsolete": true - }, - { - "type": "recipe", - "result": "mittensknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "months_old_newspaperuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "mre_beef_boxuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "mre_chicken_boxuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "mre_hotdog_boxuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "mre_ravioli_boxuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "mre_veggy_boxuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "multi_cookeruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "necklaceuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "newest_newspaperuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "noise_emitterfrom-scratch", - "obsolete": true - }, - { - "type": "recipe", - "result": "noise_emitterradio-mod", - "obsolete": true - }, - { - "type": "recipe", - "result": "nx17", - "obsolete": true - }, - { - "type": "recipe", - "result": "omnicamerafrom-eyebots", - "obsolete": true - }, - { - "type": "recipe", - "result": "omnicamerafrom-scratch", - "obsolete": true - }, - { - "type": "recipe", - "result": "one_year_old_newspaperuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "pdauncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "peacoatknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "pillowuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "pipe_shotgunsawn", - "obsolete": true - }, - { - "type": "recipe", - "result": "pipebomb_radio", - "obsolete": true - }, - { - "type": "recipe", - "result": "pipeuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "plastic_chunkfrom_milk", - "obsolete": true - }, - { - "type": "recipe", - "result": "plastic_chunkfrom_plastic_bags", - "obsolete": true - }, - { - "type": "recipe", - "result": "pocketwatchuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "ponchoknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "power_armor_basic", - "obsolete": true - }, - { - "type": "recipe", - "result": "power_armor_helmet_basic", - "obsolete": true - }, - { - "type": "recipe", - "result": "processoruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "radio_car_boxuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "ragknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "raguncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "rebreather_xlmod_existing", - "obsolete": true - }, - { - "type": "recipe", - "result": "rechargeable_battery", - "obsolete": true - }, - { - "type": "recipe", - "result": "ref_lighteruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "reloaded_40mm_flechette", - "obsolete": true - }, - { - "type": "recipe", - "result": "reloaded_40mm_shot", - "obsolete": true - }, - { - "type": "recipe", - "result": "reloaded_shot_beanbag", - "obsolete": true - }, - { - "type": "recipe", - "result": "reloaded_shot_he", - "obsolete": true - }, - { - "type": "recipe", - "result": "reloaded_signal_flare", - "obsolete": true - }, - { - "type": "recipe", - "result": "restaurantmapuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "ringuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "roadmapuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "robot_controls", - "obsolete": true - }, - { - "type": "recipe", - "result": "rope_6from_cloth", - "obsolete": true - }, - { - "type": "recipe", - "result": "rope_6from_string", - "obsolete": true - }, - { - "type": "recipe", - "result": "saiga_sawn", - "obsolete": true - }, - { - "type": "recipe", - "result": "saltfrom_salt_water", - "obsolete": true - }, - { - "type": "recipe", - "result": "scarf_fur_longmerge_scarves", - "obsolete": true - }, - { - "type": "recipe", - "result": "scarf_longknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "scarfknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "sf_watchuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "shaft_metal", - "obsolete": true - }, - { - "type": "recipe", - "result": "shaft_plastic", - "obsolete": true - }, - { - "type": "recipe", - "result": "shaft_wood", - "obsolete": true - }, - { - "type": "recipe", - "result": "shaft_wood_heavy", - "obsolete": true - }, - { - "type": "recipe", - "result": "shelter_kitrepair", - "obsolete": true - }, - { - "type": "recipe", - "result": "shorts_denimfrom fabric", - "obsolete": true - }, - { - "type": "recipe", - "result": "shot_scrapbag", - "obsolete": true - }, - { - "type": "recipe", - "result": "shot_scrapslug", - "obsolete": true - }, - { - "type": "recipe", - "result": "shotgun_sawn", - "obsolete": true - }, - { - "type": "recipe", - "result": "silver_braceletuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "silver_earuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "silveruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeping_bag", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeping_bag_fur", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_duster_furfrom_duster_fur", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_duster_furfrom_fur", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_duster_leatherfrom_duster_leather", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_duster_leatherfrom_leather", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_duster_survivorfrom_duster_survivor", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_duster_survivorfrom_stuff", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_dusterfrom_duster", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_dusterfrom_rags", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_trenchcoat_furfrom_fur", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_trenchcoat_furfrom_trenchcoat_fur", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_trenchcoat_leatherfrom_leather", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_trenchcoat_leatherfrom_trenchcoat_leather", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_trenchcoat_survivorfrom_stuff", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_trenchcoat_survivorfrom_trenchcoat_survivor", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_trenchcoatfrom_rags", - "obsolete": true - }, - { - "type": "recipe", - "result": "sleeveless_trenchcoatfrom_trenchcoat", - "obsolete": true - }, - { - "type": "recipe", - "result": "small_relicuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "rock_pot", - "obsolete": true - }, - { - "type": "recipe", - "result": "small_storage_battery", - "obsolete": true - }, - { - "type": "recipe", - "result": "snare_trigger", - "obsolete": true - }, - { - "type": "recipe", - "result": "socks_woolknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "spoonuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "sporkuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "stockings_tent_armsfrom_rags", - "obsolete": true - }, - { - "type": "recipe", - "result": "stockings_tent_armsfrom_stockings", - "obsolete": true - }, - { - "type": "recipe", - "result": "stockings_tent_legsfrom_rags", - "obsolete": true - }, - { - "type": "recipe", - "result": "stockings_tent_legsfrom_stockings", - "obsolete": true - }, - { - "type": "recipe", - "result": "straw_basketuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "straw_dolluncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "straw_fedorauncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "straw_hatuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "straw_sandalsuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "strawberries_cooked", - "obsolete": true - }, - { - "type": "recipe", - "result": "sugarfrom_beets", - "obsolete": true - }, - { - "type": "recipe", - "result": "sugarfrom_sweet_water", - "obsolete": true - }, - { - "type": "recipe", - "result": "sugarfrom_sweets", - "obsolete": true - }, - { - "type": "recipe", - "result": "sugarfrom_wood", - "obsolete": true - }, - { - "type": "recipe", - "result": "survivormapuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "survnoteuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "sweaterknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "sword_forged", - "obsolete": true - }, - { - "type": "recipe", - "result": "talking_dolluncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "tank_topuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "tanning_hide_modern", - "obsolete": true - }, - { - "type": "recipe", - "result": "tanning_pelt_modern", - "obsolete": true - }, - { - "type": "recipe", - "result": "television", - "obsolete": true - }, - { - "type": "recipe", - "result": "thermal_outfitthermal_outfit_from_bits", - "obsolete": true - }, - { - "type": "recipe", - "result": "thermal_outfitthermal_outfit_from_scratch", - "obsolete": true - }, - { - "type": "recipe", - "result": "tieclipuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "toaster", - "obsolete": true - }, - { - "type": "recipe", - "result": "toolboxuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "touristmapuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "tshirtuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "usb_driveuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "v_table", - "obsolete": true - }, - { - "type": "recipe", - "result": "vac_sealeruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "veh_tracker", - "obsolete": true - }, - { - "type": "recipe", - "result": "vest_leatherfrom_patches", - "obsolete": true - }, - { - "type": "recipe", - "result": "water_acidfrom electrolysis", - "obsolete": true - }, - { - "type": "recipe", - "result": "weeks_old_newspaperuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "wool_hoodieknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "wool_suitknitting", - "obsolete": true - }, - { - "type": "recipe", - "result": "wristwatchuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "years_old_newspaperuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "bio_reactoruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "bio_plut_filteruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "bio_reactor_upgradeuncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "bio_advreactoruncraft", - "obsolete": true - }, - { - "type": "recipe", - "result": "plut_slurry_dense", - "obsolete": true - }, - { - "type": "recipe", - "result": "plut_slurry", - "obsolete": true - }, - { - "type": "recipe", - "result": "smg_22", - "obsolete": true - }, - { - "type": "recipe", - "result": "smg_38", - "obsolete": true - }, - { - "type": "recipe", - "result": "smg_22_mag", - "obsolete": true - }, - { - "type": "recipe", - "result": "smg_38_mag", - "obsolete": true - }, - { - "type": "recipe", - "result": "magbandolier", - "obsolete": true - }, - { - "type": "recipe", - "result": "washcloth", - "obsolete": true - }, - { - "type": "recipe", - "result": "afs_rolling_pin", - "obsolete": true - }, - { - "type": "recipe", - "result": "afs_fried_donut_holes", - "obsolete": true - }, - { - "type": "recipe", - "result": "afs_cake", - "obsolete": true - }, - { - "type": "recipe", - "result": "makeshift_shovel", - "obsolete": true - }, - { - "type": "recipe", - "result": "leather_scraped", - "obsolete": true - }, - { - "type": "recipe", - "result": "tanned_hide_scraped", - "obsolete": true - }, - { - "type": "recipe", - "result": "matchbomb", - "obsolete": true - }, - { - "type": "recipe", - "result": "tool_black_powder_bomb", - "obsolete": true - }, - { - "type": "recipe", - "result": "tool_rdx_sand_bomb", - "obsolete": true - }, - { - "type": "recipe", - "result": "pressure_cooker", - "obsolete": true - }, - { - "type": "recipe", - "result": "xacto", - "obsolete": true - }, - { - "type": "recipe", - "result": "abzats", - "obsolete": true - }, - { - "type": "recipe", - "result": "40mm_flechette", - "obsolete": true - }, - { - "type": "recipe", - "result": "40mm_shot", - "obsolete": true - }, - { - "type": "recipe", - "result": "40mm_slug", - "obsolete": true - }, - { - "type": "recipe", - "result": "scrambler", - "obsolete": true - }, - { - "type": "recipe", - "result": "broken_chickenbot", - "obsolete": true - }, - { - "type": "recipe", - "result": "bot_chickenbot", - "obsolete": true - }, - { - "type": "recipe", - "result": "broken_tripod", - "obsolete": true - }, - { - "type": "recipe", - "result": "bot_tripod", - "obsolete": true - }, - { - "type": "recipe", - "result": "broken_tankbot", - "obsolete": true - }, - { - "type": "recipe", - "result": "bot_tankbot", - "obsolete": true - }, - { - "type": "recipe", - "result": "soap_flakes", - "id_suffix": "fast_cut", - "obsolete": true - }, - { - "type": "recipe", - "result": "hand_vice", - "obsolete": true - }, - { - "type": "recipe", - "result": "crucible", - "obsolete": true - }, - { - "type": "recipe", - "result": "battletorch_done", - "obsolete": true - }, - { - "type": "recipe", - "result": "battletorch", - "obsolete": true - }, - { - "type": "recipe", - "result": "shishkebab_off", - "obsolete": true - }, - { - "type": "recipe", - "result": "firemachete_off", - "obsolete": true - }, - { - "type": "recipe", - "result": "broadfire_off", - "obsolete": true - }, - { - "type": "recipe", - "result": "firekatana_off", - "obsolete": true - }, - { - "type": "recipe", - "result": "zweifire_off", - "obsolete": true - }, - { - "type": "recipe", - "result": "l_HFPack", - "obsolete": true - }, - { - "type": "recipe", - "result": "mosin91_30", - "obsolete": true - }, - { - "type": "recipe", - "result": "mosin44", - "obsolete": true - }, - { - "type": "recipe", - "result": "mosin91_30_ebr", - "obsolete": true - }, - { - "type": "recipe", - "result": "mosin44_ebr", - "obsolete": true - }, - { - "type": "recipe", - "result": "l_car_223", - "obsolete": true - }, - { - "type": "recipe", - "result": "l_mbr_223", - "obsolete": true - }, - { - "type": "recipe", - "result": "l_dsr_223", - "obsolete": true - }, - { - "type": "recipe", - "result": "l_lmg_223", - "obsolete": true - }, - { - "type": "recipe", - "result": "compcrossbow", - "obsolete": true - }, - { - "type": "recipe", - "result": "compbow", - "obsolete": true - }, - { - "type": "recipe", - "result": "recurbow", - "obsolete": true - }, - { - "type": "recipe", - "result": "reflexrecurvebow", - "obsolete": true - }, - { - "type": "recipe", - "result": "q_solarpack", + "result": "small_relicuncraft", "obsolete": true }, { "type": "recipe", - "result": "q_solarpack_on", + "result": "small_storage_battery", "obsolete": true }, { "type": "recipe", - "result": "plastic_chunk", - "id_suffix": "from_cash_cards", + "result": "socks_woolknitting", "obsolete": true }, { - "result": "ballistic_vest_esapi", "type": "recipe", + "result": "spoonuncraft", "obsolete": true }, { - "result": "modularvestkevlar", "type": "recipe", + "result": "sporkuncraft", "obsolete": true }, { - "result": "modularvest", "type": "recipe", + "result": "stockings_tent_armsfrom_rags", "obsolete": true }, { "type": "recipe", - "result": "bot_rifleturret", + "result": "stockings_tent_armsfrom_stockings", "obsolete": true }, { "type": "recipe", - "result": "bot_crows_m240", + "result": "stockings_tent_legsfrom_rags", "obsolete": true }, { "type": "recipe", - "result": "bot_antimateriel", + "result": "stockings_tent_legsfrom_stockings", "obsolete": true }, { - "result": "broken_turret_rifleuncraft", "type": "recipe", + "result": "straw_basketuncraft", "obsolete": true }, { - "result": "broken_crows_m240uncraft", "type": "recipe", + "result": "straw_dolluncraft", "obsolete": true }, { - "result": "broken_turret_bmguncraft", "type": "recipe", + "result": "straw_fedorauncraft", "obsolete": true }, { - "result": "bot_turret", "type": "recipe", + "result": "straw_hatuncraft", "obsolete": true }, { - "result": "broken_turretuncraft", "type": "recipe", + "result": "straw_sandalsuncraft", "obsolete": true }, { - "result": "22_cbuncraft", "type": "recipe", + "result": "survivormapuncraft", "obsolete": true }, { - "result": "22_fmjuncraft", "type": "recipe", + "result": "survnoteuncraft", "obsolete": true }, { - "result": "reloaded_22_fmj", "type": "recipe", + "result": "sweaterknitting", "obsolete": true }, { - "result": "bp_22_fmj", "type": "recipe", + "result": "talking_dolluncraft", "obsolete": true }, { "type": "recipe", - "result": "bp_shot_00", - "id_suffix": "with dowel", + "result": "tank_topuncraft", "obsolete": true }, { "type": "recipe", - "result": "bp_shot_bird", - "id_suffix": "with dowel", + "result": "tanning_hide_modern", "obsolete": true }, { "type": "recipe", - "result": "bp_shot_dragon", - "id_suffix": "with dowel", + "result": "tanning_pelt_modern", "obsolete": true }, { "type": "recipe", - "result": "bp_shot_slug", - "id_suffix": "with dowel", + "result": "thermal_outfitthermal_outfit_from_bits", "obsolete": true }, { "type": "recipe", - "result": "bp_shot_scrap", - "id_suffix": "with dowel", + "result": "thermal_outfitthermal_outfit_from_scratch", "obsolete": true }, { "type": "recipe", - "result": "hand_axe", + "result": "tieclipuncraft", "obsolete": true }, { "type": "recipe", - "result": "sheet_cotton_patchwork", + "result": "toolboxuncraft", "obsolete": true }, { "type": "recipe", - "result": "sheet_neoprene", + "result": "touristmapuncraft", "obsolete": true }, { "type": "recipe", - "result": "makeshift_axe", + "result": "tshirtuncraft", "obsolete": true }, { "type": "recipe", - "result": "sheet_neoprene_patchwork", + "result": "usb_driveuncraft", "obsolete": true }, { "type": "recipe", - "result": "sheet_cotton", + "result": "v_table", "obsolete": true }, { "type": "recipe", - "result": "loom_frame", + "result": "vac_sealeruncraft", "obsolete": true }, { "type": "recipe", - "result": "shed_stick", + "result": "veh_tracker", "obsolete": true }, { "type": "recipe", - "result": "rag", - "id_suffix": "from_sheet", + "result": "vest_leatherfrom_patches", "obsolete": true }, { "type": "recipe", - "result": "neoprene", - "id_suffix": "from_sheet", + "result": "water_acidfrom electrolysis", "obsolete": true }, { - "result": "sieve_primitive", "type": "recipe", + "result": "weeks_old_newspaperuncraft", "obsolete": true }, { - "result": "sieve_steel", "type": "recipe", + "result": "wool_hoodieknitting", "obsolete": true }, { - "result": "gunpowder", "type": "recipe", + "result": "wool_suitknitting", "obsolete": true }, { - "result": "mp3", "type": "recipe", + "result": "wristwatchuncraft", "obsolete": true }, { - "result": "portable_game", "type": "recipe", + "result": "years_old_newspaperuncraft", "obsolete": true }, { "type": "recipe", - "result": "straw_basketuncraft", + "result": "plut_slurry_dense", "obsolete": true }, { "type": "recipe", - "result": "straw_fedorauncraft", + "result": "plut_slurry", "obsolete": true }, { "type": "recipe", - "result": "straw_hatuncraft", + "result": "smg_22", "obsolete": true }, { "type": "recipe", - "result": "straw_sandalsuncraft", + "result": "smg_38", "obsolete": true }, { "type": "recipe", - "result": "tanned_hide", + "result": "smg_22_mag", "obsolete": true }, { "type": "recipe", - "result": "tanned_hide", - "id_suffix": "from_pieces", + "result": "smg_38_mag", "obsolete": true }, { "type": "recipe", - "result": "tanning_hide", + "result": "magbandolier", "obsolete": true }, { "type": "recipe", - "result": "tanning_pelt", + "result": "washcloth", "obsolete": true }, { "type": "recipe", - "result": "brew_milk_curdled", + "result": "afs_rolling_pin", "obsolete": true }, { "type": "recipe", - "result": "raw_butter", + "result": "afs_fried_donut_holes", "obsolete": true }, { "type": "recipe", - "result": "milk_cream_rising", + "result": "afs_cake", "obsolete": true }, { "type": "recipe", - "result": "milk_cream", + "result": "makeshift_shovel", "obsolete": true }, { "type": "recipe", - "result": "reloaded_32_acp", + "result": "matchbomb", "obsolete": true }, { "type": "recipe", - "result": "reloaded_38_fmj", + "result": "tool_black_powder_bomb", "obsolete": true }, { "type": "recipe", - "result": "reloaded_38_special", + "result": "tool_rdx_sand_bomb", "obsolete": true }, { "type": "recipe", - "result": "reloaded_38super_fmj", + "result": "pressure_cooker", "obsolete": true }, { "type": "recipe", - "result": "reloaded_357sig_fmj", + "result": "xacto", "obsolete": true }, { "type": "recipe", - "result": "reloaded_357sig_jhp", + "result": "abzats", "obsolete": true }, { "type": "recipe", - "result": "reloaded_357mag_fmj", + "result": "40mm_flechette", "obsolete": true }, { "type": "recipe", - "result": "reloaded_357mag_jhp", + "result": "40mm_shot", "obsolete": true }, { "type": "recipe", - "result": "reloaded_38_super", + "result": "40mm_slug", "obsolete": true }, { "type": "recipe", - "result": "reloaded_40fmj", + "result": "scrambler", "obsolete": true }, { "type": "recipe", - "result": "reloaded_40sw", + "result": "soap_flakes", + "id_suffix": "fast_cut", "obsolete": true }, { "type": "recipe", - "result": "reloaded_10mm_fmj", + "result": "hand_vice", "obsolete": true }, { "type": "recipe", - "result": "reloaded_44fmj", + "result": "crucible", "obsolete": true }, { "type": "recipe", - "result": "reloaded_44magnum", + "result": "battletorch_done", "obsolete": true }, { "type": "recipe", - "result": "reloaded_45_acp", + "result": "battletorch", "obsolete": true }, { "type": "recipe", - "result": "reloaded_45_jhp", + "result": "shishkebab_off", "obsolete": true }, { "type": "recipe", - "result": "reloaded_45_super", + "result": "firemachete_off", "obsolete": true }, { "type": "recipe", - "result": "reloaded_454_Casull", + "result": "broadfire_off", "obsolete": true }, { "type": "recipe", - "result": "reloaded_45colt_jhp", + "result": "firekatana_off", "obsolete": true }, { "type": "recipe", - "result": "reloaded_46mm", + "result": "zweifire_off", "obsolete": true }, { "type": "recipe", - "result": "reloaded_460_fmj", + "result": "l_HFPack", "obsolete": true }, { "type": "recipe", - "result": "reloaded_460_rowland", + "result": "mosin91_30", "obsolete": true }, { "type": "recipe", - "result": "reloaded_500_Magnum", + "result": "mosin44", "obsolete": true }, { "type": "recipe", - "result": "reloaded_57mm", + "result": "mosin91_30_ebr", "obsolete": true }, { "type": "recipe", - "result": "reloaded_762_25", + "result": "mosin44_ebr", "obsolete": true }, { "type": "recipe", - "result": "reloaded_9mm", + "result": "l_car_223", "obsolete": true }, { "type": "recipe", - "result": "reloaded_9mmP", + "result": "l_mbr_223", "obsolete": true }, { "type": "recipe", - "result": "reloaded_9mmP2", + "result": "l_dsr_223", "obsolete": true }, { "type": "recipe", - "result": "reloaded_9mmfmj", + "result": "l_lmg_223", "obsolete": true }, { "type": "recipe", - "result": "reloaded_9x18mm", + "result": "compcrossbow", "obsolete": true }, { "type": "recipe", - "result": "reloaded_9x18mmfmj", + "result": "compbow", "obsolete": true }, { "type": "recipe", - "result": "reloaded_9x18mmP2", + "result": "recurbow", "obsolete": true }, { "type": "recipe", - "result": "reloaded_380_JHP", + "result": "reflexrecurvebow", "obsolete": true }, { "type": "recipe", - "result": "reloaded_380_FMJ", + "result": "q_solarpack", "obsolete": true }, { "type": "recipe", - "result": "reloaded_380_p", + "result": "q_solarpack_on", "obsolete": true }, { "type": "recipe", - "result": "reloaded_22_cphp", + "result": "plastic_chunk", + "id_suffix": "from_cash_cards", "obsolete": true }, { + "result": "ballistic_vest_esapi", "type": "recipe", - "result": "reloaded_22_lr", "obsolete": true }, { + "result": "modularvestkevlar", "type": "recipe", - "result": "reloaded_223", "obsolete": true }, { + "result": "modularvest", "type": "recipe", - "result": "reloaded_270win_jsp", "obsolete": true }, { "type": "recipe", - "result": "reloaded_300_winmag", + "result": "bot_rifleturret", "obsolete": true }, { "type": "recipe", - "result": "reloaded_3006", + "result": "bot_crows_m240", "obsolete": true }, { "type": "recipe", - "result": "reloaded_3006fmj", + "result": "bot_antimateriel", "obsolete": true }, { + "result": "broken_turret_rifleuncraft", "type": "recipe", - "result": "reloaded_3006_incendiary", "obsolete": true }, { + "result": "broken_crows_m240uncraft", "type": "recipe", - "result": "reloaded_308", "obsolete": true }, { + "result": "broken_turret_bmguncraft", "type": "recipe", - "result": "reloaded_4570_sp", "obsolete": true }, { + "result": "bot_turret", "type": "recipe", - "result": "reloaded_4570_pen", "obsolete": true }, { + "result": "broken_turretuncraft", "type": "recipe", - "result": "reloaded_4570_low", "obsolete": true }, { + "result": "22_cbuncraft", "type": "recipe", - "result": "reloaded_5x50dart", "obsolete": true }, { + "result": "22_fmjuncraft", "type": "recipe", - "result": "reloaded_50bmg", "obsolete": true }, { "type": "recipe", - "result": "reloaded_50_incendiary", + "result": "hand_axe", "obsolete": true }, { "type": "recipe", - "result": "reloaded_50ss", + "result": "makeshift_axe", "obsolete": true }, { "type": "recipe", - "result": "reloaded_545", + "result": "loom_frame", "obsolete": true }, { "type": "recipe", - "result": "reloaded_545_ap", + "result": "shed_stick", "obsolete": true }, { "type": "recipe", - "result": "reloaded_300blk", + "result": "rag", + "id_suffix": "from_sheet", "obsolete": true }, { + "result": "sieve_primitive", "type": "recipe", - "result": "reloaded_556", "obsolete": true }, { + "result": "sieve_steel", "type": "recipe", - "result": "reloaded_556_incendiary", "obsolete": true }, { "type": "recipe", - "result": "reloaded_700nx", + "result": "straw_basketuncraft", "obsolete": true }, { "type": "recipe", - "result": "reloaded_762_51", + "result": "straw_fedorauncraft", "obsolete": true }, { "type": "recipe", - "result": "reloaded_762_51_incendiary", + "result": "straw_hatuncraft", "obsolete": true }, { "type": "recipe", - "result": "reloaded_762_54R", + "result": "straw_sandalsuncraft", "obsolete": true }, { "type": "recipe", - "result": "reloaded_762_m43", + "result": "tanned_hide", "obsolete": true }, { "type": "recipe", - "result": "reloaded_762_m87", + "result": "tanned_hide", + "id_suffix": "from_pieces", "obsolete": true }, { "type": "recipe", - "result": "reloaded_shot_00", + "result": "tanning_hide", "obsolete": true }, { "type": "recipe", - "result": "reloaded_410shot_000", + "result": "tanning_pelt", "obsolete": true }, { "type": "recipe", - "result": "reloaded_shot_bird", + "result": "brew_milk_curdled", "obsolete": true }, { "type": "recipe", - "result": "reloaded_shot_dragon", + "result": "raw_butter", "obsolete": true }, { "type": "recipe", - "result": "reloaded_shot_flechette", + "result": "milk_cream_rising", "obsolete": true }, { "type": "recipe", - "result": "reloaded_shot_slug", + "result": "milk_cream", "obsolete": true }, { diff --git a/data/json/obsoletion/uncategorized.json b/data/json/obsoletion/uncategorized.json index 37587f409d0d..7584da8355ec 100644 --- a/data/json/obsoletion/uncategorized.json +++ b/data/json/obsoletion/uncategorized.json @@ -328,35 +328,6 @@ ] } }, - { - "type": "material", - "id": "lycra", - "name": "Lycra", - "//": "not actually pure Lycra, but poly/nylon and Lycra blend", - "density": 2, - "specific_heat_liquid": 1.7, - "specific_heat_solid": 1.7, - "latent_heat": 27, - "soft": true, - "reinforces": true, - "bash_resist": 2, - "cut_resist": 2, - "bullet_resist": 2, - "acid_resist": 9, - "fire_resist": 2, - "elec_resist": 2, - "chip_resist": 6, - "repaired_with": "lycra_patch", - "salvaged_into": "lycra_patch", - "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ], - "bash_dmg_verb": "ripped", - "cut_dmg_verb": "cut", - "burn_data": [ - { "fuel": 1, "smoke": 2, "burn": 1, "volume_per_turn": "650 ml" }, - { "fuel": 1, "smoke": 3, "burn": 3 }, - { "fuel": 1, "smoke": 5, "burn": 5 } - ] - }, { "type": "terrain", "//": "Obsoleted in favor of a furniture version.", diff --git a/data/json/recipes/animals/medium_quadruped_armor.json b/data/json/recipes/animals/medium_quadruped_armor.json index d9bdd0f895a1..42e178159b83 100644 --- a/data/json/recipes/animals/medium_quadruped_armor.json +++ b/data/json/recipes/animals/medium_quadruped_armor.json @@ -78,14 +78,7 @@ ], [ [ "salt", 150 ] ], [ [ "leather", 105 ] ], - [ - [ "rag", 18 ], - [ "lycra_patch", 18 ], - [ "nylon", 18 ], - [ "leather", 18 ], - [ "nomex", 18 ], - [ "neoprene", 18 ] - ] + [ [ "rag", 18 ], [ "nylon", 18 ], [ "leather", 18 ], [ "nomex", 18 ], [ "neoprene", 18 ] ] ] }, { diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json index ab0f3d22d622..6ed4930dc180 100644 --- a/data/json/recipes/other/materials.json +++ b/data/json/recipes/other/materials.json @@ -608,7 +608,6 @@ "components": [ [ [ "plastic_scrap", 10 ], - [ "button_plastic", 3 ], [ "bottle_folding", 4 ], [ "plastic_six_dice", 10 ], [ "bag_zipper", 10 ], diff --git a/data/json/requirements/ammo.json b/data/json/requirements/ammo.json index f435b82b8492..26038c0e2fe4 100644 --- a/data/json/requirements/ammo.json +++ b/data/json/requirements/ammo.json @@ -88,9 +88,7 @@ [ "22_lr", -1 ], [ "22_ratshot", -1 ], [ "bp_22_cphp", -1 ], - [ "bp_22_lr", -1 ], - [ "reloaded_22_lr", -1 ], - [ "reloaded_22_cphp", -1 ] + [ "bp_22_lr", -1 ] ] ] }, @@ -108,13 +106,9 @@ [ "bp_223", -1 ], [ "bp_556", -1 ], [ "bp_556_incendiary", -1 ], - [ "reloaded_223", -1 ], - [ "reloaded_556", -1 ], - [ "reloaded_556_incendiary", -1 ], [ "300blk", -1 ], [ "300blk_ss", -1 ], - [ "bp_300blk", -1 ], - [ "reloaded_300blk", -1 ] + [ "bp_300blk", -1 ] ] ] }, @@ -130,10 +124,7 @@ [ "762_51_incendiary", -1 ], [ "bp_308", -1 ], [ "bp_762_51", -1 ], - [ "bp_762_51_incendiary", -1 ], - [ "reloaded_308", -1 ], - [ "reloaded_762_51", -1 ], - [ "reloaded_762_51_incendiary", -1 ] + [ "bp_762_51_incendiary", -1 ] ] ] }, @@ -149,11 +140,7 @@ [ "9mmP", -1 ], [ "9mmP2", -1 ], [ "bp_9mm", -1 ], - [ "bp_9mmfmj", -1 ], - [ "reloaded_9mm", -1 ], - [ "reloaded_9mmfmj", -1 ], - [ "reloaded_9mmP", -1 ], - [ "reloaded_9mmP2", -1 ] + [ "bp_9mmfmj", -1 ] ] ] }, @@ -169,12 +156,8 @@ [ "40sw", -1 ], [ "bp_40fmj", -1 ], [ "bp_40sw", -1 ], - [ "reloaded_40fmj", -1 ], - [ "reloaded_40sw", -1 ], [ "357sig_fmj", -1 ], - [ "357sig_jhp", -1 ], - [ "reloaded_357sig_fmj", -1 ], - [ "reloaded_357sig_jhp", -1 ] + [ "357sig_jhp", -1 ] ] ] }, @@ -190,16 +173,11 @@ [ "460_rowland", -1 ], [ "bp_460_fmj", -1 ], [ "bp_460_rowland", -1 ], - [ "reloaded_460_fmj", -1 ], - [ "reloaded_460_rowland", -1 ], [ "45_acp", -1 ], [ "45_jhp", -1 ], [ "45_super", -1 ], [ "bp_45_acp", -1 ], - [ "bp_45_jhp", -1 ], - [ "reloaded_45_acp", -1 ], - [ "reloaded_45_jhp", -1 ], - [ "reloaded_45_super", -1 ] + [ "bp_45_jhp", -1 ] ] ] }, @@ -216,12 +194,8 @@ [ "bp_3006", -1 ], [ "bp_3006fmj", -1 ], [ "bp_3006_incendiary", -1 ], - [ "reloaded_3006", -1 ], - [ "reloaded_3006fmj", -1 ], - [ "reloaded_3006_incendiary", -1 ], [ "270win_casing", -1 ], - [ "270win_jsp", -1 ], - [ "reloaded_270win_jsp", -1 ] + [ "270win_jsp", -1 ] ] ] }, @@ -229,15 +203,13 @@ "id": "762_casehead", "type": "requirement", "//": "References needed for boltfaces and magazines using 7.62x39 or derivatives", - "tools": [ - [ [ "762_casing", -1 ], [ "762_m43", -1 ], [ "762_m87", -1 ], [ "reloaded_762_m43", -1 ], [ "reloaded_762_m87", -1 ] ] - ] + "tools": [ [ [ "762_casing", -1 ], [ "762_m43", -1 ], [ "762_m87", -1 ] ] ] }, { "id": "762R_casehead", "type": "requirement", "//": "References needed for boltfaces and magazines using 7.62x54R or derivatives", - "tools": [ [ [ "762R_casing", -1 ], [ "762_54R", -1 ], [ "reloaded_762_54R", -1 ] ] ] + "tools": [ [ [ "762R_casing", -1 ], [ "762_54R", -1 ] ] ] }, { "id": "explosives_casting_standard", diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json index 6e84a571a5ae..f0cd84fb0a72 100644 --- a/data/json/uncraft/generic.json +++ b/data/json/uncraft/generic.json @@ -113,15 +113,6 @@ "components": [ [ [ "bag_canvas", 1 ] ], [ [ "material_sand", 3000 ] ] ], "flags": [ "BLIND_EASY" ] }, - { - "result": "scrap_cotton", - "type": "uncraft", - "skill_used": "tailor", - "time": "2 m", - "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "thread", 1 ] ] ], - "charges": 1 - }, { "result": "spatula", "type": "uncraft", @@ -1806,20 +1797,6 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "rag", 6 ] ], [ [ "down_feather", 40 ] ] ] }, - { - "result": "sheet_cotton_patchwork", - "type": "uncraft", - "time": "1 m", - "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "rag", 1 ] ], [ [ "scrap_cotton", 20 ] ] ] - }, - { - "result": "sheet_neoprene_patchwork", - "type": "uncraft", - "time": "1 m", - "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "neoprene", 1 ] ], [ [ "scrap_neoprene", 20 ] ] ] - }, { "result": "eink_tablet_pc", "type": "uncraft", @@ -4252,14 +4229,6 @@ "components": [ [ [ "plastic_scrap", 1 ] ] ], "flags": [ "BLIND_EASY" ] }, - { - "result": "button_plastic", - "type": "uncraft", - "skill_used": "fabrication", - "time": "6 s", - "components": [ [ [ "plastic_scrap", 3 ] ] ], - "flags": [ "BLIND_EASY" ] - }, { "result": "bottle_folding", "type": "uncraft", diff --git a/data/mods/DinoMod/recipes/head.json b/data/mods/DinoMod/recipes/head.json index 27d0c73b8065..ce5fca76e130 100644 --- a/data/mods/DinoMod/recipes/head.json +++ b/data/mods/DinoMod/recipes/head.json @@ -11,7 +11,7 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "skull_dino_small", 1 ], [ "skull_dino_med", 1 ], [ "skull_dino_large", 1 ] ] ], "using": [ [ "tailoring_leather_patchwork", 2 ] ], - "byproducts": [ [ "leather", 3 ], [ "scrap_leather", 1 ], [ "meal_bone", 1 ] ] + "byproducts": [ [ "leather", 3 ], [ "meal_bone", 1 ] ] }, { "result": "helmet_ceratopsian", @@ -26,7 +26,7 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "skull_triceratops", 1 ] ] ], "using": [ [ "tailoring_leather_patchwork", 2 ] ], - "byproducts": [ [ "leather", 3 ], [ "scrap_leather", 1 ], [ "meal_bone", 1 ] ] + "byproducts": [ [ "leather", 3 ], [ "meal_bone", 1 ] ] }, { "result": "helmet_ceratopsian", @@ -41,7 +41,7 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "skull_centrosaurus", 1 ] ] ], "using": [ [ "tailoring_leather_patchwork", 2 ] ], - "byproducts": [ [ "leather", 3 ], [ "scrap_leather", 1 ], [ "meal_bone", 1 ] ] + "byproducts": [ [ "leather", 3 ], [ "meal_bone", 1 ] ] }, { "result": "helmet_ceratopsian", @@ -56,7 +56,7 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "skull_torosaurus", 1 ] ] ], "using": [ [ "tailoring_leather_patchwork", 2 ] ], - "byproducts": [ [ "leather", 3 ], [ "scrap_leather", 1 ], [ "meal_bone", 1 ] ] + "byproducts": [ [ "leather", 3 ], [ "meal_bone", 1 ] ] }, { "result": "helmet_ceratopsian", @@ -71,7 +71,7 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "skull_styracosaurus", 1 ] ] ], "using": [ [ "tailoring_leather_patchwork", 2 ] ], - "byproducts": [ [ "leather", 3 ], [ "scrap_leather", 1 ], [ "meal_bone", 1 ] ] + "byproducts": [ [ "leather", 3 ], [ "meal_bone", 1 ] ] }, { "result": "helmet_dino_pred", @@ -85,7 +85,7 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "skull_dino_pred_small", 1 ], [ "skull_dino_pred_med", 1 ], [ "skull_dino_pred_large", 1 ] ] ], "using": [ [ "tailoring_leather_patchwork", 2 ] ], - "byproducts": [ [ "leather", 3 ], [ "scrap_leather", 1 ], [ "meal_bone", 1 ] ] + "byproducts": [ [ "leather", 3 ], [ "meal_bone", 1 ] ] }, { "result": "helmet_dino_pred", @@ -100,7 +100,7 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "skull_tyrannosaurus", 1 ] ] ], "using": [ [ "tailoring_leather_patchwork", 2 ] ], - "byproducts": [ [ "leather", 3 ], [ "scrap_leather", 1 ], [ "meal_bone", 1 ] ] + "byproducts": [ [ "leather", 3 ], [ "meal_bone", 1 ] ] }, { "result": "helmet_dino_pred", @@ -115,7 +115,7 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "skull_allosaurus", 1 ] ] ], "using": [ [ "tailoring_leather_patchwork", 2 ] ], - "byproducts": [ [ "leather", 3 ], [ "scrap_leather", 1 ], [ "meal_bone", 1 ] ] + "byproducts": [ [ "leather", 3 ], [ "meal_bone", 1 ] ] }, { "result": "helmet_dino_pred", @@ -130,6 +130,6 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "skull_acrocanthosaurus", 1 ] ] ], "using": [ [ "tailoring_leather_patchwork", 2 ] ], - "byproducts": [ [ "leather", 3 ], [ "scrap_leather", 1 ], [ "meal_bone", 1 ] ] + "byproducts": [ [ "leather", 3 ], [ "meal_bone", 1 ] ] } ] diff --git a/data/mods/DinoMod/recipes/pets_bear.json b/data/mods/DinoMod/recipes/pets_bear.json index 021218378a44..5b62054953a2 100644 --- a/data/mods/DinoMod/recipes/pets_bear.json +++ b/data/mods/DinoMod/recipes/pets_bear.json @@ -169,7 +169,7 @@ "time": "3 h", "autolearn": true, "qualities": [ { "id": "SEW", "level": 1 }, { "id": "CUT", "level": 1 } ], - "components": [ [ [ "duct_tape", 350 ] ], [ [ "bag_plastic", 70 ] ], [ [ "scrap_cotton", 70 ] ] ] + "components": [ [ [ "duct_tape", 350 ] ], [ [ "bag_plastic", 70 ] ], [ [ "rag", 10 ] ] ] }, { "result": "sweater_armor_bear",