Skip to content

Commit

Permalink
Patch for seltzer drink #2 (CleverRaven#52870)
Browse files Browse the repository at this point in the history
  • Loading branch information
AHolmen authored Nov 21, 2021
1 parent b6de1e3 commit 2b6b91f
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 0 deletions.
2 changes: 2 additions & 0 deletions data/json/itemgroups/Food/food.json
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,7 @@
{ "group": "mixed_alcoholic_drinks", "prob": 141 },
{ "item": "dandelion_wine", "prob": 8 },
{ "item": "hb_beer", "prob": 8 },
{ "item": "hb_seltzer", "prob": 8 },
{ "item": "moonshine", "prob": 8 },
{ "item": "brandied_fruit", "prob": 2, "charges": 12, "container-item": "jar_3l_glass_sealed" }
]
Expand Down Expand Up @@ -705,6 +706,7 @@
"subtype": "distribution",
"entries": [
{ "item": "beer", "prob": 15 },
{ "item": "drink_hard_seltzer", "prob": 15 },
{ "item": "meat", "prob": 65 },
{ "item": "glazed_tenderloin", "prob": 55 },
{ "item": "fish", "prob": 10 },
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/Locations_MapExtras/mansion.json
Original file line number Diff line number Diff line change
Expand Up @@ -1255,6 +1255,7 @@
"subtype": "distribution",
"items": [
[ "beer", 80 ],
[ "drink_hard_seltzer", 20 ],
[ "european_pilsner", 20 ],
[ "imperial_stout", 20 ],
[ "india_pale_ale", 20 ],
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/SUS/fridges.json
Original file line number Diff line number Diff line change
Expand Up @@ -838,6 +838,7 @@
"distribution": [
{ "item": "beer", "count": [ 1, 6 ], "prob": 35 },
{ "item": "european_pilsner", "count": [ 1, 6 ], "prob": 25 },
{ "item": "drink_hard_seltzer", "count": [ 1, 6 ], "prob": 25 },
{ "item": "pale_ale", "count": [ 1, 6 ], "prob": 25 },
{ "item": "india_pale_ale", "count": [ 1, 6 ], "prob": 25 },
{ "item": "stout", "count": [ 1, 6 ], "prob": 15 },
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/food_service.json
Original file line number Diff line number Diff line change
Expand Up @@ -1145,6 +1145,7 @@
"items": [
[ "keg", 100 ],
{ "item": "beer", "prob": 40, "container-item": "keg" },
{ "item": "drink_hard_seltzer", "prob": 40, "container-item": "keg" },
{ "item": "belgian_ale", "prob": 30, "container-item": "keg" },
{ "item": "european_pilsner", "prob": 20, "container-item": "keg" },
{ "item": "wine_barley", "prob": 17, "container-item": "keg" },
Expand Down
1 change: 1 addition & 0 deletions data/json/npcs/NC_BARTENDER.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
{ "item": "brandy", "prob": 12 },
{ "item": "irish_coffee", "prob": 12 },
{ "item": "drink_boozeberry", "prob": 8 },
{ "item": "drink_hard_seltzer", "prob": 25 },
{ "item": "drink_rumcola", "prob": 12 },
{ "item": "drink_screwdriver", "prob": 12 },
{ "item": "drink_wsour", "prob": 12 },
Expand Down
10 changes: 10 additions & 0 deletions data/json/npcs/TALK_FRIEND_CONVERSATION.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
"yes": "<chitchat_prefix_booze> <neutralchitchat_later>",
"no": "<neutralchitchat_later>"
},
{
"u_has_item": "drink_hard_seltzer",
"yes": "<chitchat_prefix_booze> <neutralchitchat_later>",
"no": "<neutralchitchat_later>"
},
{
"u_has_item": "pale_ale",
"yes": "<chitchat_prefix_booze> <neutralchitchat_later>",
Expand Down Expand Up @@ -82,6 +87,11 @@
"yes": "<chitchat_prefix_booze> <neutralchitchat>",
"no": "<neutralchitchat>"
},
{
"u_has_item": "drink_hard_seltzer",
"yes": "<chitchat_prefix_booze> <neutralchitchat>",
"no": "<neutralchitchat>"
},
{ "u_has_item": "pale_ale", "yes": "<chitchat_prefix_booze> <neutralchitchat>", "no": "<neutralchitchat>" },
{
"u_has_item": "india_pale_ale",
Expand Down
1 change: 1 addition & 0 deletions data/json/npcs/items_generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,7 @@
{ "item": "dogfood", "prob": 3, "container-item": "can_medium" },
[ "doublespeargun", 1 ],
[ "drink_boozeberry", 1 ],
[ "drink_hard_seltzer", 1 ],
[ "drink_rumcola", 1 ],
[ "drink_screwdriver", 1 ],
[ "drink_strawberry_surprise", 1 ],
Expand Down
2 changes: 2 additions & 0 deletions data/json/requirements/cooking_components.json
Original file line number Diff line number Diff line change
Expand Up @@ -967,8 +967,10 @@
[ "beer", 1 ],
[ "belgian_ale", 1 ],
[ "drink_beeknees", 1 ],
[ "drink_hard_seltzer", 1 ],
[ "european_pilsner", 1 ],
[ "hb_beer", 1 ],
[ "hb_seltzer", 1 ],
[ "india_pale_ale", 1 ],
[ "wine_barley", 1 ],
[ "pale_ale", 1 ],
Expand Down

0 comments on commit 2b6b91f

Please sign in to comment.