Skip to content

Commit

Permalink
Merge pull request #35640 from LilShiningMan/LSM---MRE-List
Browse files Browse the repository at this point in the history 
MRE food list and Military List clean up
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Nov 22, 2019
2 parents c4c1962 + 87b495e commit dc3a1bf
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 140 deletions.
2 changes: 0 additions & 2 deletions data/json/itemgroups/clothing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1336,8 +1336,6 @@
[ "power_armor_frame", 4 ],
[ "helmet_army", 40 ],
[ "helmet_liner", 10 ],
[ "UPS_off", 5 ],
[ "adv_UPS_off", 3 ],
[ "beret", 50 ],
[ "beret_wool", 40 ],
[ "elbow_pads", 50 ],
Expand Down
29 changes: 29 additions & 0 deletions data/json/itemgroups/food.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,5 +199,34 @@
[ "cracklins", 25 ],
[ "fried_seeds", 25 ]
]
},
{
"type": "item_group",
"id": "MRE",
"items": [
[ "mre_chilibeans_box", 45 ],
[ "mre_bbqbeef_box", 45 ],
[ "mre_chickennoodle_box", 45 ],
[ "mre_spaghetti_box", 45 ],
[ "mre_chicken_box", 45 ],
[ "mre_beeftaco_box", 45 ],
[ "mre_beef_box", 45 ],
[ "mre_meatball_box", 45 ],
[ "mre_beefstew_box", 45 ],
[ "mre_chilimac_box", 45 ],
[ "mre_veggy_box", 45 ],
[ "mre_macaronimarinara_box", 45 ],
[ "mre_cheesetort_box", 45 ],
[ "mre_mushroomfettuccine_box", 45 ],
[ "mre_mexicanchickenstew_box", 45 ],
[ "mre_maplesausage_box", 45 ],
[ "mre_ravioli_box", 45 ],
[ "mre_hashbrownbacon_box", 45 ],
[ "mre_lemontuna_box", 45 ],
[ "mre_asianbeef_box", 45 ],
[ "mre_chickenpesto_box", 45 ],
[ "mre_southwestbeef_box", 45 ],
[ "mre_hotdog_box", 45 ]
]
}
]
143 changes: 5 additions & 138 deletions data/json/itemgroups/item_groups.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4961,41 +4961,9 @@
"type": "item_group",
"id": "mil_food",
"items": [
[ "chocolate", 50 ],
[ "neccowafers", 30 ],
[ "can_beans", 40 ],
[ "pork_beans", 40 ],
[ "mre_chilibeans_box", 45 ],
[ "mre_bbqbeef_box", 45 ],
[ "mre_chickennoodle_box", 45 ],
[ "mre_spaghetti_box", 45 ],
[ "mre_chicken_box", 45 ],
[ "mre_beeftaco_box", 45 ],
[ "mre_beef_box", 45 ],
[ "mre_meatball_box", 45 ],
[ "mre_beefstew_box", 45 ],
[ "mre_chilimac_box", 45 ],
[ "mre_veggy_box", 45 ],
[ "mre_macaronimarinara_box", 45 ],
[ "mre_cheesetort_box", 45 ],
[ "mre_mushroomfettuccine_box", 45 ],
[ "mre_mexicanchickenstew_box", 45 ],
[ "mre_maplesausage_box", 45 ],
[ "mre_ravioli_box", 45 ],
[ "mre_hashbrownbacon_box", 45 ],
[ "mre_lemontuna_box", 45 ],
[ "mre_asianbeef_box", 45 ],
[ "mre_chickenpesto_box", 45 ],
[ "mre_southwestbeef_box", 45 ],
[ "mre_hotdog_box", 45 ],
[ "1st_aid", 35 ],
[ "saline", 15 ],
[ "con_milk", 5 ],
[ "milk_UHT", 35 ],
[ "cereal", 35 ],
{ "group": "mil_food_nodrugs", "prob": 1410 },
[ "codeine", 15 ],
[ "antibiotics", 25 ],
[ "water_clean", 90 ],
[ "purifier", 12 ],
[ "heatpack", 60 ],
[ "pur_tablets", 20 ],
Expand All @@ -5016,32 +4984,11 @@
"type": "item_group",
"id": "mil_food_nodrugs",
"items": [
{ "group": "MRE", "prob": 1035 },
[ "chocolate", 50 ],
[ "neccowafers", 30 ],
[ "can_beans", 40 ],
[ "pork_beans", 40 ],
[ "mre_chilibeans_box", 45 ],
[ "mre_bbqbeef_box", 45 ],
[ "mre_chickennoodle_box", 45 ],
[ "mre_spaghetti_box", 45 ],
[ "mre_chicken_box", 45 ],
[ "mre_beeftaco_box", 45 ],
[ "mre_beef_box", 45 ],
[ "mre_meatball_box", 45 ],
[ "mre_beefstew_box", 45 ],
[ "mre_chilimac_box", 45 ],
[ "mre_veggy_box", 45 ],
[ "mre_macaronimarinara_box", 45 ],
[ "mre_cheesetort_box", 45 ],
[ "mre_mushroomfettuccine_box", 45 ],
[ "mre_mexicanchickenstew_box", 45 ],
[ "mre_maplesausage_box", 45 ],
[ "mre_ravioli_box", 45 ],
[ "mre_hashbrownbacon_box", 45 ],
[ "mre_lemontuna_box", 45 ],
[ "mre_asianbeef_box", 45 ],
[ "mre_chickenpesto_box", 45 ],
[ "mre_southwestbeef_box", 45 ],
[ "mre_hotdog_box", 45 ],
[ "1st_aid", 35 ],
[ "saline", 10 ],
[ "con_milk", 10 ],
Expand Down Expand Up @@ -5982,6 +5929,8 @@
"type": "item_group",
"id": "military",
"items": [
{ "group": "mil_food", "prob": 1251 },
{ "group": "mil_armor", "prob": 575 },
[ "m107a1", 1 ],
[ "bipod", 1 ],
[ "50bmg", 3 ],
Expand All @@ -5993,38 +5942,10 @@
[ "water_clean", 90 ],
[ "knuckle_brass", 15 ],
[ "battery_ups", 10 ],
[ "duffelbag", 15 ],
[ "mre_chilibeans_box", 45 ],
[ "mre_bbqbeef_box", 45 ],
[ "mre_chickennoodle_box", 45 ],
[ "mre_spaghetti_box", 45 ],
[ "mre_chicken_box", 45 ],
[ "mre_beeftaco_box", 45 ],
[ "mre_beef_box", 45 ],
[ "mre_meatball_box", 45 ],
[ "mre_beefstew_box", 45 ],
[ "mre_chilimac_box", 45 ],
[ "mre_veggy_box", 45 ],
[ "mre_macaronimarinara_box", 45 ],
[ "mre_cheesetort_box", 45 ],
[ "mre_mushroomfettuccine_box", 45 ],
[ "mre_mexicanchickenstew_box", 45 ],
[ "mre_maplesausage_box", 45 ],
[ "mre_ravioli_box", 45 ],
[ "mre_hashbrownbacon_box", 45 ],
[ "mre_lemontuna_box", 45 ],
[ "mre_asianbeef_box", 45 ],
[ "mre_chickenpesto_box", 45 ],
[ "mre_southwestbeef_box", 45 ],
[ "mre_hotdog_box", 45 ],
[ "bandages", 50 ],
[ "cotton_ball", 20 ],
[ "1st_aid", 35 ],
[ "saline", 15 ],
[ "iodine", 5 ],
[ "prussian_blue", 5 ],
[ "neccowafers", 5 ],
[ "codeine", 15 ],
[ "adrenaline_injector", 4 ],
[ "cig", 90 ],
[ "ecig", 10 ],
Expand All @@ -6035,42 +5956,9 @@
[ "kukri", 2 ],
[ "throwing_knife", 7 ],
[ "boots_steel", 50 ],
[ "boots_combat", 50 ],
[ "pants_army", 30 ],
[ "jacket_army", 30 ],
[ "winter_pants_army", 10 ],
[ "winter_jacket_army", 10 ],
[ "winter_gloves_army", 10 ],
[ "army_top", 30 ],
[ "kevlar", 10 ],
[ "modularvest", 15 ],
[ "modularvestkevlar", 18 ],
[ "modularvestceramic", 24 ],
[ "modularveststeel", 18 ],
[ "modularvestsuper", 8 ],
[ "modularvesthard", 2 ],
[ "vest", 15 ],
[ "gloves_fingerless", 20 ],
[ "gloves_tactical", 30 ],
[ "glasses_bal", 40 ],
[ "mask_gas", 10 ],
[ "glasses_safety", 40 ],
[ "goggles_nv", 1 ],
[ "goggles_ir", 1 ],
[ "hat_boonie", 10 ],
[ "armguard_hard", 20 ],
[ "legguard_hard", 15 ],
[ "helmet_army", 40 ],
[ "kevlar", 10 ],
[ "modularvest", 15 ],
[ "modularvestkevlar", 18 ],
[ "modularvestceramic", 24 ],
[ "modularveststeel", 18 ],
[ "modularvestsuper", 8 ],
[ "modularvesthard", 2 ],
[ "dump_pouch", 20 ],
[ "helmet_liner", 10 ],
[ "backpack", 38 ],
[ "holster", 15 ],
[ "sholster", 10 ],
[ "bandolier_shotgun", 12 ],
Expand Down Expand Up @@ -6141,8 +6029,6 @@
[ "EMPbomb", 2 ],
[ "gasbomb", 3 ],
[ "smokebomb", 5 ],
[ "UPS_off", 5 ],
[ "adv_UPS_off", 3 ],
[ "tazer", 3 ],
[ "c4", 5 ],
[ "hk_g80", 2 ],
Expand All @@ -6153,18 +6039,11 @@
[ "masterkey", 2 ],
[ "rm121aux", 1 ],
[ "shot_flechette", 5 ],
[ "tacvest", 10 ],
[ "molle_pack", 8 ],
[ "legrig", 10 ],
[ "power_armor_basic", 5 ],
[ "power_armor_helmet_basic", 6 ],
[ "power_armor_frame", 4 ],
[ "canteen", 15 ],
[ "2lcanteen", 10 ],
[ "camelbak", 5 ],
[ "jerrycan", 10 ],
[ "rucksack", 20 ],
[ "heatpack", 60 ],
[ "LAW_Packed", 30 ],
[ "m3_carlgustav", 1 ],
[ "84x246mm_he", 3 ],
Expand Down Expand Up @@ -6195,7 +6074,6 @@
[ "nic_gum", 1 ],
[ "improve_sights", 10 ],
[ "waterproof_gunmod", 4 ],
[ "pur_tablets", 10 ],
[ "cleansuit", 5 ],
[ "needlegun", 4 ],
[ "needlepistol", 6 ],
Expand All @@ -6204,19 +6082,9 @@
[ "hazmat_suit", 5 ],
[ "e_tool", 20 ],
[ "knife_trench", 14 ],
[ "fungicide", 3 ],
[ "insecticide", 3 ],
[ "flaregun", 20 ],
[ "signal_flare", 25 ],
[ "militarymap", 4 ],
[ "quikclot", 20 ],
[ "bfipowder", 20 ],
[ "rx12_injector", 5 ],
[ "ampoule", 10 ],
[ "rx11_stimpack", 5 ],
[ "stimpack_ammo", 10 ],
[ "optical_cloak", 1 ],
[ "holo_cloak", 1 ],
[ "halligan", 10 ],
[ "fire_ax", 5 ],
[ "antiparasitic", 2 ],
Expand All @@ -6234,7 +6102,6 @@
[ "bot_manhack", 1 ],
[ "bot_grenade_hack", 1 ],
[ "l-stick", 1 ],
[ "solarpack", 2 ],
[ "chem_hexamine", 5 ],
[ "esbit_stove", 8 ],
[ "mess_tin", 4 ],
Expand Down

0 comments on commit dc3a1bf

Please sign in to comment.