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

[fixed] Blood on Saw/Spikes/Spiker will be toggled properly on changing g_kidssafe #1854

Closed

Conversation

mugg91
Copy link
Contributor

@mugg91 mugg91 commented Jan 16, 2024

Status

  • READY: this PR is (to the best of your knowledge) ready to be incorporated into the game.

Description

[fixed] Spikes, Spiker and Saw will properly remember if they are bloody or not and will instantly update their spritelayer when changing g_kidssafe from the menu
[changed] Spikes don't continuously update their animation frame in onTick() via calling onHealthChange()
[changed] Spiker will change its animation frame rather than adding a spritelayer
[changed] There will be no flesh gibs when g_kidssafe is on
[added] Water splash from bucket, water bomb or water arrow will remove the blood 
[added] Spiker will show blood on its tip even in closed state

Fixes #1753
Fixes #1811

This PR implements the same changes as PR #1507 and does the following additional changes:

  • The conflict with Saw.as has been resolved.
  • There will be no flesh gibs from player corpses or animals when g_kidssafe is on.

Other than that please refer to the write-up of the above linked PR.

@mugg91
Copy link
Contributor Author

mugg91 commented Jan 21, 2024

I made a change so that "bloody" tag is removed when using a water splash from bucket, water bomb or water arrow.

Only watersplash will clear blood, but going underwater won't because it looked odd in testing.

@mugg91
Copy link
Contributor Author

mugg91 commented Jan 28, 2024

I added a commit that does the following changes:

  • Merged Spike.as (which was a sprite script) and GenericSpike.as (which was a blob script) to Spike.as (sprite + blob script).
  • Spiker's tip in closed state will now also show blood: When spiker is placed and therefore spike is created, it saves spiker's network ID to spike. When spike gets bloody or its blood status is toggled, it will now also fetch spiker blob and update its background spritelayer.
  • Changed Spiker.png to add the bloody spiker frame to use less space and file size (-289 Bytes, -66%).
    Tested offline and online and it works.

Spikes will not assume non-bloody state when stabbing or becoming hidden.

Spikes and Spiker only become bloody when not in water.
@mugg91
Copy link
Contributor Author

mugg91 commented Apr 11, 2024

There is a problem that the Spike sprite will be behind the Spiker's main frame after rejoining server.
Will work on a fix.

@mugg91
Copy link
Contributor Author

mugg91 commented Apr 12, 2024

Added a commit that makes the following changes:

  • When cleaning bloody blob by water splash, script CleanSparkles.as is applied to the blob which will produce sparkle particles and a sparkle sound effect will play. This happens only if "faster graphics" is turned off.
  • Sparkle sound effect taken from here: https://pixabay.com/sound-effects/magic-sparkle-190030/

Aforementioned issue with spiker still unfixed as of this writing.

mugg91 added 4 commits April 13, 2024 01:48
Make it not trigger on close menu but on actually changing the g_kidssafe boolean
@mugg91
Copy link
Contributor Author

mugg91 commented Apr 20, 2024

Added a commit that makes it so the toggling doesn't take place when the menu is closed but when the g_kidssafe boolean changes.

Cleaning blood didn't work online, now it does
@mugg91
Copy link
Contributor Author

mugg91 commented Dec 4, 2024

I will fix the merge issue with this PR sooner or later.

@mugg91
Copy link
Contributor Author

mugg91 commented Dec 25, 2024

I'm replacing this PR with this new one #2271

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make water clean bloody things kidssafe can't deactive small flesh gibs
1 participant