Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(mods/craftgp): add Luty's book and mainline recipes for the Luty SMGs #4050

Merged
merged 3 commits into from
Jan 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down
3 changes: 3 additions & 0 deletions data/json/itemgroups/books.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
]
},
Expand Down Expand Up @@ -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 }
]
Expand Down Expand Up @@ -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 },
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/science_and_tech.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
[ "pocket_firstaid", 4 ],
[ "pocket_survival", 2 ],
[ "pocket_firearms", 2 ],
[ "manual_luty", 1 ],
[ "SICP", 3 ],
[ "textbook_robots", 1 ],
[ "reference_cooking", 1 ],
Expand Down
18 changes: 18 additions & 0 deletions data/json/items/book/gun.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
]
45 changes: 45 additions & 0 deletions data/json/recipes/weapon/ranged.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ] ]
}
]
42 changes: 0 additions & 42 deletions data/mods/Craft_Gunpowder/cgp_recipes.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading