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

New sprites for bottles #77365

Merged
merged 12 commits into from
Aug 5, 2023
Merged

New sprites for bottles #77365

merged 12 commits into from
Aug 5, 2023

Conversation

MTandi
Copy link
Contributor

@MTandi MTandi commented Aug 4, 2023

image

About The Pull Request

Updates sprites of many bottles.

Combined effort of three:
Most of these are donated by Kryson.
I tweaked them and added the missing bottles.
Zeckle provided the base for the Voltaic Wine Bottle.

image

Unholy water now has a separate sprite:

image

Also made the holy grenade use the holy flask sprite:

dreamseeker_ghN6iH29nO.mp4

Why It's Good For The Game

They look more consistent with other 3/4 items.

Changelog

🆑 Kryson, MTandi, Zeckle (Mike)
image: New bottles and holy grenade sprites
/:cl:

@tgstation-server tgstation-server added the Sprites A bikeshed full of soulless bikes. label Aug 4, 2023
@Loafin34
Copy link
Contributor

Loafin34 commented Aug 4, 2023

the soul of captain's flask....... smh my head....

@Cheshify
Copy link
Contributor

Cheshify commented Aug 4, 2023

The inubashiri sake is a specific touhou reference. I don't see the same in the new sprite?

@MTandi
Copy link
Contributor Author

MTandi commented Aug 4, 2023

The inubashiri sake is a specific touhou reference. I don't see the same in the new sprite?

Didn't know that. Will address. Can you provide a reference please?

@Cheshify
Copy link
Contributor

Cheshify commented Aug 4, 2023

[https://en.touhouwiki.net/wiki/Momiji_Inubashiri#Design]
It's literally some wolf girl from touhou 10. The OG bottle's icon has her "tokin" (little red hat). Maybe adding a maple leaf or similar design to the new bottle could work?

@CoiledLamb
Copy link
Contributor

does the ethereal flask still have an animation?

@MTandi
Copy link
Contributor Author

MTandi commented Aug 4, 2023

does the ethereal flask still have an animation?

It doesn't.

@CoiledLamb
Copy link
Contributor

does the ethereal flask still have an animation?

It doesn't.

all good. might add one later when this gets merged (something smaller scale, maybe the same effect but on the face on the front rather than the whole bottle)

@JohnFulpWillard
Copy link
Member

The inubashiri sake is a specific touhou reference. I don't see the same in the new sprite?

it is morally correct to remove touhou references

Copy link
Member

@Wallemations Wallemations left a comment

Choose a reason for hiding this comment

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

No comment on the Touhou reference, but the sabered champagne bottle should have its neck more crooked to emphasize the slice, like the original had.

@Loafin34
Copy link
Contributor

Loafin34 commented Aug 4, 2023

@carshalash it looks like there's a seraka mushroom instead, the tiziran mushroom thing that that one cook PR added

@AdipemDragon
Copy link
Contributor

slightly sad about the shaker's loss of what little ornatability it had, specially on the comemorative NT one, but yeah the bottles are nice, more a reason to make a bottle display like how pubby had one by default

@Sealed101
Copy link
Member

with the champagne bottle's height change you'd have to nudge the pixel offset on the frothing a bit to match it up.

/*
* Proc to make the bottle spill some of its contents out in a froth geyser of varying intensity/height
* Arguments:
* * offset_x = pixel offset by x from where the froth animation will start
* * offset_y = pixel offset by y from where the froth animation will start
* * intensity = how strong the effect is, both visually and in the amount of reagents lost. comes in three flavours
*/
/obj/item/reagent_containers/cup/glass/bottle/proc/make_froth(offset_x, offset_y, intensity)
if(!intensity)
return
if(!reagents.total_volume)
return
var/amount_lost = intensity * 5
reagents.remove_any(amount_lost)
visible_message(span_warning("Some of [name]'s contents are let loose!"))
var/intensity_state = null
switch(intensity)
if(1)
intensity_state = "low"
if(2)
intensity_state = "medium"
if(3)
intensity_state = "high"
///The froth fountain that we are sticking onto the bottle
var/mutable_appearance/froth = mutable_appearance(icon, "froth_bottle_[intensity_state]")
froth.pixel_x = offset_x
froth.pixel_y = offset_y
add_overlay(froth)
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, cut_overlay), froth), 2 SECONDS)

make_froth(offset_x = 0, offset_y = sabraged ? 13 : 15, intensity = froth_severity) //the y offset for sabraged is lower because the bottle's lip is smashed

@Jezzared
Copy link

Jezzared commented Aug 4, 2023

I concur with adipem. The commemorative shaker was always a fun surprise and now i might not even notice it.

If you wanna keep the simple NT logo on it instead of the "I <3 NT", maybe some NT-blue bands?

@bluetshirtguy
Copy link
Contributor

Turning a lot of the different designs/art on the bottles labels with generic "text" is pretty boring.

@Likteer
Copy link
Contributor

Likteer commented Aug 4, 2023

I really like the Extra strong absinthe.
The skull on the label got squashed in a previous resprite.
Now the tiny wall of text fits all the random warnings they get in the name.

@MTandi
Copy link
Contributor Author

MTandi commented Aug 4, 2023

No comment on the Touhou reference, but the sabered champagne bottle should have its neck more crooked to emphasize the slice, like the original had.

image

