gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

game over

Browse Source
This commit is contained in:
Yoshman29
2022-12-05 22:55:56 +01:00
parent 2dc72d7c48
commit e9654cbc89
20 changed files with 218 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/game/Character.hx
+2 -111
View File
@@ -47,6 +47,7 @@ class Character extends FlxSprite implements IBeatReceiver implements IOffsetCom
public var playerOffsets:Bool = false;
public var icon:String = null;
public var gameOverCharacter:String = "bf-dead";
public var cameraOffset:FlxPoint = new FlxPoint(0, 0);
public var globalOffset:FlxPoint = new FlxPoint(0, 0);
@@ -111,6 +112,7 @@ class Character extends FlxSprite implements IBeatReceiver implements IOffsetCom
if (xml.has.isGF) isGF = (xml.att.isGF == "true");
if (xml.has.x) globalOffset.x = Std.parseFloat(xml.att.x);
if (xml.has.y) globalOffset.y = Std.parseFloat(xml.att.y);
if (xml.has.gameOverChar) gameOverCharacter = xml.att.gameOverChar;
if (xml.has.camx) cameraOffset.x = Std.parseFloat(xml.att.camx);
if (xml.has.camy) cameraOffset.y = Std.parseFloat(xml.att.camy);
if (xml.has.holdTime) holdTime = CoolUtil.getDefault(Std.parseFloat(xml.att.holdTime), 4);
@@ -142,56 +144,6 @@ class Character extends FlxSprite implements IBeatReceiver implements IOffsetCom
/**
NON CONVERTED CHARACTERS - DO NOT REMOVE
**/
// case 'gf-pixel':
// tex = Paths.getSparrowAtlas('weeb/gfPixel');
// frames = tex;
// animation.addByIndices('singUP', 'GF IDLE', [2], "", 24, false);
// animation.addByIndices('danceLeft', 'GF IDLE', [30, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false);
// animation.addByIndices('danceRight', 'GF IDLE', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false);
// addOffset('danceLeft', 0);
// addOffset('danceRight', 0);
// playAnim('danceRight');
// setGraphicSize(Std.int(width * PlayState.daPixelZoom));
// updateHitbox();
// antialiasing = false;
// flipX = true;
// case 'bf-pixel':
// frames = Paths.getSparrowAtlas('weeb/bfPixel');
// animation.addByPrefix('idle', 'BF IDLE', 24, false);
// animation.addByPrefix('singUP', 'BF UP NOTE', 24, false);
// animation.addByPrefix('singLEFT', 'BF LEFT NOTE', 24, false);
// animation.addByPrefix('singRIGHT', 'BF RIGHT NOTE', 24, false);
// animation.addByPrefix('singDOWN', 'BF DOWN NOTE', 24, false);
// animation.addByPrefix('singUPmiss', 'BF UP MISS', 24, false);
// animation.addByPrefix('singLEFTmiss', 'BF LEFT MISS', 24, false);
// animation.addByPrefix('singRIGHTmiss', 'BF RIGHT MISS', 24, false);
// animation.addByPrefix('singDOWNmiss', 'BF DOWN MISS', 24, false);
// addOffset('idle');
// addOffset("singUP");
// addOffset("singRIGHT");
// addOffset("singLEFT");
// addOffset("singDOWN");
// addOffset("singUPmiss");
// addOffset("singRIGHTmiss");
// addOffset("singLEFTmiss");
// addOffset("singDOWNmiss");
// setGraphicSize(Std.int(width * 6));
// updateHitbox();
// playAnim('idle');
// width -= 100;
// height -= 100;
// antialiasing = false;
// flipX = true;
// case 'bf-pixel-dead':
// frames = Paths.getSparrowAtlas('weeb/bfPixelsDEAD');
// animation.addByPrefix('singUP', "BF Dies pixel", 24, false);
@@ -210,67 +162,6 @@ class Character extends FlxSprite implements IBeatReceiver implements IOffsetCom
// antialiasing = false;
// flipX = true;
// case 'senpai':
// frames = Paths.getSparrowAtlas('weeb/senpai');
// animation.addByPrefix('idle', 'Senpai Idle', 24, false);
// animation.addByPrefix('singUP', 'SENPAI UP NOTE', 24, false);
// animation.addByPrefix('singLEFT', 'SENPAI LEFT NOTE', 24, false);
// animation.addByPrefix('singRIGHT', 'SENPAI RIGHT NOTE', 24, false);
// animation.addByPrefix('singDOWN', 'SENPAI DOWN NOTE', 24, false);
// addOffset('idle');
// addOffset("singUP", 5, 37);
// addOffset("singRIGHT");
// addOffset("singLEFT", 40);
// addOffset("singDOWN", 14);
// playAnim('idle');
// setGraphicSize(Std.int(width * 6));
// updateHitbox();
// antialiasing = false;
// case 'senpai-angry':
// frames = Paths.getSparrowAtlas('weeb/senpai');
// animation.addByPrefix('idle', 'Angry Senpai Idle', 24, false);
// animation.addByPrefix('singUP', 'Angry Senpai UP NOTE', 24, false);
// animation.addByPrefix('singLEFT', 'Angry Senpai LEFT NOTE', 24, false);
// animation.addByPrefix('singRIGHT', 'Angry Senpai RIGHT NOTE', 24, false);
// animation.addByPrefix('singDOWN', 'Angry Senpai DOWN NOTE', 24, false);
// addOffset('idle');
// addOffset("singUP", 5, 37);
// addOffset("singRIGHT");
// addOffset("singLEFT", 40);
// addOffset("singDOWN", 14);
// playAnim('idle');
// setGraphicSize(Std.int(width * 6));
// updateHitbox();
// antialiasing = false;
// case 'spirit':
// frames = Paths.getPackerAtlas('weeb/spirit');
// animation.addByPrefix('idle', "idle spirit_", 24, false);
// animation.addByPrefix('singUP', "up_", 24, false);
// animation.addByPrefix('singRIGHT', "right_", 24, false);
// animation.addByPrefix('singLEFT', "left_", 24, false);
// animation.addByPrefix('singDOWN', "spirit down_", 24, false);
// addOffset('idle', -220, -280);
// addOffset('singUP', -220, -240);
// addOffset("singRIGHT", -220, -280);
// addOffset("singLEFT", -200, -280);
// addOffset("singDOWN", 170, 110);
// setGraphicSize(Std.int(width * 6));
// updateHitbox();
// playAnim('idle');
// antialiasing = false;
isDanceLeftDanceRight = (animation.getByName("danceLeft") != null && animation.getByName("danceRight") != null);
source/funkin/game/GameOverSubstate.hx
+32 -19
View File
@@ -14,24 +14,26 @@ import funkin.system.Conductor;
class GameOverSubstate extends MusicBeatSubstate
{
var bf:Character;
public var character:String;
var character:Character;
public var characterName:String;
public var gameOverSong:String;
public var lossSFXName:String;
public var retrySFX:String;
var camFollow:FlxObject;
var stageSuffix:String = "";
var x:Float = 0;
var y:Float = 0;
public var lossSFX:FlxSound;
public function new(x:Float, y:Float, character:String = "bf", gameOverSong:String = "gameOver") {
public function new(x:Float, y:Float, character:String = "bf-dead", gameOverSong:String = "gameOver", lossSFX:String = "gameOverSFX", retrySFX:String = "gameOverEnd") {
super();
this.x = x;
this.y = y;
this.character = character;
this.characterName = character;
this.gameOverSong = gameOverSong;
this.lossSFXName = lossSFX;
this.retrySFX = retrySFX;
}
public override function create()
@@ -40,18 +42,18 @@ class GameOverSubstate extends MusicBeatSubstate
if (FlxG.sound.music != null)
FlxG.sound.music.stop();
bf = new Character(x, y, character, true);
add(bf);
character = new Character(x, y, characterName, true);
character.danceOnBeat = false;
character.playAnim('firstDeath');
add(character);
camFollow = new FlxObject(bf.getGraphicMidpoint().x, bf.getGraphicMidpoint().y, 1, 1);
var camPos = character.getCameraPosition();
camFollow = new FlxObject(camPos.x, camPos.y, 1, 1);
add(camFollow);
FlxG.camera.target = camFollow;
lossSFX = FlxG.sound.play(Paths.sound('fnf_loss_sfx' + stageSuffix));
lossSFX = FlxG.sound.play(Paths.sound(lossSFXName));
Conductor.changeBPM(100);
bf.danceOnBeat = false;
bf.playAnim('firstDeath');
}
override function update(elapsed:Float)
@@ -67,6 +69,7 @@ class GameOverSubstate extends MusicBeatSubstate
{
if (FlxG.sound.music != null)
FlxG.sound.music.stop();
FlxG.sound.music = null;
if (PlayState.isStoryMode)
FlxG.switchState(new StoryMenuState());
@@ -74,7 +77,7 @@ class GameOverSubstate extends MusicBeatSubstate
FlxG.switchState(new FreeplayState());
}
if (!lossSFX.playing && (FlxG.sound.music == null || !FlxG.sound.music.playing))
if (!isEnding && ((!lossSFX.playing) || (character.animation.curAnim != null && character.animation.curAnim.name == "firstDeath" && character.animation.curAnim.finished)) && (FlxG.sound.music == null || !FlxG.sound.music.playing))
CoolUtil.playMusic(Paths.music(gameOverSong), 100);
}
@@ -82,7 +85,7 @@ class GameOverSubstate extends MusicBeatSubstate
{
super.beatHit(curBeat);
if (!lossSFX.playing)
bf.playAnim("deathLoop", DANCE);
character.playAnim("deathLoop", true, DANCE);
}
var isEnding:Bool = false;
@@ -92,12 +95,22 @@ class GameOverSubstate extends MusicBeatSubstate
if (!isEnding)
{
isEnding = true;
bf.playAnim('deathConfirm', true);
character.playAnim('deathConfirm', true);
FlxG.sound.music.stop();
FlxG.sound.play(Paths.music('gameOverEnd' + stageSuffix));
new FlxTimer().start(0.7, function(tmr:FlxTimer)
var sound = FlxG.sound.play(Paths.sound(retrySFX));
var secsLength:Float = sound.length / 1000;
var waitTime = 0.7;
var fadeOutTime = secsLength - 0.7;
if (fadeOutTime < 0.5) {
fadeOutTime = secsLength;
waitTime = 0;
}
new FlxTimer().start(waitTime, function(tmr:FlxTimer)
{
FlxG.camera.fade(FlxColor.BLACK, 2, false, function()
FlxG.camera.fade(FlxColor.BLACK, fadeOutTime, false, function()
{
FlxTransitionableState.skipNextTransOut = true;
FlxG.switchState(new PlayState());
source/funkin/game/PlayState.hx
+40 -25
View File
@@ -80,7 +80,12 @@ class PlayState extends MusicBeatState
public var scripts:ScriptPack;
public var halloweenLevel:Bool = false;
public var gameOverSong:String = "gameOver";
public var lossSFX:String = "fnf_loss_sfx";
public var retrySFX:String = "gameOverEnd";
public var stage:Stage;
public var canDie:Bool = true;
public var scrollSpeed:Float = 0;
public var downscroll(get, set):Bool;
@@ -782,6 +787,8 @@ class PlayState extends MusicBeatState
super.closeSubState();
}
var __wereVocalsPlaying:Bool = false;
var __wasAutoPause:Bool = false;
override public function onFocus():Void
{
scripts.call("onFocus");
@@ -798,6 +805,8 @@ class PlayState extends MusicBeatState
}
}
#end
if (__wasAutoPause && __wereVocalsPlaying)
vocals.play();
super.onFocus();
}
@@ -811,6 +820,11 @@ class PlayState extends MusicBeatState
DiscordClient.changePresence(detailsPausedText, SONG.song + " (" + difficultyText + ")", iconRPC);
}
#end
if (__wasAutoPause = FlxG.autoPause) {
__wereVocalsPlaying = vocals.playing;
vocals.pause();
}
super.onFocusLost();
}
@@ -1003,31 +1017,8 @@ class PlayState extends MusicBeatState
trace("User is cheating!");
}
if (health <= 0)
{
boyfriend.stunned = true;
persistentUpdate = false;
persistentDraw = false;
paused = true;
vocals.stop();
FlxG.sound.music.stop();
openSubState(new GameOverSubstate(boyfriend.x, boyfriend.y));
// FlxG.switchState(new GameOverState(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y));
#if desktop
// Game Over doesn't get his own variable because it's only used here
DiscordClient.changePresence("Game Over - " + detailsText, SONG.song + " (" + difficultyText + ")", iconRPC);
#end
}
// while(unspawnNotes[0] != null && unspawnNotes[0].strumTime - Conductor.songPosition < 1500)
// notes.add(unspawnNotes.shift());
if (health <= 0 && canDie)
gameOver();
if (generatedMusic)
{
@@ -1091,6 +1082,30 @@ class PlayState extends MusicBeatState
scripts.call("postUpdate", [elapsed]);
}
function gameOver(?character:String, ?gameOverSong:String, ?lossSFX:String, ?retrySFX:String) {
character = character.getDefault((boyfriend != null) ? boyfriend.gameOverCharacter : "bf-dead");
gameOverSong.getDefault(this.gameOverSong);
lossSFX.getDefault(this.lossSFX);
retrySFX.getDefault(this.retrySFX);
boyfriend.stunned = true;
persistentUpdate = false;
persistentDraw = false;
paused = true;
vocals.stop();
if (FlxG.sound.music != null)
FlxG.sound.music.stop();
openSubState(new GameOverSubstate(boyfriend.x, boyfriend.y, character, gameOverSong, lossSFX, retrySFX));
#if desktop
// Game Over doesn't get his own variable because it's only used here
DiscordClient.changePresence("Game Over - " + detailsText, SONG.song + " (" + difficultyText + ")", iconRPC);
#end
}
function endSong():Void
{
scripts.call("onSongEnd");