Skip to content

Commit 371d993

Browse files
committed
Good lord...
1 parent 9ee84f4 commit 371d993

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

source/archipelago/APItem.hx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@ class APItem {
134134
var playState:archipelago.APPlayState = cast states.PlayState.instance;
135135
if (playState != null && playState.startedCountdown) {
136136
// Call the die() function once the countdown has started
137+
backend.COD.COD.COD = "Killed by Blue Balls Curse.";
138+
playState.deathByBlueBalls = true;
139+
137140
playState.die();
138141
} else {
139142
// Retry after a short delay if countdown hasn't started

source/archipelago/APPlayState.hx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ using yutautil.Table;
2323
class APPlayState extends PlayState {
2424
public static var apGame:APGameState;
2525
public static var deathByLink:Bool = false;
26+
public static var deathByBlueBalls:Bool = false;
2627
public static var currentMod = "";
2728
public static var deathLinkPacket:Dynamic;
2829
public static var effectiveScrollSpeed:Float;

source/substates/GameOverSubstate.hx

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,23 @@ class GameOverSubstate extends MusicBeatSubstate
277277
{
278278
FlxG.camera.fade(FlxColor.BLACK, 2, false, function()
279279
{
280-
MusicBeatState.resetState();
280+
if (Std.is(PlayState.instance, APPlayState) && APPlayState.deathByBlueBalls)
281+
{
282+
APPlayState.deathByBlueBalls = false;
283+
FlxG.camera.visible = false;
284+
FlxG.sound.music.stop();
285+
PlayState.deathCounter = 0;
286+
PlayState.seenCutscene = false;
287+
PlayState.chartingMode = false;
288+
289+
Mods.loadTopMod();
290+
MusicBeatState.switchState(new FreeplayState());
291+
FlxG.sound.playMusic(Paths.music('freakyMenu'));
292+
}
293+
else
294+
{
295+
MusicBeatState.resetState();
296+
}
281297
});
282298
});
283299
PlayState.instance.callOnScripts('onGameOverConfirm', [true]);

0 commit comments

Comments
 (0)