Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

alcohol v2 electric boogaloo #1662

Merged

Conversation

ray-boop
Copy link
Contributor

@ray-boop ray-boop commented Jul 12, 2024

About the PR

Five more drinks: Gin and Sonic, Golden Cat, Pineapple Blast, Torpedo Juice and Bees Knees.

Why / Balance

Fun

How to test

  1. Spawn metamorphic glasses with new drinks.

Media

New drinks - first five on the left side of the table
2024-9-15_23 10 15

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

None (I think)

Changelog
🆑 ray-boop

  • add: Added a set of new drinks for bartenders to mix: Gin and Sonic, Golden Cat, Pineapple Blast, Torpedo Juice and the Bee's Knees.

Copy link
Contributor

github-actions bot commented Jul 12, 2024

RSI Diff Bot; head commit 5f858c4 merging into 2bd7120
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Objects/Consumable/Drinks/beesknees.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added

Resources/Textures/_NF/Objects/Consumable/Drinks/ginandsonic.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
icon Added
icon_empty Added

Resources/Textures/_NF/Objects/Consumable/Drinks/goldencat.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
icon Added
icon_empty Added

Resources/Textures/_NF/Objects/Consumable/Drinks/pineappleblast.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
icon Added
icon_empty Added

Resources/Textures/_NF/Objects/Consumable/Drinks/torpedojuice.rsi

State Old New Status
fill-1 Added
fill-2 Added
fill-3 Added
fill-4 Added
fill-5 Added
fill-6 Added
icon Added
icon_empty Added

Edit: diff updated after 5f858c4

@ray-boop
Copy link
Contributor Author

ray-boop commented Sep 1, 2024

dont have much time right now, cant say when im able to continue, gonna open it for your review

@ray-boop ray-boop marked this pull request as ready for review September 1, 2024 16:32
@github-actions github-actions bot added the Merge Conflict This PR has conflicts that prevent merging label Sep 14, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict This PR has conflicts that prevent merging label Sep 14, 2024
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, so the stuff works, but imo drink sprites are way too big in comparison with other glass sprites and unfortunately they aren't scalable on yml side, so they need to be scaled down in graphical editor. I don't think that I'm interested in doing it, unless someone is willing to take this burden I'll close this PR soon(ish).

image

@ErhardSteinhauer
Copy link
Contributor

2024-9-15_23 10 15

@github-actions github-actions bot added the Status: Needs Review This PR is awaiting reviews label Sep 15, 2024
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the sprites, good to go. Would like someone else to check it before merging though.

@whatston3
Copy link
Contributor

Giving it a look.

@whatston3
Copy link
Contributor

Touching up a few of the sprites, will ask for your thoughts when I'm done with them. Don't think it's anything huge.

Copy link
Contributor

@whatston3 whatston3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to go. Enlarged the base on the gin and sonic, flipped the metal bit on top (difficult to read with so few pixels, looks more like an opening), moved the straw over on the bee's knees, cleaned up the lines on the chest in the golden cat, and added some more fill states to most drinks.

Minor rewrites to descriptions, fixed up the fast flavour reference. Looks good on my end. @ErhardSteinhauer, a sanity check would be appreciated when you can.

@ErhardSteinhauer
Copy link
Contributor

Changes work fine.

@ErhardSteinhauer ErhardSteinhauer merged commit 21c2262 into new-frontiers-14:master Sep 16, 2024
14 checks passed
FrontierATC added a commit that referenced this pull request Sep 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants