From 091cd243bb2c90ca8f01954744d5ee978d4cd22a Mon Sep 17 00:00:00 2001 From: moxian Date: Sat, 28 Sep 2019 01:13:42 +0000 Subject: [PATCH 1/4] Granularize curing recipies Creating cured_pelt and cured_hide now requires 10x less raw fur/leather (50 -> 5), 10x less salt (10 -> 1) and 10x less time (30m -> 3m) The resulting cured_pelt and cured_hide items are 10x smaller, and one needs to use 10x of them to create tanning versions of them. The problem this is trying to solve is that currently most animals drop small amounts of raw leather and fur (in the 10-20 range), which makes it challenging to amass 50 raw hides/pelts required for curing by the time they rot. Making curing work in smaller batches allows for dramatical savings in the amount of material that goes to waste. --- data/json/items/generic.json | 12 ++++++------ data/json/recipes/recipe_others.json | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/data/json/items/generic.json b/data/json/items/generic.json index bdd0fcae446a5..528dfeb5f4e00 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -2330,11 +2330,11 @@ "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": 200, "material": [ "flesh" ], "flags": [ "NO_SALVAGE" ], - "weight": "600 g", - "volume": "750 ml", + "weight": "60 g", + "volume": "75 ml", "category": "spare_parts", "to_hit": -1 }, @@ -2361,11 +2361,11 @@ "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": 200, "material": [ "fur", "flesh" ], "flags": [ "NO_SALVAGE" ], - "weight": "684 g", - "volume": "1 L", + "weight": "68 g", + "volume": "100 ml", "category": "spare_parts", "to_hit": -1 }, diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index e064d6eccfa13..36745e4a2e38b 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -3778,7 +3778,7 @@ "skill_used": "survival", "skills_required": [ "cooking", 1 ], "difficulty": 1, - "time": "30 m", + "time": "3 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ @@ -3794,7 +3794,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", "difficulty": 1, - "time": "20 m", + "time": "2 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "cured_pelt", 1 ] ] ] @@ -3833,10 +3833,10 @@ "skill_used": "survival", "skills_required": [ "cooking", 1 ], "difficulty": 1, - "time": "30 m", + "time": "3 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], [ [ "raw_fur", 50 ], [ "raw_tainted_fur", 50 ] ] ] + "components": [ [ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 1 ] ], [ [ "raw_fur", 5 ], [ "raw_tainted_fur", 5 ] ] ] }, { "type": "recipe", @@ -3861,7 +3861,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", 10 ] ] ] }, { @@ -3883,7 +3883,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", 10 ] ] ] }, { "type": "recipe", From 9080df26a5388e3d1a950165e6efaa16bdaf3309 Mon Sep 17 00:00:00 2001 From: moxian Date: Sun, 29 Sep 2019 01:53:35 +0000 Subject: [PATCH 2/4] Make raw skins and their cured versions patch-sized. Currenlty skins are as small as they are as a result of #27399 PR fixing #27390. But the latter bug was since independently (accidentally) fixed in #32983 and small animals (including wolves) now always drop at least one pelt (regardless of how big the pelt item is). So increasing the size of the pelts is no longer a problem. The 1:1 skin->cured skin recipe feels very good to play with, since you don't up in a situation where you for some reason can't cure a pelt just because it's too small. Both being the size of leather/fur patch paves the path for 1 skin -> 1 cured skin -> 1 small tanning skin -> 1 leather patch recipe chain, but that's a problem for another day. --- data/json/items/comestibles/carnivore.json | 16 ++++++++-------- data/json/items/generic.json | 8 ++++---- data/json/items/tools.json | 4 ++-- data/json/recipes/recipe_others.json | 18 +++++++++--------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index fb5eb7cc51202..2bc3289c8610f 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -691,19 +691,19 @@ "id": "raw_leather", "category": "spare_parts", "name": "raw hide", - "weight": "15 g", + "weight": "100 g", + "volume": "125 ml", "color": "pink", "spoils_in": "1 day 12 hours", "comestible_type": "FOOD", "symbol": ",", "quench": -2, "healthy": -1, - "calories": 52, + "calories": 350, "description": "A carefully folded raw skin harvested from an animal. You can cure it for storage and tanning, or eat it if you're desperate enough.", - "price": 50, + "price": 330, "material": "flesh", "flags": "TRADER_AVOID", - "volume": "25ml", "stack_size": 1, "fun": -12 }, @@ -730,19 +730,19 @@ "id": "raw_fur", "category": "spare_parts", "name": "raw pelt", - "weight": "17 g", + "weight": "114 g", + "volume": "170 ml", "color": "brown", "spoils_in": "1 day 12 hours", "comestible_type": "FOOD", "symbol": ",", "quench": -20, "healthy": -5, - "calories": 52, + "calories": 350, "description": "A carefully folded raw skin harvested from a fur-bearing animal. It still has the fur attached. You can cure it for storage and tanning, or eat it if you're desperate enough.", - "price": 50, + "price": 330, "material": [ "fur", "flesh" ], "flags": [ "NO_SALVAGE", "TRADER_AVOID" ], - "volume": "25ml", "stack_size": 1, "fun": -24 }, diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 528dfeb5f4e00..fd0ab15d8850d 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -2333,8 +2333,8 @@ "price": 200, "material": [ "flesh" ], "flags": [ "NO_SALVAGE" ], - "weight": "60 g", - "volume": "75 ml", + "weight": "100 g", + "volume": "125 ml", "category": "spare_parts", "to_hit": -1 }, @@ -2364,8 +2364,8 @@ "price": 200, "material": [ "fur", "flesh" ], "flags": [ "NO_SALVAGE" ], - "weight": "68 g", - "volume": "100 ml", + "weight": "114 g", + "volume": "170 ml", "category": "spare_parts", "to_hit": -1 }, diff --git a/data/json/items/tools.json b/data/json/items/tools.json index 6ad085c93f34f..05322c2e6971d 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -5806,7 +5806,7 @@ "category": "spare_parts", "name": "tanning leather hide", "description": "A treated animal hide which is undergoing the chemical processes required to become leather. You will be able to activate it to unroll and make use of it when it is done.", - "weight": "400 g", + "weight": "600 g", "volume": "1 L", "price": 0, "to_hit": -2, @@ -5830,7 +5830,7 @@ "category": "spare_parts", "name": "tanning fur pelt", "description": "A treated animal pelt which is undergoing the chemical processes required to become fur. You will be able to activate it to unroll and make use of it when it is done.", - "weight": "400 g", + "weight": "684 g", "volume": "1 L", "price": 0, "to_hit": -2, diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 36745e4a2e38b..11d2fc22793fd 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -3778,12 +3778,12 @@ "skill_used": "survival", "skills_required": [ "cooking", 1 ], "difficulty": 1, - "time": "3 m", + "time": "5 m", "autolearn": true, "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", 1 ], [ "raw_tainted_leather", 1 ], [ "raw_hleather", 1 ] ] ] }, { @@ -3794,7 +3794,7 @@ "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", "difficulty": 1, - "time": "2 m", + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ [ [ "cured_pelt", 1 ] ] ] @@ -3822,7 +3822,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_hide", 1 ] ] + [ [ "cured_hide", 6 ] ] ] }, { @@ -3833,10 +3833,10 @@ "skill_used": "survival", "skills_required": [ "cooking", 1 ], "difficulty": 1, - "time": "3 m", + "time": "5 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], - "components": [ [ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 1 ] ], [ [ "raw_fur", 5 ], [ "raw_tainted_fur", 5 ] ] ] + "components": [ [ [ "salt_water", 1 ], [ "saline", 2 ], [ "salt", 2 ] ], [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ] ] ] }, { "type": "recipe", @@ -3861,7 +3861,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", 10 ] ] + [ [ "cured_pelt", 6 ] ] ] }, { @@ -3883,7 +3883,7 @@ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "water_clean", 2 ], [ "water", 2 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "cured_hide", 10 ] ] ] + "components": [ [ [ "water_clean", 1 ], [ "water", 1 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "cured_hide", 6 ] ] ] }, { "type": "recipe", @@ -3904,7 +3904,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", 6 ] ] ] }, { "type": "recipe", From 998e9a3d80fd85d72b4353dc10b139c157849df5 Mon Sep 17 00:00:00 2001 From: moxian Date: Sun, 29 Sep 2019 02:34:03 +0000 Subject: [PATCH 3/4] Fix hide bag crafting cost. --- data/json/recipes/armor/storage.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/armor/storage.json b/data/json/recipes/armor/storage.json index ac5b94f9be8fc..f418710177086 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", 6 ], [ "raw_hleather", 6 ], [ "raw_fur", 6 ] ] ], "flags": [ "BLIND_EASY" ] }, { From 59c38567fc0c66564558f2bca2208788f213b310 Mon Sep 17 00:00:00 2001 From: moxian Date: Sun, 29 Sep 2019 10:36:39 +0000 Subject: [PATCH 4/4] Fix typos from previous commit. --- 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 11d2fc22793fd..377507126c1ba 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -3782,7 +3782,7 @@ "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], "components": [ - [ [ "salt_water", 2 ], [ "saline", 10 ], [ "salt", 10 ] ], + [ [ "salt_water", 1 ], [ "saline", 2 ], [ "salt", 2 ] ], [ [ "raw_leather", 1 ], [ "raw_tainted_leather", 1 ], [ "raw_hleather", 1 ] ] ] }, @@ -3883,7 +3883,7 @@ { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], - "components": [ [ [ "water_clean", 1 ], [ "water", 1 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "cured_hide", 6 ] ] ] + "components": [ [ [ "water_clean", 2 ], [ "water", 2 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "cured_hide", 6 ] ] ] }, { "type": "recipe",