diff --git a/data/json/itemgroups/SUS_specific_use_storage_items.json b/data/json/itemgroups/SUS_specific_use_storage_items.json index 68e5e9d47c665..8beb9bb703eef 100644 --- a/data/json/itemgroups/SUS_specific_use_storage_items.json +++ b/data/json/itemgroups/SUS_specific_use_storage_items.json @@ -168,6 +168,8 @@ { "item": "pot_copper", "prob": 75 }, { "item": "stock_pot", "prob": 50 }, { "item": "pot_canning", "prob": 25 }, + { "item": "colander_steel", "prob": 40 }, + { "item": "splatter_guard", "prob": 20 }, { "item": "pan", "count": [ 1, 2 ] }, { "item": "steel_pan", "prob": 80 }, { "item": "copper_pan", "prob": 30 }, diff --git a/data/json/itemgroups/ammo.json b/data/json/itemgroups/ammo.json index 187d59f1e8749..5ad2b1e48ff9e 100644 --- a/data/json/itemgroups/ammo.json +++ b/data/json/itemgroups/ammo.json @@ -343,7 +343,12 @@ "id": "ammo_parts", "//": "Raw materials for assembling ammo excluding casings.", "items": [ - [ "gunpowder", 320 ], + [ "gunpowder_shotgun", 20 ], + [ "gunpowder_pistol", 105 ], + [ "gunpowder_magnum_pistol", 60 ], + [ "gunpowder_rifle", 85 ], + [ "gunpowder_large_rifle", 40 ], + [ "gunpowder_artillery", 5 ], [ "incendiary", 20 ], [ "lead", 160 ], [ "shotgun_primer", 80 ], diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json index bf098d19f0ee8..06373bed55843 100644 --- a/data/json/itemgroups/collections_domestic.json +++ b/data/json/itemgroups/collections_domestic.json @@ -66,6 +66,8 @@ [ "pressure_cooker", 5 ], [ "teapot", 40 ], [ "kettle", 40 ], + [ "colander_steel", 35 ], + [ "splatter_guard", 10 ], [ "jar_glass", 50 ], [ "jar_3l_glass", 40 ], [ "bowl_pewter", 25 ], diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index bc843d7233740..395f900bfd195 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -468,20 +468,68 @@ "type": "AMMO", "id": "gunpowder", "category": "chems", - "price": 3000, - "name": "gunpowder", + "price": 500, + "name": "mixed gunpowder", "symbol": "=", "color": "dark_gray", - "description": "Firearm-quality gunpowder.", - "container": "bottle_plastic_small", + "description": "Firearm-quality gunpowder, mixed without concern for composition, burn rate or shape. It has been slightly ground to make its properties more uniform. Only the truly desperate would attempt to reload with this.", + "container": "bottle_plastic", "material": "powder", "flags": [ "TINDER" ], "volume": "250 ml", "weight": 1, "ammo_type": "components", - "count": 200, + "count": 454, "effects": [ "COOKOFF" ] }, + { + "type": "AMMO", + "id": "gunpowder_shotgun", + "copy-from": "gunpowder", + "price": 3000, + "name": "smokeless shotgun powder", + "description": "Firearm-quality gunpowder, intended for use in shotgun shells." + }, + { + "type": "AMMO", + "id": "gunpowder_pistol", + "copy-from": "gunpowder", + "price": 3000, + "name": "smokeless pistol powder", + "description": "Firearm-quality gunpowder, intended for use in pistol ammunition." + }, + { + "type": "AMMO", + "id": "gunpowder_magnum_pistol", + "copy-from": "gunpowder", + "price": 3000, + "name": "smokeless magnum powder", + "description": "Firearm-quality gunpowder intended for use in magnum pistol ammunition." + }, + { + "type": "AMMO", + "id": "gunpowder_rifle", + "copy-from": "gunpowder", + "price": 3000, + "name": "smokeless rifle powder", + "description": "Firearm-quality gunpowder intended for use in rifle ammunition." + }, + { + "type": "AMMO", + "id": "gunpowder_large_rifle", + "copy-from": "gunpowder", + "price": 3000, + "name": "smokeless overbore rifle powder", + "description": "Firearm-quality gunpowder intended for use in large rifle ammunition." + }, + { + "type": "AMMO", + "id": "gunpowder_artillery", + "copy-from": "gunpowder", + "price": 3000, + "name": "artillery propellant", + "description": "Single base smokeless gunpowder intended for use in artillery propelling charges." + }, { "type": "AMMO", "id": "oxy_powder", diff --git a/data/json/items/generic/dining_kitchen.json b/data/json/items/generic/dining_kitchen.json index 2555326284054..e78fa69d59fb5 100644 --- a/data/json/items/generic/dining_kitchen.json +++ b/data/json/items/generic/dining_kitchen.json @@ -805,6 +805,29 @@ "container_data": { "contains": "1500 ml", "watertight": true }, "delete": { "qualities": [ [ "COOK", 3 ] ] } }, + { + "id": "colander_steel", + "name": "mesh colander", + "category": "other", + "description": "A stainless steel mesh colander, for washing rice, vegetables or straining liquid off from noodles or other foods.", + "type": "GENERIC", + "volume": 2, + "weight": 318, + "symbol": ")", + "price": 600, + "price_postapoc": 5 + }, + { + "id": "splatter_guard", + "name": "splatter guard", + "description": "A stainless steel mesh screen for preventing flying oil from getting all over your nice counters (or you) when frying.", + "type": "GENERIC", + "volume": 2, + "weight": 357, + "symbol": ")", + "price": 600, + "price_postapoc": 5 + }, { "id": "cutting_board", "type": "GENERIC", diff --git a/data/json/items/tools.json b/data/json/items/tools.json index f88059c17b4fd..68b6dbd71139e 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -861,6 +861,20 @@ "charges_per_use": 1, "use_action": "CAN_GOO" }, + { + "id": "sieve_steel", + "type": "GENERIC", + "category": "tools", + "name": "sieve", + "description": "This is no mere strainer for noodles; it's a sieve used to separate particles of certain sizes. You could use this to do a really good job sifting flour, remove dust and soil from grain, or perhaps conduct gradiation tests for any civil engineers you might know. This one has been constructed from steel mesh.", + "weight": 318, + "volume": 2, + "price": 700, + "bashing": 2, + "material": [ "steel" ], + "symbol": ";", + "color": "dark_gray" + }, { "id": "carding_paddles", "type": "GENERIC", diff --git a/data/json/recipes/ammo/components.json b/data/json/recipes/ammo/components.json index 2a7d7cd96096e..260d505ca603d 100644 --- a/data/json/recipes/ammo/components.json +++ b/data/json/recipes/ammo/components.json @@ -12,6 +12,27 @@ "qualities": [ { "id": "CHEM", "level": 1 } ], "components": [ [ [ "magnesium", 100 ], [ "chem_aluminium_powder", 100 ] ], [ [ "oxy_powder", 200 ] ] ] }, + { + "result": "gunpowder", + "type": "recipe", + "category": "CC_AMMO", + "subcategory": "CSC_AMMO_COMPONENTS", + "skill_used": "fabrication", + "difficulty": 1, + "time": "15 s", + "book_learn": [ [ "pocket_firearms", 3 ], [ "manual_gun", 2 ], [ "recipe_bullets", 1 ], [ "textbook_anarch", 0 ] ], + "tools": [ [ [ "mortar_pestle", -1 ] ], [ [ "sieve_steel", -1 ] ] ], + "components": [ + [ + [ "gunpowder_shotgun", 1 ], + [ "gunpowder_pistol", 1 ], + [ "gunpowder_magnum_pistol", 1 ], + [ "gunpowder_rifle", 1 ], + [ "gunpowder_large_rifle", 1 ], + [ "gunpowder_artillery", 1 ] + ] + ] + }, { "type": "recipe", "result": "460_casing", diff --git a/data/json/recipes/ammo/grenades.json b/data/json/recipes/ammo/grenades.json index bc153f9350ea3..28d6f96d23fdf 100644 --- a/data/json/recipes/ammo/grenades.json +++ b/data/json/recipes/ammo/grenades.json @@ -14,7 +14,7 @@ "charges": 1, "using": [ [ "ammo_40mm", 1 ] ], "tools": [ [ [ "press", -1 ] ] ], - "components": [ [ [ "gunpowder", 30 ] ], [ [ "combatnail", 25 ] ] ] + "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_pistol", 30 ], [ "gunpowder_shotgun", 3 ] ], [ [ "combatnail", 25 ] ] ] }, { "result": "40mm_shot", @@ -30,7 +30,7 @@ "book_learn": [ [ "manual_launcher", 4 ], [ "manual_shotgun", 6 ] ], "charges": 1, "using": [ [ "bullet_forming", 2 ], [ "ammo_40mm", 1 ], [ "ammo_bullet", 12 ] ], - "components": [ [ [ "gunpowder", 30 ] ] ] + "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_pistol", 30 ], [ "gunpowder_shotgun", 30 ] ] ] }, { "result": "40mm_slug", @@ -46,6 +46,6 @@ "book_learn": [ [ "manual_launcher", 4 ], [ "manual_shotgun", 6 ] ], "charges": 1, "using": [ [ "bullet_forming", 3 ], [ "ammo_40mm", 1 ], [ "ammo_bullet", 12 ] ], - "components": [ [ [ "gunpowder", 36 ] ], [ [ "plastic_chunk", 1 ] ] ] + "components": [ [ [ "gunpowder", 36 ], [ "gunpowder_pistol", 36 ], [ "gunpowder_shotgun", 2 ] ], [ [ "plastic_chunk", 1 ] ] ] } ] diff --git a/data/json/recipes/ammo/pistol.json b/data/json/recipes/ammo/pistol.json index 93356ddbcb147..49d65e9cd1ee1 100644 --- a/data/json/recipes/ammo/pistol.json +++ b/data/json/recipes/ammo/pistol.json @@ -77,7 +77,11 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "32_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ] + "components": [ + [ [ "32_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ], [ "gunpowder_shotgun", 2 ] ] + ] }, { "result": "reloaded_38_fmj", @@ -93,7 +97,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ], [ [ "copper", 1 ] ] ] + "components": [ + [ [ "38_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ], [ "gunpowder_shotgun", 2 ] ], + [ [ "copper", 1 ] ] + ] }, { "result": "reloaded_38_special", @@ -109,7 +118,11 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ] + "components": [ + [ [ "38_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ], [ "gunpowder_shotgun", 2 ] ] + ] }, { "result": "reloaded_38super_fmj", @@ -125,7 +138,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_38super", 1 ] ], - "components": [ [ [ "gunpowder", 3 ] ] ] + "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ] ] }, { "result": "reloaded_357mag_fmj", @@ -141,7 +154,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357mag", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ] ] + "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_rifle", 5 ], [ "gunpowder_magnum_pistol", 5 ] ] ] }, { "result": "reloaded_357mag_jhp", @@ -157,7 +170,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_357mag", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ] ] + "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_rifle", 5 ], [ "gunpowder_magnum_pistol", 5 ] ] ] }, { "result": "bp_38_special", @@ -189,7 +202,11 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ] + "components": [ + [ [ "38_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ] + ] }, { "result": "reloaded_40fmj", @@ -205,7 +222,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 1 ] ] ] + "components": [ + [ [ "40_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ], [ "gunpowder_shotgun", 4 ] ], + [ [ "copper", 1 ] ] + ] }, { "result": "reloaded_40sw", @@ -221,7 +243,11 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ] + "components": [ + [ [ "40_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ], [ "gunpowder_shotgun", 4 ] ] + ] }, { "result": "reloaded_10mm_fmj", @@ -237,7 +263,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_10mm", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ] ] + "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_magnum_pistol", 5 ] ] ] }, { "result": "reloaded_44fmj", @@ -253,7 +279,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], - "components": [ [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ] + "components": [ + [ [ "44_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ], + [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ], + [ [ "copper", 2 ] ] + ] }, { "result": "reloaded_44magnum", @@ -269,7 +300,11 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 5 ] ], - "components": [ [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ] ] + "components": [ + [ [ "44_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ], + [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ] + ] }, { "result": "bp_44magnum", @@ -301,7 +336,11 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ] + "components": [ + [ [ "45_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ], + [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ], [ "gunpowder_shotgun", 4 ] ] + ] }, { "result": "reloaded_45_jhp", @@ -317,7 +356,11 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ] + "components": [ + [ [ "45_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ], + [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ], [ "gunpowder_shotgun", 4 ] ] + ] }, { "result": "reloaded_45_super", @@ -333,7 +376,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ] + "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 5 ], [ "gunpowder_pistol", 5 ] ] ] }, { "result": "reloaded_454_Casull", @@ -349,7 +392,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], - "components": [ [ [ "454_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ] + "components": [ + [ [ "454_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ], + [ [ "copper", 2 ] ] + ] }, { "result": "bp_454_Casull", @@ -381,7 +429,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 4 ], [ "ammo_45colt", 1 ] ], - "components": [ [ [ "gunpowder", 4 ] ] ] + "components": [ [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ], [ "gunpowder_shotgun", 4 ] ] ] }, { "result": "reloaded_46mm", @@ -397,7 +445,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "46mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ] + "components": [ [ [ "46mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ] ] ] }, { "result": "reloaded_460_fmj", @@ -413,7 +461,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ] + "components": [ + [ [ "460_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ], + [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ], + [ [ "copper", 2 ] ] + ] }, { "result": "reloaded_460_rowland", @@ -429,7 +482,11 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 6 ] ] ] + "components": [ + [ [ "460_casing", 1 ] ], + [ [ "lgpistol_primer", 1 ] ], + [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ] + ] }, { "result": "reloaded_500_Magnum", @@ -445,7 +502,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 6 ], [ "ammo_bullet", 5 ] ], - "components": [ [ [ "500_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 2 ] ] ] + "components": [ + [ [ "500_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 8 ], [ "gunpowder_rifle", 8 ], [ "gunpowder_magnum_pistol", 8 ] ], + [ [ "copper", 2 ] ] + ] }, { "result": "reloaded_57mm", @@ -461,7 +523,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "57mm_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ] + "components": [ [ [ "57mm_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ] ] ] }, { "result": "reloaded_762_25", @@ -477,7 +539,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_762_25", 1 ] ], - "components": [ [ [ "gunpowder", 4 ] ] ] + "components": [ [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ] ] ] }, { "result": "reloaded_9mm", @@ -493,7 +555,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], - "components": [ [ [ "gunpowder", 3 ] ] ] + "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ] ] }, { "result": "reloaded_9mmP", @@ -509,7 +571,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], - "components": [ [ [ "gunpowder", 4 ] ] ] + "components": [ [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ] ] ] }, { "result": "reloaded_9mmP2", @@ -525,7 +587,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ] ] + "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_pistol", 5 ] ] ] }, { "result": "reloaded_9mmfmj", @@ -541,7 +603,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], - "components": [ [ [ "gunpowder", 3 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "copper", 1 ] ] ] }, { "result": "reloaded_9x18mm", @@ -557,7 +619,11 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ] + "components": [ + [ [ "9x18mm_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ] + ] }, { "result": "reloaded_9x18mmfmj", @@ -573,7 +639,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ], [ [ "copper", 1 ] ] ] + "components": [ + [ [ "9x18mm_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], + [ [ "copper", 1 ] ] + ] }, { "result": "reloaded_9x18mmP2", @@ -589,7 +660,11 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ] + "components": [ + [ [ "9x18mm_casing", 1 ] ], + [ [ "smpistol_primer", 1 ] ], + [ [ "gunpowder", 5 ], [ "gunpowder_pistol", 5 ], [ "gunpowder_shotgun", 5 ] ] + ] }, { "result": "reloaded_380_JHP", @@ -605,7 +680,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], - "components": [ [ [ "gunpowder", 2 ] ] ] + "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ], [ "gunpowder_shotgun", 2 ] ] ] }, { "result": "reloaded_380_p", @@ -621,7 +696,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], - "components": [ [ [ "gunpowder", 3 ] ] ] + "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ] ] }, { "result": "reloaded_380_FMJ", @@ -637,6 +712,6 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], - "components": [ [ [ "gunpowder", 2 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "copper", 1 ] ] ] } ] diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json index bdcb8962157f7..8622bfd3fe409 100644 --- a/data/json/recipes/ammo/rifle.json +++ b/data/json/recipes/ammo/rifle.json @@ -47,7 +47,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 2 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ] ], [ [ "copper", 1 ] ] ] }, { "result": "reloaded_22_lr", @@ -63,7 +63,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], - "components": [ [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 2 ] ] ] + "components": [ [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ] ] ] }, { "result": "reloaded_223", @@ -79,7 +79,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 1 ] ] ] + "components": [ + [ [ "223_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "gunpowder", 4 ], [ "gunpowder_magnum_pistol", 4 ], [ "gunpowder_rifle", 4 ] ], + [ [ "copper", 1 ] ] + ] }, { "result": "reloaded_270win_jsp", @@ -95,7 +100,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 8 ], [ "ammo_bullet", 5 ], [ "ammo_270win", 1 ] ], - "components": [ [ [ "gunpowder", 10 ] ], [ [ "copper", 3 ] ] ] + "components": [ [ [ "gunpowder", 10 ], [ "gunpowder_magnum_pistol", 10 ], [ "gunpowder_rifle", 10 ] ], [ [ "copper", 3 ] ] ] }, { "result": "reloaded_300_winmag", @@ -111,7 +116,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 8 ] ], - "components": [ [ [ "300_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 16 ] ], [ [ "copper", 4 ] ] ] + "components": [ + [ [ "300_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 16 ], [ "gunpowder_rifle", 16 ], [ "gunpowder_large_rifle", 16 ] ], + [ [ "copper", 4 ] ] + ] }, { "result": "reloaded_3006", @@ -127,7 +137,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 8 ] ], - "components": [ [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ], [ [ "copper", 4 ] ] ] + "components": [ + [ [ "3006_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ], + [ [ "copper", 4 ] ] + ] }, { "result": "reloaded_3006fmj", @@ -143,7 +158,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 8 ] ], - "components": [ [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ], [ [ "copper", 4 ] ] ] + "components": [ + [ [ "3006_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ], + [ [ "copper", 4 ] ] + ] }, { "result": "reloaded_3006_incendiary", @@ -162,7 +182,12 @@ "components": [ [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 12 ] ], + [ + [ "gunpowder", 12 ], + [ "gunpowder_magnum_pistol", 12 ], + [ "gunpowder_rifle", 12 ], + [ "gunpowder_large_rifle", 12 ] + ], [ [ "copper", 4 ] ], [ [ "incendiary", 8 ] ] ] @@ -184,7 +209,12 @@ "components": [ [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 8 ] ], + [ + [ "gunpowder", 8 ], + [ "gunpowder_magnum_pistol", 12 ], + [ "gunpowder_rifle", 12 ], + [ "gunpowder_large_rifle", 12 ] + ], [ [ "copper", 3 ] ] ] }, @@ -204,7 +234,7 @@ "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 15 ] ], + [ [ "gunpowder", 15 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_magnum_pistol", 12 ] ], [ [ "lead", 5 ] ], [ [ "copper", 2 ] ] ] @@ -222,7 +252,12 @@ "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], "charges": 1, "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], - "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 17 ] ], [ [ "copper", 7 ] ] ] + "components": [ + [ [ "4570_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 17 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ] ], + [ [ "copper", 7 ] ] + ] }, { "result": "reloaded_4570_low", @@ -237,7 +272,12 @@ "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 4 ] ], "charges": 1, "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], - "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ], [ [ "lead", 9 ] ] ] + "components": [ + [ [ "4570_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 12 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ] ], + [ [ "lead", 9 ] ] + ] }, { "result": "reloaded_4570_bp", @@ -273,7 +313,7 @@ [ [ "5x50_hull", 1 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder", 3 ] ], + [ [ "gunpowder", 3 ], [ "gunpowder_magnum_pistol", 3 ] ], [ [ "combatnail", 1 ] ] ] }, @@ -291,7 +331,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 18 ], [ "ammo_bullet", 12 ] ], - "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 30 ] ], [ [ "copper", 6 ] ] ] + "components": [ + [ [ "50_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ], + [ [ "copper", 6 ] ] + ] }, { "result": "reloaded_50_incendiary", @@ -310,7 +355,7 @@ "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 30 ] ], + [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ], [ [ "copper", 6 ] ], [ [ "incendiary", 20 ] ] ] @@ -332,7 +377,7 @@ "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 30 ] ], + [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ], [ [ "scrap", 1 ] ], [ [ "copper", 6 ] ] ] @@ -351,7 +396,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 5 ] ], [ [ "copper", 1 ] ] ] + "components": [ + [ [ "545_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "gunpowder", 5 ], [ "gunpowder_magnum_pistol", 5 ], [ "gunpowder_rifle", 5 ] ], + [ [ "copper", 1 ] ] + ] }, { "result": "reloaded_545_ap", @@ -367,7 +417,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 1 ] ] ] + "components": [ + [ [ "545_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "gunpowder", 6 ], [ "gunpowder_magnum_pistol", 6 ], [ "gunpowder_rifle", 6 ] ], + [ [ "copper", 1 ] ] + ] }, { "result": "reloaded_300blk", @@ -399,7 +454,17 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 3 ] ], - "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 1 ] ] ] + "components": [ + [ [ "223_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ + [ "gunpowder", 6 ], + [ "gunpowder_magnum_pistol", 6 ], + [ "gunpowder_rifle", 6 ], + [ "gunpowder_magnum_pistol", 6 ] + ], + [ [ "copper", 1 ] ] + ] }, { "result": "reloaded_556_incendiary", @@ -418,7 +483,7 @@ "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder", 6 ] ], + [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ], [ [ "copper", 1 ] ], [ [ "incendiary", 2 ] ] ] @@ -437,7 +502,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 10 ] ], - "components": [ [ [ "700nx_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 30 ] ], [ [ "copper", 5 ] ] ] + "components": [ + [ [ "700nx_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ], + [ [ "copper", 5 ] ] + ] }, { "result": "reloaded_762_51", @@ -456,7 +526,7 @@ "components": [ [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 10 ] ], + [ [ "gunpowder", 10 ], [ "gunpowder_rifle", 10 ], [ "gunpowder_magnum_pistol", 10 ] ], [ [ "copper", 3 ] ] ] }, @@ -477,7 +547,12 @@ "components": [ [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 10 ] ], + [ + [ "gunpowder", 10 ], + [ "gunpowder_magnum_pistol", 10 ], + [ "gunpowder_rifle", 10 ], + [ "gunpowder_large_rifle", 10 ] + ], [ [ "copper", 3 ] ], [ [ "incendiary", 6 ] ] ] @@ -496,7 +571,17 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 7 ] ], - "components": [ [ [ "762R_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 10 ] ], [ [ "copper", 3 ] ] ] + "components": [ + [ [ "762R_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ + [ "gunpowder", 10 ], + [ "gunpowder_magnum_pistol", 10 ], + [ "gunpowder_rifle", 10 ], + [ "gunpowder_large_rifle", 10 ] + ], + [ [ "copper", 3 ] ] + ] }, { "result": "reloaded_762_m43", @@ -512,7 +597,12 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], - "components": [ [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 1 ] ] ] + "components": [ + [ [ "762_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 8 ], [ "gunpowder_magnum_pistol", 8 ], [ "gunpowder_rifle", 8 ] ], + [ [ "copper", 1 ] ] + ] }, { "result": "reloaded_762_m87", @@ -528,6 +618,11 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], - "components": [ [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 1 ] ] ] + "components": [ + [ [ "762_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder", 8 ], [ "gunpowder_magnum_pistol", 8 ], [ "gunpowder_rifle", 8 ] ], + [ [ "copper", 1 ] ] + ] } ] diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json index c1f325237e490..7fd05a9bbb6ce 100644 --- a/data/json/recipes/ammo/shot.json +++ b/data/json/recipes/ammo/shot.json @@ -13,7 +13,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_shot", 1 ] ], - "components": [ [ [ "gunpowder", 6 ] ] ] + "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ] }, { "result": "reloaded_410shot_000", @@ -29,7 +29,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 5 ], [ "ammo_410shot", 1 ] ], - "components": [ [ [ "gunpowder", 5 ] ] ] + "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_pistol", 5 ], [ "gunpowder_shotgun", 5 ] ] ] }, { "result": "reloaded_shot_bird", @@ -45,7 +45,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_shot", 1 ] ], - "components": [ [ [ "gunpowder", 3 ] ] ] + "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ] ] }, { "result": "reloaded_shot_dragon", @@ -61,7 +61,7 @@ "charges": 1, "using": [ [ "ammo_shot", 1 ] ], "tools": [ [ [ "press", -1 ] ] ], - "components": [ [ [ "gunpowder", 3 ] ], [ [ "magnesium", 5 ] ] ] + "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "magnesium", 5 ] ] ] }, { "result": "reloaded_shot_flechette", @@ -78,7 +78,7 @@ "reversible": true, "using": [ [ "ammo_shot", 1 ] ], "tools": [ [ [ "press", -1 ] ] ], - "components": [ [ [ "gunpowder", 6 ] ], [ [ "combatnail", 10 ] ] ] + "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ], [ [ "combatnail", 10 ] ] ] }, { "result": "reloaded_shot_slug", @@ -94,7 +94,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 20 ], [ "ammo_shot", 1 ] ], - "components": [ [ [ "gunpowder", 6 ] ] ] + "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ] }, { "result": "bp_shot_00", @@ -193,7 +193,10 @@ "reversible": true, "using": [ [ "ammo_shot", 2 ] ], "tools": [ [ [ "press", -1 ] ] ], - "components": [ [ [ "gunpowder", 12 ] ], [ [ "scrap", 1 ], [ "nail", 10 ], [ "bb", 20 ] ] ] + "components": [ + [ [ "gunpowder", 12 ], [ "gunpowder_pistol", 12 ], [ "gunpowder_shotgun", 12 ] ], + [ [ "scrap", 1 ], [ "nail", 10 ], [ "bb", 20 ] ] + ] }, { "result": "signal_flare", diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index 534f48acb6654..7635f5e55693e 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -363,5 +363,15 @@ "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "stick", 1 ], [ "2x4", 1 ], [ "splinter", 1 ], [ "pool_cue", 1 ], [ "torch_done", 1 ] ], [ [ "pine_bough", 2 ] ] ] + }, + { + "type": "recipe", + "result": "sieve_steel", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_TOOLS", + "skill_used": "fabrication", + "time": "2 m", + "autolearn": true, + "components": [ [ [ "colander_steel", 1 ], [ "splatter_guard", 1 ] ] ] } ] diff --git a/data/json/snippets/snippets.json b/data/json/snippets/snippets.json index 3601b6d4540e6..8e2dd6cb356d0 100644 --- a/data/json/snippets/snippets.json +++ b/data/json/snippets/snippets.json @@ -287,7 +287,9 @@ "\"Go to every fungus patch you find but WEAR A SUIT. Food there is very very filling. Look for pink berries, blue flowers\"", "\"red blue yellow berry seed sap bloom flowers tower mycus mycus mycus.\"", "\"Husband 30 yrs died in bombs. Mushrooms brought him back. GIVE YOURSELF TO THEm AND THEY WILL HELP YOU\"", - "\"Lisa always was a fan of sports. Thank God these Global Athletics Games in Harran started some time before the outbreak, so she was able to leave New England before it was quarantined. She should be safe outside the country, right?\"" + "\"Lisa always was a fan of sports. Thank God these Global Athletics Games in Harran started some time before the outbreak, so she was able to leave New England before it was quarantined. I can only hope there are no zombies, as we do have here, in the city she flew to.\"", + "\"Don't mix powders, them books said. Do Not Mix powders. Didn't listen did I. Blew my goddamn pinky off, near lost my right eye.\"", + "\"followed what toby wrote down. shells looked like theyd hold more, I put in some more. traded most to h raiders for crank. shot my 38 today and it fuckn exploded. low on crank, good as dead, no gun, no toby. headed to montreal real sorry bout the bullets\"" ] }, { diff --git a/data/json/uncraft/ammo/10mm.json b/data/json/uncraft/ammo/10mm.json index 9cbd29fed0454..a8fdc492c25ee 100644 --- a/data/json/uncraft/ammo/10mm.json +++ b/data/json/uncraft/ammo/10mm.json @@ -4,7 +4,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "10mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "10mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/22.json b/data/json/uncraft/ammo/22.json index 36a35659b737a..17313c6d8e9bb 100644 --- a/data/json/uncraft/ammo/22.json +++ b/data/json/uncraft/ammo/22.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 1 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 1 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +16,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 2 ] ], [ [ "copper", 1 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 2 ] ], [ [ "copper", 1 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -26,7 +26,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 2 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -36,7 +36,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 2 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "22_casing_new", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/223.json b/data/json/uncraft/ammo/223.json index a1740fb18c3b9..e59ca2db651eb 100644 --- a/data/json/uncraft/ammo/223.json +++ b/data/json/uncraft/ammo/223.json @@ -6,7 +6,13 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 4 ] ], [ [ "copper", 2 ] ] ], + "components": [ + [ [ "lead", 3 ] ], + [ [ "223_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "gunpowder_rifle", 4 ] ], + [ [ "copper", 2 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/270win.json b/data/json/uncraft/ammo/270win.json index b5cbfe387fea7..f204174bca71a 100644 --- a/data/json/uncraft/ammo/270win.json +++ b/data/json/uncraft/ammo/270win.json @@ -10,7 +10,7 @@ [ [ "lead", 5 ] ], [ [ "270win_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 10 ] ], + [ [ "gunpowder_large_rifle", 10 ] ], [ [ "copper", 3 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/30-06.json b/data/json/uncraft/ammo/30-06.json index c86eb571960de..80560f3a1bc8a 100644 --- a/data/json/uncraft/ammo/30-06.json +++ b/data/json/uncraft/ammo/30-06.json @@ -10,7 +10,7 @@ [ [ "lead", 6 ] ], [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 8 ] ], + [ [ "gunpowder_large_rifle", 8 ] ], [ [ "copper", 6 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] @@ -26,7 +26,7 @@ [ [ "incendiary", 6 ] ], [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 8 ] ], + [ [ "gunpowder_large_rifle", 8 ] ], [ [ "copper", 6 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] @@ -42,7 +42,7 @@ [ [ "lead", 6 ] ], [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 8 ] ], + [ [ "gunpowder_large_rifle", 8 ] ], [ [ "copper", 6 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/300.json b/data/json/uncraft/ammo/300.json index 828093538a649..02dbf8bdaf12b 100644 --- a/data/json/uncraft/ammo/300.json +++ b/data/json/uncraft/ammo/300.json @@ -10,7 +10,7 @@ [ [ "lead", 8 ] ], [ [ "300_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 16 ] ], + [ [ "gunpowder_large_rifle", 16 ] ], [ [ "copper", 21 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/300blk.json b/data/json/uncraft/ammo/300blk.json index f9a7536fe8ce1..09105b3fdb007 100644 --- a/data/json/uncraft/ammo/300blk.json +++ b/data/json/uncraft/ammo/300blk.json @@ -10,7 +10,7 @@ [ [ "lead", 5 ] ], [ [ "300blk_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder", 4 ] ], + [ [ "gunpowder_rifle", 4 ] ], [ [ "copper", 2 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/308.json b/data/json/uncraft/ammo/308.json index e01067cfe0081..ad96d0863a6ff 100644 --- a/data/json/uncraft/ammo/308.json +++ b/data/json/uncraft/ammo/308.json @@ -10,7 +10,7 @@ [ [ "lead", 6 ] ], [ [ "308_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 10 ] ], + [ [ "gunpowder_large_rifle", 10 ] ], [ [ "copper", 6 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/32.json b/data/json/uncraft/ammo/32.json index 5f3b2d4374940..f615190e387db 100644 --- a/data/json/uncraft/ammo/32.json +++ b/data/json/uncraft/ammo/32.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "32_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "32_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/357mag.json b/data/json/uncraft/ammo/357mag.json index 41d027ea6190a..29c2c95c720a5 100644 --- a/data/json/uncraft/ammo/357mag.json +++ b/data/json/uncraft/ammo/357mag.json @@ -4,7 +4,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +12,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "357mag_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/357sig.json b/data/json/uncraft/ammo/357sig.json index c80a0926a5997..ed1ed2c6f5b60 100644 --- a/data/json/uncraft/ammo/357sig.json +++ b/data/json/uncraft/ammo/357sig.json @@ -4,7 +4,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 2 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +12,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "357sig_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 2 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/38.json b/data/json/uncraft/ammo/38.json index b51fa23972ec7..6e6989f43eba4 100644 --- a/data/json/uncraft/ammo/38.json +++ b/data/json/uncraft/ammo/38.json @@ -4,7 +4,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +12,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 2 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 2 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -20,7 +20,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 3 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/380.json b/data/json/uncraft/ammo/380.json index dc4b9db6bf46f..cbc1e66ab104c 100644 --- a/data/json/uncraft/ammo/380.json +++ b/data/json/uncraft/ammo/380.json @@ -5,7 +5,7 @@ "type": "uncraft", "using": [ [ "ammo_380", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ] + "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 3 ] ] ] }, { "result": "380_FMJ", @@ -13,7 +13,7 @@ "type": "uncraft", "using": [ [ "ammo_380", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ] + "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 3 ] ] ] }, { "result": "380_p", @@ -21,6 +21,6 @@ "type": "uncraft", "using": [ [ "ammo_380", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 4 ] ] ] + "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 4 ] ] ] } ] diff --git a/data/json/uncraft/ammo/38super.json b/data/json/uncraft/ammo/38super.json index 7810c99fca71f..143ef343d3bcd 100644 --- a/data/json/uncraft/ammo/38super.json +++ b/data/json/uncraft/ammo/38super.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "38super_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "38super_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 3 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/40.json b/data/json/uncraft/ammo/40.json index 6c7265ba44957..3134dfbb47d30 100644 --- a/data/json/uncraft/ammo/40.json +++ b/data/json/uncraft/ammo/40.json @@ -4,7 +4,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +12,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/410shot.json b/data/json/uncraft/ammo/410shot.json index f8cd941656d39..ad3f7658a1a18 100644 --- a/data/json/uncraft/ammo/410shot.json +++ b/data/json/uncraft/ammo/410shot.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "410shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder", 5 ] ], [ [ "lead", 5 ] ] ], + "components": [ [ [ "410shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_pistol", 5 ] ], [ [ "lead", 5 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/44.json b/data/json/uncraft/ammo/44.json index e191b9aae3b48..f48d88a6b2819 100644 --- a/data/json/uncraft/ammo/44.json +++ b/data/json/uncraft/ammo/44.json @@ -10,7 +10,7 @@ [ [ "lead", 7 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], - [ [ "gunpowder", 10 ] ], + [ [ "gunpowder_magnum_pistol", 10 ] ], [ [ "copper", 7 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] @@ -22,7 +22,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 10 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 10 ] ] ], + "components": [ [ [ "lead", 10 ] ], [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 10 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/45.json b/data/json/uncraft/ammo/45.json index 3b9fbbde76cac..30350589639e0 100644 --- a/data/json/uncraft/ammo/45.json +++ b/data/json/uncraft/ammo/45.json @@ -4,7 +4,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ], + "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -12,7 +12,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ], + "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -20,7 +20,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ], + "components": [ [ [ "lead", 3 ] ], [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 5 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/454.json b/data/json/uncraft/ammo/454.json index bae0e66db6290..ad1a028d1d749 100644 --- a/data/json/uncraft/ammo/454.json +++ b/data/json/uncraft/ammo/454.json @@ -10,7 +10,7 @@ [ [ "lead", 20 ] ], [ [ "454_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder", 20 ] ], + [ [ "gunpowder_magnum_pistol", 20 ] ], [ [ "copper", 20 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/4570.json b/data/json/uncraft/ammo/4570.json index 87629aa32304e..2239490c0244b 100644 --- a/data/json/uncraft/ammo/4570.json +++ b/data/json/uncraft/ammo/4570.json @@ -9,7 +9,7 @@ [ [ "lead", 5 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 15 ] ] + [ [ "gunpowder_large_rifle", 15 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, @@ -18,7 +18,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "copper", 7 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 17 ] ] ], + "components": [ [ [ "copper", 7 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder_large_rifle", 17 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -26,7 +26,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 9 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 12 ] ] ], + "components": [ [ [ "lead", 9 ] ], [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder_large_rifle", 12 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/45colt.json b/data/json/uncraft/ammo/45colt.json index ca3b831d8adfe..cf84c3b9fb5c1 100644 --- a/data/json/uncraft/ammo/45colt.json +++ b/data/json/uncraft/ammo/45colt.json @@ -4,7 +4,7 @@ "type": "uncraft", "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 5 ] ], [ [ "45colt_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ], + "components": [ [ [ "lead", 5 ] ], [ [ "45colt_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/460.json b/data/json/uncraft/ammo/460.json index c9dac3edbcb7b..1540caa180408 100644 --- a/data/json/uncraft/ammo/460.json +++ b/data/json/uncraft/ammo/460.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 10 ] ] ], + "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 10 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +16,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder", 10 ] ] ], + "components": [ [ [ "lead", 3 ] ], [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "gunpowder_magnum_pistol", 10 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/46mm.json b/data/json/uncraft/ammo/46mm.json index 540d26c2be90d..f3480e4f8a4b1 100644 --- a/data/json/uncraft/ammo/46mm.json +++ b/data/json/uncraft/ammo/46mm.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "46mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "46mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/500.json b/data/json/uncraft/ammo/500.json index b79146ae5ca73..f617c1b13abab 100644 --- a/data/json/uncraft/ammo/500.json +++ b/data/json/uncraft/ammo/500.json @@ -10,7 +10,7 @@ [ [ "lead", 24 ] ], [ [ "500_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], - [ [ "gunpowder", 24 ] ], + [ [ "gunpowder_magnum_pistol", 24 ] ], [ [ "copper", 24 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/50bmg.json b/data/json/uncraft/ammo/50bmg.json index 8a4b0df1185c2..f38632073d9df 100644 --- a/data/json/uncraft/ammo/50bmg.json +++ b/data/json/uncraft/ammo/50bmg.json @@ -11,7 +11,7 @@ [ [ "incendiary", 20 ] ], [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 30 ] ], + [ [ "gunpowder_large_rifle", 30 ] ], [ [ "copper", 6 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] @@ -27,7 +27,7 @@ [ [ "lead", 12 ] ], [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 30 ] ], + [ [ "gunpowder_large_rifle", 30 ] ], [ [ "copper", 6 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] @@ -42,7 +42,7 @@ "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 30 ] ], + [ [ "gunpowder_large_rifle", 30 ] ], [ [ "copper", 6 ] ], [ [ "scrap", 1 ] ] ], diff --git a/data/json/uncraft/ammo/545.json b/data/json/uncraft/ammo/545.json index 4537e16fcb72b..a22ab9ae35683 100644 --- a/data/json/uncraft/ammo/545.json +++ b/data/json/uncraft/ammo/545.json @@ -6,7 +6,13 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 5 ] ], [ [ "copper", 2 ] ] ], + "components": [ + [ [ "lead", 2 ] ], + [ [ "545_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "gunpowder_rifle", 5 ] ], + [ [ "copper", 2 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +22,13 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 5 ] ], [ [ "copper", 3 ] ] ], + "components": [ + [ [ "lead", 3 ] ], + [ [ "545_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "gunpowder_rifle", 5 ] ], + [ [ "copper", 3 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/556.json b/data/json/uncraft/ammo/556.json index 804b80af2f5fd..eabf5c87d2ac9 100644 --- a/data/json/uncraft/ammo/556.json +++ b/data/json/uncraft/ammo/556.json @@ -6,7 +6,13 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "copper", 2 ] ] ], + "components": [ + [ [ "lead", 3 ] ], + [ [ "223_casing", 1 ] ], + [ [ "smrifle_primer", 1 ] ], + [ [ "gunpowder_rifle", 6 ] ], + [ [ "copper", 2 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -21,7 +27,7 @@ [ [ "lead", 3 ] ], [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], - [ [ "gunpowder", 6 ] ], + [ [ "gunpowder_rifle", 6 ] ], [ [ "copper", 2 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/57mm.json b/data/json/uncraft/ammo/57mm.json index 01e20020fd831..ca3e7e99f9292 100644 --- a/data/json/uncraft/ammo/57mm.json +++ b/data/json/uncraft/ammo/57mm.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "57mm_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 4 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "57mm_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder_pistol", 4 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/5x50.json b/data/json/uncraft/ammo/5x50.json index a3666d230316b..8455759437ba7 100644 --- a/data/json/uncraft/ammo/5x50.json +++ b/data/json/uncraft/ammo/5x50.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "5x50_hull", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "5x50_hull", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder_rifle", 3 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +16,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 3 ] ], [ [ "5x50_hull", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ], + "components": [ [ [ "lead", 3 ] ], [ [ "5x50_hull", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "gunpowder_rifle", 3 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/700nx.json b/data/json/uncraft/ammo/700nx.json index 052d144a30b0b..3a5d9fec01c04 100644 --- a/data/json/uncraft/ammo/700nx.json +++ b/data/json/uncraft/ammo/700nx.json @@ -10,7 +10,7 @@ [ [ "lead", 14 ] ], [ [ "700nx_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 38 ] ], + [ [ "gunpowder_large_rifle", 38 ] ], [ [ "copper", 9 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/762x25.json b/data/json/uncraft/ammo/762x25.json index 7bb8b8435bba1..e29c5675386f1 100644 --- a/data/json/uncraft/ammo/762x25.json +++ b/data/json/uncraft/ammo/762x25.json @@ -5,7 +5,7 @@ "type": "uncraft", "using": [ [ "ammo_762_25", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 4 ] ] ] + "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 4 ] ] ] }, { "result": "762_25hot", @@ -13,7 +13,7 @@ "type": "uncraft", "using": [ [ "ammo_762_25", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 5 ] ] ] + "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 5 ] ] ] }, { "result": "762_25typeP", @@ -21,6 +21,6 @@ "type": "uncraft", "using": [ [ "ammo_762_25", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 5 ] ] ] + "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 5 ] ] ] } ] diff --git a/data/json/uncraft/ammo/762x39.json b/data/json/uncraft/ammo/762x39.json index dff9f0b6bb674..a77ec4aa891b1 100644 --- a/data/json/uncraft/ammo/762x39.json +++ b/data/json/uncraft/ammo/762x39.json @@ -6,7 +6,13 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 5 ] ], [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 7 ] ], [ [ "copper", 5 ] ] ], + "components": [ + [ [ "lead", 5 ] ], + [ [ "762_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder_rifle", 7 ] ], + [ [ "copper", 5 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +22,13 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 5 ] ], [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "gunpowder", 8 ] ], [ [ "copper", 5 ] ] ], + "components": [ + [ [ "lead", 5 ] ], + [ [ "762_casing", 1 ] ], + [ [ "lgrifle_primer", 1 ] ], + [ [ "gunpowder_rifle", 8 ] ], + [ [ "copper", 5 ] ] + ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ] diff --git a/data/json/uncraft/ammo/762x51.json b/data/json/uncraft/ammo/762x51.json index ff1acdd9e7b0e..0298b6f588eb0 100644 --- a/data/json/uncraft/ammo/762x51.json +++ b/data/json/uncraft/ammo/762x51.json @@ -10,7 +10,7 @@ [ [ "lead", 6 ] ], [ [ "762_51_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 10 ] ], + [ [ "gunpowder_large_rifle", 10 ] ], [ [ "copper", 6 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] @@ -26,7 +26,7 @@ [ [ "incendiary", 6 ] ], [ [ "762_51_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 10 ] ], + [ [ "gunpowder_large_rifle", 10 ] ], [ [ "copper", 6 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/762x54.json b/data/json/uncraft/ammo/762x54.json index 2a6a899ee8f7e..357ee2d591789 100644 --- a/data/json/uncraft/ammo/762x54.json +++ b/data/json/uncraft/ammo/762x54.json @@ -10,7 +10,7 @@ [ [ "lead", 3 ] ], [ [ "762R_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], - [ [ "gunpowder", 8 ] ], + [ [ "gunpowder_large_rifle", 8 ] ], [ [ "copper", 10 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/9mm.json b/data/json/uncraft/ammo/9mm.json index aca38159006e1..2d300f54c9081 100644 --- a/data/json/uncraft/ammo/9mm.json +++ b/data/json/uncraft/ammo/9mm.json @@ -5,7 +5,7 @@ "type": "uncraft", "using": [ [ "ammo_9mm", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ] + "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 3 ] ] ] }, { "result": "9mmP", @@ -13,7 +13,7 @@ "type": "uncraft", "using": [ [ "ammo_9mm", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 4 ] ] ] + "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 4 ] ] ] }, { "result": "9mmP2", @@ -21,7 +21,7 @@ "type": "uncraft", "using": [ [ "ammo_9mm", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 5 ] ] ] + "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 5 ] ] ] }, { "result": "9mmfmj", @@ -29,6 +29,6 @@ "type": "uncraft", "using": [ [ "ammo_9mm", 1 ] ], "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder", 3 ] ] ] + "components": [ [ [ "lead", 2 ] ], [ [ "gunpowder_pistol", 3 ] ] ] } ] diff --git a/data/json/uncraft/ammo/9x18mm.json b/data/json/uncraft/ammo/9x18mm.json index 870af31ad4661..9b9a144a2c01a 100644 --- a/data/json/uncraft/ammo/9x18mm.json +++ b/data/json/uncraft/ammo/9x18mm.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 3 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 3 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +16,7 @@ "difficulty": 5, "time": "5 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "lead", 2 ] ], [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder", 5 ] ] ], + "components": [ [ [ "lead", 2 ] ], [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "gunpowder_pistol", 5 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -30,7 +30,7 @@ [ [ "lead", 2 ] ], [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], - [ [ "gunpowder", 3 ] ], + [ [ "gunpowder_pistol", 3 ] ], [ [ "copper", 2 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] diff --git a/data/json/uncraft/ammo/shot.json b/data/json/uncraft/ammo/shot.json index 6d4153075aade..e36133224349b 100644 --- a/data/json/uncraft/ammo/shot.json +++ b/data/json/uncraft/ammo/shot.json @@ -6,7 +6,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "lead", 10 ] ] ], + "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 6 ] ], [ [ "lead", 10 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -16,7 +16,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder", 3 ] ], [ [ "rubber_slug", 1 ] ] ], + "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 3 ] ], [ [ "rubber_slug", 1 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -26,7 +26,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder", 3 ] ], [ [ "lead", 10 ] ] ], + "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 3 ] ], [ [ "lead", 10 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -36,7 +36,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder", 3 ] ], [ [ "magnesium", 5 ] ] ], + "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 3 ] ], [ [ "magnesium", 5 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -46,7 +46,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "combatnail", 10 ] ] ], + "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 6 ] ], [ [ "combatnail", 10 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -57,7 +57,7 @@ "time": "50 s", "//": "A little more carefully...", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder", 3 ] ], [ [ "chem_rdx", 1 ] ] ], + "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 3 ] ], [ [ "chem_rdx", 1 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] }, { @@ -67,7 +67,7 @@ "difficulty": 5, "time": "1 s", "qualities": [ { "id": "PULL", "level": 1 } ], - "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder", 6 ] ], [ [ "lead", 20 ] ] ], + "components": [ [ [ "shot_hull", 1 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "gunpowder_shotgun", 6 ] ], [ [ "lead", 20 ] ] ], "flags": [ "UNCRAFT_SINGLE_CHARGE" ] } ]