From 82b25706ef142a56e7dd6b12f41b72a5a5e2471f Mon Sep 17 00:00:00 2001 From: Lil Shining Man <56778776+LilShiningMan@users.noreply.github.com> Date: Mon, 11 Nov 2019 18:00:22 -0800 Subject: [PATCH] softdrink list added (#35475) added softdrink list to food.json and changed item spawn lists in item_group, locations and food_service to reflect this. --- data/json/itemgroups/food.json | 15 +++ data/json/itemgroups/food_service.json | 33 +------ data/json/itemgroups/item_groups.json | 128 ++++--------------------- data/json/itemgroups/locations.json | 6 +- 4 files changed, 37 insertions(+), 145 deletions(-) diff --git a/data/json/itemgroups/food.json b/data/json/itemgroups/food.json index 0fc61a29bfc81..f966276067061 100644 --- a/data/json/itemgroups/food.json +++ b/data/json/itemgroups/food.json @@ -149,5 +149,20 @@ [ "garlic", 3 ], [ "pine_nuts", 2 ] ] + }, + { + "type": "item_group", + "id": "softdrinks_canned", + "items": [ + [ "cola", 60 ], + [ "colamdew", 55 ], + [ "creamsoda", 50 ], + [ "lemonlime", 50 ], + [ "orangesoda", 45 ], + [ "rootbeer", 40 ], + [ "crispycran", 35 ], + [ "purple_drink", 35 ], + [ "choc_drink", 25 ] + ] } ] diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json index c4d363d7b0f28..63f2bcc83720c 100644 --- a/data/json/itemgroups/food_service.json +++ b/data/json/itemgroups/food_service.json @@ -130,8 +130,7 @@ [ "oj", 40 ], [ "juice", 35 ], [ "cranberry_juice", 35 ], - [ "cola", 50 ], - [ "lemonlime", 45 ], + { "group": "softdrinks_canned", "prob": 95 }, [ "V8", 15 ], [ "fries", 7 ], [ "cheese_fries", 5 ], @@ -247,18 +246,7 @@ { "id": "pizza_soda", "type": "item_group", - "items": [ - [ "purple_drink", 3 ], - [ "crispycran", 7 ], - [ "rootbeer", 15 ], - [ "colamdew", 9 ], - [ "orangesoda", 10 ], - [ "lemonlime", 9 ], - [ "creamsoda", 9 ], - [ "cola", 9 ], - [ "energy_drink", 5 ], - [ "lemonade", 8 ] - ] + "items": [ { "group": "softdrinks_canned", "prob": 70 }, [ "energy_drink", 5 ], [ "lemonade", 8 ] ] }, { "id": "pizza_table", @@ -460,13 +448,7 @@ [ "cheeseburger", 15 ], [ "hamburger", 15 ], [ "fish_sandwich", 10 ], - [ "cola", 15 ], - [ "lemonlime", 10 ], - [ "orangesoda", 10 ], - [ "crispycran", 10 ], - [ "rootbeer", 13 ], - [ "colamdew", 10 ], - [ "lemonade", 7 ] + { "group": "softdrinks_canned", "prob": 75 } ] }, { @@ -621,15 +603,8 @@ [ "sports_drink", 40 ], [ "energy_drink", 40 ], [ "energy_drink_atomic", 5 ], - [ "cola", 35 ], - [ "creamsoda", 30 ], - [ "lemonlime", 40 ], - [ "orangesoda", 30 ], - [ "colamdew", 40 ], - [ "rootbeer", 30 ], + { "group": "softdrinks_canned", "prob": 290 }, [ "spezi", 10 ], - [ "crispycran", 35 ], - [ "purple_drink", 50 ], { "item": "cola", "prob": 30, "container-item": "bottle_plastic" }, { "item": "creamsoda", "prob": 20, "container-item": "bottle_plastic" }, { "item": "lemonlime", "prob": 20, "container-item": "bottle_plastic" }, diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json index 2f09b9b4403b0..359de6b55d5f7 100644 --- a/data/json/itemgroups/item_groups.json +++ b/data/json/itemgroups/item_groups.json @@ -17,13 +17,7 @@ [ "cookies", 80 ], [ "crack", 8 ], [ "bat", 60 ], - [ "purple_drink", 12 ], - [ "cola", 6 ], - [ "creamsoda", 6 ], - [ "lemonlime", 6 ], - [ "orangesoda", 5 ], - [ "crispycran", 12 ], - [ "colamdew", 8 ], + { "group": "softdrinks_canned", "prob": 55 }, { "item": "cola", "prob": 6, "container-item": "bottle_plastic" }, { "item": "creamsoda", "prob": 6, "container-item": "bottle_plastic" }, { "item": "lemonlime", "prob": 6, "container-item": "bottle_plastic" }, @@ -203,20 +197,12 @@ "ammo": 50, "magazine": 100, "items": [ - [ "rootbeer", 65 ], + { "group": "softdrinks_canned", "prob": 325 }, [ "mag_computer", 35 ], - [ "purple_drink", 35 ], - [ "creamsoda", 35 ], [ "basket_laundry", 20 ], - [ "lemonlime", 35 ], - [ "orangesoda", 20 ], - [ "crispycran", 20 ], - [ "colamdew", 35 ], [ "television", 30 ], [ "clock", 10 ], [ "fp_loyalty_card", 5 ], - [ "cola", 70 ], - [ "choc_drink", 10 ], { "item": "cola", "prob": 20, "container-item": "bottle_plastic" }, { "item": "rootbeer", "prob": 20, "container-item": "bottle_plastic" }, { "item": "lemonlime", "prob": 10, "container-item": "bottle_plastic" }, @@ -671,15 +657,7 @@ [ "cranberry_juice", 50 ], [ "sports_drink", 30 ], [ "lemonade", 50 ], - [ "cola", 70 ], - [ "choc_drink", 30 ], - [ "rootbeer", 65 ], - [ "purple_drink", 35 ], - [ "creamsoda", 35 ], - [ "lemonlime", 35 ], - [ "orangesoda", 20 ], - [ "crispycran", 20 ], - [ "colamdew", 35 ], + { "group": "softdrinks_canned", "prob": 345 }, { "item": "cola", "prob": 15, "container-item": "bottle_twoliter" }, { "item": "creamsoda", "prob": 15, "container-item": "bottle_twoliter" }, { "item": "lemonlime", "prob": 15, "container-item": "bottle_twoliter" }, @@ -996,13 +974,7 @@ [ "firecracker", 5 ], [ "fried_seeds", 30 ], [ "chips", 65 ], - [ "cola", 70 ], - [ "lemonlime", 70 ], - [ "orangesoda", 60 ], - [ "crispycran", 30 ], - [ "creamsoda", 70 ], - [ "colamdew", 70 ], - [ "choc_drink", 10 ], + { "group": "softdrinks_canned", "prob": 380 }, [ "picklocks", 10 ], [ "wolfsuit", 4 ], [ "dinosuit", 4 ], @@ -1155,8 +1127,7 @@ [ "lemonade", 50 ], [ "energy_drink", 55 ], [ "energy_drink_atomic", 4 ], - [ "crispycran", 40 ], - [ "choc_drink", 30 ], + { "group": "softdrinks_canned", "prob": 70 }, { "item": "cola", "prob": 70, "container-item": "bottle_plastic" }, { "item": "rootbeer", "prob": 20, "container-item": "bottle_plastic" }, { "item": "creamsoda", "prob": 60, "container-item": "bottle_plastic" }, @@ -1243,15 +1214,7 @@ [ "energy_drink", 55 ], [ "herbal_tea", 30 ], [ "energy_drink_atomic", 4 ], - [ "cola", 70 ], - [ "creamsoda", 60 ], - [ "lemonlime", 60 ], - [ "orangesoda", 40 ], - [ "crispycran", 30 ], - [ "colamdew", 60 ], - [ "choc_drink", 30 ], - [ "rootbeer", 65 ], - [ "purple_drink", 45 ], + { "group": "softdrinks_canned", "prob": 460 }, [ "milk", 50 ], [ "yoghurt", 40 ], [ "pudding", 50 ], @@ -1310,15 +1273,7 @@ "id": "fast_food", "items": [ [ "water_clean", 90 ], - [ "cola", 70 ], - [ "choc_drink", 30 ], - [ "rootbeer", 65 ], - [ "creamsoda", 60 ], - [ "lemonlime", 60 ], - [ "orangesoda", 60 ], - [ "crispycran", 30 ], - [ "colamdew", 60 ], - [ "purple_drink", 45 ], + { "group": "softdrinks_canned", "prob": 480 }, [ "sandwich_t", 30 ], [ "sandwich_pb", 30 ], [ "sandwich_pbj", 30 ], @@ -1382,15 +1337,7 @@ "items": [ [ "water_clean", 90 ], [ "water_mineral", 10 ], - [ "cola", 70 ], - [ "choc_drink", 40 ], - [ "rootbeer", 65 ], - [ "creamsoda", 60 ], - [ "lemonlime", 60 ], - [ "orangesoda", 40 ], - [ "crispycran", 40 ], - [ "colamdew", 60 ], - [ "purple_drink", 35 ], + { "group": "softdrinks_canned", "prob": 470 }, [ "almond_milk", 30 ], [ "soy_milk", 30 ], [ "juice", 20 ], @@ -3055,12 +3002,7 @@ "ammo": 75, "magazine": 100, "items": [ - [ "cola", 70 ], - [ "creamsoda", 60 ], - [ "lemonlime", 60 ], - [ "orangesoda", 60 ], - [ "crispycran", 40 ], - [ "colamdew", 60 ], + { "group": "softdrinks_canned", "prob": 370 }, [ "file", 90 ], [ "mag_barter", 35 ], [ "mag_computer", 35 ], @@ -3073,7 +3015,6 @@ [ "mag_unarmed", 10 ], [ "decoy_anarch", 8 ], [ "recipe_augs", 8 ], - [ "choc_drink", 20 ], [ "aspirin", 85 ], [ "junk_burrito", 25 ], [ "cigar", 5 ], @@ -3128,13 +3069,7 @@ "type": "item_group", "id": "cubical_office", "items": [ - [ "cola", 70 ], - [ "choc_drink", 30 ], - [ "creamsoda", 60 ], - [ "lemonlime", 60 ], - [ "orangesoda", 60 ], - [ "crispycran", 40 ], - [ "colamdew", 60 ], + { "group": "softdrinks_canned", "prob": 560 }, [ "file", 90 ], [ "mag_barter", 15 ], [ "mag_computer", 35 ], @@ -3188,8 +3123,6 @@ [ "bubblewrap", 50 ], [ "coffee_raw", 15 ], [ "usb_drive", 5 ], - [ "rootbeer", 65 ], - [ "purple_drink", 55 ], [ "cig", 80 ], [ "tobacco", 10 ], [ "chaw", 20 ], @@ -3226,15 +3159,7 @@ "type": "item_group", "id": "office_breakroom", "items": [ - [ "cola", 100 ], - [ "choc_drink", 100 ], - [ "creamsoda", 100 ], - [ "lemonlime", 100 ], - [ "orangesoda", 100 ], - [ "crispycran", 100 ], - [ "colamdew", 100 ], - [ "rootbeer", 100 ], - [ "purple_drink", 100 ], + { "group": "softdrinks_canned", "prob": 900 }, [ "maltballs", 60 ], [ "chocolate", 100 ], [ "cookies", 60 ], @@ -4953,10 +4878,9 @@ [ "firecracker", 1 ], [ "fried_seeds", 10 ], [ "chips", 65 ], - [ "cola", 70 ], + { "group": "softdrinks_canned", "prob": 90 }, [ "choco_coffee_beans", 20 ], [ "caffeine", 20 ], - [ "choc_drink", 20 ], [ "cola_meth", 1 ], [ "picklocks", 10 ], [ "wolfsuit", 4 ], @@ -5625,12 +5549,7 @@ "type": "item_group", "id": "radio", "items": [ - [ "cola", 70 ], - [ "choc_drink", 20 ], - [ "creamsoda", 60 ], - [ "lemonlime", 40 ], - [ "orangesoda", 40 ], - [ "colamdew", 60 ], + { "group": "softdrinks_canned", "prob": 290 }, [ "caffeine", 25 ], [ "maltballs", 30 ], [ "cig", 90 ], @@ -6651,13 +6570,7 @@ "items": [ [ "water_clean", 90 ], [ "water_mineral", 5 ], - [ "cola", 70 ], - [ "creamsoda", 60 ], - [ "lemonlime", 60 ], - [ "orangesoda", 60 ], - [ "crispycran", 40 ], - [ "colamdew", 60 ], - [ "choc_drink", 30 ], + { "group": "softdrinks_canned", "prob": 380 }, { "item": "cola", "prob": 25, "container-item": "bottle_glass" }, { "item": "creamsoda", "prob": 25, "container-item": "bottle_glass" }, { "item": "lemonlime", "prob": 25, "container-item": "bottle_glass" }, @@ -7213,13 +7126,7 @@ [ "maltballs", 45 ], [ "cookies", 45 ], [ "bat", 15 ], - [ "purple_drink", 42 ], - [ "cola", 32 ], - [ "creamsoda", 42 ], - [ "lemonlime", 32 ], - [ "orangesoda", 32 ], - [ "crispycran", 32 ], - [ "colamdew", 32 ], + { "group": "softdrinks_canned", "prob": 244 }, [ "backpack", 20 ], [ "hairpin", 10 ], [ "fc_hairpin", 4 ], @@ -8163,11 +8070,8 @@ "items": [ [ "water_clean", 30 ], [ "water_mineral", 15 ], - [ "cola", 30 ], - [ "choc_drink", 30 ], + { "group": "softdrinks_canned", "prob": 121 }, [ "milk_UHT", 10 ], - [ "rootbeer", 33 ], - [ "creamsoda", 28 ], [ "juice", 31 ], [ "pie", 40 ], [ "pie_meat", 28 ], diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json index 8bf8779214448..b520ffadbe89b 100644 --- a/data/json/itemgroups/locations.json +++ b/data/json/itemgroups/locations.json @@ -322,8 +322,7 @@ [ "oj", 40 ], [ "juice", 35 ], [ "cranberry_juice", 35 ], - [ "cola", 50 ], - [ "lemonlime", 45 ], + { "group": "softdrinks_canned", "prob": 95 }, [ "V8", 15 ], [ "gum", 15 ] ] @@ -337,8 +336,7 @@ [ "oj", 40 ], [ "juice", 35 ], [ "cranberry_juice", 35 ], - [ "cola", 50 ], - [ "lemonlime", 45 ], + { "group": "softdrinks_canned", "prob": 95 }, [ "V8", 15 ], [ "fries", 7 ], [ "cheese_fries", 5 ],