From d1699630acd5b2fecbb7118f28a8647bc7e2b762 Mon Sep 17 00:00:00 2001 From: XygenSS Date: Thu, 26 Nov 2020 13:38:36 +0900 Subject: [PATCH 1/4] snacks, office, cubical office, office breakroom, shelter --- data/json/itemgroups/Food/food.json | 3 ++- data/json/itemgroups/Locations_MapExtras/locations.json | 6 ++++-- data/json/itemgroups/SUS/domestic.json | 5 +++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 7c5b8f1af6022..6eb2ea96f1870 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -189,6 +189,7 @@ { "item": "marshmallow", "prob": 10 }, { "item": "syrup", "prob": 15 }, { "item": "coffee_syrup", "prob": 10 }, + { "item": "instant_coffee", "prob": 10 }, { "item": "soup_veggy", "prob": 15 }, { "item": "soup_meat", "prob": 15 }, { "item": "soup_chicken", "prob": 15 }, @@ -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": 15 }, { "item": "choco_coffee_beans", "prob": 10 }, { "item": "salt", "prob": 10 }, { "item": "pepper", "prob": 10 }, diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 47fc743139b62..591571e107cd7 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -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 ], @@ -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 }, @@ -2049,6 +2049,7 @@ [ "gum", 100 ], [ "caff_gum", 20 ], [ "nic_gum", 20 ], + [ "instant_coffee", 100 ], [ "weed", 10 ], [ "joint", 10 ], [ "matches", 50 ], @@ -2154,6 +2155,7 @@ [ "neccowafers", 40 ], [ "can_herring", 30 ], [ "coffee_raw", 15 ], + [ "instant_coffee", 25], [ "cheese_hard", 5 ], [ "bandages", 50 ], [ "adhesive_bandages", 50 ], diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json index e4f62e78ae545..648a81f4d4fa7 100644 --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -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, 15 ] }, + { "item": "coffee_raw", "prob": 30, "charges": [ 1, 200 ], "container-item": "can_food_big" } ], "prob": 80 }, From 23368ce1b8ad0a7454cec3b0dab23c54daad5d20 Mon Sep 17 00:00:00 2001 From: XygenSS Date: Thu, 26 Nov 2020 13:59:43 +0900 Subject: [PATCH 2/4] Lint --- data/json/itemgroups/Locations_MapExtras/locations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 591571e107cd7..552d18d302d28 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -2155,7 +2155,7 @@ [ "neccowafers", 40 ], [ "can_herring", 30 ], [ "coffee_raw", 15 ], - [ "instant_coffee", 25], + [ "instant_coffee", 25 ], [ "cheese_hard", 5 ], [ "bandages", 50 ], [ "adhesive_bandages", 50 ], From 2d54d80a344dc274c7d6bb0d8a04cbf3d8396aae Mon Sep 17 00:00:00 2001 From: XygenSS Date: Thu, 26 Nov 2020 14:54:21 +0900 Subject: [PATCH 3/4] stash_food, mil_food_nodrugs, ws_fire_lookout_tower --- data/json/itemgroups/military.json | 1 + data/json/itemgroups/stashes.json | 1 + data/json/mapgen/ws_fire_lookout_tower.json | 1 + 3 files changed, 3 insertions(+) diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index 2a9208b1afabe..7e80da8e42f9a 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -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": 15 }, { "item": "con_milk", "prob": 10 }, { "item": "milk_UHT", "prob": 25 }, { "item": "cereal", "prob": 20 }, diff --git a/data/json/itemgroups/stashes.json b/data/json/itemgroups/stashes.json index e7fbe8fc48a33..1e96bd7f56fdc 100644 --- a/data/json/itemgroups/stashes.json +++ b/data/json/itemgroups/stashes.json @@ -27,6 +27,7 @@ { "item": "sauerkraut", "prob": 20, "charges": 4, "container-item": "jar_glass_sealed" }, [ "con_milk", 10 ], [ "milk_evap", 10 ], + [ "instant_coffee", 15 ], { "item": "fish_pickled", "prob": 26, "charges": 2, "container-item": "jar_glass_sealed" }, [ "lutefisk", 1 ], [ "pemmican", 10 ], diff --git a/data/json/mapgen/ws_fire_lookout_tower.json b/data/json/mapgen/ws_fire_lookout_tower.json index be9e4bb2f6017..a4dd3d2f7d76a 100644 --- a/data/json/mapgen/ws_fire_lookout_tower.json +++ b/data/json/mapgen/ws_fire_lookout_tower.json @@ -44,6 +44,7 @@ [ "coffee", 20 ], [ "atomic_coffee", 20 ], [ "coffee_raw", 20 ], + [ "instant_coffee", 20 ], [ "coffee_syrup", 20 ], [ "water_mineral", 20 ] ] From c23a58934f839bd7249214794c94820def4d639b Mon Sep 17 00:00:00 2001 From: XygenSS Date: Fri, 27 Nov 2020 10:21:52 +0900 Subject: [PATCH 4/4] Rebalance --- data/json/itemgroups/Food/food.json | 6 +++--- data/json/itemgroups/Locations_MapExtras/locations.json | 4 +++- data/json/itemgroups/SUS/domestic.json | 2 +- data/json/itemgroups/military.json | 2 +- data/json/itemgroups/stashes.json | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 6eb2ea96f1870..b8889ec3eb336 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -188,8 +188,8 @@ { "item": "grahmcrackers", "prob": 10 }, { "item": "marshmallow", "prob": 10 }, { "item": "syrup", "prob": 15 }, - { "item": "coffee_syrup", "prob": 10 }, - { "item": "instant_coffee", "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 }, @@ -462,7 +462,7 @@ { "item": "cookies", "prob": 80 }, { "item": "tea_raw", "prob": 10 }, { "item": "tea_green_raw", "prob": 5 }, - { "item": "instant_coffee", "prob": 15 }, + { "item": "instant_coffee", "prob": 20 }, { "item": "choco_coffee_beans", "prob": 10 }, { "item": "salt", "prob": 10 }, { "item": "pepper", "prob": 10 }, diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json index 552d18d302d28..29327c24f5361 100644 --- a/data/json/itemgroups/Locations_MapExtras/locations.json +++ b/data/json/itemgroups/Locations_MapExtras/locations.json @@ -2049,7 +2049,9 @@ [ "gum", 100 ], [ "caff_gum", 20 ], [ "nic_gum", 20 ], - [ "instant_coffee", 100 ], + [ "instant_coffee", 130 ], + [ "coffee_syrup", 80 ], + [ "coffee_raw", 80 ], [ "weed", 10 ], [ "joint", 10 ], [ "matches", 50 ], diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json index 648a81f4d4fa7..f5c9d060635a3 100644 --- a/data/json/itemgroups/SUS/domestic.json +++ b/data/json/itemgroups/SUS/domestic.json @@ -479,7 +479,7 @@ { "distribution": [ { "item": "coffee_raw", "prob": 30 }, - { "item": "instant_coffee", "prob": 40, "count": [ 1, 15 ] }, + { "item": "instant_coffee", "prob": 40, "count": [ 1, 5 ] }, { "item": "coffee_raw", "prob": 30, "charges": [ 1, 200 ], "container-item": "can_food_big" } ], "prob": 80 diff --git a/data/json/itemgroups/military.json b/data/json/itemgroups/military.json index 7e80da8e42f9a..719c44e14e571 100644 --- a/data/json/itemgroups/military.json +++ b/data/json/itemgroups/military.json @@ -474,7 +474,7 @@ { "item": "pork_beans", "prob": 40 }, { "distribution": [ { "group": "full_ifak" }, { "group": "used_ifak" } ], "prob": 35 }, { "item": "saline", "prob": 10 }, - { "item": "instant_coffee", "prob": 15 }, + { "item": "instant_coffee", "prob": 25 }, { "item": "con_milk", "prob": 10 }, { "item": "milk_UHT", "prob": 25 }, { "item": "cereal", "prob": 20 }, diff --git a/data/json/itemgroups/stashes.json b/data/json/itemgroups/stashes.json index 1e96bd7f56fdc..fdcde540d2088 100644 --- a/data/json/itemgroups/stashes.json +++ b/data/json/itemgroups/stashes.json @@ -27,7 +27,7 @@ { "item": "sauerkraut", "prob": 20, "charges": 4, "container-item": "jar_glass_sealed" }, [ "con_milk", 10 ], [ "milk_evap", 10 ], - [ "instant_coffee", 15 ], + [ "instant_coffee", 25 ], { "item": "fish_pickled", "prob": 26, "charges": 2, "container-item": "jar_glass_sealed" }, [ "lutefisk", 1 ], [ "pemmican", 10 ],