From a2ebb51dca4aa4f6e11af8201ee5442c04499ede Mon Sep 17 00:00:00 2001 From: apurples <123270096+APurples@users.noreply.github.com> Date: Tue, 6 Feb 2024 04:19:22 -0600 Subject: [PATCH] Pixel Note Splashes in Week 6 (#238) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * pixel note splashes * tyy!! --------- Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com> --- assets/data/scripts/pixel.hx | 7 ++++ assets/data/splashes/pixel-default.xml | 20 ++++++++++ .../stages/school/ui/pixel-splashes.png | Bin 0 -> 10923 bytes .../stages/school/ui/pixel-splashes.xml | 36 ++++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 assets/data/splashes/pixel-default.xml create mode 100644 assets/images/stages/school/ui/pixel-splashes.png create mode 100644 assets/images/stages/school/ui/pixel-splashes.xml diff --git a/assets/data/scripts/pixel.hx b/assets/data/scripts/pixel.hx index b0976cf20..1d14aa4e7 100644 --- a/assets/data/scripts/pixel.hx +++ b/assets/data/scripts/pixel.hx @@ -3,6 +3,7 @@ import funkin.backend.scripting.events.NoteHitEvent; public var pixelNotesForBF = true; public var pixelNotesForDad = true; +public var pixelSplashes = true; public var enablePixelUI = true; public var enablePixelGameOver = true; public var enableCameraHacks = Options.week6PixelPerfect; @@ -34,6 +35,12 @@ function onNoteCreation(event) { note.updateHitbox(); } +function onPostNoteCreation(event) { + var splashes = event.note; + if (pixelSplashes) + splashes.splash = "pixel-default"; +} + function onStrumCreation(event) { if (event.player == 1 && !pixelNotesForBF) return; if (event.player == 0 && !pixelNotesForDad) return; diff --git a/assets/data/splashes/pixel-default.xml b/assets/data/splashes/pixel-default.xml new file mode 100644 index 000000000..99a30bb3b --- /dev/null +++ b/assets/data/splashes/pixel-default.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/stages/school/ui/pixel-splashes.png b/assets/images/stages/school/ui/pixel-splashes.png new file mode 100644 index 0000000000000000000000000000000000000000..43535dcabbfcd2d00e0c54e82231296e2436ba6a GIT binary patch literal 10923 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 literal 0 HcmV?d00001 diff --git a/assets/images/stages/school/ui/pixel-splashes.xml b/assets/images/stages/school/ui/pixel-splashes.xml new file mode 100644 index 000000000..f0bd79008 --- /dev/null +++ b/assets/images/stages/school/ui/pixel-splashes.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file