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

Expand metalworking and other older proficiencies #44446

Merged
merged 15 commits into from
Oct 2, 2020
Prev Previous commit
Next Next commit
linting
I-am-Erk committed Sep 29, 2020
commit ad0e7366b83bcd8b7ba54baba0477e1e219c70a2
2 changes: 1 addition & 1 deletion data/json/recipes/other/materials.json
Original file line number Diff line number Diff line change
@@ -265,7 +265,7 @@
"time": "3 h",
"autolearn": true,
"using": [ [ "blacksmithing_standard", 2 ], [ "steel_tiny", 2 ] ],
"proficiencies": [
"proficiencies": [
{ "proficiency": "prof_metalworking", "required": false, "time_multiplier": 2 },
{ "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 },
{ "proficiency": "prof_toolsmithing", "required": false, "time_multiplier": 2 }
15 changes: 9 additions & 6 deletions data/json/recipes/other/tool.json
Original file line number Diff line number Diff line change
@@ -242,8 +242,12 @@
{ "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
{ "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2 },
{ "proficiency": "prof_bladesmith", "required": false, "time_multiplier": 2 },
{ "proficiency": "prof_toolsmithing", "required": false, "time_multiplier": 1.5,
"learning_time_multiplier": 0.5 },
{
"proficiency": "prof_toolsmithing",
"required": false,
"time_multiplier": 1.5,
"learning_time_multiplier": 0.5
},
{
"proficiency": "prof_plasticworking",
"required": false,
@@ -450,7 +454,8 @@
"proficiencies": [
{ "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 },
{ "proficiency": "prof_blacksmithing", "required": false, "time_multiplier": 2.5 },
{ "proficiency": "prof_plasticworking", "required": false, "time_multiplier": 2.5 } ],
{ "proficiency": "prof_plasticworking", "required": false, "time_multiplier": 2.5 }
],
"qualities": [ { "id": "ANVIL", "level": 3 }, { "id": "HAMMER", "level": 3 }, { "id": "CHISEL", "level": 3 } ],
"tools": [ [ [ "tongs", -1 ] ], [ [ "swage", -1 ] ] ],
"components": [ [ [ "scrap", 2 ] ] ]
@@ -577,9 +582,7 @@
"reversible": true,
"book_learn": [ [ "manual_mechanics", 2 ], [ "manual_fabrication", 3 ], [ "textbook_fabrication", 3 ] ],
"using": [ [ "welding_standard", 5 ] ],
"proficiencies": [
{ "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 }
],
"proficiencies": [ { "proficiency": "prof_metalworking", "required": false, "time_multiplier": 1.5, "fail_multiplier": 5 } ],
"qualities": [ { "id": "SAW_M_FINE", "level": 1 }, { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
"components": [ [ [ "pipe", 4 ] ], [ [ "scrap", 2 ] ] ]
},