Skip to content

Commit

Permalink
softdrink list added (CleverRaven#35475)
Browse files Browse the repository at this point in the history 
added softdrink list to food.json and changed item spawn lists in item_group, locations and food_service to reflect this.
  • Loading branch information
@LilShiningMan @AMurkin
LilShiningMan authored and AMurkin committed Nov 13, 2019
1 parent fe08f7b commit 82b2570
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 145 deletions.
15 changes: 15 additions & 0 deletions data/json/itemgroups/food.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
]
}
]
33 changes: 4 additions & 29 deletions data/json/itemgroups/food_service.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ],
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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 }
]
},
{
Expand Down Expand Up @@ -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" },
Expand Down
128 changes: 16 additions & 112 deletions data/json/itemgroups/item_groups.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down Expand Up @@ -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" },
Expand Down Expand Up @@ -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" },
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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" },
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ],
Expand All @@ -3073,7 +3015,6 @@
[ "mag_unarmed", 10 ],
[ "decoy_anarch", 8 ],
[ "recipe_augs", 8 ],
[ "choc_drink", 20 ],
[ "aspirin", 85 ],
[ "junk_burrito", 25 ],
[ "cigar", 5 ],
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -3188,8 +3123,6 @@
[ "bubblewrap", 50 ],
[ "coffee_raw", 15 ],
[ "usb_drive", 5 ],
[ "rootbeer", 65 ],
[ "purple_drink", 55 ],
[ "cig", 80 ],
[ "tobacco", 10 ],
[ "chaw", 20 ],
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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" },
Expand Down Expand Up @@ -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 ],
Expand Down Expand Up @@ -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 ],
Expand Down
6 changes: 2 additions & 4 deletions data/json/itemgroups/locations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,7 @@
[ "oj", 40 ],
[ "juice", 35 ],
[ "cranberry_juice", 35 ],
[ "cola", 50 ],
[ "lemonlime", 45 ],
{ "group": "softdrinks_canned", "prob": 95 },
[ "V8", 15 ],
[ "gum", 15 ]
]
Expand All @@ -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 ],
Expand Down

0 comments on commit 82b2570

Please sign in to comment.