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 a new type of food, freeze-dried camping meals. #46469

Merged
merged 9 commits into from Jan 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions data/json/itemgroups/Food/food.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
{ "item": "brandied_fruit", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "fish_pickled", "prob": 40, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "sauce_red", "prob": 60, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "kompot", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" }
{ "item": "kompot", "prob": 10, "charges": 12, "container-item": "jar_3l_glass_sealed" },
{ "item": "freeze_dried_meal", "prob": 10 }
]
},
{
Expand All @@ -44,7 +45,8 @@
{ "item": "salted_fish", "prob": 15 },
{ "item": "dry_beans", "prob": 40 },
{ "item": "dry_lentils", "prob": 30 },
{ "item": "dry_rice", "prob": 40 }
{ "item": "dry_rice", "prob": 40 },
{ "item": "freeze_dried_meal", "prob": 10 }
]
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,7 @@
[ "bronze_medal", 3 ],
[ "silver_medal", 2 ],
[ "gold_medal", 1 ],
[ "freeze_dried_meal", 5 ],
{ "group": "tinware", "prob": 10 },
{ "item": "pen", "prob": 10, "charges": [ 0, 300 ] }
]
Expand Down Expand Up @@ -627,6 +628,7 @@
"id": "mil_surplus",
"items": [
{ "group": "mags_surplus", "prob": 400 },
[ "freeze_dried_meal", 20 ],
[ "knife_combat", 14 ],
[ "knife_rm42", 1 ],
[ "kukri", 2 ],
Expand Down
42 changes: 42 additions & 0 deletions data/json/items/comestibles/junkfood.json
Original file line number Diff line number Diff line change
Expand Up @@ -1187,5 +1187,47 @@
"charges": 4,
"vitamins": [ [ "calcium", 4 ] ],
"fun": 6
},
{
"type": "COMESTIBLE",
"id": "freeze_dried_meal",
"name": "freeze-dried meal",
"weight": "175 g",
"color": "red",
"spoils_in": "1461 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -8,
"calories": 879,
"description": "A sealed plastic bag containing a full dehydrated meal. This one contains a hearty cooked beef and egg breakfast.",
"price": 1200,
"price_postapoc": 1400,
"material": [ "flesh", "egg", "junk" ],
"volume": "250ml",
"flags": [ "EATEN_HOT" ],
"vitamins": [ [ "vitA", 3 ], [ "iron", 10 ] ],
"fun": -2
},
{
"type": "COMESTIBLE",
"id": "freeze_dried_meal_hydrated",
"name": "rehydrated freeze-dried meal",
"weight": "675 g",
"color": "brown",
"spoils_in": "1 day",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
"quench": 1,
"calories": 879,
"description": "This is a rehydrated meal meant for camping or hiking.",
"price": 1200,
"price_postapoc": 1400,
"material": [ "flesh", "egg", "junk" ],
"volume": "500ml",
"flags": [ "EATEN_HOT" ],
"vitamins": [ [ "vitA", 3 ], [ "iron", 10 ] ],
"fun": 4
}
]
11 changes: 11 additions & 0 deletions data/json/recipes/food/other.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,16 @@
"qualities": [ { "id": "BOIL", "level": 2 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
"components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "sweet_fruit", 1, "LIST" ] ], [ [ "sugar", 10 ] ] ]
},
{
"type": "recipe",
"activity_level": "NO_EXERCISE",
"result": "freeze_dried_meal_hydrated",
"category": "CC_FOOD",
"subcategory": "CSC_FOOD_OTHER",
"skill_used": "cooking",
"time": "15 m",
"charges": 2,
"components": [ [ [ "water_clean", 1 ] ], [ [ "freeze_dried_meal", 1 ] ] ]
}
]