From e462a5b47dda6ccd9859a6a8dc580956dff0a5d4 Mon Sep 17 00:00:00 2001 From: Tonkatsu Date: Mon, 19 Aug 2019 19:28:52 -0500 Subject: [PATCH 01/12] hand fit mags --- data/json/recipes/weapon/magazines.json | 50 +++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index 67a817456b0d0..8f05a10d1c6eb 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -9,6 +9,25 @@ "skills_required": [ "gun", 2 ], "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], + "tools": [ + [ + [ "3006_casing", -1 ], + [ "270win_casing", -1 ], + [ "3006", -1 ], + [ "3006_casing", -1 ], + [ "3006fmj", -1 ], + [ "3006_incendiary", -1 ], + [ "270win_jsp", -1 ], + [ "reloaded_270win_jsp", -1 ], + [ "3006_incendiary", -1 ], + [ "reloaded_3006", -1 ], + [ "reloaded_3006fmj", -1 ], + [ "reloaded_3006_incendiary", -1 ], + [ "270win_jsp", -1 ], + [ "reloaded_270win_jsp", -1 ] + ], + [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] + ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], "components": [ [ [ "steel_chunk", 1 ] ] ] @@ -24,7 +43,10 @@ "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], + "tools": [ + [ [ "762_casing", -1 ], [ "762_m43", -1 ], [ "762_m87", -1 ], [ "reloaded_762_m43", -1 ], [ "reloaded_762_m87", -1 ] ], + [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] + ], "components": [ [ [ "steel_chunk", 2 ] ] ] }, { @@ -38,7 +60,10 @@ "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], + "tools": [ + [ [ "762R_casing", -1 ], [ "762_54R", -1 ], [ "reloaded_762_54R", -1 ] ], + [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] + ], "components": [ [ [ "steel_chunk", 1 ] ] ] }, { @@ -52,7 +77,7 @@ "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], + "tools": [ [ [ "garand", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], "components": [ [ [ "steel_chunk", 1 ] ] ] }, { @@ -79,6 +104,7 @@ "skills_required": [ "gun", 2 ], "time": "8 m", "autolearn": true, + "tools": [ [ [ "nail", -1 ], [ "combatnail", -1 ] ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ], [ "canister_empty", 1 ] ], @@ -111,6 +137,20 @@ "skills_required": [ "gun", 1 ], "time": "20 m", "autolearn": true, + "tools": [ + [ + [ "acr", -1 ], + [ "ar15", -1 ], + [ "hk416a5", -1 ], + [ "m249", -1 ], + [ "m27iar", -1 ], + [ "m4a1", -1 ], + [ "scar_l", -1 ], + [ "sig552", -1 ], + [ "surv_carbine_223", -1 ] + ], + [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] + ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] }, @@ -136,6 +176,7 @@ "difficulty": 2, "skills_required": [ "gun", 1 ], "time": "20 m", + "tools": [ [ [ "smg_22", -1 ] ] ], "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] @@ -163,6 +204,7 @@ "skills_required": [ "gun", 1 ], "time": "20 m", "autolearn": true, + "tools": [ [ [ "smg_40", -1 ] ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] }, @@ -176,6 +218,7 @@ "skills_required": [ "gun", 1 ], "time": "20 m", "autolearn": true, + "tools": [ [ [ "smg_45", -1 ] ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] }, @@ -189,6 +232,7 @@ "skills_required": [ "gun", 1 ], "time": "20 m", "autolearn": true, + "tools": [ [ [ "smg_9mm", -1 ], [ "sten", -1 ] ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] }, From 79f2e909af49f8eea87e38f3f5d3abafb2966862 Mon Sep 17 00:00:00 2001 From: Tonkatsu Date: Mon, 19 Aug 2019 20:03:02 -0500 Subject: [PATCH 02/12] omit dup --- data/json/recipes/weapon/magazines.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index 8f05a10d1c6eb..25f5148a21110 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -29,7 +29,6 @@ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], "components": [ [ [ "steel_chunk", 1 ] ] ] }, { From f910f186787c9ca29eb259ffaa27607d63b6bdfc Mon Sep 17 00:00:00 2001 From: Tonkatsu Date: Mon, 19 Aug 2019 20:05:41 -0500 Subject: [PATCH 03/12] hk->H&K --- data/json/recipes/weapon/magazines.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index 25f5148a21110..2c3276ff67292 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -140,7 +140,7 @@ [ [ "acr", -1 ], [ "ar15", -1 ], - [ "hk416a5", -1 ], + [ "h&k416a5", -1 ], [ "m249", -1 ], [ "m27iar", -1 ], [ "m4a1", -1 ], From 2268983ee00f2ba6fafaf8bd6758fae2616ded79 Mon Sep 17 00:00:00 2001 From: Tonkatsu Date: Mon, 19 Aug 2019 23:21:24 -0500 Subject: [PATCH 04/12] casehead reqs --- data/json/recipes/weapon/magazines.json | 29 ++---- data/json/requirements/ammo.json | 116 ++++++++++++++++++++++++ 2 files changed, 125 insertions(+), 20 deletions(-) diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index 2c3276ff67292..9ace0fcc6925b 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -9,25 +9,8 @@ "skills_required": [ "gun", 2 ], "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], - "tools": [ - [ - [ "3006_casing", -1 ], - [ "270win_casing", -1 ], - [ "3006", -1 ], - [ "3006_casing", -1 ], - [ "3006fmj", -1 ], - [ "3006_incendiary", -1 ], - [ "270win_jsp", -1 ], - [ "reloaded_270win_jsp", -1 ], - [ "3006_incendiary", -1 ], - [ "reloaded_3006", -1 ], - [ "reloaded_3006fmj", -1 ], - [ "reloaded_3006_incendiary", -1 ], - [ "270win_jsp", -1 ], - [ "reloaded_270win_jsp", -1 ] - ], - [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] - ], + "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], + "using": [ [ "3006_casehead", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "steel_chunk", 1 ] ] ] }, @@ -75,6 +58,7 @@ "skills_required": [ "gun", 2 ], "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], + "using": [ [ "3006_casehead", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "garand", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], "components": [ [ [ "steel_chunk", 1 ] ] ] @@ -103,7 +87,7 @@ "skills_required": [ "gun", 2 ], "time": "8 m", "autolearn": true, - "tools": [ [ [ "nail", -1 ], [ "combatnail", -1 ] ] ], + "tools": [ [ [ "nailgun", -1 ], [ "nailrifle", -1 ], [ "coilgun", -1 ] ], [ [ "nail", -1 ], [ "combatnail", -1 ] ] ], "qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ [ [ "can_drink_unsealed", 1 ], [ "can_food_unsealed", 1 ], [ "canister_empty", 1 ] ], @@ -150,6 +134,7 @@ ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], + "using": [ [ "223_casehead", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] }, @@ -176,6 +161,7 @@ "skills_required": [ "gun", 1 ], "time": "20 m", "tools": [ [ [ "smg_22", -1 ] ] ], + "using": [ [ "22_casehead", 1 ] ], "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] @@ -204,6 +190,7 @@ "time": "20 m", "autolearn": true, "tools": [ [ [ "smg_40", -1 ] ] ], + "using": [ [ "40_casehead", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] }, @@ -218,6 +205,7 @@ "time": "20 m", "autolearn": true, "tools": [ [ [ "smg_45", -1 ] ] ], + "using": [ [ "45_casehead", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] }, @@ -232,6 +220,7 @@ "time": "20 m", "autolearn": true, "tools": [ [ [ "smg_9mm", -1 ], [ "sten", -1 ] ] ], + "using": [ [ "9mm_casehead", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] }, diff --git a/data/json/requirements/ammo.json b/data/json/requirements/ammo.json index 3bf204ee72674..ba83cccaed36c 100644 --- a/data/json/requirements/ammo.json +++ b/data/json/requirements/ammo.json @@ -63,5 +63,121 @@ "type": "requirement", "//": "Components required for .270 Winchester ammo", "components": [ [ [ "270win_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ] ] + }, + { + "id": "22_casehead", + "type": "requirement", + "//": "References needed for boltfaces and magazines using .22 lr or derivatives", + "tools": [ + [ + [ "22_casing", -1 ], + [ "22_casing_new", -1 ], + [ "22_fmj", -1 ], + [ "22_lr", -1 ], + [ "22_cb", -1 ], + [ "22_ratshot", -1 ], + [ "reloaded_22_lr", -1 ], + [ "reloaded_22_fmj", -1 ] + ] + ] + }, + { + "id": "223_casehead", + "type": "requirement", + "//": "References needed for boltfaces and magazines using .223 or derivatives", + "tools": [ + [ + [ "300blk_casing", -1 ], + [ "223_casing", -1 ], + [ "223", -1 ], + [ "556", -1 ], + [ "556_incendiary", -1 ], + [ "reloaded_223", -1 ], + [ "reloaded_556", -1 ], + [ "reloaded_556_incendiary", -1 ], + [ "300blk", -1 ], + [ "300blk_ss", -1 ], + [ "reloaded_300blk", -1 ] + ] + ] + }, + { + "id": "9mm_casehead", + "type": "requirement", + "//": "References needed for boltfaces and magazines using .30-06 or derivatives", + "tools": [ + [ + [ "9mm_casing", -1 ], + [ "9mm", -1 ], + [ "9mmfmj", -1 ], + [ "9mmP", -1 ], + [ "9mmP2", -1 ], + [ "bp_9mm", -1 ], + [ "bp_9mmfmj", -1 ], + [ "reloaded_9mm", -1 ], + [ "reloaded_9mmfmj", -1 ], + [ "reloaded_9mmP", -1 ], + [ "reloaded_9mmP2", -1 ] + ] + ] + }, + { + "id": "40_casehead", + "type": "requirement", + "//": "References needed for boltfaces and magazines using .40sw or derivatives", + "tools": [ + [ + [ "357sig_casing", -1 ], + [ "40_casing", -1 ], + [ "40fmj", -1 ], + [ "40sw", -1 ], + [ "reloaded_40fmj", -1 ], + [ "reloaded_40sw", -1 ], + [ "357sig_fmj", -1 ], + [ "357sig_jhp", -1 ], + [ "reloaded_357sig_fmj", -1 ], + [ "reloaded_357sig_jhp", -1 ] + ] + ] + }, + { + "id": "45_casehead", + "type": "requirement", + "//": "References needed for boltfaces and magazines using .45acp or derivatives", + "tools": [ + [ + [ "45_casing", -1 ], + [ "460_casing", -1 ], + [ "460_fmj", -1 ], + [ "460_rowland", -1 ], + [ "reloaded_460_fmj", -1 ], + [ "reloaded_460_rowland", -1 ], + [ "45_acp", -1 ], + [ "45_jhp", -1 ], + [ "45_super", -1 ], + [ "reloaded_45_acp", -1 ], + [ "reloaded_45_jhp", -1 ], + [ "reloaded_45_super", -1 ] + ] + ] + }, + { + "id": "3006_casehead", + "type": "requirement", + "//": "References needed for boltfaces and magazines using .30-06 or derivatives", + "tools": [ + [ + [ "3006_casing", -1 ], + [ "3006", -1 ], + [ "3006fmj", -1 ], + [ "3006_incendiary", -1 ], + [ "reloaded_3006", -1 ], + [ "reloaded_3006fmj", -1 ], + [ "reloaded_3006_incendiary", -1 ], + [ "270win_casing", -1 ], + [ "270win_jsp", -1 ], + [ "reloaded_270win_jsp", -1 ] + ] + ] } ] From d39067a2f0207ba66d39932410a1adbcae77d857 Mon Sep 17 00:00:00 2001 From: Tonkatsu Date: Tue, 20 Aug 2019 00:57:07 -0500 Subject: [PATCH 05/12] mag desc update --- data/json/items/magazine/22.json | 8 ++++---- data/json/items/magazine/40.json | 2 +- data/json/items/magazine/45.json | 2 +- data/json/items/magazine/9mm.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index 20b09ad47ef72..a90771f4340a0 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -132,16 +132,16 @@ { "id": "smg_22_mag", "type": "MAGAZINE", - "name": "makeshift .22 30-round magazine", - "description": "A makeshift 30-round single-column steel magazine which fits Ruger 10/22 rifle, but may fit some makeshift magazine-fed weapons as well. Don't expect much reliability.", + "name": "makeshift .22LR 15-round magazine", + "description": "An improvised magazine that is mostly compatible with a homemade 'Luty' submachinegun, with a simplified feed system. It looks like it might feed 15 rounds of .22LR.", "weight": 300, "volume": 3, - "price": 4000, + "price": 200, "material": "steel", "symbol": "#", "color": "light_gray", "ammo_type": "22", - "capacity": 30, + "capacity": 15, "reliability": 1, "reload_time": 160, "flags": [ "MAG_COMPACT" ] diff --git a/data/json/items/magazine/40.json b/data/json/items/magazine/40.json index 54da521a95a47..5e938b2239eb8 100644 --- a/data/json/items/magazine/40.json +++ b/data/json/items/magazine/40.json @@ -67,7 +67,7 @@ "id": "smg_40_mag", "type": "MAGAZINE", "name": "makeshift .40 20-round magazine", - "description": "A makeshift 20-round single-column steel magazine which fits Glock 22 pistol, but may fit some makeshift magazine-fed firearms as well. Don't expect much reliability.", + "description": "An improvised magazine that is mostly compatible with a homemade 'Luty' submachinegun, with a simplified feed system. It looks like it might feed 20 rounds of .40S&W.", "weight": 300, "volume": 3, "price": 4000, diff --git a/data/json/items/magazine/45.json b/data/json/items/magazine/45.json index 1e0058426bf5d..d0d1a2093004f 100644 --- a/data/json/items/magazine/45.json +++ b/data/json/items/magazine/45.json @@ -51,7 +51,7 @@ "id": "smg_45_mag", "type": "MAGAZINE", "name": "makeshift .45 20-round magazine", - "description": "A makeshift 20-round single-column steel magazine which fits MAC-10, but may fit some makeshift magazine-fed firearms as well. Don't expect much reliability.", + "description": "An improvised magazine that is mostly compatible with a homemade 'Luty' submachinegun, with a simplified feed system. It looks like it might feed 20 rounds of .45 ACP.", "weight": 300, "volume": 3, "price": 4000, diff --git a/data/json/items/magazine/9mm.json b/data/json/items/magazine/9mm.json index d2a54476fdb59..58c58c26c0f4e 100644 --- a/data/json/items/magazine/9mm.json +++ b/data/json/items/magazine/9mm.json @@ -231,7 +231,7 @@ "id": "survivor9mm_mag", "type": "MAGAZINE", "name": "makeshift STEN magazine", - "description": "An improvised magazine designed to be compatible with the STEN submachine gun, with a simplified feed system.", + "description": "An improvised magazine that is mostly compatible with the STEN submachine gun, with a simplified feed system.", "weight": 300, "volume": 2, "price": 4000, From 36ff47d652c24c17353bb54eb05f9211ad8fb0b5 Mon Sep 17 00:00:00 2001 From: Tonkatsu Date: Tue, 20 Aug 2019 01:00:33 -0500 Subject: [PATCH 06/12] sheet strippers --- data/json/recipes/weapon/magazines.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index 9ace0fcc6925b..d6dd361e4e749 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -12,7 +12,7 @@ "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], "using": [ [ "3006_casehead", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "components": [ [ [ "steel_chunk", 1 ] ] ] + "components": [ [ [ "sheet_metal_small", 1 ] ] ] }, { "result": "762x39_clip", @@ -29,7 +29,7 @@ [ [ "762_casing", -1 ], [ "762_m43", -1 ], [ "762_m87", -1 ], [ "reloaded_762_m43", -1 ], [ "reloaded_762_m87", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], - "components": [ [ [ "steel_chunk", 2 ] ] ] + "components": [ [ [ "sheet_metal_small", 1 ] ] ] }, { "result": "762R_clip", @@ -46,7 +46,7 @@ [ [ "762R_casing", -1 ], [ "762_54R", -1 ], [ "reloaded_762_54R", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], - "components": [ [ [ "steel_chunk", 1 ] ] ] + "components": [ [ [ "sheet_metal_small", 1 ] ] ] }, { "result": "garandclip", @@ -61,7 +61,7 @@ "using": [ [ "3006_casehead", 1 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], "tools": [ [ [ "garand", -1 ] ], [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], - "components": [ [ [ "steel_chunk", 1 ] ] ] + "components": [ [ [ "sheet_metal_small", 1 ] ] ] }, { "result": "marlin_tubeloader", From 6bf18db857c8b2474b2cdebabde12cfeebcf9c12 Mon Sep 17 00:00:00 2001 From: Tonkatsu Date: Tue, 20 Aug 2019 01:23:27 -0500 Subject: [PATCH 07/12] delete .38 luty --- data/json/itemgroups/guns.json | 2 +- data/json/itemgroups/magazines.json | 2 +- data/json/items/gun/38.json | 37 ------------------------- data/json/items/magazine/38.json | 17 ------------ data/json/items/migration.json | 10 +++++++ data/json/recipes/weapon/magazines.json | 13 --------- 6 files changed, 12 insertions(+), 69 deletions(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index e22a64bbcc885..dcd4a5535e5ac 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -140,7 +140,7 @@ "type": "item_group", "id": "guns_smg_improvised", "//": "Makeshift or otherwise poor quality SMGs.", - "items": [ [ "smg_22", 50 ], [ "smg_38", 30 ], [ "smg_40", 40 ], [ "smg_45", 40 ], [ "smg_9mm", 100 ] ] + "items": [ [ "smg_22", 50 ], [ "smg_40", 40 ], [ "smg_45", 40 ], [ "smg_9mm", 100 ] ] }, { "type": "item_group", diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json index ca5e0e732ba42..068b29a05af09 100644 --- a/data/json/itemgroups/magazines.json +++ b/data/json/itemgroups/magazines.json @@ -171,7 +171,7 @@ "type": "item_group", "id": "mags_smg_makeshift", "//": "Makeshift or otherwise poor quality SMG magazines.", - "items": [ [ "survivor9mm_mag", 50 ], [ "smg_22_mag", 20 ], [ "smg_38_mag", 15 ], [ "smg_40_mag", 15 ], [ "smg_45_mag", 20 ] ] + "items": [ [ "survivor9mm_mag", 50 ], [ "smg_22_mag", 20 ], [ "smg_40_mag", 15 ], [ "smg_45_mag", 20 ] ] }, { "type": "item_group", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index f6941a2dd3903..45d2a6db41512 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -129,43 +129,6 @@ [ "underbarrel", 1 ] ] }, - { - "id": "smg_38", - "copy-from": "smg_base", - "type": "GUN", - "name": "Luty SMG: .38 Special", - "name_plural": "Luty SMGs: .38 Special", - "description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using some of the more advanced powered hand tools; likely one of the most complex guns that are feasible to make outside of a machine shop, but still very unreliable. This one is chambered for .38 Special cartridges and accepts Taurus Pro .38 pistol magazines, or alternatively custom-made makeshift ones.", - "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game.", - "weight": 3274, - "volume": 7, - "price": 20000, - "to_hit": -1, - "bashing": 10, - "material": "steel", - "color": "dark_gray", - "ammo": "38", - "ranged_damage": -3, - "dispersion": 590, - "durability": 4, - "modes": [ [ "DEFAULT", "auto", 10 ] ], - "loudness": 25, - "barrel_length": 1, - "valid_mod_locations": [ - [ "accessories", 3 ], - [ "barrel", 1 ], - [ "brass catcher", 1 ], - [ "grip", 1 ], - [ "magazine", 1 ], - [ "muzzle", 1 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "underbarrel", 1 ] - ], - "magazines": [ [ "38", [ "taurus38mag", "smg_38_mag" ] ] ] - }, { "id": "sw_619", "copy-from": "pistol_revolver", diff --git a/data/json/items/magazine/38.json b/data/json/items/magazine/38.json index 0141286f59c1a..74c8149ab1949 100644 --- a/data/json/items/magazine/38.json +++ b/data/json/items/magazine/38.json @@ -1,21 +1,4 @@ [ - { - "id": "smg_38_mag", - "type": "MAGAZINE", - "name": "makeshift .38 25-round magazine", - "description": "A makeshift 25-round single-column steel magazine which fits Taurus Pro .38 pistol, but may fit some makeshift magazine-fed firearms as well. Don't expect much reliability.", - "weight": 300, - "volume": 3, - "price": 4000, - "material": "steel", - "symbol": "#", - "color": "light_gray", - "ammo_type": "38", - "capacity": 25, - "reliability": 1, - "reload_time": 160, - "flags": [ "MAG_COMPACT" ] - }, { "id": "taurus38mag", "type": "MAGAZINE", diff --git a/data/json/items/migration.json b/data/json/items/migration.json index 4c346b5f05031..810eab538f615 100644 --- a/data/json/items/migration.json +++ b/data/json/items/migration.json @@ -633,5 +633,15 @@ "id": "reloaded_270", "type": "MIGRATION", "replace": "reloaded_270win_jsp" + }, + { + "id": "smg_38", + "type": "MIGRATION", + "replace": "smg_22" + }, + { + "id": "smg_38_mag", + "type": "MIGRATION", + "replace": "smg_22_mag" } ] diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index d6dd361e4e749..0f5b4b77010c2 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -166,19 +166,6 @@ "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] }, - { - "result": "smg_38_mag", - "type": "recipe", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_MAGAZINES", - "skill_used": "fabrication", - "difficulty": 2, - "skills_required": [ "gun", 1 ], - "time": "20 m", - "autolearn": true, - "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], - "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] - }, { "result": "smg_40_mag", "type": "recipe", From 542549a1fc24222fe1a9baab1620500886f21fe0 Mon Sep 17 00:00:00 2001 From: Tonkatsu Date: Tue, 20 Aug 2019 08:04:55 -0500 Subject: [PATCH 08/12] Update data/json/requirements/ammo.json Co-Authored-By: Rail-Runner --- data/json/requirements/ammo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/requirements/ammo.json b/data/json/requirements/ammo.json index ba83cccaed36c..3122389bafcb3 100644 --- a/data/json/requirements/ammo.json +++ b/data/json/requirements/ammo.json @@ -104,7 +104,7 @@ { "id": "9mm_casehead", "type": "requirement", - "//": "References needed for boltfaces and magazines using .30-06 or derivatives", + "//": "References needed for boltfaces and magazines using 9mm or derivatives", "tools": [ [ [ "9mm_casing", -1 ], From 467eb0d8d7b6c95168c9f34dd12ae299040201cf Mon Sep 17 00:00:00 2001 From: tenmillimaster Date: Tue, 20 Aug 2019 09:35:00 -0500 Subject: [PATCH 09/12] axe 22, nerf 40, 762 and 762r ecipes --- data/json/items/gun/22.json | 37 ------------------------- data/json/items/gun/40.json | 4 +-- data/json/items/magazine/22.json | 17 ------------ data/json/items/migration.json | 14 ++++++++-- data/json/recipes/weapon/magazines.json | 12 +++----- data/json/requirements/ammo.json | 14 ++++++++++ 6 files changed, 32 insertions(+), 66 deletions(-) diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 55b3100247d05..f44fcaef01b81 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -261,43 +261,6 @@ "magazine_well": 1, "magazines": [ [ "22", [ "mosquitomag" ] ] ] }, - { - "id": "smg_22", - "copy-from": "smg_base", - "type": "GUN", - "name": "Luty SMG: .22", - "name_plural": "Luty SMGs: .22", - "description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using some of the more advanced powered hand tools; likely one of the most complex guns that are feasible to make outside of a machine shop, but still very unreliable. This one is chambered for .22 LR cartridges and accepts Ruger 10/22 magazines, or alternatively custom-made makeshift ones.", - "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game.", - "weight": 3274, - "volume": 7, - "price": 20000, - "to_hit": -1, - "bashing": 10, - "material": "steel", - "color": "dark_gray", - "ammo": "22", - "ranged_damage": -2, - "dispersion": 590, - "durability": 4, - "modes": [ [ "DEFAULT", "auto", 10 ] ], - "loudness": 25, - "barrel_length": 1, - "valid_mod_locations": [ - [ "accessories", 3 ], - [ "barrel", 1 ], - [ "brass catcher", 1 ], - [ "grip", 1 ], - [ "magazine", 1 ], - [ "muzzle", 1 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "underbarrel", 1 ] - ], - "magazines": [ [ "22", [ "ruger1022mag", "ruger1022bigmag", "smg_22_mag" ] ] ] - }, { "id": "sw_22", "copy-from": "pistol_base", diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json index a865b62b0a898..5d9286f2ea49b 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -112,7 +112,7 @@ "name": "Luty SMG: .40 S&W", "name_plural": "Luty SMGs: .40 S&W", "description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using some of the more advanced powered hand tools; likely one of the most complex guns that are feasible to make outside of a machine shop, but still very unreliable. This one is chambered for .40 S&W cartridges and accepts Glock 22 magazines, or alternatively custom-made makeshift ones.", - "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game.", + "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game. No factory mags until UMP40, mp5/40, or other straight .40 mags are implemented.", "weight": 3274, "volume": 7, "price": 20000, @@ -140,7 +140,7 @@ [ "stock", 1 ], [ "underbarrel", 1 ] ], - "magazines": [ [ "40", [ "glock40mag", "glock40bigmag", "smg_40_mag" ] ] ] + "magazines": [ [ "40", [ "smg_40_mag" ] ] ] }, { "id": "surv_six_shooter", diff --git a/data/json/items/magazine/22.json b/data/json/items/magazine/22.json index a90771f4340a0..15aaa02d8b8a1 100644 --- a/data/json/items/magazine/22.json +++ b/data/json/items/magazine/22.json @@ -129,23 +129,6 @@ "reload_time": 160, "flags": [ "MAG_COMPACT" ] }, - { - "id": "smg_22_mag", - "type": "MAGAZINE", - "name": "makeshift .22LR 15-round magazine", - "description": "An improvised magazine that is mostly compatible with a homemade 'Luty' submachinegun, with a simplified feed system. It looks like it might feed 15 rounds of .22LR.", - "weight": 300, - "volume": 3, - "price": 200, - "material": "steel", - "symbol": "#", - "color": "light_gray", - "ammo_type": "22", - "capacity": 15, - "reliability": 1, - "reload_time": 160, - "flags": [ "MAG_COMPACT" ] - }, { "id": "sw22mag", "type": "MAGAZINE", diff --git a/data/json/items/migration.json b/data/json/items/migration.json index 810eab538f615..894b7c9e6fea2 100644 --- a/data/json/items/migration.json +++ b/data/json/items/migration.json @@ -637,11 +637,21 @@ { "id": "smg_38", "type": "MIGRATION", - "replace": "smg_22" + "replace": "smg_45" }, { "id": "smg_38_mag", "type": "MIGRATION", - "replace": "smg_22_mag" + "replace": "smg_45_mag" + }, + { + "id": "smg_22", + "type": "MIGRATION", + "replace": "smg_9" + }, + { + "id": "smg_22_mag", + "type": "MIGRATION", + "replace": "survivor9mm_mag" } ] diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index 0f5b4b77010c2..5165c0f907436 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -25,10 +25,8 @@ "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "tools": [ - [ [ "762_casing", -1 ], [ "762_m43", -1 ], [ "762_m87", -1 ], [ "reloaded_762_m43", -1 ], [ "reloaded_762_m87", -1 ] ], - [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] - ], + "using": [ [ "762_casehead", 1 ] ], + "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], "components": [ [ [ "sheet_metal_small", 1 ] ] ] }, { @@ -42,10 +40,8 @@ "time": "20 m", "book_learn": [ [ "recipe_bullets", 2 ], [ "mag_rifle", 3 ] ], "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 } ], - "tools": [ - [ [ "762R_casing", -1 ], [ "762_54R", -1 ], [ "reloaded_762_54R", -1 ] ], - [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] - ], + "using": [ [ "762R_casehead", 1 ] ], + "tools": [ [ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ] ], "components": [ [ [ "sheet_metal_small", 1 ] ] ] }, { diff --git a/data/json/requirements/ammo.json b/data/json/requirements/ammo.json index 3122389bafcb3..d261be288f098 100644 --- a/data/json/requirements/ammo.json +++ b/data/json/requirements/ammo.json @@ -179,5 +179,19 @@ [ "reloaded_270win_jsp", -1 ] ] ] + }, + { + "id": "762_casehead", + "type": "requirement", + "//": "References needed for boltfaces and magazines using 7.62x39 or derivatives", + "tools": [ + [ [ "762_casing", -1 ], [ "762_m43", -1 ], [ "762_m87", -1 ], [ "reloaded_762_m43", -1 ], [ "reloaded_762_m87", -1 ] ] + ] + }, + { + "id": "762r_casehead", + "type": "requirement", + "//": "References needed for boltfaces and magazines using 7.62x54R or derivatives", + "tools": [ [ [ "762R_casing", -1 ], [ "762_54R", -1 ], [ "reloaded_762_54R", -1 ] ] ] } ] From 80b766986ce4f79c9077320ff67b8a3ab8dea7b6 Mon Sep 17 00:00:00 2001 From: tenmillimaster Date: Tue, 20 Aug 2019 10:41:35 -0500 Subject: [PATCH 10/12] porkchop is bad at this --- data/json/itemgroups/guns.json | 2 +- data/json/itemgroups/magazines.json | 2 +- data/json/items/migration.json | 2 +- data/json/recipes/weapon/magazines.json | 15 --------------- data/json/requirements/ammo.json | 2 +- 5 files changed, 4 insertions(+), 19 deletions(-) diff --git a/data/json/itemgroups/guns.json b/data/json/itemgroups/guns.json index dcd4a5535e5ac..ae8099fda9c93 100644 --- a/data/json/itemgroups/guns.json +++ b/data/json/itemgroups/guns.json @@ -140,7 +140,7 @@ "type": "item_group", "id": "guns_smg_improvised", "//": "Makeshift or otherwise poor quality SMGs.", - "items": [ [ "smg_22", 50 ], [ "smg_40", 40 ], [ "smg_45", 40 ], [ "smg_9mm", 100 ] ] + "items": [ [ "smg_40", 40 ], [ "smg_45", 40 ], [ "smg_9mm", 100 ] ] }, { "type": "item_group", diff --git a/data/json/itemgroups/magazines.json b/data/json/itemgroups/magazines.json index 068b29a05af09..2d81d607127b7 100644 --- a/data/json/itemgroups/magazines.json +++ b/data/json/itemgroups/magazines.json @@ -171,7 +171,7 @@ "type": "item_group", "id": "mags_smg_makeshift", "//": "Makeshift or otherwise poor quality SMG magazines.", - "items": [ [ "survivor9mm_mag", 50 ], [ "smg_22_mag", 20 ], [ "smg_40_mag", 15 ], [ "smg_45_mag", 20 ] ] + "items": [ [ "survivor9mm_mag", 50 ], [ "smg_40_mag", 15 ], [ "smg_45_mag", 20 ] ] }, { "type": "item_group", diff --git a/data/json/items/migration.json b/data/json/items/migration.json index 894b7c9e6fea2..26c5316dbea45 100644 --- a/data/json/items/migration.json +++ b/data/json/items/migration.json @@ -647,7 +647,7 @@ { "id": "smg_22", "type": "MIGRATION", - "replace": "smg_9" + "replace": "smg_9mm" }, { "id": "smg_22_mag", diff --git a/data/json/recipes/weapon/magazines.json b/data/json/recipes/weapon/magazines.json index 5165c0f907436..f3c555ba706f3 100644 --- a/data/json/recipes/weapon/magazines.json +++ b/data/json/recipes/weapon/magazines.json @@ -147,21 +147,6 @@ "using": [ [ "sewing_standard", 40 ] ], "components": [ [ [ "rag", 2 ] ] ] }, - { - "result": "smg_22_mag", - "type": "recipe", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_MAGAZINES", - "skill_used": "fabrication", - "difficulty": 2, - "skills_required": [ "gun", 1 ], - "time": "20 m", - "tools": [ [ [ "smg_22", -1 ] ] ], - "using": [ [ "22_casehead", 1 ] ], - "autolearn": true, - "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], - "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "spring", 1 ] ], [ [ "duct_tape", 40 ] ] ] - }, { "result": "smg_40_mag", "type": "recipe", diff --git a/data/json/requirements/ammo.json b/data/json/requirements/ammo.json index d261be288f098..c543d6745437b 100644 --- a/data/json/requirements/ammo.json +++ b/data/json/requirements/ammo.json @@ -189,7 +189,7 @@ ] }, { - "id": "762r_casehead", + "id": "762R_casehead", "type": "requirement", "//": "References needed for boltfaces and magazines using 7.62x54R or derivatives", "tools": [ [ [ "762R_casing", -1 ], [ "762_54R", -1 ], [ "reloaded_762_54R", -1 ] ] ] From 918c028b74ea0849df16d7b08a84db08110dd4e8 Mon Sep 17 00:00:00 2001 From: Tonkatsu Date: Sat, 24 Aug 2019 06:44:24 -0500 Subject: [PATCH 11/12] accidentally a { --- data/json/items/magazine/38.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/items/magazine/38.json b/data/json/items/magazine/38.json index aef047ce87384..ca7ba0bd1281b 100644 --- a/data/json/items/magazine/38.json +++ b/data/json/items/magazine/38.json @@ -1,4 +1,5 @@ [ + { "id": "taurus38mag", "type": "MAGAZINE", "name": "Taurus .38 magazine", From 93b38141285c103c7192d64dfc35c7fc1ee2490d Mon Sep 17 00:00:00 2001 From: Tonkatsu Date: Sat, 24 Aug 2019 07:46:32 -0500 Subject: [PATCH 12/12] lint --- data/json/requirements/ammo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/requirements/ammo.json b/data/json/requirements/ammo.json index d9e59bf640f88..bfdc52c49ec7c 100644 --- a/data/json/requirements/ammo.json +++ b/data/json/requirements/ammo.json @@ -70,7 +70,7 @@ "//": "Components required for .300 AAC Blackout ammo", "components": [ [ [ "300blk_casing", 1 ] ], [ [ "smrifle_primer", 1 ] ] ] }, -{ + { "id": "22_casehead", "type": "requirement", "//": "References needed for boltfaces and magazines using .22 lr or derivatives",