-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
Magiclysm: Cooking with Poison #36627
Merged
KorGgenT
merged 14 commits into
CleverRaven:master
from
Maleclypse:Magiclysm-Demon-Cookware
Jan 4, 2020
Merged
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
6ab2e88
Merge pull request #9 from CleverRaven/master
Maleclypse 904bb1b
Cooking with Poison
Maleclypse 6e70937
Update tools.json
Maleclypse 0df58c2
Update magic_tools.json
Maleclypse 31ea65f
Update magic_tools.json
Maleclypse 005f67e
Update recipe_books.json
Maleclypse c150100
Update tools.json
Maleclypse 510de92
Update tools.json
Maleclypse 156f98a
fixing travis errors
Maleclypse 3a9c86c
linting
Maleclypse 9376450
Changes from playtesting
Maleclypse d6cebda
Update cooking_components.json
Maleclypse f7ff1af
Update comestibles.json
Maleclypse 2f541de
reverse skills used cooking primary
Maleclypse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
[ | ||
{ | ||
"id": "cauldron_demon_chitin", | ||
"type": "CONTAINER", | ||
"category": "other", | ||
"name": { "str": "cauldron of purification", "str_pl": "cauldrons of purification" }, | ||
"description": "This cauldron made of demon spider chitin seems to absorb the light. It will hold 16 liters of material and will absorb poisons from it. It may have other properties that require discovery.", | ||
"weight": "1424 g", | ||
"volume": "20 L", | ||
"price": 2000, | ||
"to_hit": -1, | ||
"looks_like": "clay_hydria", | ||
"bashing": 1, | ||
"material": "demon_chitin", | ||
"symbol": ")", | ||
"color": "red", | ||
"contains": "16 L", | ||
"//": "I went ahead and gave this a level of 2 for when magical mutagens become a thing as I figured dragonblood for instance should need different tools than making alpha mutagen.", | ||
"watertight": true, | ||
"qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "MAGIC_MUTAGEN", 2 ] ], | ||
"use_action": "HEAT_FOOD" | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
[ | ||
{ | ||
"type": "recipe", | ||
"result": "purified_meat", | ||
"category": "CC_FOOD", | ||
"subcategory": "CSC_FOOD_MEAT", | ||
"skill_used": "spellcraft", | ||
Maleclypse marked this conversation as resolved.
Show resolved
Hide resolved
|
||
"skills_required": [ "cooking", 1 ], | ||
"difficulty": 3, | ||
"book_learn": [ [ "cooking_poison", 2 ] ], | ||
"time": "15 m", | ||
"batch_time_factors": [ 67, 5 ], | ||
"qualities": [ { "id": "COOK", "level": 1 }, { "id": "MAGIC_MUTAGEN", "level": 1 } ], | ||
"tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], | ||
"components": [ [ [ "mutant_meat", 3 ] ] ] | ||
}, | ||
{ | ||
"type": "recipe", | ||
"result": "impure_meat", | ||
"category": "CC_FOOD", | ||
"subcategory": "CSC_FOOD_MEAT", | ||
"skill_used": "spellcraft", | ||
"skills_required": [ "cooking", 3 ], | ||
"difficulty": 5, | ||
"book_learn": [ [ "cooking_poison", 2 ] ], | ||
"time": "15 m", | ||
"autolearn": true, | ||
"batch_time_factors": [ 67, 5 ], | ||
"qualities": [ { "id": "COOK", "level": 1 }, { "id": "MAGIC_MUTAGEN", "level": 1 } ], | ||
"tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], | ||
"components": [ [ [ "meat_tainted", 4 ] ] ] | ||
}, | ||
{ | ||
"type": "recipe", | ||
"result": "flu_shot", | ||
"category": "CC_CHEM", | ||
"subcategory": "CSC_CHEM_DRUGS", | ||
"skill_used": "spellcraft", | ||
"skills_required": [ "cooking", 5 ], | ||
"difficulty": 6, | ||
"book_learn": [ [ "cooking_poison", 2 ] ], | ||
"time": "120 m", | ||
"autolearn": true, | ||
"qualities": [ { "id": "COOK", "level": 1 }, { "id": "MAGIC_MUTAGEN", "level": 1 } ], | ||
"tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], | ||
"components": [ | ||
[ [ "mutant_fat", 2 ] ], | ||
[ [ "syringe", 1 ] ], | ||
[ [ "owlbear_stone", 1 ] ], | ||
[ [ "glow_dust", 2 ] ], | ||
[ [ "aspirin", 20 ] ], | ||
[ [ "meth", 3 ] ] | ||
] | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
[ | ||
{ | ||
"id": "meat_raw_steak", | ||
"type": "requirement", | ||
"//": "override of vanilla raw steak, includes purified and impure meat", | ||
"components": [ | ||
[ | ||
[ "meat", 1 ], | ||
[ "mutant_meat", 1 ], | ||
[ "human_flesh", 1 ], | ||
[ "mutant_human_flesh", 1 ], | ||
[ "purified_meat", 1 ], | ||
[ "impure_meat", 1 ] | ||
] | ||
] | ||
} | ||
] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
[ | ||
{ | ||
"type": "tool_quality", | ||
"id": "MAGIC_MUTAGEN", | ||
"name": "magic mutagen mixer" | ||
} | ||
] |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry i didn't catch this earlier, but for a 20 L object, 3 pounds is very very light.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree, but I used straight math for demon chitin and bowl volume. If the cauldron contains 16 L of volume that means 4 L of material. Each chunk of demon chitin is 250 ml so 16 chunks to make the cauldron. 4 L of Demon chitin chunks at 89 grams per 250 ml comes out to 1424 exactly. I'm good to update it to whatever you think is best but I feel it's important to show my math and why I will need you to let me know what it should actually be? I can add the bone glue in weight but that only adds 450 g in weight.
Edit: I could be totally wrong on how I calculated the volume of material needed though,