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.

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

Added bell pepper #39547

Merged
merged 24 commits into from
May 9, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
No commit message
  • Loading branch information
TheSalamanderDJ committed Apr 14, 2020
commit f5597fe2f35794fab0ade226515c89358e6f7ff1
3 changes: 2 additions & 1 deletion data/json/itemgroups/Food/food.json
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,8 @@
{ "item": "onion", "prob": 3 },
{ "item": "garlic", "prob": 3 },
{ "item": "pine_nuts", "prob": 2 },
{ "item": "carrot", "prob": 3 }
{ "item": "carrot", "prob": 3 },
{ "item": "bell_pepper", "prob": 7}
]
},
{
Expand Down
3 changes: 2 additions & 1 deletion data/json/items/comestibles/raw_veggy.json
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@
"quench": 2,
"healthy": 1,
"calories": 31,
"description": "A green bell pepper. They could be cooked.",
"description": "A green bell pepper. It could be cooked.",
ZhilkinSerg marked this conversation as resolved.
Show resolved Hide resolved
"price": 20,
"material": "veggy",
"volume": "250 ml",
Expand All @@ -846,3 +846,4 @@
"vitamins": [ [ "calcium", 2 ], [ "vitC", 12 ], [ "vitA", 8 ] ]
}
]
]
ZhilkinSerg marked this conversation as resolved.
Show resolved Hide resolved
ZhilkinSerg marked this conversation as resolved.
Show resolved Hide resolved
13 changes: 13 additions & 0 deletions data/json/recipes/recipe_food.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,19 @@
"tools": [ [ [ "surface_heat", 7, "LIST" ] ] ],
"components": [ [ [ "mushroom", 1 ] ] ]
},
{
"type": "recipe",
"result": "cooked_bell_pepper",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_VEGGI",
"skill_used": "cooking",
"time": "10 m",
"autolearn": true,
"batch_time_factors": [ 67, 5 ],
"qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1} ],
"tools": [ [ [ "surface_heat", 7, "LIST" ] ] ],
"components": [ [ [ "bell_pepper", 1 ] ] ]
},
{
"type": "recipe",
"result": "meat_cooked",
Expand Down