Skip to content

Commit

Permalink
Adjust MRE contents to better reflect real MREs (#37484)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dziugaske
Dziugaske committed Jan 30, 2020
1 parent 7a6ccdd commit 33daec5
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 54 deletions.
2 changes: 1 addition & 1 deletion data/json/items/comestibles/mre.json
View file
Expand Up @@ -8,7 +8,7 @@
"category": "food",
"description": "A generic MRE box, you shouldn't see this.",
"price": 1500,
"weight": "900 g",
"weight": "725 g",
"volume": "750 ml",
"material": [ "plastic" ],
"looks_like": "mre_beef_box",
Expand Down
105 changes: 52 additions & 53 deletions data/json/recipes/recipe_deconstruction_package.json
View file
Expand Up @@ -7,9 +7,8 @@
[ [ "pur_tablets", 6 ] ],
[ [ "gummy_vitamins", 1 ] ],
[ [ "coffee_raw", 1 ] ],
[ [ "lemonade_powder", 2 ] ],
[ [ "lemonade_powder", 1 ] ],
[ [ "matches", 1 ] ],
[ [ "protein_powder", 1 ] ],
[ [ "gum", 2 ] ],
[ [ "paper", 8 ] ],
[ [ "spork", 1 ] ],
Expand All @@ -21,16 +20,16 @@
"result": "mre_dessert",
"type": "uncraft",
"time": "4 s",
"components": [ [ [ "dry_fruit", 1 ] ], [ [ "chocolate", 1 ] ], [ [ "candy2", 2 ] ], [ [ "cookies", 1 ] ], [ [ "bag_plastic", 1 ] ] ],
"components": [ [ [ "dry_fruit", 1 ] ], [ [ "chocolate", 1 ] ], [ [ "candy2", 1 ] ], [ [ "cookies", 1 ] ], [ [ "bag_plastic", 1 ] ] ],
"flags": [ "BLIND_EASY" ]
},
{
"result": "mre_chilibeans_box",
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_chilibeans", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_chilibeans", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -44,8 +43,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_bbqbeef", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_bbqbeef", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -59,8 +58,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_chickennoodle", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_chickennoodle", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -74,8 +73,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_spaghetti", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_spaghetti", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -89,8 +88,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_chicken", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_chicken", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -104,8 +103,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_beeftaco", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_beeftaco", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -119,8 +118,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_beef", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_beef", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -134,8 +133,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_meatball", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_meatball", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -149,8 +148,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_beefstew", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_beefstew", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -164,8 +163,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_chilimac", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_chilimac", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -179,8 +178,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_veggy", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_veggy", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -194,8 +193,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_macaronimarinara", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_macaronimarinara", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -209,8 +208,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_cheesetort", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_cheesetort", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -224,8 +223,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_mushroomfettuccine", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_mushroomfettuccine", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -239,8 +238,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_mexicanchickenstew", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_mexicanchickenstew", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -254,8 +253,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_chickenburritobowl", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_chickenburritobowl", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -269,8 +268,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_maplesausage", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_maplesausage", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -284,8 +283,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_ravioli", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_ravioli", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -299,8 +298,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_pepperjackbeef", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_pepperjackbeef", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -314,8 +313,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_hashbrownbacon", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_hashbrownbacon", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -329,8 +328,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_lemontuna", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_lemontuna", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -344,8 +343,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_asianbeef", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_asianbeef", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -359,8 +358,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_chickenpesto", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_chickenpesto", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -374,8 +373,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_southwestbeef", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_southwestbeef", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand All @@ -389,8 +388,8 @@
"type": "uncraft",
"time": "30 s",
"components": [
[ [ "mre_hotdog", 4 ] ],
[ [ "crackers", 2 ] ],
[ [ "mre_hotdog", 1 ] ],
[ [ "crackers", 1 ] ],
[ [ "can_cheese", 1 ] ],
[ [ "heatpack", 1 ] ],
[ [ "mre_dessert", 1 ] ],
Expand Down

0 comments on commit 33daec5

Please sign in to comment.