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.

Sign up for GitHub

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

Clean up homemade mags and guns #33376

Merged
merged 13 commits into from
Aug 27, 2019
Merged

Clean up homemade mags and guns #33376

Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e462a5b
hand fit mags
tenmillimaster Aug 20, 2019
79f2e90
omit dup
tenmillimaster Aug 20, 2019
f910f18
hk->H&K
tenmillimaster Aug 20, 2019
2268983
casehead reqs
tenmillimaster Aug 20, 2019
d39067a
mag desc update
tenmillimaster Aug 20, 2019
36ff47d
sheet strippers
tenmillimaster Aug 20, 2019
6bf18db
delete .38 luty
tenmillimaster Aug 20, 2019
542549a
Update data/json/requirements/ammo.json
tenmillimaster Aug 20, 2019
467eb0d
axe 22, nerf 40, 762 and 762r ecipes
tenmillimaster Aug 20, 2019
80b7669
porkchop is bad at this
tenmillimaster Aug 20, 2019
da8634e
Merge branch 'master' into craftmags
tenmillimaster Aug 24, 2019
918c028
accidentally a {
tenmillimaster Aug 24, 2019
93b3814
lint
tenmillimaster Aug 24, 2019
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
51 changes: 47 additions & 4 deletions data/json/recipes/weapon/magazines.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,26 @@
"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 ],
tenmillimaster marked this conversation as resolved.
Show resolved Hide resolved
[ "3006fmj", -1 ],
[ "3006_incendiary", -1 ],
[ "270win_jsp", -1 ],
[ "reloaded_270win_jsp", -1 ],
[ "3006_incendiary", -1 ],
tenmillimaster marked this conversation as resolved.
Show resolved Hide resolved
[ "reloaded_3006", -1 ],
[ "reloaded_3006fmj", -1 ],
[ "reloaded_3006_incendiary", -1 ],
[ "270win_jsp", -1 ],
tenmillimaster marked this conversation as resolved.
Show resolved Hide resolved
[ "reloaded_270win_jsp", -1 ]
tenmillimaster marked this conversation as resolved.
Show resolved Hide resolved
],
[ [ "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 ] ] ]
},
{
Expand All @@ -24,7 +42,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 ] ],
tenmillimaster marked this conversation as resolved.
Show resolved Hide resolved
[ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ]
],
"components": [ [ [ "steel_chunk", 2 ] ] ]
},
{
Expand All @@ -38,7 +59,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 ] ],
tenmillimaster marked this conversation as resolved.
Show resolved Hide resolved
[ [ "small_repairkit", 10 ], [ "large_repairkit", 5 ] ]
],
"components": [ [ [ "steel_chunk", 1 ] ] ]
},
{
Expand All @@ -52,7 +76,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 ] ] ]
},
{
Expand All @@ -79,6 +103,7 @@
"skills_required": [ "gun", 2 ],
"time": "8 m",
"autolearn": true,
"tools": [ [ [ "nail", -1 ], [ "combatnail", -1 ] ] ],
tenmillimaster marked this conversation as resolved.
Show resolved Hide resolved
"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 ] ],
Expand Down Expand Up @@ -111,6 +136,20 @@
"skills_required": [ "gun", 1 ],
"time": "20 m",
"autolearn": true,
"tools": [
[
[ "acr", -1 ],
[ "ar15", -1 ],
[ "h&k416a5", -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 ] ] ]
},
Expand All @@ -136,6 +175,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 ] ] ]
Expand Down Expand Up @@ -163,6 +203,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 ] ] ]
},
Expand All @@ -176,6 +217,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 ] ] ]
},
Expand All @@ -189,6 +231,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 ] ] ]
},
Expand Down