From f92ee3a54a6dc31a7ef780a8399bc2e559470f7d Mon Sep 17 00:00:00 2001 From: Podesta <11512008+Podesta@users.noreply.github.com> Date: Sat, 27 Jul 2019 15:27:19 -0300 Subject: [PATCH 1/7] Granularize cured plet and hides recipes Also remove human leather from recipes that use it, since humans now give normal raw hide. --- data/json/items/generic.json | 10 +++++----- data/json/recipes/armor/storage.json | 2 +- data/json/recipes/chem/other.json | 2 +- data/json/recipes/recipe_others.json | 14 ++++++++------ 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 1e233a1395891..cd92a5fadba28 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -2237,8 +2237,8 @@ "price": 2000, "material": [ "flesh" ], "flags": [ "NO_SALVAGE" ], - "weight": 600, - "volume": 3, + "weight": 12, + "volume": "15ml", "category": "spare_parts", "to_hit": -1 }, @@ -2268,8 +2268,8 @@ "price": 2000, "material": [ "fur", "flesh" ], "flags": [ "NO_SALVAGE" ], - "weight": 684, - "volume": 4, + "weight": 14, + "volume": "20ml", "category": "spare_parts", "to_hit": -1 }, @@ -2283,7 +2283,7 @@ "description": "A folded sheet of leather made from carefully tanned animal hide, with the fur still intact. Can be cut up or used as is.", "price": 5000, "material": [ "fur" ], - "weight": 684, + "weight": 700, "volume": 6, "category": "spare_parts", "to_hit": -1 diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index 0133b9d1aabf5..0761eade92eb4 100644 --- a/data/json/recipes/armor/storage.json +++ b/data/json/recipes/armor/storage.json @@ -315,7 +315,7 @@ "time": "36 s", "reversible": true, "autolearn": true, - "components": [ [ [ "raw_leather", 50 ], [ "raw_hleather", 50 ], [ "raw_fur", 50 ] ] ], + "components": [ [ [ "raw_leather", 50 ], [ "raw_fur", 50 ] ] ], "flags": [ "BLIND_EASY" ] }, { diff --git a/data/json/recipes/chem/other.json b/data/json/recipes/chem/other.json index 6a0218efe44c8..283e1a569471b 100644 --- a/data/json/recipes/chem/other.json +++ b/data/json/recipes/chem/other.json @@ -33,7 +33,7 @@ [ "bone", 20 ], [ "bone_human", 20 ], [ "bone_tainted", 40 ], - [ "cured_hide", 2 ], + [ "cured_hide", 100 ], [ "pine_bough", 10 ], [ "raw_dandelion", 20 ], [ "biollante_bud", 1 ], diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 2ba0b58a88c67..66f6c5a783c9c 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -3683,6 +3683,7 @@ { "type": "recipe", "result": "cured_hide", + "result_mult": 50, "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", @@ -3693,7 +3694,7 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], - [ [ "raw_leather", 50 ], [ "raw_tainted_leather", 50 ], [ "raw_hleather", 50 ] ] + [ [ "raw_leather", 50 ], [ "raw_tainted_leather", 50 ] ] ] }, { @@ -3704,7 +3705,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", "difficulty": 1, - "time": "20 m", + "time": "20 s", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "cured_pelt", 1 ] ] ] @@ -3732,12 +3733,13 @@ [ [ "tanbark", 1 ], [ "acorns", 2 ], [ "hops", 2 ], [ "pine_bough", 6 ] ], [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], [ [ "tallow", 1 ], [ "tallow_tainted", 1 ], [ "lard", 1 ] ], - [ [ "cured_hide", 1 ] ] + [ [ "cured_hide", 50 ] ] ] }, { "type": "recipe", "result": "cured_pelt", + "result_mult": 50, "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", @@ -3771,7 +3773,7 @@ [ [ "tanbark", 1 ], [ "acorns", 2 ], [ "hops", 2 ], [ "pine_bough", 6 ] ], [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], [ [ "tallow", 1 ], [ "tallow_tainted", 1 ], [ "lard", 1 ] ], - [ [ "cured_pelt", 1 ] ] + [ [ "cured_pelt", 50 ] ] ] }, { @@ -3793,7 +3795,7 @@ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "water_clean", 2 ], [ "water", 2 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "cured_hide", 1 ] ] ] + "components": [ [ [ "water_clean", 2 ], [ "water", 2 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "cured_hide", 50 ] ] ] }, { "type": "recipe", @@ -3814,7 +3816,7 @@ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "water_clean", 2 ], [ "water", 2 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "cured_pelt", 1 ] ] ] + "components": [ [ [ "water_clean", 2 ], [ "water", 2 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "cured_pelt", 50 ] ] ] }, { "type": "recipe", From f9335a31ae5e0fa6b273562bf0f0fc6f47d0c5d2 Mon Sep 17 00:00:00 2001 From: Podesta <11512008+Podesta@users.noreply.github.com> Date: Sat, 27 Jul 2019 19:58:09 +0000 Subject: [PATCH 2/7] Mainline cured hide recipe from MST mod - use fire --- data/json/recipes/recipe_others.json | 30 ++++++++++++++++++++ data/mods/More_Survival_Tools/recipes.json | 32 ---------------------- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 66f6c5a783c9c..d29098fde7898 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -3710,6 +3710,21 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "cured_pelt", 1 ] ] ] }, + { + "type": "recipe", + "result": "cured_hide", + "id_suffix": "drying", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "survival", + "skills_required": [ "cooking", 2 ], + "difficulty": 3, + "time": "40 s", + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "surface_heat", 1, "LIST" ] ] ], + "components": [ [ [ "raw_leather", 1 ], [ "raw_tainted_leather", 1 ] ] ] + }, { "type": "recipe", "result": "tanning_hide", @@ -3750,6 +3765,21 @@ "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], [ [ "raw_fur", 50 ], [ "raw_tainted_fur", 50 ] ] ] }, + { + "type": "recipe", + "result": "cured_pelt", + "id_suffix": "drying", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "survival", + "skills_required": [ "cooking", 2 ], + "difficulty": 3, + "time": "40 s", + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "tools": [ [ [ "surface_heat", 1, "LIST" ] ] ], + "components": [ [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ] ] ] + }, { "type": "recipe", "result": "tanning_pelt", diff --git a/data/mods/More_Survival_Tools/recipes.json b/data/mods/More_Survival_Tools/recipes.json index 045bacb65c9cf..8670c28197860 100644 --- a/data/mods/More_Survival_Tools/recipes.json +++ b/data/mods/More_Survival_Tools/recipes.json @@ -14,38 +14,6 @@ "qualities": [ { "id": "HAMMER", "level": 3 } ], "components": [ [ [ "sharp_rock", 1 ] ] ] }, - { - "type": "recipe", - "result": "cured_hide", - "id_suffix": "drying", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "survival", - "skills_required": [ "cooking", 2 ], - "difficulty": 3, - "time": 56000, - "autolearn": true, - "batch_time_factors": [ 83, 5 ], - "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "raw_leather", 50 ], [ "raw_tainted_leather", 50 ], [ "raw_hleather", 50 ] ] ] - }, - { - "type": "recipe", - "result": "cured_pelt", - "id_suffix": "drying", - "category": "CC_OTHER", - "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "survival", - "skills_required": [ "cooking", 2 ], - "difficulty": 3, - "time": 56000, - "autolearn": true, - "batch_time_factors": [ 83, 5 ], - "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "raw_fur", 50 ], [ "raw_tainted_fur", 50 ] ] ] - }, { "type": "recipe", "result": "resin_cord", From c8282c6c99a76e08bb892695d78f0edfa167ae0e Mon Sep 17 00:00:00 2001 From: Podesta <11512008+Podesta@users.noreply.github.com> Date: Sat, 27 Jul 2019 19:58:32 +0000 Subject: [PATCH 3/7] Scale price of cured items --- data/json/items/generic.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/generic.json b/data/json/items/generic.json index cd92a5fadba28..8e0fac8204ac8 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -2234,7 +2234,7 @@ "name": "cured hide", "name_plural": "cured hides", "description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay. It still requires tanning to become usable leather.", - "price": 2000, + "price": 40, "material": [ "flesh" ], "flags": [ "NO_SALVAGE" ], "weight": 12, @@ -2265,7 +2265,7 @@ "name": "cured pelt", "name_plural": "cured pelts", "description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay. It still requires tanning to become usable fur.", - "price": 2000, + "price": 40, "material": [ "fur", "flesh" ], "flags": [ "NO_SALVAGE" ], "weight": 14, From 27bef10c82a621d1bf6d363b6e3bf3f313a62547 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Sun, 28 Jul 2019 04:03:50 +0000 Subject: [PATCH 4/7] Style --- data/json/recipes/recipe_others.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index d29098fde7898..96b0b4d24c3db 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -3692,10 +3692,7 @@ "time": "30 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ - [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], - [ [ "raw_leather", 50 ], [ "raw_tainted_leather", 50 ] ] - ] + "components": [ [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], [ [ "raw_leather", 50 ], [ "raw_tainted_leather", 50 ] ] ] }, { "type": "recipe", From 606e90a4096aa1f0a7d590b2538890592093a9ce Mon Sep 17 00:00:00 2001 From: Podesta <11512008+Podesta@users.noreply.github.com> Date: Sun, 28 Jul 2019 10:23:43 +0000 Subject: [PATCH 5/7] Add clean hides to split the curing process from cleaning --- data/json/items/generic.json | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 8e0fac8204ac8..4387277a9ee65 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -2226,6 +2226,15 @@ "volume": 1, "to_hit": -5 }, + { + "type": "COMESTIBLE", + "id": "clean_hide", + "copy-from": "raw_leather", + "looks_like": "cured_hide", + "name": "clean hide", + "name_plural": "clean hides", + "description": "A animal hide that has been scrapped of extraneous hair and flesh and is ready for the next process, by either curing for preservation or tanning directly." + }, { "type": "GENERIC", "id": "cured_hide", @@ -2233,7 +2242,7 @@ "color": "white", "name": "cured hide", "name_plural": "cured hides", - "description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay. It still requires tanning to become usable leather.", + "description": "A rolled up animal hide which has been preserved by either salting or drying. It still requires tanning to become usable leather.", "price": 40, "material": [ "flesh" ], "flags": [ "NO_SALVAGE" ], @@ -2257,6 +2266,15 @@ "category": "spare_parts", "to_hit": -1 }, + { + "type": "COMESTIBLE", + "id": "clean_fur", + "copy-from": "raw_fur", + "looks_like": "cured_pelt", + "name": "clean pelt", + "name_plural": "clean pelts", + "description": "A animal hide that has been scrapped of extraneous hair and flesh and is ready for the next process, by either curing for preservation or tanning directly." + }, { "type": "GENERIC", "id": "cured_pelt", @@ -2264,7 +2282,7 @@ "color": "brown", "name": "cured pelt", "name_plural": "cured pelts", - "description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay. It still requires tanning to become usable fur.", + "description": "A rolled up animal hide which has been preserved by either salting or drying. It still requires tanning to become usable fur.", "price": 40, "material": [ "fur", "flesh" ], "flags": [ "NO_SALVAGE" ], From 3684049351da1ad2e05c3288158328ab851e4e32 Mon Sep 17 00:00:00 2001 From: Podesta <11512008+Podesta@users.noreply.github.com> Date: Sun, 28 Jul 2019 16:29:03 +0000 Subject: [PATCH 6/7] Changes to the hideworking recipes - granular 2 - Separate the curing from the cleaning process. - New recipe to cure hides by air drying. - Update ancient tanning recipe. --- data/json/items/generic.json | 4 +- data/json/items/tools.json | 58 +++++++++- data/json/recipes/recipe_others.json | 156 ++++++++++++++------------- 3 files changed, 140 insertions(+), 78 deletions(-) diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 4387277a9ee65..2f90fedf872b6 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -2233,7 +2233,7 @@ "looks_like": "cured_hide", "name": "clean hide", "name_plural": "clean hides", - "description": "A animal hide that has been scrapped of extraneous hair and flesh and is ready for the next process, by either curing for preservation or tanning directly." + "description": "This is the first step into the tanning process. A animal hide that has been scrapped of extraneous hair and flesh and is ready for the next process, by either curing for preservation or tanning directly." }, { "type": "GENERIC", @@ -2273,7 +2273,7 @@ "looks_like": "cured_pelt", "name": "clean pelt", "name_plural": "clean pelts", - "description": "A animal hide that has been scrapped of extraneous hair and flesh and is ready for the next process, by either curing for preservation or tanning directly." + "description": "This is the first step into the tanning process. A animal hide that has been scrapped of extraneous hair and flesh and is ready for the next process, by either curing for preservation or tanning directly." }, { "type": "GENERIC", diff --git a/data/json/items/tools.json b/data/json/items/tools.json index 2b074ed32e1aa..d7c94f5910a88 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -5662,6 +5662,31 @@ ], "flags": [ "ALLOWS_REMOTE_USE" ] }, + { + "id": "air_curing_hide", + "type": "TOOL", + "category": "spare_parts", + "name": "air drying leather hide", + "name_plural": "air drying leather hides", + "description": "A clean animal hide which is being left to dry to prevent decay. Keep it away from the rain and water. You will be able to activate it when it has finished drying.", + "weight": 12, + "volume": "30 ml", + "price": 0, + "to_hit": -2, + "material": [ "flesh", "leather" ], + "symbol": ",", + "color": "brown", + "use_action": { + "target": "cured_hide", + "msg": "You unstretch the cured leather hide and fold it for storage.", + "moves": 15, + "type": "delayed_transform", + "transform_age": 345600, + "not_ready_msg": "The hide isn't dry yet.", + "//": "4 days" + }, + "flags": [ "NO_SALVAGE" ] + }, { "id": "tanning_hide", "type": "TOOL", @@ -5680,9 +5705,34 @@ "msg": "You carefully unfold the tanning leather hide and shake it clean.", "moves": 150, "type": "delayed_transform", - "transform_age": 28800, + "transform_age": 518400, "not_ready_msg": "The tanning leather hide isn't done yet.", - "//": "2 days" + "//": "6 days" + }, + "flags": [ "NO_SALVAGE" ] + }, + { + "id": "air_curing_pelt", + "type": "TOOL", + "category": "spare_parts", + "name": "air drying pelt", + "name_plural": "air drying pelts", + "description": "A clean animal fur which is being left to dry to prevent decay. Keep it away from the rain and water. You will be able to activate it when it has finished drying.", + "weight": 12, + "volume": "30 ml", + "price": 0, + "to_hit": -2, + "material": [ "fur", "flesh" ], + "symbol": ",", + "color": "brown", + "use_action": { + "target": "cured_pelt", + "msg": "You unstretch the cured pelt and fold it for storage.", + "moves": 15, + "type": "delayed_transform", + "transform_age": 345600, + "not_ready_msg": "The pelt isn't dry yet.", + "//": "4 days" }, "flags": [ "NO_SALVAGE" ] }, @@ -5704,9 +5754,9 @@ "msg": "You carefully unfold the tanning fur pelt and shake it clean.", "moves": 150, "type": "delayed_transform", - "transform_age": 28800, + "transform_age": 518400, "not_ready_msg": "The tanning fur pelt isn't done yet.", - "//": "2 days" + "//": "6 days" }, "flags": [ "NO_SALVAGE" ] }, diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index d29098fde7898..08f8f09a7c283 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -3680,23 +3680,46 @@ "qualities": [ { "id": "HAMMER", "level": 1 } ], "components": [ [ [ "chunk_sulfur", 1 ] ] ] }, + { + "type": "recipe", + "result": "clean_hide", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "survival", + "skills_required": [ "survival", 1 ], + "difficulty": 1, + "time": "20 s", + "autolearn": true, + "qualities": [ { "id": "CUT", "level": 1 } ], + "components": [ [ [ "raw_leather", 1 ], [ "raw_tainted_leather", 1 ] ] ] + }, { "type": "recipe", "result": "cured_hide", - "result_mult": 50, + "result_mult": 5, "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", "skills_required": [ "cooking", 1 ], "difficulty": 1, - "time": "30 m", + "time": "2 m", "autolearn": true, - "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ - [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], - [ [ "raw_leather", 50 ], [ "raw_tainted_leather", 50 ] ] + [ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 1 ] ], + [ [ "clean_hide", 5 ] ] ] }, + { + "type": "recipe", + "result": "air_curing_hide", + "category": "CC_OTHER", + "subcategory": "CSC_OTHER_MATERIALS", + "skill_used": "survival", + "difficulty": 1, + "time": "10 s", + "autolearn": true, + "components": [ [ [ "clean_hide", 1 ] ] ] + }, { "type": "recipe", "result": "cured_hide", @@ -3712,122 +3735,111 @@ }, { "type": "recipe", - "result": "cured_hide", - "id_suffix": "drying", + "result": "tanning_hide", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "skills_required": [ "cooking", 2 ], "difficulty": 3, - "time": "40 s", + "time": "48 m", + "batch_time_factors": [ 20, 3 ], "autolearn": true, - "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "surface_heat", 1, "LIST" ] ] ], - "components": [ [ [ "raw_leather", 1 ], [ "raw_tainted_leather", 1 ] ] ] + "qualities": [ + { "id": "HAMMER", "level": 1 }, + { "id": "CONTAIN", "level": 1 } + ], + "components": [ + [ [ "water_clean", 2 ], [ "water", 2 ] ], + [ [ "tanbark", 1 ], [ "acorns", 2 ], [ "hops", 2 ], [ "pine_bough", 6 ], [ "tallow", 1 ], [ "tallow_tainted", 1 ], [ "lard", 1 ] ], + [ [ "clean_hide", 50 ], [ "cured_hide", 50 ] ] + ] }, { "type": "recipe", "result": "tanning_hide", + "id_suffix": "modern", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "survival", - "skills_required": [ "cooking", 2 ], - "difficulty": 3, - "time": "48 m", - "batch_time_factors": [ 20, 10 ], - "autolearn": true, + "skill_used": "cooking", + "skills_required": [ "cooking", 1 ], + "difficulty": 4, + "time": "20 m", + "batch_time_factors": [ 50, 5 ], + "book_learn": [ [ "textbook_survival", 6 ], [ "textbook_chemistry", 5 ], [ "modern_tanner", 4 ] ], "qualities": [ - { "id": "CUT", "level": 1 }, - { "id": "COOK", "level": 2 }, - { "id": "BOIL", "level": 1 }, + { "id": "CHEM", "level": 1 }, + { "id": "COOK", "level": 3 }, + { "id": "BOIL", "level": 2 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], + "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "components": [ [ [ "water_clean", 2 ], [ "water", 2 ] ], - [ [ "tanbark", 1 ], [ "acorns", 2 ], [ "hops", 2 ], [ "pine_bough", 6 ] ], - [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], - [ [ "tallow", 1 ], [ "tallow_tainted", 1 ], [ "lard", 1 ] ], - [ [ "cured_hide", 50 ] ] + [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], + [ [ "clean_hide", 50 ], [ "cured_hide", 50 ] ] ] }, { "type": "recipe", - "result": "cured_pelt", - "result_mult": 50, + "result": "clean_fur", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "skills_required": [ "cooking", 1 ], "difficulty": 1, - "time": "30 m", + "time": "20 s", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], [ [ "raw_fur", 50 ], [ "raw_tainted_fur", 50 ] ] ] + "components": [ [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ] ] ] }, { "type": "recipe", "result": "cured_pelt", - "id_suffix": "drying", + "result_mult": 5, "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "skills_required": [ "cooking", 2 ], - "difficulty": 3, - "time": "40 s", + "skills_required": [ "cooking", 1 ], + "difficulty": 1, + "time": "2 m", "autolearn": true, - "qualities": [ { "id": "CUT", "level": 1 } ], - "tools": [ [ [ "surface_heat", 1, "LIST" ] ] ], - "components": [ [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ] ] ] + "components": [ + [ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 1 ] ], + [ [ "clean_fur", 5 ] ] + ] }, { "type": "recipe", - "result": "tanning_pelt", - "category": "CC_OTHER", + "result": "air_curing_pelt", + "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "skills_required": [ "cooking", 2 ], - "difficulty": 3, - "time": "48 m", - "batch_time_factors": [ 20, 10 ], + "skills_required": [ "survival", 1 ], + "difficulty": 1, + "time": "10 s", "autolearn": true, - "qualities": [ - { "id": "CUT", "level": 1 }, - { "id": "COOK", "level": 2 }, - { "id": "BOIL", "level": 1 }, - { "id": "CONTAIN", "level": 1 } - ], - "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], - "components": [ - [ [ "water_clean", 2 ], [ "water", 2 ] ], - [ [ "tanbark", 1 ], [ "acorns", 2 ], [ "hops", 2 ], [ "pine_bough", 6 ] ], - [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], - [ [ "tallow", 1 ], [ "tallow_tainted", 1 ], [ "lard", 1 ] ], - [ [ "cured_pelt", 50 ] ] - ] + "components": [ [ [ "clean_fur", 1 ] ] ] }, { "type": "recipe", - "result": "tanning_hide", - "id_suffix": "modern", + "result": "tanning_pelt", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "cooking", - "skills_required": [ "survival", 3 ], + "skill_used": "survival", + "skills_required": [ "cooking", 1 ], "difficulty": 4, - "time": "20 m", - "batch_time_factors": [ 50, 5 ], - "book_learn": [ [ "textbook_survival", 6 ], [ "textbook_chemistry", 5 ], [ "modern_tanner", 4 ] ], + "time": "48 m", + "batch_time_factors": [ 20, 3 ], + "autolearn": true, "qualities": [ - { "id": "CHEM", "level": 1 }, - { "id": "COOK", "level": 3 }, - { "id": "BOIL", "level": 2 }, + { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "water_clean", 2 ], [ "water", 2 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "cured_hide", 50 ] ] ] + "components": [ + [ [ "water_clean", 2 ], [ "water", 2 ] ], + [ [ "tanbark", 1 ], [ "acorns", 2 ], [ "hops", 2 ], [ "pine_bough", 6 ], [ "tallow", 1 ], [ "tallow_tainted", 1 ], [ "lard", 1 ] ], + [ [ "clean_fur", 50 ], [ "cured_pelt", 50 ] ] + ] }, - { + { "type": "recipe", "result": "tanning_pelt", "id_suffix": "modern", @@ -3846,7 +3858,7 @@ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "water_clean", 2 ], [ "water", 2 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "cured_pelt", 50 ] ] ] + "components": [ [ [ "water_clean", 2 ], [ "water", 2 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "clean_fur", 50 ], [ "cured_pelt", 50 ] ] ] }, { "type": "recipe", From b69225689580c8fad60e5a623765c759d05b1133 Mon Sep 17 00:00:00 2001 From: Podesta <11512008+Podesta@users.noreply.github.com> Date: Sun, 28 Jul 2019 16:59:36 +0000 Subject: [PATCH 7/7] Remove trailing space --- data/json/recipes/recipe_others.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 08f8f09a7c283..0c143c572c04f 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -3712,7 +3712,7 @@ { "type": "recipe", "result": "air_curing_hide", - "category": "CC_OTHER", + "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", "difficulty": 1,