cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-10 00:34:40 +00:00
Code Issues Releases Wiki Activity

game over in progress

Browse source
This commit is contained in:
Cameron Taylor 2021-01-30 07:16:51 -05:00
parent c531aad3f6
commit 224d8ea029
2 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/Character.hx
View file

@ -385,6 +385,23 @@ class Character extends FlxSprite
antialiasing = false; antialiasing = false;
flipX = true; 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': case 'senpai':
frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/senpai.png', 'assets/images/weeb/senpai.xml'); frames = FlxAtlasFrames.fromSparrow('assets/images/weeb/senpai.png', 'assets/images/weeb/senpai.xml');
animation.addByPrefix('idle', 'Senpai Idle', 24, false); animation.addByPrefix('idle', 'Senpai Idle', 24, false);

21
source/GameOverSubstate.hx
View file

@ -12,21 +12,32 @@ class GameOverSubstate extends MusicBeatSubstate
var bf:Boyfriend; var bf:Boyfriend;
var camFollow:FlxObject; var camFollow:FlxObject;
// var var stageSuffix:String = "";
public function new(x:Float, y:Float) 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(); super();
Conductor.songPosition = 0; Conductor.songPosition = 0;
bf = new Boyfriend(x, y); bf = new Boyfriend(x, y, daBf);
add(bf); add(bf);
camFollow = new FlxObject(bf.getGraphicMidpoint().x, bf.getGraphicMidpoint().y, 1, 1); camFollow = new FlxObject(bf.getGraphicMidpoint().x, bf.getGraphicMidpoint().y, 1, 1);
add(camFollow); 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); Conductor.changeBPM(100);
// FlxG.camera.followLerp = 1; // FlxG.camera.followLerp = 1;
@ -63,7 +74,7 @@ class GameOverSubstate extends MusicBeatSubstate
if (bf.animation.curAnim.name == 'firstDeath' && bf.animation.curAnim.finished) 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) if (FlxG.sound.music.playing)
@ -88,7 +99,7 @@ class GameOverSubstate extends MusicBeatSubstate
isEnding = true; isEnding = true;
bf.playAnim('deathConfirm', true); bf.playAnim('deathConfirm', true);
FlxG.sound.music.stop(); 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) new FlxTimer().start(0.7, function(tmr:FlxTimer)
{ {
FlxG.camera.fade(FlxColor.BLACK, 2, false, function() FlxG.camera.fade(FlxColor.BLACK, 2, false, function()