From 21fd3d9568a2c39366a0a34556e54ac69c0c867d Mon Sep 17 00:00:00 2001 From: RobbieNeko <30732426+RobbieNeko@users.noreply.github.com> Date: Sat, 6 Jan 2024 23:53:44 -0500 Subject: [PATCH] refactor(mods/craftgp): add Luty's book and mainline Luty SMGs (#4050) * feat: add luty's homemade firearms guide * feat: add luty's guide in itemgroups * refactor(mods/craftgp): mainline luty's SMG recipes Co-authored-by: Zaweri Co-authored-by: Noctifer-de-Mortem --------- Co-authored-by: Zaweri Co-authored-by: Noctifer-de-Mortem --- .../Locations_MapExtras/locations.json | 1 + data/json/itemgroups/books.json | 3 ++ data/json/itemgroups/science_and_tech.json | 1 + data/json/items/book/gun.json | 18 ++++++++ data/json/recipes/weapon/ranged.json | 45 +++++++++++++++++++ data/mods/Craft_Gunpowder/cgp_recipes.json | 42 ----------------- 6 files changed, 68 insertions(+), 42 deletions(-) diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index f176773209af..22bdfa12d004 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -65,6 +65,7 @@ [ "pocket_firstaid", 2 ], [ "pocket_survival", 2 ], [ "pocket_firearms", 2 ], + [ "manual_luty", 1 ], [ "mag_archery", 15 ], [ "manual_archery", 8 ], [ "book_archery", 2 ] diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json index 2d82bfe39d27..684cf7db0b14 100644 --- a/data/json/itemgroups/books.json +++ b/data/json/itemgroups/books.json @@ -25,6 +25,7 @@ { "item": "manual_shotgun", "prob": 30 }, { "item": "manual_smg", "prob": 10 }, { "item": "pocket_firearms", "prob": 100 }, + { "item": "manual_luty", "prob": 45 }, { "item": "recipe_bullets", "prob": 80 } ] }, @@ -90,6 +91,7 @@ { "item": "manual_stabbing", "prob": 40 }, { "item": "manual_swimming", "prob": 30 }, { "item": "manual_traps_mil", "prob": 30 }, + { "item": "manual_luty", "prob": 10 }, { "item": "pocket_firearms", "prob": 10 }, { "item": "textbook_firstaid", "prob": 30 } ] @@ -383,6 +385,7 @@ { "item": "textbook_gaswarfare", "prob": 5 }, { "item": "recipe_bullets", "prob": 8 }, { "item": "pocket_firearms", "prob": 2 }, + { "item": "manual_luty", "prob": 1 }, { "item": "textbook_traps", "prob": 4 }, { "item": "reference_cooking", "prob": 2 }, { "item": "reference_fabrication1", "prob": 6 }, diff --git a/data/json/itemgroups/science_and_tech.json b/data/json/itemgroups/science_and_tech.json index c1a0e2249e5f..f0b32dc190f7 100644 --- a/data/json/itemgroups/science_and_tech.json +++ b/data/json/itemgroups/science_and_tech.json @@ -61,6 +61,7 @@ [ "pocket_firstaid", 4 ], [ "pocket_survival", 2 ], [ "pocket_firearms", 2 ], + [ "manual_luty", 1 ], [ "SICP", 3 ], [ "textbook_robots", 1 ], [ "reference_cooking", 1 ], diff --git a/data/json/items/book/gun.json b/data/json/items/book/gun.json index 1d2a93ac99d7..29420830eef0 100644 --- a/data/json/items/book/gun.json +++ b/data/json/items/book/gun.json @@ -50,5 +50,23 @@ "max_level": 2, "intelligence": 6, "time": "20 m" + }, + { + "id": "manual_luty", + "type": "BOOK", + "name": { "str": "Expedient Homemade Firearms", "str_pl": "copies of Expedient Homemade Firearms" }, + "description": "A manual written by Philip Luty regarding the production of the homemade submachine gun that often is referred to simply as the Luty Submachine Gun. Contains instructions for the original 9x19 model and also for .45 ACP and .40 S&W variations.", + "weight": "230 g", + "volume": "275 ml", + "price": "25 USD", + "price_postapoc": "40 USD", + "material": "paper", + "symbol": "?", + "color": "green", + "skill": "gun", + "max_level": 6, + "intelligence": 8, + "time": "30 m", + "looks_like": "pocket_firearms" } ] diff --git a/data/json/recipes/weapon/ranged.json b/data/json/recipes/weapon/ranged.json index 103afe7a9f08..8ce784f13955 100644 --- a/data/json/recipes/weapon/ranged.json +++ b/data/json/recipes/weapon/ranged.json @@ -1169,5 +1169,50 @@ [ [ "lens", 2 ] ], [ [ "plastic_chunk", 6 ] ] ] + }, + { + "type": "recipe", + "result": "smg_9mm", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "mechanics", + "skills_required": [ "gun", 4 ], + "difficulty": 6, + "time": 36000, + "reversible": true, + "autolearn": true, + "book_learn": [ [ "manual_luty", 4 ] ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "components": [ [ [ "pipe", 2 ] ], [ [ "scrap", 3 ] ], [ [ "spring", 1 ] ], [ [ "2x4", 2 ] ], [ [ "sheet_metal", 1 ] ] ] + }, + { + "type": "recipe", + "result": "smg_40", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "mechanics", + "skills_required": [ "gun", 4 ], + "difficulty": 6, + "time": 36000, + "reversible": true, + "autolearn": true, + "book_learn": [ [ "manual_luty", 4 ] ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "components": [ [ [ "pipe", 2 ] ], [ [ "scrap", 3 ] ], [ [ "spring", 1 ] ], [ [ "2x4", 2 ] ], [ [ "sheet_metal", 1 ] ] ] + }, + { + "type": "recipe", + "result": "smg_45", + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_RANGED", + "skill_used": "mechanics", + "skills_required": [ "gun", 4 ], + "difficulty": 6, + "time": 36000, + "reversible": true, + "autolearn": true, + "book_learn": [ [ "manual_luty", 4 ] ], + "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], + "components": [ [ [ "pipe", 2 ] ], [ [ "scrap", 3 ] ], [ [ "spring", 1 ] ], [ [ "2x4", 2 ] ], [ [ "sheet_metal", 1 ] ] ] } ] diff --git a/data/mods/Craft_Gunpowder/cgp_recipes.json b/data/mods/Craft_Gunpowder/cgp_recipes.json index a7df98c48926..af38ca8d8e2d 100644 --- a/data/mods/Craft_Gunpowder/cgp_recipes.json +++ b/data/mods/Craft_Gunpowder/cgp_recipes.json @@ -27,48 +27,6 @@ [ [ "sheet_metal", 2 ] ] ] }, - { - "type": "recipe", - "result": "smg_9mm", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ "gun", 4 ], - "difficulty": 6, - "time": 36000, - "reversible": true, - "autolearn": true, - "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], - "components": [ [ [ "pipe", 2 ] ], [ [ "scrap", 3 ] ], [ [ "spring", 1 ] ], [ [ "2x4", 2 ] ], [ [ "sheet_metal", 1 ] ] ] - }, - { - "type": "recipe", - "result": "smg_40", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ "gun", 4 ], - "difficulty": 6, - "time": 36000, - "reversible": true, - "autolearn": true, - "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], - "components": [ [ [ "pipe", 2 ] ], [ [ "scrap", 3 ] ], [ [ "spring", 1 ] ], [ [ "2x4", 2 ] ], [ [ "sheet_metal", 1 ] ] ] - }, - { - "type": "recipe", - "result": "smg_45", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_RANGED", - "skill_used": "mechanics", - "skills_required": [ "gun", 4 ], - "difficulty": 6, - "time": 36000, - "reversible": true, - "autolearn": true, - "qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW_FINE", "level": 1 } ], - "components": [ [ [ "pipe", 2 ] ], [ [ "scrap", 3 ] ], [ [ "spring", 1 ] ], [ [ "2x4", 2 ] ], [ [ "sheet_metal", 1 ] ] ] - }, { "type": "recipe", "result": "red_dot_sight",