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

Water balloons :3 :3 #33935

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Conversation

Thinbug0
Copy link
Contributor

About the PR

Added water balloons, they hold up to 10 units and pop when tossed. Also a water balloon box that contains 25 of them and can be found in maints or bought at cargo for cheap
(they are a bit transparent so you can see the chems inside)

Why / Balance

silly

Technical details

made a WaterBalloonSystem that makes a new entity and passes the "empty" balloon solution to it, was gonna have inhand sprites for them but the inhandVisuals and RandomSpriteComponent dont mix well together x.x

also the whole like sprite stuffies is client sided so i decided to make the empty balloon have a "rainbow" sprite, and just randomize the color of the filled water balloon. It's not perfect but it workies out u.u

and a new pallete for balloons because the existing ones looked super sucky on the balloons

Media

(empty balloons)
wawa

(silly showcase :33)
https://youtu.be/e0ExQl2QRZg

Requirements

Breaking changes

Changelog

🆑

  • add: Added water balloons! buy them at cargo or find them in maints lockers.

@github-actions github-actions bot added size/M Denotes a PR that changes 100-999 lines. S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. Changes: Sprites Changes: Might require knowledge of spriting or visual design. labels Dec 18, 2024
Copy link
Contributor

github-actions bot commented Dec 18, 2024

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

Resources/Textures/Objects/Fun/water_balloons.rsi

State Old New Status
icon Added
icon_inflated Added
icon_inflated_fill-1 Added
water-balloon-box-inhand-left Added
water-balloon-box-inhand-right Added
water_balloon_box Added
water_balloon_cargo_icon Added

Edit: diff updated after a4ff49d

@Thinbug0
Copy link
Contributor Author

please dont be stinky cargo i didnt give them a fixed price i beg for mercy

@SlimmSlamm
Copy link
Contributor

This should be included in the toy chest with maybe a slight increase to the price to it.

@Thinbug0
Copy link
Contributor Author

thankies :33

and water guns have their own crate so thats why i gave them their own crate, you get 50 wawa balloons for 500 spesos so its pretty worth it i thinkie

Copy link
Contributor

@lzk228 lzk228 left a comment

Choose a reason for hiding this comment

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

the other code seems fine
though i would make the balloon like this

  • you can fill a balloon with water and spill the water out
  • then if the balloon filled, then you can tie it with a verb

Content.Shared/WaterBalloon/WaterBalloonComponent.cs Outdated Show resolved Hide resolved
Content.Shared/WaterBalloon/WaterBalloonComponent.cs Outdated Show resolved Hide resolved
Content.Shared/WaterBalloon/WaterBalloonSystem.cs Outdated Show resolved Hide resolved
@Thinbug0
Copy link
Contributor Author

yeah im doing a few fixies lol, forgor to check a few thingies before doing the push

so gonna check comments again after the next push

@Thinbug0
Copy link
Contributor Author

thankies x2 ^u^

@beck-thompson beck-thompson added P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. T: New Feature Type: New feature or content, or extending existing content D2: Medium Difficulty: A good amount of codebase knowledge required. S: Needs Review Status: Requires additional reviews before being fully accepted A: Cargo/Salvage Area: Cargo department or Salvage. A: General Interactions Area: General in-game interactions that don't relate to another area. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Dec 18, 2024
@NoElkaTheGod
Copy link
Contributor

I am going to fill those with razorium and you can do nothing about it.

Copy link
Contributor

@lzk228 lzk228 left a comment

Choose a reason for hiding this comment

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

my last cleanup review

