From 31f5650478d28d9a18ae1cb027e773bf53addcf6 Mon Sep 17 00:00:00 2001 From: Termineitor244 Date: Mon, 13 Sep 2021 02:15:03 -0500 Subject: [PATCH 1/5] Carving Practice --- data/json/recipes/practice/fabrication.json | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 data/json/recipes/practice/fabrication.json diff --git a/data/json/recipes/practice/fabrication.json b/data/json/recipes/practice/fabrication.json new file mode 100644 index 0000000000000..bf55108ccff3e --- /dev/null +++ b/data/json/recipes/practice/fabrication.json @@ -0,0 +1,22 @@ +[ + { + "id": "prac_carving", + "type": "practice", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_PRACTICE", + "subcategory": "CSC_PRACTICE_FABRICATION", + "name": "Carving", + "description": "Practice carving different forms and shapes in a piece of wood.", + "skill_used": "fabrication", + "practice_data": { "min_difficulty": 0, "max_difficulty": 1, "skill_limit": 2 }, + "proficiencies": [ { "proficiency": "prof_carving", "fail_multiplier": 1, "time_multiplier": 1 } ], + "time": "1 h", + "qualities": [ { "id": "CUT", "level": 1 } ], + "//": "One could use other wooden items to practice carving, but the stick and plank are the most easily adquired.", + "components": [ + [ [ "stick", 1 ], [ "2x4", 1 ] ] + ], + "byproducts": [ [ "splinter", 5 ] ], + "autolearn": [ [ "fabrication", 0 ] ] + } +] From 795ef0f461e241593cd91e5e2b9354237a4269d7 Mon Sep 17 00:00:00 2001 From: Termineitor244 Date: Mon, 13 Sep 2021 02:57:51 -0500 Subject: [PATCH 2/5] Basic Carpentry practice --- data/json/recipes/practice/fabrication.json | 23 ++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/data/json/recipes/practice/fabrication.json b/data/json/recipes/practice/fabrication.json index bf55108ccff3e..43827a8231741 100644 --- a/data/json/recipes/practice/fabrication.json +++ b/data/json/recipes/practice/fabrication.json @@ -5,7 +5,7 @@ "activity_level": "LIGHT_EXERCISE", "category": "CC_PRACTICE", "subcategory": "CSC_PRACTICE_FABRICATION", - "name": "Carving", + "name": "carving", "description": "Practice carving different forms and shapes in a piece of wood.", "skill_used": "fabrication", "practice_data": { "min_difficulty": 0, "max_difficulty": 1, "skill_limit": 2 }, @@ -18,5 +18,26 @@ ], "byproducts": [ [ "splinter", 5 ] ], "autolearn": [ [ "fabrication", 0 ] ] + }, + { + "id": "prac_carpentry_basic", + "type": "practice", + "activity_level": "LIGHT_EXERCISE", + "category": "CC_PRACTICE", + "subcategory": "CSC_PRACTICE_FABRICATION", + "name": "basic carpentry", + "description": "Practice basic carpentry by cutting, shaping and uniting some planks or sticks with nails.", + "skill_used": "fabrication", + "practice_data": { "min_difficulty": 0, "max_difficulty": 1, "skill_limit": 2 }, + "proficiencies": [ { "proficiency": "prof_carpentry_basic", "fail_multiplier": 1, "time_multiplier": 1 } ], + "time": "1 h", + "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ], + "//": "You destroy the wood with your practice, and most of the nails are now unusable.", + "components": [ + [ [ "stick", 4 ], [ "2x4", 2 ] ], + [ [ "nail", 20 ] ] + ], + "byproducts": [ [ "splinter", 15 ], [ "nail", 5 ] ], + "autolearn": [ [ "fabrication", 0 ] ] } ] From ed4d682d916c287fe2d44f4638c18512846ff50e Mon Sep 17 00:00:00 2001 From: Termineitor244 Date: Mon, 13 Sep 2021 03:21:36 -0500 Subject: [PATCH 3/5] Eliminated nails as byproduct --- data/json/recipes/practice/fabrication.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/recipes/practice/fabrication.json b/data/json/recipes/practice/fabrication.json index 43827a8231741..38ca496b79346 100644 --- a/data/json/recipes/practice/fabrication.json +++ b/data/json/recipes/practice/fabrication.json @@ -32,12 +32,12 @@ "proficiencies": [ { "proficiency": "prof_carpentry_basic", "fail_multiplier": 1, "time_multiplier": 1 } ], "time": "1 h", "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ], - "//": "You destroy the wood with your practice, and most of the nails are now unusable.", + "//": "You destroy the wood with your practice, and the nails are now unusable.", "components": [ [ [ "stick", 4 ], [ "2x4", 2 ] ], [ [ "nail", 20 ] ] ], - "byproducts": [ [ "splinter", 15 ], [ "nail", 5 ] ], + "byproducts": [ [ "splinter", 15 ] ], "autolearn": [ [ "fabrication", 0 ] ] } ] From c028fc357e8edab6c9f03d250c3472e04f62b9f3 Mon Sep 17 00:00:00 2001 From: Termineitor244 Date: Mon, 13 Sep 2021 03:29:18 -0500 Subject: [PATCH 4/5] JSON lint --- data/json/recipes/practice/fabrication.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/data/json/recipes/practice/fabrication.json b/data/json/recipes/practice/fabrication.json index 38ca496b79346..ce64b7ffab85b 100644 --- a/data/json/recipes/practice/fabrication.json +++ b/data/json/recipes/practice/fabrication.json @@ -13,9 +13,7 @@ "time": "1 h", "qualities": [ { "id": "CUT", "level": 1 } ], "//": "One could use other wooden items to practice carving, but the stick and plank are the most easily adquired.", - "components": [ - [ [ "stick", 1 ], [ "2x4", 1 ] ] - ], + "components": [ [ [ "stick", 1 ], [ "2x4", 1 ] ] ], "byproducts": [ [ "splinter", 5 ] ], "autolearn": [ [ "fabrication", 0 ] ] }, @@ -33,10 +31,7 @@ "time": "1 h", "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 1 } ], "//": "You destroy the wood with your practice, and the nails are now unusable.", - "components": [ - [ [ "stick", 4 ], [ "2x4", 2 ] ], - [ [ "nail", 20 ] ] - ], + "components": [ [ [ "stick", 4 ], [ "2x4", 2 ] ], [ [ "nail", 20 ] ] ], "byproducts": [ [ "splinter", 15 ] ], "autolearn": [ [ "fabrication", 0 ] ] } From 90feb9cf16e9b146a4933c02963816108ac7cb93 Mon Sep 17 00:00:00 2001 From: Termineitor244 Date: Mon, 13 Sep 2021 14:12:51 -0500 Subject: [PATCH 5/5] Update fabrication.json --- data/json/recipes/practice/fabrication.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/json/recipes/practice/fabrication.json b/data/json/recipes/practice/fabrication.json index a0c812fabfdc1..4a04b714d75a0 100644 --- a/data/json/recipes/practice/fabrication.json +++ b/data/json/recipes/practice/fabrication.json @@ -59,4 +59,3 @@ "autolearn": [ [ "fabrication", 0 ] ] } ] -