From 1cc101e2f0c32a56d1ea4b166a00f2d046beaf57 Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Sun, 6 Nov 2022 14:53:50 +0100 Subject: [PATCH] THEYRE FLABBERGASTED!! --- assets/data/stages/school.hx | 11 +++++++++++ assets/data/stages/school.xml | 6 +++--- source/funkin/game/PlayState.hx | 1 - source/funkin/game/Stage.hx | 4 +++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/assets/data/stages/school.hx b/assets/data/stages/school.hx index a7886b1f..d80215a4 100644 --- a/assets/data/stages/school.hx +++ b/assets/data/stages/school.hx @@ -1,3 +1,14 @@ function create() { importScript("data/scripts/pixel"); + if (PlayState.SONG.song == "Roses") { + flabbergastGirls(); + } +} + +public function flabbergastGirls() { + bgGirls.animation.remove("danceLeft"); + bgGirls.animation.remove("danceRight"); + bgGirls.animation.addByIndices('danceLeft', 'BG fangirls dissuaded', CoolUtil.numberArray(14), "", 24, false); + bgGirls.animation.addByIndices('danceRight', 'BG fangirls dissuaded', CoolUtil.numberArray(30, 15), "", 24, false); + bgGirls.animation.play("danceLeft", true); } \ No newline at end of file diff --git a/assets/data/stages/school.xml b/assets/data/stages/school.xml index 83661874..5fe4d094 100644 --- a/assets/data/stages/school.xml +++ b/assets/data/stages/school.xml @@ -18,8 +18,8 @@ - - - + + + \ No newline at end of file diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index 8ae785a7..7ce3d0b9 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -329,7 +329,6 @@ class PlayState extends MusicBeatState public override function createPost() { var videoCutscene = Paths.video('${PlayState.SONG.song.toLowerCase()}-cutscene'); - trace(videoCutscene); FlxTransitionableState.skipNextTransIn = true; if (cutscene != null) { diff --git a/source/funkin/game/Stage.hx b/source/funkin/game/Stage.hx index 6356d04d..6567f8d2 100644 --- a/source/funkin/game/Stage.hx +++ b/source/funkin/game/Stage.hx @@ -86,7 +86,9 @@ class Stage extends FlxBasic implements IBeatReceiver { if (node.has.beatAnim && node.att.beatAnim.trim() != "") spr.beatAnims = [for(e in node.att.beatAnim.split(",")) e.trim()]; if (node.has.anim) { - spr.animation.play(node.att.anim); + spr.animation.play(node.att.anim, true); + } else if (spr.beatAnims.length > 0) { + spr.animation.play(spr.beatAnims[0], true); } stageSprites.set(node.att.name, spr);