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

Granularize cured hides and pelts #32671

Closed
wants to merge 8 commits into from
Closed

Granularize cured hides and pelts #32671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f92ee3a
Granularize cured plet and hides recipes
Podesta Jul 27, 2019
f9335a3
Mainline cured hide recipe from MST mod - use fire
Podesta Jul 27, 2019
c8282c6
Scale price of cured items
Podesta Jul 27, 2019
27bef10
Style
kevingranade Jul 28, 2019
606e90a
Add clean hides to split the curing process from cleaning
Podesta Jul 28, 2019
3684049
Changes to the hideworking recipes - granular 2
Podesta Jul 28, 2019
4a6a7f5
Merge conflict
Podesta Jul 28, 2019
b692256
Remove trailing space
Podesta Jul 28, 2019
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
36 changes: 27 additions & 9 deletions data/json/items/generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2226,19 +2226,28 @@
"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": "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",
"id": "cured_hide",
"symbol": ",",
"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.",
"price": 2000,
"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" ],
"weight": 600,
"volume": 3,
"weight": 12,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"weight": 12,
"weight": "12 g",

"volume": "15ml",
"category": "spare_parts",
"to_hit": -1
},
Expand All @@ -2257,19 +2266,28 @@
"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": "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",
"id": "cured_pelt",
"symbol": ",",
"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.",
"price": 2000,
"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" ],
"weight": 684,
"volume": 4,
"weight": 14,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"weight": 14,
"weight": "14 g",

"volume": "20ml",
"category": "spare_parts",
"to_hit": -1
},
Expand All @@ -2283,7 +2301,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,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"weight": 700,
"weight": "700 g",

"volume": 6,
"category": "spare_parts",
"to_hit": -1
Expand Down
58 changes: 54 additions & 4 deletions data/json/items/tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"weight": 12,
"weight": "12 g",

"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",
Expand All @@ -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,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"weight": 12,
"weight": "12 g",

"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" ]
},
Expand All @@ -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" ]
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/armor/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/chem/other.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down
140 changes: 92 additions & 48 deletions data/json/recipes/recipe_others.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3682,96 +3682,75 @@
},
{
"type": "recipe",
"result": "cured_hide",
"result": "clean_hide",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "survival",
"skills_required": [ "cooking", 1 ],
"skills_required": [ "survival", 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_leather", 50 ], [ "raw_tainted_leather", 50 ], [ "raw_hleather", 50 ] ]
]
"components": [ [ [ "raw_leather", 1 ], [ "raw_tainted_leather", 1 ] ] ]
},
{
"type": "recipe",
"result": "cured_hide",
"id_suffix": "scraped",
"result_mult": 5,
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "survival",
"skills_required": [ "cooking", 1 ],
"difficulty": 1,
"time": "20 m",
"time": "2 m",
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "cured_pelt", 1 ] ] ]
"components": [
[ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 1 ] ],
[ [ "clean_hide", 5 ] ]
]
},
{
"type": "recipe",
"result": "tanning_hide",
"result": "air_curing_hide",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "survival",
"skills_required": [ "cooking", 2 ],
"difficulty": 3,
"time": "48 m",
"batch_time_factors": [ 20, 10 ],
"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_hide", 1 ] ]
]
"components": [ [ [ "clean_hide", 1 ] ] ]
},
{
"type": "recipe",
"result": "cured_pelt",
"result": "cured_hide",
kevingranade marked this conversation as resolved.
Show resolved Hide resolved
"id_suffix": "scraped",
"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": [ [ [ "cured_pelt", 1 ] ] ]
},
{
"type": "recipe",
"result": "tanning_pelt",
"result": "tanning_hide",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "survival",
"skills_required": [ "cooking", 2 ],
"difficulty": 3,
"time": "48 m",
"batch_time_factors": [ 20, 10 ],
"batch_time_factors": [ 20, 3 ],
"autolearn": true,
"qualities": [
{ "id": "CUT", "level": 1 },
{ "id": "COOK", "level": 2 },
{ "id": "BOIL", "level": 1 },
{ "id": "HAMMER", "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", 1 ] ]
[ [ "tanbark", 1 ], [ "acorns", 2 ], [ "hops", 2 ], [ "pine_bough", 6 ], [ "tallow", 1 ], [ "tallow_tainted", 1 ], [ "lard", 1 ] ],
[ [ "clean_hide", 50 ], [ "cured_hide", 50 ] ]
]
},
{
Expand All @@ -3781,7 +3760,7 @@
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "cooking",
"skills_required": [ "survival", 3 ],
"skills_required": [ "cooking", 1 ],
"difficulty": 4,
"time": "20 m",
"batch_time_factors": [ 50, 5 ],
Expand All @@ -3793,9 +3772,74 @@
{ "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 ] ],
[ [ "clean_hide", 50 ], [ "cured_hide", 50 ] ]
]
},
{
"type": "recipe",
"result": "clean_fur",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "survival",
"difficulty": 1,
"time": "20 s",
"autolearn": true,
"qualities": [ { "id": "CUT", "level": 1 } ],
"components": [ [ [ "raw_fur", 1 ], [ "raw_tainted_fur", 1 ] ] ]
},
{
"type": "recipe",
"result": "cured_pelt",
"result_mult": 5,
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "survival",
"skills_required": [ "cooking", 1 ],
"difficulty": 1,
"time": "2 m",
"autolearn": true,
"components": [
[ [ "salt_water", 1 ], [ "saline", 1 ], [ "salt", 1 ] ],
[ [ "clean_fur", 5 ] ]
]
},
{
"type": "recipe",
"result": "air_curing_pelt",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "survival",
"skills_required": [ "survival", 1 ],
"difficulty": 1,
"time": "10 s",
"autolearn": true,
"components": [ [ [ "clean_fur", 1 ] ] ]
},
{
"type": "recipe",
"result": "tanning_pelt",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "survival",
"skills_required": [ "cooking", 1 ],
"difficulty": 4,
"time": "48 m",
"batch_time_factors": [ 20, 3 ],
"autolearn": true,
"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_fur", 50 ], [ "cured_pelt", 50 ] ]
]
},
{
"type": "recipe",
"result": "tanning_pelt",
"id_suffix": "modern",
Expand All @@ -3814,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", 1 ] ] ]
"components": [ [ [ "water_clean", 2 ], [ "water", 2 ] ], [ [ "lye_powder", 10 ], [ "aspirin", 10 ] ], [ [ "clean_fur", 50 ], [ "cured_pelt", 50 ] ] ]
},
{
"type": "recipe",
Expand Down
Loading