diff --git a/assets/shared/images/noteSplashes/og_cyan_noteSplashes.png b/assets/shared/images/noteSplashes/og_cyan_noteSplashes.png new file mode 100644 index 00000000..5f13162f Binary files /dev/null and b/assets/shared/images/noteSplashes/og_cyan_noteSplashes.png differ diff --git a/assets/shared/images/noteSplashes/og_cyan_noteSplashes.xml b/assets/shared/images/noteSplashes/og_cyan_noteSplashes.xml new file mode 100644 index 00000000..680276a1 --- /dev/null +++ b/assets/shared/images/noteSplashes/og_cyan_noteSplashes.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/shared/images/noteSplashes/og_green_noteSplashes.png b/assets/shared/images/noteSplashes/og_green_noteSplashes.png new file mode 100644 index 00000000..ef612b2e Binary files /dev/null and b/assets/shared/images/noteSplashes/og_green_noteSplashes.png differ diff --git a/assets/shared/images/noteSplashes/og_green_noteSplashes.xml b/assets/shared/images/noteSplashes/og_green_noteSplashes.xml new file mode 100644 index 00000000..bdd62c30 --- /dev/null +++ b/assets/shared/images/noteSplashes/og_green_noteSplashes.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/shared/images/noteSplashes/og_idk_noteSplashes.png b/assets/shared/images/noteSplashes/og_idk_noteSplashes.png new file mode 100644 index 00000000..310d62e0c Binary files /dev/null and b/assets/shared/images/noteSplashes/og_idk_noteSplashes.png differ diff --git a/assets/shared/images/noteSplashes/og_idk_noteSplashes.xml b/assets/shared/images/noteSplashes/og_idk_noteSplashes.xml new file mode 100644 index 00000000..4038d4c7 --- /dev/null +++ b/assets/shared/images/noteSplashes/og_idk_noteSplashes.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/shared/images/noteSplashes/og_inverted_noteSplashes.png b/assets/shared/images/noteSplashes/og_inverted_noteSplashes.png new file mode 100644 index 00000000..a76953fe Binary files /dev/null and b/assets/shared/images/noteSplashes/og_inverted_noteSplashes.png differ diff --git a/assets/shared/images/noteSplashes/og_pink_noteSplashes.png b/assets/shared/images/noteSplashes/og_pink_noteSplashes.png new file mode 100644 index 00000000..d03c6601 Binary files /dev/null and b/assets/shared/images/noteSplashes/og_pink_noteSplashes.png differ diff --git a/assets/shared/images/noteSplashes/og_pink_noteSplashes.xml b/assets/shared/images/noteSplashes/og_pink_noteSplashes.xml new file mode 100644 index 00000000..1d26fa43 --- /dev/null +++ b/assets/shared/images/noteSplashes/og_pink_noteSplashes.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/shared/images/noteSplashes/og_purple_noteSplashes.png b/assets/shared/images/noteSplashes/og_purple_noteSplashes.png new file mode 100644 index 00000000..cc9b77dd Binary files /dev/null and b/assets/shared/images/noteSplashes/og_purple_noteSplashes.png differ diff --git a/assets/shared/images/noteSplashes/og_purple_noteSplashes.xml b/assets/shared/images/noteSplashes/og_purple_noteSplashes.xml new file mode 100644 index 00000000..cc87cc0b --- /dev/null +++ b/assets/shared/images/noteSplashes/og_purple_noteSplashes.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/shared/images/noteSplashes/og_red_noteSplashes.png b/assets/shared/images/noteSplashes/og_red_noteSplashes.png new file mode 100644 index 00000000..4932e7dd Binary files /dev/null and b/assets/shared/images/noteSplashes/og_red_noteSplashes.png differ diff --git a/source/NoteSplash.hx b/source/NoteSplash.hx index 10fbefb9..17c69c91 100644 --- a/source/NoteSplash.hx +++ b/source/NoteSplash.hx @@ -4,6 +4,8 @@ import flixel.FlxG; import flixel.FlxSprite; import flixel.graphics.frames.FlxAtlasFrames; +using StringTools; + class NoteSplash extends FlxSprite { public var colorSwap:ColorSwap = null; @@ -20,13 +22,16 @@ class NoteSplash extends FlxSprite case 'pink': hola = 'pink'; case 'idk': hola = 'idk'; case 'original': hola = 'og'; - default: hola = 'noteSplashes'; - } - if(hola != 'noteSplashes') { - return hola.toLowerCase() + '_noteSplashes'; - } else { - return hola; + case 'green original': hola = 'og green'; + case 'blue original': hola = 'og blue'; + case 'pink original': hola = 'og pink'; + case 'purple original': hola = 'og purple'; + case 'idk original': hola = 'og idk'; } + var holaQue:String = hola.replace(" ", '_'); + if(!hola.contains('noteSplashes')) + return holaQue.toLowerCase() + '_noteSplashes'; + return holaQue; } /** @@ -65,8 +70,8 @@ class NoteSplash extends FlxSprite colorSwap.hue = hueColor; colorSwap.saturation = satColor; colorSwap.brightness = brtColor; - if(texture == 'og_noteSplashes') { - offset.set(Std.int(0.3 * width), Std.int(0.3 * height)); + if(StringTools.startsWith(texture, 'og')) { + offset.set(80, 90); } else { offset.set(10, 10); } diff --git a/source/PlayState.hx b/source/PlayState.hx index 2c2134a1..8ca28577 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -1034,7 +1034,7 @@ class PlayState extends MusicBeatState timeTxt.y += 3; } - var splash:NoteSplash = new NoteSplash(100, 100, 0); + var splash:NoteSplash = if(StringTools.startsWith(NoteSplash.noteS(), 'og')) new NoteSplash(180, 190) else new NoteSplash(100, 100, 0); grpNoteSplashes.add(splash); splash.alpha = 0.0; diff --git a/source/altoptions/VisualsUISubState.hx b/source/altoptions/VisualsUISubState.hx index 152ffdbf..48744366 100644 --- a/source/altoptions/VisualsUISubState.hx +++ b/source/altoptions/VisualsUISubState.hx @@ -47,7 +47,23 @@ class VisualsUISubState extends BaseOptionsMenu 'noteSplashes', 'string', 'Normal', - ['Normal', 'None', 'Original', 'Inverted', 'Red', 'Pink', 'Cyan', 'Green', 'IDK']); + [ + 'Normal', + 'None', + 'Inverted', + 'Red', + 'Pink', + 'Cyan', + 'Green', + 'IDK', + 'Original', + 'Inverted Original', + 'Red Original', + 'Purple Original', + 'Pink Original', + 'Cyan Original', + 'Green Original' + ]); addOption(option); var option:Option = new Option('Kade Engine Score Text', diff --git a/source/options/VisualsUISubState.hx b/source/options/VisualsUISubState.hx index e85c05d4..a8b26ee7 100644 --- a/source/options/VisualsUISubState.hx +++ b/source/options/VisualsUISubState.hx @@ -47,7 +47,23 @@ class VisualsUISubState extends BaseOptionsMenu 'noteSplashes', 'string', 'Normal', - ['Normal', 'None', 'Original', 'Inverted', 'Red', 'Pink', 'Cyan', 'Green', 'IDK']); + [ + 'Normal', + 'None', + 'Inverted', + 'Red', + 'Pink', + 'Cyan', + 'Green', + 'IDK', + 'Original', + 'Inverted Original', + 'Red Original', + 'Purple Original', + 'Pink Original', + 'Cyan Original', + 'Green Original' + ]); addOption(option); var option:Option = new Option('Kade Engine Score Text',