Skip to content

Commit

Permalink
Alcohol Revamp
Browse files Browse the repository at this point in the history 
Granularized main alcohol groups, eliminated redundant lists in various item groups.
  • Loading branch information
@LilShiningMan @kevingranade
LilShiningMan authored and kevingranade committed Jan 2, 2020
1 parent 5bdcd06 commit f6eb74d
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 203 deletions.
120 changes: 61 additions & 59 deletions data/json/itemgroups/food.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -759,42 +759,54 @@
{
"type": "item_group",
"id": "alcohol",
"//": "all comestible alcohol -- packaged, mixed and homemade",
"items": [
{ "group": "alcohol_bottled_canned", "prob": 376 },
{ "group": "mixed_alcoholic_drinks", "prob": 141 },
[ "dandelion_wine", 8 ],
[ "hb_beer", 8 ],
[ "moonshine", 8 ]
]
},
{
"type": "item_group",
"id": "alcohol_bottled_canned",
"items": [
{ "group": "liquor_and_spirits", "prob": 108 },
{ "group": "wines_worthy", "prob": 39 },
{ "group": "beer", "prob": 141 },
{ "group": "misc_alcohol", "prob": 88 }
]
},
{
"type": "item_group",
"id": "beer",
"items": [
[ "whiskey", 16 ],
[ "vodka", 20 ],
[ "gin", 20 ],
[ "rum", 14 ],
[ "tequila", 12 ],
[ "chem_ethanol", 10 ],
[ "triple_sec", 12 ],
[ "bum_wine", 20 ],
[ "fruit_wine", 12 ],
[ "brandy", 12 ],
[ "drink_rumcola", 12 ],
[ "drink_screwdriver", 12 ],
[ "drink_wild_apple", 8 ],
[ "long_island", 6 ],
[ "wine_riesling", 6 ],
[ "wine_chardonnay", 10 ],
[ "wine_cabernet", 10 ],
[ "wine_marsala", 2 ],
[ "wine_vermouth", 9 ],
[ "wine_barley", 24 ],
[ "wine_noir", 2 ],
[ "beer", 35 ],
[ "european_pilsner", 25 ],
[ "pale_ale", 25 ],
[ "india_pale_ale", 25 ],
[ "stout", 15 ],
[ "belgian_ale", 10 ],
[ "imperial_stout", 4 ],
[ "single_malt_whiskey", 2 ],
[ "survnote", 1 ]
[ "wine_barley", 2 ]
]
},
{
"type": "item_group",
"id": "alcohol_bottled_canned",
"id": "wines_worthy",
"items": [
[ "wine_riesling", 20 ],
[ "wine_chardonnay", 30 ],
[ "wine_cabernet", 30 ],
[ "wine_noir", 20 ],
[ "wine_vermouth", 25 ],
[ "wine_marsala", 15 ]
]
},
{
"type": "item_group",
"id": "liquor_and_spirits",
"items": [
[ "whiskey", 16 ],
[ "vodka", 20 ],
Expand All @@ -803,51 +815,41 @@
[ "tequila", 12 ],
[ "triple_sec", 12 ],
[ "brandy", 12 ],
[ "single_malt_whiskey", 2 ],
[ "single_pot_whiskey", 10 ],
[ "cheap_whiskey", 10 ],
[ "canadian_whiskey", 10 ]
]
},
{
"type": "item_group",
"id": "misc_alcohol",
"items": [
[ "bum_wine", 20 ],
[ "pine_wine", 6 ],
[ "fruit_wine", 12 ],
[ "mead", 10 ],
[ "sherry", 10 ],
[ "bristol_sherry", 5 ],
[ "madeira", 5 ]
]
},
{
"type": "item_group",
"id": "mixed_alcoholic_drinks",
"items": [
[ "drink_rumcola", 12 ],
[ "drink_screwdriver", 12 ],
[ "drink_wild_apple", 8 ],
[ "long_island", 6 ],
[ "drink_strawberry_surprise", 6 ],
[ "drink_boozeberry", 6 ],
[ "drink_hobo", 10 ],
[ "drink_kalimotxo", 10 ],
[ "drink_beeknees", 8 ],
[ "drink_wsour", 8 ],
[ "wine_riesling", 6 ],
[ "wine_chardonnay", 10 ],
[ "wine_cabernet", 10 ],
[ "wine_noir", 5 ],
[ "dandelion_wine", 8 ],
[ "wine_marsala", 2 ],
[ "wine_vermouth", 9 ],
[ "wine_barley", 24 ],
[ "pine_wine", 6 ],
[ "bum_wine", 20 ],
[ "fruit_wine", 12 ],
[ "beer", 35 ],
[ "european_pilsner", 25 ],
[ "pale_ale", 25 ],
[ "india_pale_ale", 25 ],
[ "stout", 15 ],
[ "belgian_ale", 10 ],
[ "imperial_stout", 5 ],
[ "hb_beer", 8 ],
[ "long_island", 6 ],
[ "mead", 10 ],
[ "moonshine", 8 ],
[ "eggnog_spiked", 5 ],
[ "chem_ethanol", 5 ]
]
},
{
"type": "item_group",
"id": "wines_worthy",
"items": [
[ "wine_riesling", 20 ],
[ "wine_chardonnay", 30 ],
[ "wine_cabernet", 30 ],
[ "wine_noir", 20 ],
[ "wine_vermouth", 25 ],
[ "wine_marsala", 15 ]
[ "drink_martini", 10 ]
]
}
]
77 changes: 10 additions & 67 deletions data/json/itemgroups/food_service.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,38 +75,14 @@
"id": "bar_alcohol",
"type": "item_group",
"items": [
[ "beer", 70 ],
[ "european_pilsner", 60 ],
[ "pale_ale", 60 ],
[ "india_pale_ale", 57 ],
[ "wine_barley", 55 ],
[ "stout", 56 ],
[ "belgian_ale", 50 ],
[ "imperial_stout", 45 ],
[ "whiskey", 20 ],
[ "vodka", 12 ],
[ "gin", 15 ],
[ "rum", 12 ],
[ "tequila", 17 ],
[ "triple_sec", 10 ],
[ "single_pot_whiskey", 10 ],
[ "cheap_whiskey", 10 ],
[ "canadian_whiskey", 10 ],
{ "group": "beer", "prob": 453 },
{ "group": "wines_worthy", "prob": 100 },
{ "group": "liquor_and_spirits", "prob": 116 },
{ "group": "mixed_alcoholic_drinks", "prob": 202 },
[ "fruit_wine", 5 ],
[ "sherry", 10 ],
[ "bristol_sherry", 5 ],
[ "madeira", 5 ],
[ "fruit_wine", 5 ],
[ "wine_riesling", 7 ],
[ "wine_chardonnay", 4 ],
[ "wine_vermouth", 5 ],
[ "wine_cabernet", 1 ],
[ "wine_noir", 1 ],
[ "brandy", 5 ],
[ "drink_rumcola", 50 ],
[ "drink_screwdriver", 45 ],
[ "drink_wild_apple", 20 ],
[ "long_island", 27 ],
[ "drink_martini", 60 ]
[ "madeira", 5 ]
]
},
{
Expand Down Expand Up @@ -236,17 +212,7 @@
{
"id": "pizza_beer",
"type": "item_group",
"items": [
[ "imperial_stout", 15 ],
[ "belgian_ale", 10 ],
[ "stout", 20 ],
[ "india_pale_ale", 20 ],
[ "pale_ale", 15 ],
[ "european_pilsner", 17 ],
[ "wine_barley", 17 ],
[ "mead", 5 ],
[ "beer", 18 ]
]
"items": [ { "group": "beer", "prob": 10 }, [ "wine_chardonnay", 1 ], [ "wine_cabernet", 1 ] ]
},
{
"id": "pizza_soda",
Expand Down Expand Up @@ -712,16 +678,7 @@
[ "spork", 10 ],
[ "foon", 10 ],
[ "bottle_glass", 15 ],
[ "fruit_wine", 10 ],
[ "wine_vermouth", 8 ],
[ "wine_marsala", 6 ],
[ "wine_riesling", 7 ],
[ "wine_chardonnay", 8 ],
[ "wine_cabernet", 8 ],
[ "wine_noir", 6 ],
[ "sherry", 5 ],
[ "bristol_sherry", 5 ],
[ "madeira", 5 ],
{ "group": "bar_alcohol", "prob": 68 },
[ "currywurst", 5 ],
[ "macaroni_cooked", 5 ],
[ "lasagne", 5 ],
Expand Down Expand Up @@ -756,13 +713,7 @@
[ "irradiated_onion", 4 ],
[ "irradiated_carrot", 4 ],
[ "chili", 10 ],
[ "fruit_wine", 10 ],
[ "wine_riesling", 7 ],
[ "wine_chardonnay", 8 ],
[ "wine_cabernet", 8 ],
[ "wine_marsala", 6 ],
[ "wine_vermouth", 9 ],
[ "wine_noir", 6 ],
{ "group": "wines_worthy", "prob": 54 },
[ "fish_fried", 7 ],
[ "cheese", 10 ],
[ "lemon", 15 ],
Expand Down Expand Up @@ -858,16 +809,8 @@
[ "fork", 20 ],
[ "spork", 5 ],
[ "foon", 5 ],
{ "group": "wines_worthy", "prob": 66 },
[ "fruit_wine", 20 ],
[ "wine_riesling", 10 ],
[ "wine_chardonnay", 13 ],
[ "wine_cabernet", 13 ],
[ "wine_marsala", 9 ],
[ "wine_vermouth", 15 ],
[ "wine_noir", 9 ],
[ "sherry", 10 ],
[ "bristol_sherry", 5 ],
[ "madeira", 5 ],
[ "hat_chef", 30 ],
[ "jacket_chef", 30 ],
[ "pants_checkered", 28 ]
Expand Down
67 changes: 7 additions & 60 deletions data/json/itemgroups/item_groups.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,14 +226,7 @@
[ "game_watch", 2 ],
[ "deck_of_cards", 2 ],
[ "usb_drive", 5 ],
[ "beer", 35 ],
[ "european_pilsner", 25 ],
[ "pale_ale", 25 ],
[ "india_pale_ale", 25 ],
[ "stout", 15 ],
[ "belgian_ale", 10 ],
[ "wine_barley", 24 ],
[ "imperial_stout", 4 ],
{ "group": "alcohol", "prob": 163 },
[ "cell_phone", 15 ],
[ "smart_phone", 25 ],
[ "wristwatch", 15 ],
Expand Down Expand Up @@ -323,19 +316,7 @@
[ "popcan_stove", 5 ],
[ "flashlight", 40 ],
[ "extinguisher", 20 ],
[ "whiskey", 16 ],
[ "bum_wine", 10 ],
[ "drink_rumcola", 8 ],
[ "drink_screwdriver", 8 ],
[ "drink_wild_apple", 8 ],
[ "long_island", 2 ],
[ "drink_martini", 10 ],
[ "wine_riesling", 6 ],
[ "wine_chardonnay", 10 ],
[ "wine_cabernet", 10 ],
[ "wine_noir", 2 ],
[ "wine_marsala", 2 ],
[ "wine_vermouth", 9 ],
{ "group": "alcohol", "prob": 101 },
[ "sweet_sausage", 2 ],
[ "roasted_coffee_bean", 10 ],
[ "bacon", 25 ],
Expand Down Expand Up @@ -586,17 +567,9 @@
[ "fruit_wine", 7 ],
[ "brandy", 5 ],
[ "jihelucake", 1 ],
[ "beer", 35 ],
[ "european_pilsner", 25 ],
[ "pale_ale", 25 ],
[ "india_pale_ale", 25 ],
[ "stout", 15 ],
[ "belgian_ale", 10 ],
[ "imperial_stout", 4 ],
[ "wine_barley", 24 ],
{ "group": "beer", "prob": 163 },
[ "cake2", 1 ],
[ "cake3", 1 ],
[ "beer", 60 ],
[ "pizza_meat", 8 ],
[ "pizza_veggy", 8 ],
[ "pizza_cheese", 8 ],
Expand Down Expand Up @@ -2645,7 +2618,7 @@
[ "colamdew", 60 ],
[ "purple_drink", 15 ],
[ "mag_melee", 30 ],
[ "whiskey", 16 ],
{ "group": "liquor_and_spirits", "prob": 16 },
[ "bum_wine", 10 ],
[ "chem_ethanol", 12 ],
{ "group": "salty_snacks", "prob": 135 },
Expand Down Expand Up @@ -3486,8 +3459,8 @@
{ "group": "salty_snacks", "prob": 130 },
[ "aspirin", 80 ],
[ "inhaler", 30 ],
{ "group": "beer", "prob": 80 },
[ "vodka", 60 ],
[ "beer", 80 ],
[ "cig", 20 ],
[ "crackpipe", 10 ],
[ "weed", 10 ],
Expand Down Expand Up @@ -3525,10 +3498,7 @@
[ "rollerskates", 10 ],
[ "aspirin", 80 ],
[ "inhaler", 30 ],
[ "beer", 80 ],
[ "pale_ale", 40 ],
[ "wine_barley", 20 ],
[ "stout", 40 ],
{ "group": "beer", "prob": 180 },
[ "sports_drink", 80 ],
[ "energy_drink", 30 ],
[ "cig", 20 ],
Expand Down Expand Up @@ -3781,7 +3751,6 @@
"magazine": 50,
"items": [
[ "plastic_shopping_bag", 15 ],
[ "bum_wine", 15 ],
[ "meth", 2 ],
[ "heroin", 1 ],
[ "string_6", 2 ],
Expand Down Expand Up @@ -3822,29 +3791,7 @@
[ "disc_golf", 30 ],
[ "lawn_dart", 30 ],
[ "golf_ball", 20 ],
[ "whiskey", 16 ],
[ "vodka", 20 ],
[ "gin", 20 ],
[ "rum", 14 ],
[ "tequila", 12 ],
[ "triple_sec", 12 ],
[ "fruit_wine", 12 ],
[ "brandy", 12 ],
[ "drink_wild_apple", 8 ],
[ "wine_riesling", 6 ],
[ "wine_chardonnay", 10 ],
[ "wine_cabernet", 10 ],
[ "wine_noir", 2 ],
[ "wine_marsala", 2 ],
[ "wine_vermouth", 9 ],
[ "wine_barley", 24 ],
[ "beer", 35 ],
[ "european_pilsner", 25 ],
[ "pale_ale", 25 ],
[ "india_pale_ale", 25 ],
[ "stout", 15 ],
[ "belgian_ale", 10 ],
[ "imperial_stout", 4 ]
{ "group": "alcohol_bottled_canned", "prob": 343 }
]
},
{
Expand Down
Loading

0 comments on commit f6eb74d

Please sign in to comment.