Skip to content

Commit

Permalink
Add instant coffee to loot table (#45639)
Browse files Browse the repository at this point in the history
* snacks, office, cubical office, office breakroom, shelter
* stash_food, mil_food_nodrugs, ws_fire_lookout_tower
  • Loading branch information
XygenSS authored Nov 27, 2020
1 parent f780ab9 commit b9ba5a2
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 6 deletions.
5 changes: 3 additions & 2 deletions data/json/itemgroups/Food/food.json
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,8 @@
{ "item": "grahmcrackers", "prob": 10 },
{ "item": "marshmallow", "prob": 10 },
{ "item": "syrup", "prob": 15 },
{ "item": "coffee_syrup", "prob": 10 },
{ "item": "coffee_syrup", "prob": 15 },
{ "item": "instant_coffee", "prob": 15 },
{ "item": "soup_veggy", "prob": 15 },
{ "item": "soup_meat", "prob": 15 },
{ "item": "soup_chicken", "prob": 15 },
Expand Down Expand Up @@ -461,7 +462,7 @@
{ "item": "cookies", "prob": 80 },
{ "item": "tea_raw", "prob": 10 },
{ "item": "tea_green_raw", "prob": 5 },
{ "item": "coffee_raw", "prob": 15 },
{ "item": "instant_coffee", "prob": 20 },
{ "item": "choco_coffee_beans", "prob": 10 },
{ "item": "salt", "prob": 10 },
{ "item": "pepper", "prob": 10 },
Expand Down
8 changes: 6 additions & 2 deletions data/json/itemgroups/Locations_MapExtras/locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -1949,7 +1949,7 @@
{ "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
{ "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
[ "bubblewrap", 50 ],
[ "coffee_raw", 15 ],
[ "instant_coffee", 15 ],
[ "usb_drive", 5 ],
[ "software_useless", 10 ],
[ "software_electronics_reference", 2 ],
Expand Down Expand Up @@ -2009,7 +2009,7 @@
{ "item": "flashlight", "prob": 40, "charges": [ 0, 300 ] },
{ "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
{ "item": "bubblewrap", "prob": 50 },
{ "item": "coffee_raw", "prob": 15 },
{ "item": "instant_coffee", "prob": 15 },
{ "item": "usb_drive", "prob": 5 },
{ "item": "coat_rain", "prob": 50 },
{ "item": "hood_rain", "prob": 10 },
Expand Down Expand Up @@ -2049,6 +2049,9 @@
[ "gum", 100 ],
[ "caff_gum", 20 ],
[ "nic_gum", 20 ],
[ "instant_coffee", 130 ],
[ "coffee_syrup", 80 ],
[ "coffee_raw", 80 ],
[ "weed", 10 ],
[ "joint", 10 ],
[ "matches", 50 ],
Expand Down Expand Up @@ -2154,6 +2157,7 @@
[ "neccowafers", 40 ],
[ "can_herring", 30 ],
[ "coffee_raw", 15 ],
[ "instant_coffee", 25 ],
[ "cheese_hard", 5 ],
[ "bandages", 50 ],
[ "adhesive_bandages", 50 ],
Expand Down
5 changes: 3 additions & 2 deletions data/json/itemgroups/SUS/domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,9 @@
{ "distribution": [ { "item": "coffeemaker", "prob": 90 }, { "item": "atomic_coffeepot", "prob": 10 } ], "prob": 75 },
{
"distribution": [
{ "item": "coffee_raw", "prob": 50 },
{ "item": "coffee_raw", "prob": 50, "charges": [ 1, 200 ], "container-item": "can_food_big" }
{ "item": "coffee_raw", "prob": 30 },
{ "item": "instant_coffee", "prob": 40, "count": [ 1, 5 ] },
{ "item": "coffee_raw", "prob": 30, "charges": [ 1, 200 ], "container-item": "can_food_big" }
],
"prob": 80
},
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/military.json
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@
{ "item": "pork_beans", "prob": 40 },
{ "distribution": [ { "group": "full_ifak" }, { "group": "used_ifak" } ], "prob": 35 },
{ "item": "saline", "prob": 10 },
{ "item": "instant_coffee", "prob": 25 },
{ "item": "con_milk", "prob": 10 },
{ "item": "milk_UHT", "prob": 25 },
{ "item": "cereal", "prob": 20 },
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/stashes.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
{ "item": "sauerkraut", "prob": 20, "charges": 4, "container-item": "jar_glass_sealed" },
[ "con_milk", 10 ],
[ "milk_evap", 10 ],
[ "instant_coffee", 25 ],
{ "item": "fish_pickled", "prob": 26, "charges": 2, "container-item": "jar_glass_sealed" },
[ "lutefisk", 1 ],
[ "pemmican", 10 ],
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen/ws_fire_lookout_tower.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
[ "coffee", 20 ],
[ "atomic_coffee", 20 ],
[ "coffee_raw", 20 ],
[ "instant_coffee", 20 ],
[ "coffee_syrup", 20 ],
[ "water_mineral", 20 ]
]
Expand Down

0 comments on commit b9ba5a2

Please sign in to comment.