Content.Shared/WaterBalloon/WaterBalloonComponent.cs Outdated Show resolved Hide resolved
&& args.Solution.Name != null)
{
TieBalloon(ent, args.Solution, args.Solution.Name); //send the entity solution and its name

Copy link
Contributor

Choose a reason for hiding this comment

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

spare line

Resources/Prototypes/Catalog/Fills/Crates/fun.yml Outdated Show resolved Hide resolved
Comment on lines +95 to +99
inhandVisuals:
left:
- state: water-balloon-box-inhand-left
right:
- state: water-balloon-box-inhand-right
Copy link
Contributor

Choose a reason for hiding this comment

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

use heldPrefix

Copy link
Contributor Author

Choose a reason for hiding this comment

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

im not sure what that is so ill figure it out later :33

Copy link
Contributor

Choose a reason for hiding this comment

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

you can search for heldPrefix in repo and see how it's realized

@K-Dynamic
Copy link
Contributor

K-Dynamic commented Dec 19, 2024

Time to pull an epic prank on slimepeople :trollface:

Also could you make the balloon sprites 'shinier', they're a bit too basic

@Thinbug0
Copy link
Contributor Author

my last cleanup review

the code was way more messy than i expected so lotsa of thankies

@Thinbug0
Copy link
Contributor Author

Time to pull an epic prank on slimepeople :trollface:

Also could you make the balloon sprites 'shinier', they're a bit too basic

they are basically balls of plastic with water in them so its tricky to make the sprite not look basic lol

but ill try to make the sprite nicer, some less shit shadows should helpie

@Thinbug0
Copy link
Contributor Author

the sprite should now suck about like a %10 less

@TheShuEd
Copy link
Member

TheShuEd commented Dec 20, 2024

You couldn't clearly describe why this is necessary

Why / Balance

silly

I think this PR does not bring anything new in terms of gameplay, and simply bloat the amount of content and systems. The sprites also look strange in my opinion. I think this PR should not be accepted. Let's wait for the opinion of other maintainers

Copy link
Member

@Tayrtahn Tayrtahn left a comment

Choose a reason for hiding this comment

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

I'm not wild about using an entity swap to change between empty and filled states. Is there a reason this can't be handled by adding components instead?

@Thinbug0
Copy link
Contributor Author

I'm not wild about using an entity swap to change between empty and filled states. Is there a reason this can't be handled by adding components instead?

felt more practical, but there wasnt any big reason as to why

@Thinbug0
Copy link
Contributor Author

Thinbug0 commented Dec 21, 2024

You couldn't clearly describe why this is necessary

Why / Balance

silly

I think this PR does not bring anything new in terms of gameplay, and simply bloat the amount of content and systems. The sprites also look strange in my opinion. I think this PR should not be accepted. Let's wait for the opinion of other maintainers

No, silly water balloons are not necessary..

but with that argument why add anything silly like plushies, or the sec helmet wtih a light that goes wee woo
they dont add anything massive to the gameplay, but i wouldnt call them bloat

also i thinkie " You couldn't clearly describe why this is necessary" sounds rude as heck, i only left the why as silly because they are just a funny/joke item, thats goofy to watch and use. If you wanted a bigger explanation you could of asked, no need to be condescending u.u

@TheShuEd
Copy link
Member

also i thinkie " You couldn't clearly describe why this is necessary" sounds rude as heck

I apologize if some of my phrases may seem rude, I use a translator to communicate, and sometimes it may not convey intonation or context correctly.

Unlike the helmet or the toys, there's also a new system that works with reagents. I'm not sure they're on the same level.

But for the record, I would remove half of the toys from the game altogether, it's my personal dislike for such fluff content. Nevertheless, we await the opinions of more other maintainers

@lexaSvarshik
Copy link

can sprite be like not two plain colors
and deflated balloon looks like rainbow crayon, or colorful stick but not as balloon

@Tayrtahn
Copy link
Member

felt more practical, but there wasnt any big reason as to why

There's a lot of potential for information to be lost by doing it that way. If any components are added, removed, or have values changed from the empty balloon entity, those changes won't be carried over to the filled entity. For a fairly contrived example, an empty balloon made player-controlled by admemery or whatever will just be destroyed if the balloon gets filled.

@Thinbug0
Copy link
Contributor Author

Thinbug0 commented Dec 23, 2024

can sprite be like not two plain colors and deflated balloon looks like rainbow crayon, or colorful stick but not as balloon

the chem inside is visible trough the sprite, so its not as blegh
and uh, they are water balloons, they arent visually complex

(by that i meant the inside sprite is at %60 opacity so the color of the chem gets mixed with the balloon color)

@Thinbug0
Copy link
Contributor Author

felt more practical, but there wasnt any big reason as to why

There's a lot of potential for information to be lost by doing it that way. If any components are added, removed, or have values changed from the empty balloon entity, those changes won't be carried over to the filled entity. For a fairly contrived example, an empty balloon made player-controlled by admemery or whatever will just be destroyed if the balloon gets filled.

i see, i did not thinkie of that

@Pumkin69
Copy link

Pumkin69 commented Feb 1, 2025

if the balloons can be filled with any reagent i think it adds more interesting gameplay and RP opportunities.

Copy link
Member

@TheShuEd TheShuEd left a comment

Choose a reason for hiding this comment

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

Omega shitcode

@TheShuEd
Copy link
Member

TheShuEd commented Feb 1, 2025

Dont use entity swap method please
You can just make it SolutionContainer, that change visuals from olution amount + parent it from Nesty items + add system to damage entity when to much solution inserted

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: Cargo/Salvage Area: Cargo department or Salvage. A: General Interactions Area: General in-game interactions that don't relate to another area. Changes: Sprites Changes: Might require knowledge of spriting or visual design. D2: Medium Difficulty: A good amount of codebase knowledge required. P2: Raised Priority: Item has a raised priority, indicating it might get increased maintainer attention. S: Needs Review Status: Requires additional reviews before being fully accepted size/M Denotes a PR that changes 100-999 lines. T: New Feature Type: New feature or content, or extending existing content
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants