Added New Cocktails and new fill level sprites to existing drinks. #33570
+1,680
−88
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
S: Untriaged
|
RSI Diff Bot; head commit cbeac4d merging into 0462993 Resources/Textures/Objects/Consumable/Drinks/arnoldpalmer.rsi
Resources/Textures/Objects/Consumable/Drinks/bluehawaiian.rsi
Resources/Textures/Objects/Consumable/Drinks/coconutrum.rsi
Resources/Textures/Objects/Consumable/Drinks/cosmopolitan.rsi
Resources/Textures/Objects/Consumable/Drinks/curacaoglass.rsi
Resources/Textures/Objects/Consumable/Drinks/emeraldglass.rsi
Resources/Textures/Objects/Consumable/Drinks/fourteen_loko_glass.rsi
Resources/Textures/Objects/Consumable/Drinks/milkshake.rsi
Resources/Textures/Objects/Consumable/Drinks/painkiller.rsi
Resources/Textures/Objects/Consumable/Drinks/pinacolada.rsi
Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi
Resources/Textures/Objects/Consumable/Drinks/rewriter.rsi
Resources/Textures/Objects/Consumable/Drinks/royrogers.rsi
Resources/Textures/Objects/Consumable/Drinks/shirleytemple.rsi
Resources/Textures/Objects/Consumable/Drinks/sol_dry_glass.rsi
Resources/Textures/Objects/Consumable/Drinks/vodkatonicglass.rsi
Resources/Textures/Objects/Consumable/Drinks/caipirinha.rsi
Resources/Textures/Objects/Consumable/Drinks/daiquiri.rsi
Resources/Textures/Objects/Consumable/Drinks/deathintheafternoon.rsi
Resources/Textures/Objects/Consumable/Drinks/empress75.rsi
Resources/Textures/Objects/Consumable/Drinks/espressomartini.rsi
Resources/Textures/Objects/Consumable/Drinks/mayojito.rsi
Resources/Textures/Objects/Consumable/Drinks/mimeosa.rsi
Resources/Textures/Objects/Consumable/Drinks/mimosa.rsi
Resources/Textures/Objects/Consumable/Drinks/moscowmule.rsi
Resources/Textures/Objects/Consumable/Drinks/sakeglass.rsi
Resources/Textures/Objects/Consumable/Drinks/thesunalsorises.rsi
Resources/Textures/Objects/Consumable/Drinks/whiskeysour.rsi
|
DieselMohawk
suggested changes
Nov 26, 2024
Resources/Textures/Objects/Consumable/Drinks/red_meadglass.rsi/meta.json
Show resolved
Hide resolved
There was a problem hiding this comment.
Mojito recipes often times require shaking them, did you intend to remove this recipe step?
There was a problem hiding this comment.
Could be considered something of a band-aid solution currently. The recipes added for the Daiquiri and Caipirinha were conflicting with the mojito's recipe. I'll update it to re-add the old mojito recipe and change the Daiquiri/Caipirinha in a way that fixes the conflict.
There was a problem hiding this comment.
Has been updated, Mojito once again requires shaking to be made and the Caipirinha recipe now requires Ice to prevent conflicts between the recipes for the two drinks.
|
I wish there was an easier way to do that. |
ScarKy0
added
P3: Standard
|
add a beret to the mimeosa glass kinda like a lime or umbrella |
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
the
S: Merge Conflict
github-actions
bot
removed
the
S: Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
the
S: Merge Conflict
github-actions
bot
added
S: Merge Conflict
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
github-actions
bot
added
size/M
github-actions
bot
removed
the
S: Merge Conflict
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
There are just too few cocktails in the game right now, and the fact that we had absolutely none that used absinthe or champagne seemed criminal. So I made some new sprites, added some new drinks, got distracted and added sprites/fill levels for a bunch of drinks that lacked them previously, and got them all finished here.
New drinks include the Caipirinha, Daiquiri, Death In The Afternoon, Empress 75, Espresso Martini, Mayojito, Mimeosa, Mimosa, Moscow Mule, The Sun Also Rises, and the Whiskey Sour.
Old Drinks that now have new sprites or proper fill levels include the Arnold Palmer, Blue Hawaiian, Coconut Rum, Cosmopolitan, Blue Curacao, Emeraldine Melon, Fourteen Loko, Milkshake (Unused Currently), Painkiller, Pina Colada, Red Mead, Rewriter, Roy Rogers, Sake, Shirley Temple, Sol Dry, and Vodka Tonic.
Why / Balance
Balance should be largely unchanged. A few of the drinks have very minor effects (Moscow Mule contains small amounts of copper, Mayojito causes vomiting and some poison damage, Mimeosa causes mute condition) but none of them are going to be game-breakingly powerful.
Technical details
Includes lots of changes to files in Textures/Objects/Consumables/Drinks, both in adding new folders for the new drinks and modifying old drinks to add new sprites. Files in Consumable/Drink and Recipies/Reactions were tweaked for the same reason, as were drinks.yml, flavors.yml, alcohol.ftl, and flavor-profiles.ftl.
Media
Requirements
Breaking changes
Changelog
🆑 RedBookcase