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

Jump to bottom

Add supreme pizza #35924

Merged
merged 7 commits into from
Dec 10, 2019
Merged

Add supreme pizza #35924

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f4cf70b
Add Supreme Pizza
HipAndroid Dec 6, 2019
7147e90
fix syntax
HipAndroid Dec 6, 2019
c98c5ab
description tweak
HipAndroid Dec 6, 2019
bab9f8d
Formatting
HipAndroid Dec 7, 2019
30a6b97
Update meat_dishes.json
HipAndroid Dec 7, 2019
697a773
Tweaks, fixed looks-like
HipAndroid Dec 7, 2019
90682b1
added comma
HipAndroid Dec 7, 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
15 changes: 15 additions & 0 deletions data/json/items/comestibles/meat_dishes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,6 +775,21 @@
"fun": 10,
"vitamins": [ [ "vitA", 3 ], [ "vitC", 10 ], [ "calcium", 28 ], [ "iron", 28 ] ]
},
{
"type": "COMESTIBLE",
"id": "pizza_supreme",
"name": "supreme pizza",
"copy-from": "pizza_meat",
"looks-like": "pizza_meat",
"color": "light_red",
"weight": "300 g",
"calories": 641,
"description": "A supreme pizza with ALL the toppings.",
"price": 1500,
"material": [ "wheat", "flesh", "veggy", "milk" ],
"fun": 20,
HipAndroid marked this conversation as resolved.
Show resolved Hide resolved
"vitamins": [ [ "vitA", 12 ], [ "vitC", 20 ], [ "calcium", 32 ], [ "iron", 28 ] ]
},
{
"type": "COMESTIBLE",
"id": "deluxe_eggs",
Expand Down
40 changes: 40 additions & 0 deletions data/json/recipes/recipe_food.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4142,6 +4142,46 @@
[ [ "water", 1 ], [ "water_clean", 1 ] ]
]
},
{
"type": "recipe",
"result": "pizza_supreme",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_MEAT",
"skill_used": "cooking",
"difficulty": 3,
"time": "30 m",
"book_learn": [ [ "cookbook_italian", 3 ] ],
"qualities": [ { "id": "COOK", "level": 2 } ],
"tools": [ [ [ "surface_heat", 8, "LIST" ] ] ],
"components": [
[ [ "flour", 30 ] ],
[
[ "meat_red", 2, "LIST" ],
[ "can_chicken", 2 ],
[ "meat_salted", 2 ],
[ "dry_meat", 2 ],
[ "fish", 2 ],
[ "fish_canned", 2 ],
[ "can_tuna", 2 ],
[ "salted_fish", 2 ],
[ "rehydrated_fish", 2 ],
[ "dry_fish", 2 ]
],
[
[ "veggy_any", 2, "LIST" ],
[ "mushroom", 2 ],
[ "dry_mushroom", 2 ],
[ "morel_cooked", 2 ],
[ "tofu", 2 ],
[ "dry_tofu", 2 ],
Copy link
Member

Choose a reason for hiding this comment

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

Perhaps the tofus would be better put on the meat list? In terms of recipe, they're more appropriate there.

[ "mushroom_cooked", 2 ],
[ "dry_veggy", 2 ]
],
[ [ "cheese", 2 ], [ "can_cheese", 2 ], [ "cheese_hard", 2 ] ],
Copy link
Member

Choose a reason for hiding this comment

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

canned cheese on a pizza? get out of my kitchen and never come back.

(just kidding it's fine but don't do this in real life or your friends will all abandon you)

[ [ "sauce_pesto", 1 ], [ "sauce_red", 1 ], [ "seasoning_italian", 5 ], [ "wild_herbs", 10 ] ],
[ [ "water", 1 ], [ "water_clean", 1 ] ]
]
},
{
"type": "recipe",
"result": "smores",
Expand Down