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

Merge branch 'main' of https://github.com/FNF-CNE-Devs/CodenameEngine-Dev

Browse Source
This commit is contained in:
Frakist
2023-10-16 20:05:29 +03:00
parent d4c7f45c85 b67fc08b73
commit c4e135df9a
2 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/scripting/events/GameOverEvent.hx
+30
View File
@@ -0,0 +1,30 @@
package funkin.backend.scripting.events;
import funkin.game.Character;
final class GameOverEvent extends CancellableEvent {
/**
* Character which died. Default to `boyfriend`.
*/
public var character:Character;
/**
* Character ID (name) for game over. Default to whatever is specified in the character's XML.
*/
public var deathCharID:String;
/**
* Song for the game over screen. Default to `this.gameOverSong` (`gameOver`)
*/
public var gameOverSong:String;
/**
* SFX at the beginning of the game over (Mic drop). Default to `this.lossSFX` (`gameOverSFX`)
*/
public var lossSFX:String;
/**
* SFX played whenever the player retries. Defaults to `retrySFX` (`gameOverEnd`)
*/
public var retrySFX:String;
}
source/funkin/game/PlayState.hx
+11 -5
View File
@@ -1245,11 +1245,15 @@ class PlayState extends MusicBeatState
* @param retrySFX SFX played whenever the player retries. Defaults to `retrySFX` (`gameOverEnd`)
*/
public function gameOver(?character:Character, ?deathCharID:String, ?gameOverSong:String, ?lossSFX:String, ?retrySFX:String) {
character = character.getDefault(opponentMode ? dad : boyfriend);
deathCharID = deathCharID.getDefault(character != null ? character.gameOverCharacter : "bf-dead");
gameOverSong = gameOverSong.getDefault(this.gameOverSong);
lossSFX = lossSFX.getDefault(this.lossSFX);
retrySFX = retrySFX.getDefault(this.retrySFX);
var event:GameOverEvent = scripts.event("onGameOver", EventManager.get(GameOverEvent).recycle(
character.getDefault(opponentMode ? dad : boyfriend),
deathCharID.getDefault(character != null ? character.gameOverCharacter : "bf-dead"),
gameOverSong.getDefault(this.gameOverSong),
lossSFX.getDefault(this.lossSFX),
retrySFX.getDefault(this.retrySFX)
));
if (event.cancelled) return;
if (character != null)
character.stunned = true;
@@ -1263,6 +1267,8 @@ class PlayState extends MusicBeatState
FlxG.sound.music.stop();
openSubState(new GameOverSubstate(character == null ? 0 : character.x, character == null ? 0 : character.y, deathCharID, character != null ? character.isPlayer : true, gameOverSong, lossSFX, retrySFX));
scripts.event("onGameOver", event);
}
/**