Skip to content

Commit efb12a9

Browse files
committed
I got annoyed
1 parent 512bd61 commit efb12a9

File tree

3 files changed

+8
-34
lines changed

3 files changed

+8
-34
lines changed

source/archipelago/APPlayState.hx

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class APPlayState extends PlayState {
8181
public var effectArray:Array<String> = [
8282
'colorblind', 'blur', 'lag', 'mine', 'warning', 'heal', 'spin', 'songslower', 'songfaster', 'scrollswitch', 'scrollfaster', 'scrollslower', 'rainbow',
8383
'cover', 'ghost', 'flashbang', 'nostrum', 'jackspam', 'spam', 'sever', 'shake', 'poison', 'dizzy', 'noise', 'flip', 'invuln',
84-
'desync', 'mute', 'ice', 'randomize', 'randomizeAlt', 'opponentPlay', 'bothplay', 'fakeheal', 'spell', 'terminate', 'lowpass', #if windows 'notif' #end
84+
'desync', 'mute', 'ice', 'opponentPlay', 'bothplay', 'fakeheal', 'spell', 'terminate', 'lowpass', #if windows 'notif' #end
8585
];
8686
var notifs:Array<String> = [
8787
"You're crazy...",
@@ -2219,7 +2219,6 @@ class APPlayState extends PlayState {
22192219

22202220
if (daNote.specialNote)
22212221
{
2222-
specialNoteHit(daNote, field);
22232222
return;
22242223
}
22252224
super.noteMiss(daNote, field);
@@ -2379,38 +2378,6 @@ class APPlayState extends PlayState {
23792378
}
23802379
}
23812380

2382-
override function beatHit()
2383-
{
2384-
switch (terminateStep)
2385-
{
2386-
case 3:
2387-
var terminate = new TerminateTimestamp(Math.floor(Conductor.songPosition / Conductor.crochet) * Conductor.crochet + Conductor.crochet * 3);
2388-
add(terminate);
2389-
terminateTimestamps.push(terminate);
2390-
terminateStep--;
2391-
COD.setPresetCOD('custom');
2392-
COD.custom = 'You were Terminated.';
2393-
case 2 | 1 | 0:
2394-
terminateMessage.loadGraphic(Paths.image("streamervschat/terminate" + terminateStep));
2395-
terminateMessage.screenCenter(XY);
2396-
terminateMessage.cameras = [camOther];
2397-
terminateMessage.visible = true;
2398-
if (terminateStep > 0)
2399-
{
2400-
terminateSound.volume = 0.6;
2401-
terminateSound.play(true);
2402-
}
2403-
else if (terminateStep == 0)
2404-
{
2405-
FlxG.sound.play(Paths.sound('streamervschat/beep2'), 0.85);
2406-
}
2407-
terminateStep--;
2408-
case -1:
2409-
terminateMessage.visible = false;
2410-
}
2411-
super.beatHit();
2412-
}
2413-
24142381
override function closeSubState()
24152382
{
24162383
setBoyfriendInvuln(1 / 60);

source/backend/ClientPrefs.hx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ import states.TitleState;
165165
public var aprilFools:Bool = true;
166166
public var freeplayMenu:String = 'Mixtape';
167167
public var showMods:Bool = false;
168+
public var checkAPWorld:Bool = true;
168169
}
169170

170171
class ClientPrefs {

source/options/MixtapeSettingsSubState.hx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,12 @@ class MixtapeSettingsSubState extends BaseOptionsMenu
123123
LABEL);
124124
addOption(option);
125125

126+
var option:Option = new Option('Check the Archipelago World',
127+
"If checked, the engine will check the current version of the Friday Night Funkin Archipelago World at launch.",
128+
'checkAPWorld',
129+
BOOL);
130+
addOption(option);
131+
126132
var option:Option = new Option('Allow Username Detection',
127133
"Uncheck this to prevent the game from leaking your computer name. Usually a good idea for streamers.",
128134
'username',

0 commit comments

Comments
 (0)