This commit is contained in:
Cameron Taylor
2021-02-02 05:46:17 -05:00
parent 83b5c2012f
commit 8daef50850
9 changed files with 189 additions and 11 deletions

View File

@ -750,12 +750,6 @@ class PlayState extends MusicBeatState
{
switch (curSong.toLowerCase())
{
case 'senpai':
schoolIntro(doof);
case 'roses':
schoolIntro(doof);
case 'thorns':
schoolIntro(doof);
default:
startCountdown();
}
@ -770,9 +764,26 @@ class PlayState extends MusicBeatState
black.scrollFactor.set();
add(black);
if (isStoryMode && SONG.song.toLowerCase() == 'roses')
var red:FlxSprite = new FlxSprite(-100, -100).makeGraphic(FlxG.width * 2, FlxG.height * 2, 0xFFff1b31);
red.scrollFactor.set();
var senpaiEvil:FlxSprite = new FlxSprite();
senpaiEvil.frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/senpaiCrazy.png', 'assets/images/weeb/senpaiCrazy.xml');
senpaiEvil.animation.addByPrefix('idle', 'Senpai Pre Explosion', 24, false);
senpaiEvil.setGraphicSize(Std.int(senpaiEvil.width * 6));
senpaiEvil.updateHitbox();
senpaiEvil.screenCenter();
if (SONG.song.toLowerCase() == 'roses' || SONG.song.toLowerCase() == 'thorns')
{
remove(black);
if (SONG.song.toLowerCase() == 'thorns')
{
add(red);
}
}
new FlxTimer().start(0.3, function(tmr:FlxTimer)
{
black.alpha -= 0.15;
@ -786,7 +797,41 @@ class PlayState extends MusicBeatState
if (dialogueBox != null)
{
inCutscene = true;
add(dialogueBox);
if (SONG.song.toLowerCase() == 'thorns')
{
add(senpaiEvil);
senpaiEvil.alpha = 0;
new FlxTimer().start(0.3, function(swagTimer:FlxTimer)
{
senpaiEvil.alpha += 0.15;
if (senpaiEvil.alpha < 1)
{
swagTimer.reset();
}
else
{
senpaiEvil.animation.play('idle');
FlxG.sound.play('assets/sounds/Senpai_Dies' + TitleState.soundExt, 1, false, null, true, function()
{
remove(senpaiEvil);
remove(red);
FlxG.camera.fade(FlxColor.WHITE, 0.01, true, function()
{
add(dialogueBox);
}, true);
});
new FlxTimer().start(3.2, function(deadTime:FlxTimer)
{
FlxG.camera.fade(FlxColor.WHITE, 1.6, false);
});
}
});
}
else
{
add(dialogueBox);
}
}
else
startCountdown();