game over in progress

This commit is contained in:
Cameron Taylor 2021-01-30 07:16:51 -05:00
parent cdb93eb845
commit a6cd1df991
11 changed files with 164 additions and 5 deletions

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 111 KiB

View File

@ -0,0 +1,131 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="bfPixelsDEAD.png">
<!-- Created with Adobe Animate version 20.0.0.17400 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="BF Dies pixel instance 10000" x="0" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10001" x="92" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10002" x="184" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10003" x="276" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10004" x="276" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10005" x="368" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10006" x="368" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10007" x="460" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10008" x="460" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10009" x="460" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10010" x="460" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10011" x="460" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10012" x="460" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10013" x="460" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10014" x="460" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10015" x="460" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10016" x="552" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10017" x="552" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10018" x="552" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10019" x="644" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10020" x="644" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10021" x="644" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10022" x="736" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10023" x="736" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10024" x="828" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10025" x="920" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10026" x="920" y="0" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10027" x="0" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10028" x="0" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10029" x="92" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10030" x="92" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10031" x="184" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10032" x="184" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10033" x="184" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10034" x="276" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10035" x="368" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10036" x="460" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10037" x="552" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10038" x="644" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10039" x="736" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10040" x="828" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10041" x="920" y="83" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10042" x="0" y="166" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10043" x="92" y="166" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10044" x="184" y="166" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10045" x="276" y="166" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10046" x="368" y="166" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10047" x="460" y="166" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10048" x="552" y="166" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10049" x="644" y="166" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10050" x="736" y="166" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10051" x="828" y="166" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10052" x="920" y="166" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10053" x="0" y="249" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10054" x="92" y="249" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10055" x="184" y="249" width="90" height="81"/>
<SubTexture name="BF Dies pixel instance 10056" x="160" y="411" width="78" height="77"/>
<SubTexture name="BF Dies pixel instance 10057" x="160" y="411" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10000" x="276" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10001" x="356" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10002" x="356" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10003" x="436" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10004" x="436" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10005" x="516" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10006" x="516" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10007" x="596" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10008" x="676" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10009" x="756" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10010" x="836" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10011" x="916" y="249" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10012" x="0" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10013" x="80" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10014" x="160" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10015" x="240" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10016" x="320" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10017" x="400" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10018" x="480" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10019" x="560" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10020" x="640" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10021" x="720" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10022" x="800" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10023" x="880" y="332" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10024" x="0" y="411" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10025" x="80" y="411" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10026" x="160" y="411" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10027" x="160" y="411" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10028" x="160" y="411" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10029" x="160" y="411" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10030" x="160" y="411" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10031" x="160" y="411" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10032" x="160" y="411" width="78" height="77"/>
<SubTexture name="RETRY CONFIRM instance 10033" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10000" x="240" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10001" x="320" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10002" x="320" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10003" x="400" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10004" x="400" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10005" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10006" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10007" x="480" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10008" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10009" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10010" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10011" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10012" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10013" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10014" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10015" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10016" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10017" x="240" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10018" x="320" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10019" x="320" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10020" x="400" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10021" x="400" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10022" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10023" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10024" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10025" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10026" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10027" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10028" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10029" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10030" x="480" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10031" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10032" x="160" y="411" width="78" height="77"/>
<SubTexture name="Retry Loop instance 10033" x="160" y="411" width="78" height="77"/>
</TextureAtlas>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -385,6 +385,23 @@ class Character extends FlxSprite
antialiasing = false;
flipX = true;
case 'bf-pixel-dead':
frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/bfPixelsDEAD.png', 'assets/images/weeb/bfPixelsDEAD.xml');
animation.addByPrefix('singUP', "BF Dies pixel", 24, false);
animation.addByPrefix('firstDeath', "BF Dies pixel", 24, false);
animation.addByPrefix('deathLoop', "Retry Loop", 24, true);
animation.addByPrefix('deathConfirm', "RETRY CONFIRM", 24, false);
animation.play('firstDeath');
addOffset('firstDeath');
addOffset('deathLoop');
addOffset('deathConfirm');
// pixel bullshit
setGraphicSize(Std.int(width * 6));
updateHitbox();
antialiasing = false;
flipX = true;
case 'senpai':
frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/senpai.png', 'assets/images/weeb/senpai.xml');
animation.addByPrefix('idle', 'Senpai Idle', 24, false);

View File

@ -12,21 +12,32 @@ class GameOverSubstate extends MusicBeatSubstate
var bf:Boyfriend;
var camFollow:FlxObject;
// var
var stageSuffix:String = "";
public function new(x:Float, y:Float)
{
var daStage = PlayState.curStage;
var daBf:String = '';
switch (daStage)
{
case 'school':
stageSuffix = '-pixel';
daBf = 'bf-pixel-dead';
default:
daBf = 'bf';
}
super();
Conductor.songPosition = 0;
bf = new Boyfriend(x, y);
bf = new Boyfriend(x, y, daBf);
add(bf);
camFollow = new FlxObject(bf.getGraphicMidpoint().x, bf.getGraphicMidpoint().y, 1, 1);
add(camFollow);
FlxG.sound.play('assets/sounds/fnf_loss_sfx' + TitleState.soundExt);
FlxG.sound.play('assets/sounds/fnf_loss_sfx' + stageSuffix + TitleState.soundExt);
Conductor.changeBPM(100);
// FlxG.camera.followLerp = 1;
@ -63,7 +74,7 @@ class GameOverSubstate extends MusicBeatSubstate
if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.finished)
{
FlxG.sound.playMusic('assets/music/gameOver' + TitleState.soundExt);
FlxG.sound.playMusic('assets/music/gameOver' + stageSuffix + TitleState.soundExt);
}
if (FlxG.sound.music.playing)
@ -88,7 +99,7 @@ class GameOverSubstate extends MusicBeatSubstate
isEnding = true;
bf.playAnim('deathConfirm', true);
FlxG.sound.music.stop();
FlxG.sound.play('assets/music/gameOverEnd' + TitleState.soundExt);
FlxG.sound.play('assets/music/gameOverEnd' + stageSuffix + TitleState.soundExt);
new FlxTimer().start(0.7, function(tmr:FlxTimer)
{
FlxG.camera.fade(FlxColor.BLACK, 2, false, function()