[https://en.touhouwiki.net/wiki/Momiji_Inubashiri#Design] It's literally some wolf girl from touhou 10. The OG bottle's icon has her "tokin" (little red hat). Maybe adding a maple leaf or similar design to the new bottle could work?

I thought it's some specific bottle like with voltaic wine. How is this supposed to be a reference? Looks like a clump of pixels to me. I have no clue how to refer this character in a bottle design, so leaving this up to you or whoever else who is willing to put this reference back.

Can you explain the lizard wine sprite? Isn't there meant to be some indication of a tail in the bottle?

Also, is the absinthe one meant to be green fairy?

These are from @Krysonism, I'm not sure.

@Sealed101
Copy link
Member

derp

is icondiffbot drunk of off all these drinks or did you not animate the blazaam phasing in and out of view

@@ -655,7 +655,7 @@
playsound(src, 'sound/items/champagne_pop.ogg', 70, TRUE)
spillable = TRUE
update_appearance()
make_froth(offset_x = 0, offset_y = sabraged ? 13 : 15, intensity = froth_severity) //the y offset for sabraged is lower because the bottle's lip is smashed
make_froth(offset_x = 0, offset_y = sabraged ? 7 : 14, intensity = froth_severity) //the y offset for sabraged is lower because the bottle's lip is smashed
Copy link
Member

@Sealed101 Sealed101 Aug 4, 2023

Choose a reason for hiding this comment

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

can we get an in-game view of this, i feel like with the current sprite it's way too low for both
sabraged one isn't such a low cut and the standard undamaged bottle got taller by 1 px i think?

in hindsight it woulda been easier maybe if i had made these offsets vars on the bottle but maybe another time

Copy link
Contributor Author

Choose a reason for hiding this comment

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

image

I'm not sure what it supposed to do? Looks fine to me whatever it is.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I reverted these values and adjusted the sprite to make the holes at the same level as before.

Copy link
Member

Choose a reason for hiding this comment

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

one way to do it i guess

captains are naturally good at not making froth especially with their saber, shoulda used the captain pen for the tests but w/e

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Forth seems to be broken, i've seen that there are effects that are supposed to spawn in the icons, but it doesn't happen in-game.

Copy link
Member

Choose a reason for hiding this comment

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

cover3

smellbert curse you #71810 PR MURDER BARELY A MONTH IN REEEE

@MTandi
Copy link
Contributor Author

MTandi commented Aug 4, 2023

derp

is icondiffbot drunk of off all these drinks or did you not animate the blazaam phasing in and out of view

IconDiffBot thing

image

@MTandi
Copy link
Contributor Author

MTandi commented Aug 4, 2023

Changed holy water flask and made a separate sprite for unholy water flask

image

Holy grenade now uses the sprites of a holy water bottle.

Copy link
Member

@Wallemations Wallemations left a comment

Choose a reason for hiding this comment

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

Much better on the sabered one

@Twaticus
Copy link
Contributor

Twaticus commented Aug 5, 2023

yeahhh YEAHHHH

@LSommers
Copy link

LSommers commented Aug 5, 2023

Banger sprite updates that actually look like what they're updating
This is a certified MTandi classic

@Fikou Fikou merged commit bf1acac into tgstation:master Aug 5, 2023
19 checks passed
NaakaKo referenced this pull request in Bird-Lounge/Skyraptor-SS13 Aug 5, 2023
![image](https://github.com/tgstation/tgstation/assets/3625094/db3c8f35-5943-4ed6-9e53-9ea52013a0d1)

## About The Pull Request

Updates sprites of many bottles.

Combined effort of three:
Most of these are donated by Kryson. 
I tweaked them and added the missing bottles. 
Zeckle provided the base for the Voltaic Wine Bottle.


![image](https://github.com/tgstation/tgstation/assets/3625094/6dc078a9-c492-4a75-9f51-bc35f6a4141e)

Unholy water now has a separate sprite:


![image](https://github.com/tgstation/tgstation/assets/3625094/6f7f8a2a-cbf6-47e5-b276-556ad35db964)

Also made the holy grenade use the holy flask sprite:


https://github.com/tgstation/tgstation/assets/3625094/00d272ea-867d-4fdd-b4fb-807accdec49b

## Why It's Good For The Game

They look more consistent with other 3/4 items.

## Changelog

:cl: Kryson, MTandi, Zeckle (Mike)
image: New bottles and holy grenade sprites
/:cl:
@MTandi MTandi deleted the bottling branch August 5, 2023 13:14
github-actions bot added a commit that referenced this pull request Aug 5, 2023
comfyorange added a commit that referenced this pull request Aug 5, 2023
Onule pushed a commit to TaleStation/TaleStation that referenced this pull request Aug 6, 2023
Original PR: tgstation/tgstation#77365
-----

![image](https://github.com/tgstation/tgstation/assets/3625094/db3c8f35-5943-4ed6-9e53-9ea52013a0d1)

## About The Pull Request

Updates sprites of many bottles.

Combined effort of three:
Most of these are donated by Kryson. 
I tweaked them and added the missing bottles. 
Zeckle provided the base for the Voltaic Wine Bottle.


![image](https://github.com/tgstation/tgstation/assets/3625094/6dc078a9-c492-4a75-9f51-bc35f6a4141e)

Unholy water now has a separate sprite:


![image](https://github.com/tgstation/tgstation/assets/3625094/6f7f8a2a-cbf6-47e5-b276-556ad35db964)

Also made the holy grenade use the holy flask sprite:


https://github.com/tgstation/tgstation/assets/3625094/00d272ea-867d-4fdd-b4fb-807accdec49b

## Why It's Good For The Game

They look more consistent with other 3/4 items.

## Changelog

:cl: Kryson, MTandi, Zeckle (Mike)
image: New bottles and holy grenade sprites
/:cl:

---------

Co-authored-by: Andrew <mt.forspam@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet