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

@ -2,7 +2,7 @@
<project>
<!-- _________________________ Application Settings _________________________ -->
<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.6" company="ninjamuffin99" />
<app title="Friday Night Funkin'" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.7" company="ninjamuffin99" />
<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />

View File

@ -1,4 +1,4 @@
:dad:Direct contact with real humans, after being trapped in here fro so long...
:dad:Direct contact with real humans, after being trapped in here for so long...
:dad:and HER of all people.
:dad:I'll make her father pay for what he's done to me and all the others,,,,
:dad:I'll beat you and make you take my place.

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

View File

@ -0,0 +1,130 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="senpaiCrazy.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Senpai Pre Explosion instance 10000" x="0" y="0" width="234" height="168" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10001" x="244" y="0" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10002" x="244" y="0" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10003" x="484" y="0" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10004" x="484" y="0" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10005" x="484" y="0" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10006" x="724" y="0" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10007" x="724" y="0" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10008" x="0" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10009" x="240" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10010" x="240" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10011" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10012" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10013" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10014" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10015" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10016" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10017" x="720" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10018" x="720" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10019" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10020" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10021" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10022" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10023" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10024" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10025" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10026" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10027" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10028" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10029" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10030" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10031" x="720" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10032" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10033" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10034" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10035" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10036" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10037" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10038" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10039" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10040" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10041" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10042" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10043" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10044" x="720" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10045" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10046" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10047" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10048" x="720" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10049" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10050" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10051" x="720" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10052" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10053" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10054" x="720" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10055" x="0" y="352" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10056" x="480" y="178" width="230" height="164" frameX="-18" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10057" x="240" y="352" width="230" height="164" frameX="0" frameY="0" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10058" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10059" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10060" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10061" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10062" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10063" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10064" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10065" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10066" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10067" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10068" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10069" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10070" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10071" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10072" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10073" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10074" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10075" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10076" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10077" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10078" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10079" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10080" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10081" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10082" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10083" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10084" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10085" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10086" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10087" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10088" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10089" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10090" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10091" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10092" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10093" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10094" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10095" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10096" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10097" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10098" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10099" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10100" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10101" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10102" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10103" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10104" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10105" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10106" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10107" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10108" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10109" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10110" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10111" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10112" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10113" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10114" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10115" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10116" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10117" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10118" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10119" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10120" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10121" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10122" x="720" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10123" x="0" y="526" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
<SubTexture name="Senpai Pre Explosion instance 10124" x="480" y="352" width="230" height="164" frameX="0" frameY="-3" frameWidth="252" frameHeight="168"/>
</TextureAtlas>

Binary file not shown.

Binary file not shown.

View File

@ -100,7 +100,7 @@ class DialogueBox extends FlxSpriteGroup
box.animation.addByPrefix('normalOpen', 'Spirit Textbox spawn', 24, false);
box.animation.addByIndices('normal', 'Spirit Textbox spawn', [11], "", 24);
var face:FlxSprite = new FlxSprite(180, 170).loadGraphic('assets/images/weeb/spiritFaceForward.png');
var face:FlxSprite = new FlxSprite(320, 170).loadGraphic('assets/images/weeb/spiritFaceForward.png');
face.setGraphicSize(Std.int(face.width * 6));
add(face);
}

View File

@ -23,6 +23,9 @@ class GameOverSubstate extends MusicBeatSubstate
case 'school':
stageSuffix = '-pixel';
daBf = 'bf-pixel-dead';
case 'school-evil':
stageSuffix = '-pixel';
daBf = 'bf-pixel-dead';
default:
daBf = 'bf';
}

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();