diff --git a/assets/data/scripts/pixel.hx b/assets/data/scripts/pixel.hx index b0976cf2..1d14aa4e 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 00000000..99a30bb3 --- /dev/null +++ b/assets/data/splashes/pixel-default.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/assets/data/splashes/pixel-secret.xml b/assets/data/splashes/pixel-secret.xml new file mode 100644 index 00000000..09fb5697 --- /dev/null +++ b/assets/data/splashes/pixel-secret.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/images/stages/school/ui/pixel-secret-splashes.png b/assets/images/stages/school/ui/pixel-secret-splashes.png new file mode 100644 index 00000000..041ee110 Binary files /dev/null and b/assets/images/stages/school/ui/pixel-secret-splashes.png differ diff --git a/assets/images/stages/school/ui/pixel-secret-splashes.xml b/assets/images/stages/school/ui/pixel-secret-splashes.xml new file mode 100644 index 00000000..d1de650c --- /dev/null +++ b/assets/images/stages/school/ui/pixel-secret-splashes.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 00000000..43535dca Binary files /dev/null and b/assets/images/stages/school/ui/pixel-splashes.png differ 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 00000000..f0bd7900 --- /dev/null +++ b/assets/images/stages/school/ui/pixel-splashes.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project.xml b/project.xml index a0cfb250..42c962e6 100644 --- a/project.xml +++ b/project.xml @@ -142,7 +142,7 @@ - + diff --git a/source/funkin/backend/utils/NdllUtil.hx b/source/funkin/backend/utils/NdllUtil.hx index f50d0026..24493c58 100644 --- a/source/funkin/backend/utils/NdllUtil.hx +++ b/source/funkin/backend/utils/NdllUtil.hx @@ -18,10 +18,11 @@ import lime.app.Application; */ class NdllUtil { #if NDLLS_SUPPORTED - #if windows public static final os:String = "windows"; #end - #if linux public static final os:String = "linux"; #end - #if macos public static final os:String = "mac"; #end - #if android public static final os:String = "android"; #end + #if windows public static final os:String = "windows"; #end + #if linux public static final os:String = "linux"; #end + #if macos public static final os:String = "mac"; #end + #if android public static final os:String = "android"; #end + #if ios public static final os:String = "ios"; #end #end /** @@ -74,4 +75,4 @@ class NdllUtil { } @:dox(hide) @:noCompletion static function noop() {} -} \ No newline at end of file +}