From 0b010063b837c1013945cb13dfa7137790e66068 Mon Sep 17 00:00:00 2001 From: Zack <89065534+KanterDev@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:11:10 -0400 Subject: [PATCH 01/11] Update recipe_ammo.json --- data/json/recipes/recipe_ammo.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json index 61e821efeacfb..21431b09bf6c1 100644 --- a/data/json/recipes/recipe_ammo.json +++ b/data/json/recipes/recipe_ammo.json @@ -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", @@ -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", From a82fa06a3a3cade25669850b9e43fdddd4e7f713 Mon Sep 17 00:00:00 2001 From: Zack <89065534+KanterDev@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:19:04 -0400 Subject: [PATCH 02/11] Update parts.json --- data/json/recipes/other/parts.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json index ee21aeaaef3a3..d387c3df19aec 100644 --- a/data/json/recipes/other/parts.json +++ b/data/json/recipes/other/parts.json @@ -342,6 +342,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "ugl_buttstock", "category": "CC_WEAPON", + "subcategory": "CC_WEAPON_MODS", "skill_used": "fabrication", "skills_required": [ "launcher", 3 ], "difficulty": 3, From 84d68fb725f41af71ac9e7340fefdfb86cdc57e5 Mon Sep 17 00:00:00 2001 From: Zack <89065534+KanterDev@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:21:02 -0400 Subject: [PATCH 03/11] Update offal_dishes.json --- data/json/recipes/food/offal_dishes.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index 7aad909cba5b7..f5e2e217ca572 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -216,6 +216,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "leverpostej", "category": "CC_FOOD", + "subcategory": "CC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 5, "time": "60 m", From 9d3b916838299b32e7204cc9d4e072a1bf07da25 Mon Sep 17 00:00:00 2001 From: Zack <89065534+KanterDev@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:23:51 -0400 Subject: [PATCH 04/11] Update materials.json --- data/json/recipes/other/materials.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json index a1c121759c723..5bf65015c950b 100644 --- a/data/json/recipes/other/materials.json +++ b/data/json/recipes/other/materials.json @@ -636,6 +636,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "button_wood", "category": "CC_OTHER", + "subcategory": "CC_OTHER_MATERIALS", "skill_used": "fabrication", "skills_required": [ "fabrication", 1 ], "difficulty": 3, @@ -656,6 +657,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "button_plastic", "category": "CC_OTHER", + "subcategory": "CC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 4, "time": "1 h 30 m", @@ -671,6 +673,7 @@ "activity_level": "MODERATE_EXERCISE", "result": "button_steel", "category": "CC_OTHER", + "subcategory": "CC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, "time": "30 m", From ad382a974b6e50328009ad12b1a2870c10f52328 Mon Sep 17 00:00:00 2001 From: Zack <89065534+KanterDev@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:30:46 -0400 Subject: [PATCH 05/11] Update recipe_others.json --- data/json/recipes/recipe_others.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 815754ba311a5..31b84294cd0f1 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -71,6 +71,7 @@ "activity_level": "MODERATE_EXERCISE", "result": "wind_mill", "category": "CC_OTHER", + "subcategory": "CC_OTHER_TOOLS", "skill_used": "fabrication", "skills_required": [ "survival", 4 ], "difficulty": 4, @@ -96,6 +97,7 @@ "activity_level": "MODERATE_EXERCISE", "result": "water_mill", "category": "CC_OTHER", + "subcategory": "CC_OTHER_TOOLS", "skill_used": "fabrication", "skills_required": [ "survival", 4 ], "difficulty": 4, From a7bfbc12972281e175cb36ce0eeefc81d6d3d6bc Mon Sep 17 00:00:00 2001 From: Zack <89065534+KanterDev@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:37:14 -0400 Subject: [PATCH 06/11] Update parts_construction.json --- data/json/recipes/other/parts_construction.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/json/recipes/other/parts_construction.json b/data/json/recipes/other/parts_construction.json index 265a06eb0e262..d2c7789822223 100644 --- a/data/json/recipes/other/parts_construction.json +++ b/data/json/recipes/other/parts_construction.json @@ -20,6 +20,7 @@ "result": "wood_beam", "id_suffix": "from logs", "category": "CC_OTHER", + "subcategory": "CC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 1, "time": "1 h", @@ -36,6 +37,7 @@ "result": "wood_beam", "id_suffix": "with_planer", "category": "CC_OTHER", + "subcategory": "CC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, "time": "10 m", @@ -50,6 +52,7 @@ "result": "wood_panel", "id_suffix": "from wooden beams", "category": "CC_OTHER", + "subcategory": "CC_OTHER_MATERIALS", "skill_used": "fabrication", "time": "2 h", "autolearn": true, @@ -64,6 +67,7 @@ "result": "wood_panel", "id_suffix": "from wooden sheets", "category": "CC_OTHER", + "subcategory": "CC_OTHER_MATERIALS", "skill_used": "fabrication", "time": "10 m", "autolearn": true, @@ -77,6 +81,7 @@ "result": "wood_panel", "id_suffix": "from nailed planks", "category": "CC_OTHER", + "subcategory": "CC_OTHER_MATERIALS", "skill_used": "fabrication", "time": "10 m", "autolearn": true, @@ -90,6 +95,7 @@ "result": "2x4", "id_suffix": "from wooden beams", "category": "CC_OTHER", + "subcategory": "CC_OTHER_MATERIALS", "skill_used": "fabrication", "time": "2 h", "autolearn": true, @@ -104,6 +110,7 @@ "result": "2x4", "id_suffix": "with_power_saw", "category": "CC_OTHER", + "subcategory": "CC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 3, "time": "10 m", From e07ce73e7c7f43ed0ecf28af5662062483ecb738 Mon Sep 17 00:00:00 2001 From: Zack <89065534+KanterDev@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:51:55 -0400 Subject: [PATCH 07/11] Update offal_dishes.json --- data/json/recipes/food/offal_dishes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index f5e2e217ca572..d01a7574ad41f 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -216,7 +216,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "leverpostej", "category": "CC_FOOD", - "subcategory": "CC_FOOD_MEAT", + "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 5, "time": "60 m", From 75edfbac921b3348709b8a609ef7df79151280a4 Mon Sep 17 00:00:00 2001 From: Zack <89065534+KanterDev@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:52:24 -0400 Subject: [PATCH 08/11] Update materials.json --- data/json/recipes/other/materials.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json index 5bf65015c950b..b1c0938562d38 100644 --- a/data/json/recipes/other/materials.json +++ b/data/json/recipes/other/materials.json @@ -636,7 +636,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "button_wood", "category": "CC_OTHER", - "subcategory": "CC_OTHER_MATERIALS", + "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "skills_required": [ "fabrication", 1 ], "difficulty": 3, @@ -657,7 +657,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "button_plastic", "category": "CC_OTHER", - "subcategory": "CC_OTHER_MATERIALS", + "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 4, "time": "1 h 30 m", @@ -673,7 +673,7 @@ "activity_level": "MODERATE_EXERCISE", "result": "button_steel", "category": "CC_OTHER", - "subcategory": "CC_OTHER_MATERIALS", + "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, "time": "30 m", From d6e0a9a3944638e0a8132c4c73b93da05c24ee40 Mon Sep 17 00:00:00 2001 From: Zack <89065534+KanterDev@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:52:54 -0400 Subject: [PATCH 09/11] Update parts.json --- data/json/recipes/other/parts.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/other/parts.json b/data/json/recipes/other/parts.json index d387c3df19aec..2c1580d1aebdb 100644 --- a/data/json/recipes/other/parts.json +++ b/data/json/recipes/other/parts.json @@ -342,7 +342,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "ugl_buttstock", "category": "CC_WEAPON", - "subcategory": "CC_WEAPON_MODS", + "subcategory": "CSC_WEAPON_MODS", "skill_used": "fabrication", "skills_required": [ "launcher", 3 ], "difficulty": 3, From e3a5b63172085bf5428b671f3aa83dd2b33a8606 Mon Sep 17 00:00:00 2001 From: Zack <89065534+KanterDev@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:53:39 -0400 Subject: [PATCH 10/11] Update parts_construction.json --- data/json/recipes/other/parts_construction.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/recipes/other/parts_construction.json b/data/json/recipes/other/parts_construction.json index d2c7789822223..aa3093f8662d5 100644 --- a/data/json/recipes/other/parts_construction.json +++ b/data/json/recipes/other/parts_construction.json @@ -20,7 +20,7 @@ "result": "wood_beam", "id_suffix": "from logs", "category": "CC_OTHER", - "subcategory": "CC_OTHER_MATERIALS", + "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 1, "time": "1 h", @@ -37,7 +37,7 @@ "result": "wood_beam", "id_suffix": "with_planer", "category": "CC_OTHER", - "subcategory": "CC_OTHER_MATERIALS", + "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 2, "time": "10 m", @@ -52,7 +52,7 @@ "result": "wood_panel", "id_suffix": "from wooden beams", "category": "CC_OTHER", - "subcategory": "CC_OTHER_MATERIALS", + "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "time": "2 h", "autolearn": true, @@ -67,7 +67,7 @@ "result": "wood_panel", "id_suffix": "from wooden sheets", "category": "CC_OTHER", - "subcategory": "CC_OTHER_MATERIALS", + "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "time": "10 m", "autolearn": true, @@ -81,7 +81,7 @@ "result": "wood_panel", "id_suffix": "from nailed planks", "category": "CC_OTHER", - "subcategory": "CC_OTHER_MATERIALS", + "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "time": "10 m", "autolearn": true, @@ -95,7 +95,7 @@ "result": "2x4", "id_suffix": "from wooden beams", "category": "CC_OTHER", - "subcategory": "CC_OTHER_MATERIALS", + "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "time": "2 h", "autolearn": true, @@ -110,7 +110,7 @@ "result": "2x4", "id_suffix": "with_power_saw", "category": "CC_OTHER", - "subcategory": "CC_OTHER_MATERIALS", + "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", "difficulty": 3, "time": "10 m", From 017ff6278659cdf6dbf5150ea0656105f663232d Mon Sep 17 00:00:00 2001 From: Zack <89065534+KanterDev@users.noreply.github.com> Date: Wed, 18 Aug 2021 04:54:29 -0400 Subject: [PATCH 11/11] Update recipe_others.json --- data/json/recipes/recipe_others.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 31b84294cd0f1..a2b0a9da450c6 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -71,7 +71,7 @@ "activity_level": "MODERATE_EXERCISE", "result": "wind_mill", "category": "CC_OTHER", - "subcategory": "CC_OTHER_TOOLS", + "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "skills_required": [ "survival", 4 ], "difficulty": 4, @@ -97,7 +97,7 @@ "activity_level": "MODERATE_EXERCISE", "result": "water_mill", "category": "CC_OTHER", - "subcategory": "CC_OTHER_TOOLS", + "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "skills_required": [ "survival", 4 ], "difficulty": 4,