diff --git a/data/json/items/book/fabrication.json b/data/json/items/book/fabrication.json index 3de5357d9ddac..1854df6c1c4f1 100644 --- a/data/json/items/book/fabrication.json +++ b/data/json/items/book/fabrication.json @@ -155,6 +155,7 @@ "skill": "fabrication", "required_level": 3, "max_level": 6, + "proficiencies": [ { "proficiency": "prof_handloading", "time_factor": 0.8, "fail_factor": 0.5 } ], "intelligence": 9, "time": "30 m" }, diff --git a/data/json/professions.json b/data/json/professions.json index ddc6ec5764117..6f9853a31e3ed 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -136,6 +136,15 @@ { "item": "38_speedloader", "ammo-item": "357mag_fmj", "charges": 7 } ] }, + { + "type": "item_group", + "subtype": "collection", + "id": "m1911_10_magazines_reloaded", + "entries": [ + { "item": "m1911_10mag", "ammo-item": "reloaded_10mm_fmj", "charges": 8 }, + { "item": "m1911_10mag", "ammo-item": "reloaded_10mm_fmj", "charges": 8 } + ] + }, { "type": "item_group", "subtype": "collection", @@ -3912,5 +3921,39 @@ "male": [ "boxer_shorts" ], "female": [ "bra", "panties" ] } + }, + { + "type": "profession", + "id": "handloader", + "name": "Hobby Handloader", + "description": "Out of financial concerns and an appreciation for power, you took up handloading for your mighty handgun. Now that the gunstores are closed, your skills ensure you won't be running out of ammo anytime soon.", + "points": 5, + "proficiencies": [ "prof_handloading" ], + "items": { + "both": { + "items": [ + "pants", + "dress_shirt", + "wristwatch", + "socks", + "boots", + "jacket_light", + "gloves_fingerless", + "press", + "puller", + "slingpack", + "hat_ball" + ], + "entries": [ + { "group": "charged_cell_phone" }, + { "group": "m1911_10_magazines_reloaded" }, + { "item": "ear_plugs", "custom-flags": [ "no_auto_equip" ] }, + { "item": "m1911_10", "ammo-item": "reloaded_10mm_fmj", "charges": 8, "container-item": "holster" } + ] + }, + "male": [ "briefs" ], + "female": [ "bra", "panties" ] + }, + "skills": [ { "level": 3, "name": "fabrication" }, { "level": 3, "name": "gun" }, { "level": 3, "name": "pistol" } ] } ] diff --git a/data/json/proficiencies/misc.json b/data/json/proficiencies/misc.json index ce099486ce465..1db2662f4a661 100644 --- a/data/json/proficiencies/misc.json +++ b/data/json/proficiencies/misc.json @@ -134,5 +134,15 @@ "default_fail_multiplier": 2, "time_to_learn": "10 h", "required_proficiencies": [ "prof_fine_metalsmithing", "prof_redsmithing" ] + }, + { + "type": "proficiency", + "id": "prof_handloading", + "name": { "str": "Handloading" }, + "description": "You know how to accurately measure powder and projectile weights for reloading firearm cartridges.", + "can_learn": true, + "default_time_multiplier": 1.5, + "default_fail_multiplier": 5, + "time_to_learn": "8 h" } ] diff --git a/data/json/recipes/ammo/40x46mm.json b/data/json/recipes/ammo/40x46mm.json index e6ae3fa91ea05..a19c439a1d90d 100644 --- a/data/json/recipes/ammo/40x46mm.json +++ b/data/json/recipes/ammo/40x46mm.json @@ -15,6 +15,7 @@ "reversible": true, "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -40,6 +41,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", @@ -66,6 +68,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", @@ -92,6 +95,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", @@ -120,6 +124,7 @@ "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], @@ -146,6 +151,7 @@ "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "//": "186 mg gunpowder rounded to 2 100 mg 'pieces', same as factory M576 load.", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], @@ -170,6 +176,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -195,6 +202,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -220,6 +228,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -245,6 +254,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -271,6 +281,7 @@ "reversible": true, "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], @@ -296,6 +307,7 @@ "reversible": true, "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], diff --git a/data/json/recipes/ammo/40x53mm.json b/data/json/recipes/ammo/40x53mm.json index 6d3778b2df483..e03a7bc5438e3 100644 --- a/data/json/recipes/ammo/40x53mm.json +++ b/data/json/recipes/ammo/40x53mm.json @@ -14,6 +14,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 12 ], [ "ammo_bullet", 126 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "//": "11.5x the propellant and 11.5x the payload of 12 gauge 00 shot load. 13409 mg gunpowder rounded to 134 100 mg 'pieces'", @@ -40,6 +41,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 115 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "//": "11.5x the propellant and 11.5x the payload of 12 gauge slug load. 19366 mg gunpowder rounded to 194 100 mg 'pieces'", @@ -68,6 +70,7 @@ "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "//": "11.5x the propellant and 11.5x the payload of 12 gauge flechette load. 8625 mg gunpowder rounded to 86 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], @@ -92,6 +95,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 12 ], [ "ammo_bullet", 126 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -117,6 +121,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 115 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -143,6 +148,7 @@ "reversible": true, "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], diff --git a/data/json/recipes/ammo/pistol.json b/data/json/recipes/ammo/pistol.json index 66607ed15581f..6f1669fb514b7 100644 --- a/data/json/recipes/ammo/pistol.json +++ b/data/json/recipes/ammo/pistol.json @@ -14,6 +14,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 3 ] ], [ [ "copper", 1 ] ] ] }, { @@ -31,6 +32,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 3 ] ], [ [ "copper", 1 ] ] ] }, { @@ -48,6 +50,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "chem_black_powder", 3 ] ], [ [ "copper", 1 ] ] ] }, { @@ -65,6 +68,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "chem_black_powder", 6 ] ], [ [ "copper", 1 ] ] ] }, { @@ -82,6 +86,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "32_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "chem_black_powder", 2 ] ], [ [ "copper", 1 ] ] ] }, { @@ -99,6 +104,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "chem_black_powder", 3 ] ], [ [ "copper", 1 ] ] ] }, { @@ -116,6 +122,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "chem_black_powder", 7 ] ], [ [ "copper", 2 ] ] ] }, { @@ -133,6 +140,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "chem_black_powder", 3 ] ], [ [ "copper", 2 ] ] ] }, { @@ -150,6 +158,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "chem_black_powder", 5 ] ], [ [ "copper", 1 ] ] ] }, { @@ -167,6 +176,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "46mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "chem_black_powder", 4 ] ], [ [ "copper", 1 ] ] ] }, { @@ -184,6 +194,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "chem_black_powder", 8 ] ], [ [ "copper", 2 ] ] ] }, { @@ -201,6 +212,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "chem_black_powder", 8 ] ], [ [ "copper", 2 ] ] ] }, { @@ -218,6 +230,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 6 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "500_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 19 ] ], [ [ "copper", 5 ] ] ] }, { @@ -235,6 +248,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_762_25", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 4 ] ], [ [ "copper", 1 ] ] ] }, { @@ -252,6 +266,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "chem_black_powder", 4 ] ], [ [ "copper", 1 ] ] ] }, { @@ -269,6 +284,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "chem_black_powder", 4 ] ], [ [ "copper", 1 ] ] ] }, { @@ -286,6 +302,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 3 ] ], [ [ "copper", 1 ] ] ] }, { @@ -303,6 +320,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 3 ] ], [ [ "copper", 1 ] ] ] }, { @@ -320,6 +338,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 1 ], [ "ammo_57", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 4 ] ], [ [ "copper", 1 ] ] ] }, { @@ -338,6 +357,7 @@ "reversible": true, "using": [ [ "ammo_bullet", 1 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 4 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ] }, { @@ -356,6 +376,7 @@ "reversible": true, "using": [ [ "ammo_bullet", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 4 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ] }, { @@ -374,6 +395,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], "//": "207 mg gunpowder rounded to 2 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "32_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], @@ -397,6 +419,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], "//": "315 mg gunpowder rounded to 3 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], @@ -420,6 +443,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ] ], "//": "315 mg gunpowder rounded to 3 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], @@ -442,6 +466,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 1 ], [ "ammo_38super", 1 ] ], "//": "323 mg gunpowder rounded to 3 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "copper", 1 ] ] ] }, { @@ -460,6 +485,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 7 ], [ "ammo_357sig", 1 ] ], "//": "370 mg gunpowder rounded to 4 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 4 ], [ "gunpowder_rifle", 4 ], [ "gunpowder_magnum_pistol", 4 ] ], [ [ "copper", 1 ] ] ] }, { @@ -478,6 +504,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 8 ], [ "ammo_357sig", 1 ] ], "//": "531 mg gunpowder rounded to 5 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_rifle", 5 ], [ "gunpowder_magnum_pistol", 5 ] ], [ [ "copper", 1 ] ] ] }, { @@ -495,6 +522,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 7 ], [ "ammo_357sig", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 4 ] ], [ [ "copper", 1 ] ] ] }, { @@ -512,6 +540,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 8 ], [ "ammo_357sig", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 5 ] ], [ [ "copper", 1 ] ] ] }, { @@ -530,6 +559,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ], [ "ammo_357mag", 1 ] ], "//": "520 mg gunpowder rounded to 5 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_rifle", 5 ], [ "gunpowder_magnum_pistol", 5 ] ], [ [ "copper", 1 ] ] ] }, { @@ -548,6 +578,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ], [ "ammo_357mag", 1 ] ], "//": "520 mg gunpowder rounded to 5 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_rifle", 5 ], [ "gunpowder_magnum_pistol", 5 ] ], [ [ "copper", 1 ] ] ] }, { @@ -565,6 +596,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ], [ "ammo_357mag", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 5 ] ], [ [ "copper", 1 ] ] ] }, { @@ -582,6 +614,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ], [ "ammo_357mag", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 5 ] ], [ [ "copper", 1 ] ] ] }, { @@ -599,6 +632,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "chem_black_powder", 3 ] ] ] }, { @@ -617,6 +651,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], "//": "453 mg gunpowder rounded to 5 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "38_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], @@ -639,6 +674,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ] ], "//": "320 mg gunpowder rounded to 3 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], @@ -662,6 +698,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ] ], "//": "576 mg gunpowder rounded to 6 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], @@ -685,6 +722,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ], [ "ammo_10mm", 1 ] ], "//": "330 mg gunpowder rounded to 3 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_magnum_pistol", 3 ] ], [ [ "copper", 1 ] ] ] }, { @@ -702,6 +740,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ], [ "ammo_10mm", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 3 ] ], [ [ "copper", 1 ] ] ] }, { @@ -720,6 +759,7 @@ "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], "//": "660 mg gunpowder rounded to 7 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], @@ -743,6 +783,7 @@ "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], "//": "660 mg gunpowder rounded to 7 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], @@ -765,6 +806,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "44_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "chem_black_powder", 7 ] ], [ [ "copper", 2 ] ] ] }, { @@ -783,6 +825,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 4 ] ], "//": "330 mg gunpowder rounded to 3 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], @@ -806,6 +849,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 4 ] ], "//": "466 mg gunpowder rounded to 5 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], @@ -829,6 +873,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 4 ] ], "//": "513 mg gunpowder rounded to 5 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], @@ -852,6 +897,7 @@ "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 6 ] ], "//": "1574 mg gunpowder rounded to 16 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "454_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], @@ -874,6 +920,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 6 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "454_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "chem_black_powder", 16 ] ], [ [ "copper", 2 ] ] ] }, { @@ -892,6 +939,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 5 ], [ "ammo_45colt", 1 ] ], "//": "505 mg gunpowder rounded to 5 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_pistol", 5 ], [ "gunpowder_shotgun", 5 ] ], [ [ "copper", 2 ] ] ] }, { @@ -909,6 +957,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 5 ], [ "ammo_45colt", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 5 ] ], [ [ "copper", 2 ] ] ] }, { @@ -927,6 +976,7 @@ "reversible": true, "//": "Unable to find load data, used 5.7 data as cartridges are similar. 388 mg gunpowder rounded to 4 100 mg 'pieces'", "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "46mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], @@ -950,6 +1000,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], "//": "842 mg gunpowder rounded to 8 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], @@ -973,6 +1024,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 3 ] ], "//": "842 mg gunpowder rounded to 8 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "460_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], @@ -996,6 +1048,7 @@ "reversible": true, "using": [ [ "bullet_forming", 6 ], [ "ammo_bullet", 8 ] ], "//": "1943 mg gunpowder rounded to 19 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "500_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -1019,6 +1072,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 1 ] ], "//": "388 mg gunpowder rounded to 4 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "57mm_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], @@ -1041,6 +1095,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_762_25", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "390 mg gunpowder rounded to 4 100 mg 'pieces'", "components": [ [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ] ], [ [ "copper", 1 ] ] ] }, @@ -1059,6 +1114,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "290 mg gunpowder rounded to 3 100 mg 'pieces'", "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "copper", 1 ] ] ] }, @@ -1077,6 +1133,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "537 mg gunpowder rounded to 5 100 mg 'pieces'", "components": [ [ [ "gunpowder", 5 ], [ "gunpowder_pistol", 5 ] ], [ [ "copper", 1 ] ] ] }, @@ -1095,6 +1152,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "Arbitrary powder amount as +p+ is not a real standard but an informal one which has about 20% higher pressure than standard 9mm, while +p is a standard that has 10% higher pressure. 580 mg gunpowder rounded to 6 100 mg 'pieces'", "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ] ], [ [ "copper", 1 ] ] ] }, @@ -1113,6 +1171,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "290 mg gunpowder rounded to 3 100 mg 'pieces'", "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "copper", 1 ] ] ] }, @@ -1132,6 +1191,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], "//": "401 mg gunpowder rounded to 4 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], @@ -1155,6 +1215,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], "//": "401 mg gunpowder rounded to 4 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], @@ -1177,6 +1238,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "Arbitrary powder amount as +p+ is not a real standard but an informal one which has about 20% higher pressure than standard 9mm, while +p is a standard that has 10% higher pressure. 481 mg gunpowder rounded to 5 100 mg 'pieces'", "components": [ [ [ "9x18mm_casing", 1 ] ], @@ -1200,6 +1262,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "278 mg gunpowder rounded to 3 100 mg 'pieces'", "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "copper", 1 ] ] ] }, @@ -1218,6 +1281,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "320 mg gunpowder rounded to 3 100 mg 'pieces'", "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "copper", 1 ] ] ] }, @@ -1236,6 +1300,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "278 mg gunpowder rounded to 3 100 mg 'pieces'", "components": [ [ [ "gunpowder", 3 ], [ "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 12a35a9055660..1b02e79926de9 100644 --- a/data/json/recipes/ammo/rifle.json +++ b/data/json/recipes/ammo/rifle.json @@ -15,6 +15,7 @@ "reversible": true, "using": [ [ "ammo_bullet", 10 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 30 ] ], [ [ "paper", 1 ] ] ] }, { @@ -33,6 +34,7 @@ "reversible": true, "using": [ [ "ammo_bullet", 10 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 30 ] ], [ [ "paper", 1 ] ] ] }, { @@ -51,6 +53,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 1 ] ], "//": "65 mg gunpowder rounded to 1 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 1 ], [ "gunpowder_pistol", 1 ] ], [ [ "copper", 1 ] ] ] }, { @@ -69,6 +72,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 1 ] ], "//": "65 mg gunpowder rounded to 1 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "22_casing_new", 1 ] ], [ [ "gunpowder", 1 ], [ "gunpowder_pistol", 1 ] ] ] }, { @@ -86,6 +90,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "22_casing_new", 1 ] ], [ [ "chem_black_powder", 1 ] ], [ [ "copper", 1 ] ] ] }, { @@ -103,6 +108,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "22_casing_new", 1 ] ], [ [ "chem_black_powder", 1 ] ] ] }, { @@ -121,6 +127,7 @@ "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 1 ] ], "//": "1500 mg gunpowder rounded to 15 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], @@ -143,6 +150,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "chem_black_powder", 15 ] ], [ [ "copper", 1 ] ] ] }, { @@ -161,6 +169,7 @@ "reversible": true, "using": [ [ "bullet_forming", 8 ], [ "ammo_bullet", 3 ], [ "ammo_270win", 1 ] ], "//": "2974 mg gunpowder rounded to 30 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_magnum_pistol", 30 ], [ "gunpowder_rifle", 30 ] ], [ [ "copper", 1 ] ] ] }, { @@ -178,6 +187,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 8 ], [ "ammo_bullet", 3 ], [ "ammo_270win", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 30 ] ], [ [ "copper", 1 ] ] ] }, { @@ -196,6 +206,7 @@ "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 4 ] ], "//": "4327 mg gunpowder rounded to 43 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "300_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -218,6 +229,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "300_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 43 ] ], [ [ "copper", 2 ] ] ] }, { @@ -236,6 +248,7 @@ "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 3 ] ], "//": "3200 mg gunpowder rounded to 32 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -259,6 +272,7 @@ "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 4 ] ], "//": "3300 mg gunpowder rounded to 33 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -282,6 +296,7 @@ "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 4 ] ], "//": "3300 mg gunpowder rounded to 33 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -310,6 +325,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 32 ] ], [ [ "copper", 2 ] ] ] }, { @@ -327,6 +343,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 33 ] ], [ [ "copper", 2 ] ] ] }, { @@ -344,6 +361,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 12 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "3006_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -368,6 +386,7 @@ "reversible": true, "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ] ], "//": "2800 mg gunpowder rounded to 28 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -395,6 +414,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -418,6 +438,7 @@ "reversible": true, "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 5 ] ], "//": "2844 mg gunpowder rounded to 28 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -442,6 +463,7 @@ "reversible": true, "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 3 ] ], "//": "3000 mg gunpowder rounded to 30 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -465,6 +487,7 @@ "reversible": true, "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], "//": "1944 mg gunpowder rounded to 19 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -487,6 +510,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 15 ], [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "4570_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 19 ] ], [ [ "copper", 3 ] ] ] }, { @@ -503,7 +527,7 @@ "book_learn": [ [ "recipe_caseless", 4 ] ], "charges": 1, "reversible": true, - "proficiencies": [ { "proficiency": "prof_plasticworking" } ], + "proficiencies": [ { "proficiency": "prof_plasticworking" }, { "proficiency": "prof_handloading" } ], "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "plastic_molding", 1 ] ], "//": "3000 mg gunpowder rounded to 30 100 mg 'pieces'", "components": [ @@ -529,6 +553,7 @@ "reversible": true, "using": [ [ "bullet_forming", 18 ], [ "ammo_bullet", 12 ] ], "//": "15800 mg gunpowder rounded to 158 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -551,6 +576,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 18 ], [ "ammo_bullet", 12 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 158 ] ], [ [ "copper", 6 ] ] ] }, { @@ -569,6 +595,7 @@ "reversible": true, "using": [ [ "bullet_forming", 21 ], [ "ammo_bullet", 12 ] ], "//": "15800 mg gunpowder rounded to 158 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -592,6 +619,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 21 ], [ "ammo_bullet", 12 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -616,6 +644,7 @@ "reversible": true, "using": [ [ "bullet_forming", 21 ] ], "//": "15800 mg gunpowder rounded to 158 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -639,6 +668,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 21 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "50_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -663,6 +693,7 @@ "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 1 ] ], "//": "1295 mg gunpowder rounded to 13 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], @@ -685,6 +716,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "chem_black_powder", 13 ] ], [ [ "copper", 1 ] ] ] }, { @@ -703,6 +735,7 @@ "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 1 ] ], "//": "1295 mg gunpowder rounded to 13 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], @@ -725,6 +758,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "545_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], [ [ "chem_black_powder", 13 ] ], [ [ "copper", 1 ] ] ] }, { @@ -742,6 +776,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 3 ], [ "ammo_300blk", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "1133 mg gunpowder rounded to 11 100 mg 'pieces'", "components": [ [ [ "gunpowder", 11 ] ], [ [ "copper", 1 ] ] ] }, @@ -760,6 +795,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 3 ], [ "ammo_300blk", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 11 ] ], [ [ "copper", 1 ] ] ] }, { @@ -778,6 +814,7 @@ "reversible": true, "using": [ [ "bullet_forming", 20 ] ], "//": "1717 mg gunpowder rounded to 17 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], @@ -802,6 +839,7 @@ "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 1 ] ], "//": "1717 mg gunpowder rounded to 17 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], @@ -825,6 +863,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 20 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], @@ -848,6 +887,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "223_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ], @@ -872,6 +912,7 @@ "reversible": true, "using": [ [ "bullet_forming", 20 ], [ "ammo_bullet", 18 ] ], "//": "16523 mg gunpowder rounded to 165 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "700nx_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -894,6 +935,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 20 ], [ "ammo_bullet", 18 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "700nx_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 165 ] ], [ [ "copper", 10 ] ] ] }, { @@ -912,6 +954,7 @@ "reversible": true, "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ] ], "//": "2462 mg gunpowder rounded to 25 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -935,6 +978,7 @@ "reversible": true, "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ] ], "//": "2462 mg gunpowder rounded to 25 100 mg 'pieces'", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -963,6 +1007,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -985,6 +1030,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 9 ], [ "ammo_bullet", 3 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "308_casing", 1 ], [ "762_51_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -1008,6 +1054,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 3 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "2851 mg gunpowder rounded to 29 100 mg 'pieces'", "components": [ [ [ "762R_casing", 1 ] ], @@ -1036,6 +1083,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 3 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "762R_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 29 ] ], [ [ "copper", 2 ] ] ] }, { @@ -1053,6 +1101,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "1535 mg gunpowder rounded to 15 100 mg 'pieces'", "components": [ [ [ "762_casing", 1 ] ], @@ -1077,6 +1126,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], @@ -1100,6 +1150,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 3 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "//": "1535 mg gunpowder rounded to 15 100 mg 'pieces'", "components": [ [ [ "762_casing", 1 ] ], @@ -1123,6 +1174,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 5 ], [ "ammo_bullet", 3 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "762_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ], [ [ "chem_black_powder", 15 ] ], [ [ "copper", 2 ] ] ] } ] diff --git a/data/json/recipes/ammo/shot.json b/data/json/recipes/ammo/shot.json index 7b0f8e87235b2..ca6cdbfdeaf69 100644 --- a/data/json/recipes/ammo/shot.json +++ b/data/json/recipes/ammo/shot.json @@ -15,6 +15,7 @@ "reversible": true, "//": "Assumes standard 9 pellet 00 load. 1166 mg gunpowder rounded to 12 100 mg 'pieces'", "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 11 ], [ "ammo_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "components": [ [ [ "gunpowder", 12 ], [ "gunpowder_pistol", 12 ], [ "gunpowder_shotgun", 12 ] ] ] }, @@ -33,6 +34,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 8 ], [ "ammo_410shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "//": "971 mg gunpowder rounded to 10 100 mg 'pieces'", "components": [ [ [ "gunpowder", 10 ], [ "gunpowder_pistol", 10 ], [ "gunpowder_shotgun", 10 ] ] ] @@ -52,6 +54,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "//": "1490 mg gunpowder rounded to 15 100 mg 'pieces'", "components": [ [ [ "gunpowder", 15 ], [ "gunpowder_pistol", 15 ], [ "gunpowder_shotgun", 15 ] ] ] @@ -70,6 +73,7 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "charges": 1, "using": [ [ "ammo_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "//": "same charge as a 1 oz load, could find no refference to actual loading data. 1490 mg gunpowder rounded to 15 100 mg 'pieces'", "components": [ [ [ "gunpowder", 15 ], [ "gunpowder_pistol", 15 ], [ "gunpowder_shotgun", 15 ] ], [ [ "magnesium", 5 ] ] ] @@ -89,6 +93,7 @@ "charges": 1, "reversible": true, "using": [ [ "ammo_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "//": "Wikipedia states the shells contain 20 7.3 grain flechettes for a 146 grain or 1/3 oz load. http://www.sabotdesigns.com/002.html lists flechette velocity at 1950 fps. Gunpowder charge is calculated as if it was a solid slug for sake of ease. 750 mg gunpowder rounded to 8 100 mg 'pieces", "components": [ [ [ "gunpowder", 8 ], [ "gunpowder_pistol", 8 ], [ "gunpowder_shotgun", 8 ] ], [ [ "combatnail", 10 ] ] ] @@ -109,6 +114,7 @@ "reversible": true, "//": "assumes 1 oz slug. 1684 mg gunpowder rounded to 17 100 mg 'pieces'", "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 17 ], [ "gunpowder_pistol", 17 ], [ "gunpowder_shotgun", 17 ] ] ] }, { @@ -126,6 +132,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 11 ], [ "ammo_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "components": [ [ [ "chem_black_powder", 12 ] ] ] }, @@ -145,6 +152,7 @@ "reversible": true, "//": "assumes 1 oz load", "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "components": [ [ [ "chem_black_powder", 15 ] ] ] }, @@ -163,6 +171,7 @@ "charges": 1, "reversible": true, "using": [ [ "ammo_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "components": [ [ [ "chem_black_powder", 15 ] ], [ [ "magnesium", 5 ] ] ] }, @@ -181,6 +190,7 @@ "charges": 1, "reversible": true, "using": [ [ "ammo_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "components": [ [ [ "chem_black_powder", 8 ] ], [ [ "combatnail", 10 ] ] ] }, @@ -199,6 +209,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 10 ], [ "ammo_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 17 ] ] ] }, { @@ -271,6 +282,7 @@ "using": [ [ "ammo_shot", 2 ] ], "tools": [ [ [ "press", -1 ] ] ], "//": "1166 mg gunpowder rounded to 12 100 mg 'pieces'; recipe makes two shells", + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 23 ], [ "gunpowder_pistol", 23 ], [ "gunpowder_shotgun", 23 ] ], [ @@ -303,6 +315,7 @@ "charges": 2, "reversible": true, "using": [ [ "ammo_shot", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "components": [ [ [ "chem_black_powder", 23 ] ], @@ -362,6 +375,7 @@ "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 2 ], [ "pocket_survival", 2 ], [ "mag_survival", 2 ] ], "charges": 1, "using": [ [ "ammo_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "components": [ [ [ "incendiary", 25 ] ] ] }, @@ -380,6 +394,7 @@ "charges": 1, "reversible": true, "using": [ [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "chem_black_powder", 15 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ] }, @@ -398,6 +413,7 @@ "charges": 1, "reversible": true, "using": [ [ "ammo_bullet", 16 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "chem_black_powder", 15 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ] }, @@ -416,6 +432,7 @@ "charges": 1, "reversible": true, "using": [ [ "ammo_bullet", 16 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "chem_black_powder", 12 ] ], @@ -439,6 +456,7 @@ "charges": 1, "reversible": true, "using": [ [ "ammo_bullet", 8 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "chem_black_powder", 15 ] ], [ [ "shotgun_primer", 1 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ] } diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json index 2e62dea8f6346..d3750c6917f6d 100644 --- a/data/json/recipes/recipe_ammo.json +++ b/data/json/recipes/recipe_ammo.json @@ -556,6 +556,7 @@ "autolearn": true, "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 20 ], [ "chem_black_powder", 20 ] ], [ @@ -584,6 +585,7 @@ "autolearn": true, "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 20 ], [ "chem_black_powder", 20 ] ], [ [ "scrap", 1 ], [ "nail", 8 ], [ "copper", 16 ], [ "lead", 16 ] ], @@ -603,6 +605,7 @@ "autolearn": true, "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SAW_M", "level": 1 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 20 ], [ "chem_black_powder", 20 ] ], [ [ "rebar", 1 ], [ "spear_rebar", 1 ], [ "rebar_rail", 1 ], [ "steel_rail", 1 ], [ "scrap", 1 ] ], @@ -624,6 +627,7 @@ "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "using": [ [ "surface_heat", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 20 ], [ "chem_black_powder", 20 ] ], [ [ "lead", 24 ] ], [ [ "paper", 1 ], [ "aluminum_foil", 1 ] ] ] }, { @@ -639,6 +643,7 @@ "autolearn": true, "book_learn": [ [ "recipe_bullets", 2 ], [ "manual_shotgun", 2 ] ], "qualities": [ { "id": "CUT", "level": 1 } ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 20 ], [ "chem_black_powder", 20 ] ], [ [ "nail", 8 ], [ "combatnail", 8 ] ], diff --git a/data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json b/data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json index 8d0dbedf2d1a9..5099e347436ba 100644 --- a/data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json +++ b/data/mods/Generic_Guns/recipes/recipes_grenade_propelled.json @@ -14,6 +14,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 12 ], [ "req_grenade", -1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -37,6 +38,7 @@ "charges": 1, "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 12 ], [ "req_grenade", -1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ], [ [ "swage", -1 ] ] ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ diff --git a/data/mods/Generic_Guns/recipes/recipes_pistol.json b/data/mods/Generic_Guns/recipes/recipes_pistol.json index 5912d6bf07e73..ba751161e446f 100644 --- a/data/mods/Generic_Guns/recipes/recipes_pistol.json +++ b/data/mods/Generic_Guns/recipes/recipes_pistol.json @@ -14,6 +14,7 @@ "charges": 1, "reversible": true, "using": [ [ "req_pistol_tiny", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ], [ "gunpowder_shotgun", 2 ] ] ] }, { @@ -29,6 +30,7 @@ "activity_level": "fake", "copy-from": "reloaded_tiny_pistol_jhp", "using": [ [ "req_pistol_tiny", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 2 ], [ "gunpowder_pistol", 2 ] ], [ [ "copper", 1 ] ] ] }, { @@ -53,6 +55,7 @@ "charges": 1, "reversible": true, "using": [ [ "req_pistol", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ], [ "gunpowder_shotgun", 4 ] ] ] }, { @@ -68,6 +71,7 @@ "activity_level": "fake", "copy-from": "reloaded_pistol_jhp", "using": [ [ "req_pistol", 1 ], [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ], [ "gunpowder_shotgun", 4 ] ], [ [ "copper", 1 ], [ "pistol_tiny_casing", 1 ] ] @@ -95,6 +99,7 @@ "charges": 1, "reversible": true, "using": [ [ "req_pistol_magnum", 1 ], [ "bullet_forming", 5 ], [ "ammo_bullet", 5 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ] ] }, { @@ -110,6 +115,7 @@ "activity_level": "fake", "copy-from": "reloaded_pistol_magnum_jhp", "using": [ [ "req_pistol_magnum", 1 ], [ "bullet_forming", 5 ], [ "ammo_bullet", 4 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_rifle", 6 ], [ "gunpowder_magnum_pistol", 6 ] ], [ [ "copper", 2 ], [ "pistol_magnum_casing", 1 ] ] diff --git a/data/mods/Generic_Guns/recipes/recipes_rifle.json b/data/mods/Generic_Guns/recipes/recipes_rifle.json index 0a76716d1647a..9cb81f6eee452 100644 --- a/data/mods/Generic_Guns/recipes/recipes_rifle.json +++ b/data/mods/Generic_Guns/recipes/recipes_rifle.json @@ -14,6 +14,7 @@ "charges": 1, "reversible": true, "using": [ [ "ammo_bullet", 10 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "chem_black_powder", 5 ] ], [ [ "paper", 1 ] ] ] }, @@ -32,6 +33,7 @@ "charges": 1, "reversible": true, "using": [ [ "ammo_bullet", 10 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "chem_black_powder", 5 ] ], [ [ "paper", 1 ] ] ] }, @@ -50,6 +52,7 @@ "charges": 1, "reversible": true, "using": [ [ "req_rifle", 1 ], [ "bullet_forming", 9 ], [ "ammo_bullet", 6 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 12 ], [ "gunpowder_magnum_pistol", 12 ], [ "gunpowder_rifle", 12 ], [ "gunpowder_large_rifle", 12 ] ] ] @@ -94,6 +97,7 @@ "charges": 1, "reversible": true, "using": [ [ "req_rifle_huge", 1 ], [ "bullet_forming", 18 ], [ "ammo_bullet", 12 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 30 ], [ "gunpowder_large_rifle", 30 ] ] ] }, { diff --git a/data/mods/Generic_Guns/recipes/recipes_shot.json b/data/mods/Generic_Guns/recipes/recipes_shot.json index a2994f101900e..f5c4724219eaf 100644 --- a/data/mods/Generic_Guns/recipes/recipes_shot.json +++ b/data/mods/Generic_Guns/recipes/recipes_shot.json @@ -14,6 +14,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ] }, @@ -32,6 +33,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press", -1 ] ] ], "components": [ [ [ "chem_black_powder", 6 ] ] ] }, @@ -51,6 +53,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "tools": [ [ [ "press_dowel", -1 ] ] ] }, { @@ -69,6 +72,7 @@ "tools": [ [ [ "press", -1 ] ] ], "book_learn": [ [ "recipe_bullets", 1 ], [ "manual_shotgun", 1 ] ], "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ] ] }, { @@ -85,6 +89,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 3 ] ] ] }, { @@ -103,6 +108,7 @@ "reversible": true, "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], "tools": [ [ [ "press_dowel", -1 ] ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 3 ] ] ] }, { @@ -121,6 +127,7 @@ "tools": [ [ [ "press", -1 ] ] ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "using": [ [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 3 ], [ "gunpowder_pistol", 3 ], [ "gunpowder_shotgun", 3 ] ], [ [ "magnesium", 5 ] ] ] }, { @@ -139,6 +146,7 @@ "tools": [ [ [ "press", -1 ] ] ], "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "using": [ [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 3 ] ], [ [ "magnesium", 5 ] ] ] }, { @@ -156,6 +164,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], "tools": [ [ [ "press_dowel", -1 ] ] ] }, @@ -175,6 +184,7 @@ "difficulty": 3, "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 20 ], [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ] ] }, { @@ -193,6 +203,7 @@ "difficulty": 3, "book_learn": [ [ "recipe_bullets", 3 ], [ "manual_shotgun", 3 ] ], "using": [ [ "bullet_forming", 1 ], [ "ammo_bullet", 20 ], [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 6 ] ] ] }, { @@ -210,6 +221,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], "tools": [ [ [ "press_dowel", -1 ] ] ] }, @@ -229,6 +241,7 @@ "tools": [ [ [ "press", -1 ] ] ], "book_learn": [ [ "recipe_bullets", 4 ], [ "manual_shotgun", 4 ] ], "using": [ [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ], [ [ "combatnail", 10 ] ] ] }, { @@ -247,6 +260,7 @@ "tools": [ [ [ "press", -1 ] ] ], "book_learn": [ [ "recipe_bullets", 4 ], [ "manual_shotgun", 4 ] ], "using": [ [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 6 ] ], [ [ "combatnail", 10 ] ] ] }, { @@ -264,6 +278,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], "tools": [ [ [ "press_dowel", -1 ] ] ] }, @@ -282,6 +297,7 @@ "reversible": true, "tools": [ [ [ "press", -1 ] ] ], "using": [ [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "gunpowder", 6 ], [ "gunpowder_pistol", 6 ], [ "gunpowder_shotgun", 6 ] ], [ @@ -314,6 +330,7 @@ "reversible": true, "tools": [ [ [ "press", -1 ] ] ], "using": [ [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "components": [ [ [ "chem_black_powder", 6 ] ], [ @@ -346,6 +363,7 @@ "charges": 1, "reversible": true, "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 10 ], [ "req_shot", 1 ] ], + "proficiencies": [ { "proficiency": "prof_handloading" } ], "book_learn": [ [ "survival_book", 1 ], [ "mag_survival", 1 ] ], "tools": [ [ [ "press_dowel", -1 ] ] ] }