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

Add subcategories to crafting recipes that lack them #50866

Merged
merged 12 commits into from
Aug 18, 2021
Merged

Add subcategories to crafting recipes that lack them #50866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0b01006
Update recipe_ammo.json
KanterDev Aug 18, 2021
a82fa06
Update parts.json
KanterDev Aug 18, 2021
84d68fb
Update offal_dishes.json
KanterDev Aug 18, 2021
9d3b916
Update materials.json
KanterDev Aug 18, 2021
ad382a9
Update recipe_others.json
KanterDev Aug 18, 2021
a7bfbc1
Update parts_construction.json
KanterDev Aug 18, 2021
e07ce73
Update offal_dishes.json
KanterDev Aug 18, 2021
75edfba
Update materials.json
KanterDev Aug 18, 2021
d6e0a9a
Update parts.json
KanterDev Aug 18, 2021
e3a5b63
Update parts_construction.json
KanterDev Aug 18, 2021
017ff62
Update recipe_others.json
KanterDev Aug 18, 2021
88f1065
Merge branch 'CleverRaven:master' into master
KanterDev Aug 18, 2021
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/recipes/food/offal_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,7 @@
"activity_level": "LIGHT_EXERCISE",
"result": "leverpostej",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_MEAT",
"skill_used": "cooking",
"difficulty": 5,
"time": "60 m",
Expand Down
3 changes: 3 additions & 0 deletions data/json/recipes/other/materials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,7 @@
"activity_level": "LIGHT_EXERCISE",
"result": "button_wood",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"skills_required": [ "fabrication", 1 ],
"difficulty": 3,
Expand All @@ -656,6 +657,7 @@
"activity_level": "LIGHT_EXERCISE",
"result": "button_plastic",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"difficulty": 4,
"time": "1 h 30 m",
Expand All @@ -671,6 +673,7 @@
"activity_level": "MODERATE_EXERCISE",
"result": "button_steel",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"difficulty": 2,
"time": "30 m",
Expand Down
1 change: 1 addition & 0 deletions data/json/recipes/other/parts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@
"activity_level": "LIGHT_EXERCISE",
"result": "ugl_buttstock",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_MODS",
"skill_used": "fabrication",
"skills_required": [ "launcher", 3 ],
"difficulty": 3,
Expand Down
7 changes: 7 additions & 0 deletions data/json/recipes/other/parts_construction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"result": "wood_beam",
"id_suffix": "from logs",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"difficulty": 1,
"time": "1 h",
Expand All @@ -36,6 +37,7 @@
"result": "wood_beam",
"id_suffix": "with_planer",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"difficulty": 2,
"time": "10 m",
Expand All @@ -50,6 +52,7 @@
"result": "wood_panel",
"id_suffix": "from wooden beams",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"time": "2 h",
"autolearn": true,
Expand All @@ -64,6 +67,7 @@
"result": "wood_panel",
"id_suffix": "from wooden sheets",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"time": "10 m",
"autolearn": true,
Expand All @@ -77,6 +81,7 @@
"result": "wood_panel",
"id_suffix": "from nailed planks",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"time": "10 m",
"autolearn": true,
Expand All @@ -90,6 +95,7 @@
"result": "2x4",
"id_suffix": "from wooden beams",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"time": "2 h",
"autolearn": true,
Expand All @@ -104,6 +110,7 @@
"result": "2x4",
"id_suffix": "with_power_saw",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "fabrication",
"difficulty": 3,
"time": "10 m",
Expand Down
2 changes: 2 additions & 0 deletions data/json/recipes/recipe_ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,7 @@
"activity_level": "LIGHT_EXERCISE",
"result": "fishspear",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_OTHER",
"skill_used": "fabrication",
"difficulty": 2,
"time": "5 m",
Expand All @@ -529,6 +530,7 @@
"activity_level": "LIGHT_EXERCISE",
"result": "m_fishspear",
"category": "CC_AMMO",
"subcategory": "CSC_AMMO_OTHER",
"skill_used": "fabrication",
"difficulty": 4,
"time": "10 m",
Expand Down
2 changes: 2 additions & 0 deletions data/json/recipes/recipe_others.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
"activity_level": "MODERATE_EXERCISE",
"result": "wind_mill",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "fabrication",
"skills_required": [ "survival", 4 ],
"difficulty": 4,
Expand All @@ -96,6 +97,7 @@
"activity_level": "MODERATE_EXERCISE",
"result": "water_mill",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "fabrication",
"skills_required": [ "survival", 4 ],
"difficulty": 4,
Expand Down