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

Grenade resprites part 1, stinger sound change, projectile grenade animation fix #34421

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

Conversation

K-Dynamic
Copy link
Contributor

@K-Dynamic K-Dynamic commented Jan 14, 2025

About the PR

  • Resprites unprimed and primed grenades; flashbangs, stinger grenades, EMP grenades, smoke grenades, tear gas grenades
  • Removes redundant beeping from stinger grenade
  • Fixes animation not playing on projectile grenades

Why / Balance

Grenades were resprited for the following reasons:

  • Pin and arm removal from primed states is more realistic and lays out groundwork for future forensics (i.e. triggering a grenade should leave a pin and arm for evidence)
  • Flattening so perspective matches other grenades rather than being 3/4ths from tg
  • Different grenade shapes help identify certain grenades more easily, especially among colourblind players

Rather than creating a new shape or style altogether, I opted to 'remix' the original r4407 grenades and their derivatives, which should make them consistent and easier to identify.

I will be adding more grenades in separate PRs as I am still working on them and their attributions.

Projectile grenades such as stingers grenades or shrapnel grenades should now play their animations, which improves player experience and helps point out primed grenades.

Stinger grenades played two different overlapping sounds, so I've removed one and kept the flashbang sound; their sound cue should be associated with security.

Technical details

image, json, yml changes

  • Resources/Prototypes/Entities/Objects/Weapons/Throwable/projectile_grenades.yml (removed one of two stinger beeping sounds, added animations for all projectile grenades)

Media

image

Requirements

Breaking changes

N/A

Changelog

🆑

  • tweak: Flashbangs, stinger grenades, EMP grenades, smoke grenades, and tear gas grenades have new appearances.
  • fix: Projectile grenades (including stinger and shrapnel grenades) should now play animations when triggered.

@github-actions github-actions bot added Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/S Denotes a PR that changes 10-99 lines. labels Jan 14, 2025
Copy link
Contributor

github-actions bot commented Jan 14, 2025

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

Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi

State Old New Status
icon Modified
primed Modified

Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi

State Old New Status
equipped-BELT Modified
icon Modified
primed Modified

Resources/Textures/Objects/Weapons/Grenades/smoke.rsi

State Old New Status
icon Modified
primed Modified
equipped-BELT Added

Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi

State Old New Status
equipped-BELT Modified
icon Modified
primed Modified

Resources/Textures/Objects/Weapons/Grenades/tear_gas.rsi

State Old New Status
icon Modified
primed Modified

Edit: diff updated after 3e9df19

@K-Dynamic K-Dynamic changed the title Grenade resprites Part 1 Grenade resprites Part 1, projectile grenade animation fix Jan 14, 2025
@K-Dynamic K-Dynamic changed the title Grenade resprites Part 1, projectile grenade animation fix Grenade resprites Part 1, stinger sound change, projectile grenade animation fix Jan 14, 2025
@Pumkin69
Copy link

i like it as long as they still flash when armed.

@LaCumbiaDelCoronavirus
Copy link

Looks good but the stinger should be way more spherical if you wanna replicate the shape of a real stinger grenade (as in, rubber ball grenades)

@K-Dynamic
Copy link
Contributor Author

Looks good but the stinger should be way more spherical if you wanna replicate the shape of a real stinger grenade (as in, rubber ball grenades)

I was considering that, but I'm currently reserving the 'oval' look for all projectile grenades (stingers, incendiary, shrapnel, etc.), and doing a ball shape for explosives

@K-Dynamic
Copy link
Contributor Author

i like it as long as they still flash when armed.

Yeah they do that, I just can't show it as well with still images

@K-Dynamic K-Dynamic changed the title Grenade resprites Part 1, stinger sound change, projectile grenade animation fix Grenade resprites part 1, stinger sound change, projectile grenade animation fix Jan 14, 2025
@ScarKy0 ScarKy0 added P3: Standard Priority: Default priority for repository items. T: New Feature Type: New feature or content, or extending existing content T: Cleanup Type: Code clean-up, without being a full refactor or feature D3: Low Difficulty: Some codebase knowledge required. S: Needs Review Status: Requires additional reviews before being fully accepted A: Art Area: Art with no implications for other areas. and removed S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. labels Jan 14, 2025
@KaiserMaus
Copy link

Is it possible to add movement to gas grenades?
like when gas air tank that have an open valve and are thrown by pressure from side to side

@K-Dynamic
Copy link
Contributor Author

Is it possible to add movement to gas grenades? like when gas air tank that have an open valve and are thrown by pressure from side to side

Out of scope and unsure what this would be for

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A: Art Area: Art with no implications for other areas. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. D3: Low Difficulty: Some codebase knowledge required. P3: Standard Priority: Default priority for repository items. S: Needs Review Status: Requires additional reviews before being fully accepted size/S Denotes a PR that changes 10-99 lines. T: Cleanup Type: Code clean-up, without being a full refactor or feature 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.

5 participants