really last minute things

Author: Z11Coding

source/archipelago/APPlayState.hx

@@ -2379,6 +2379,38 @@ class APPlayState extends PlayState {
 		}
 	}
 
+    override function beatHit()
+    {
+        switch (terminateStep)
+		{
+			case 3:
+				var terminate = new TerminateTimestamp(Math.floor(Conductor.songPosition / Conductor.crochet) * Conductor.crochet + Conductor.crochet * 3);
+				add(terminate);
+				terminateTimestamps.push(terminate);
+				terminateStep--;
+                COD.setPresetCOD('custom');
+                COD.custom = 'You were Terminated.';
+			case 2 | 1 | 0:
+				terminateMessage.loadGraphic(Paths.image("streamervschat/terminate" + terminateStep));
+				terminateMessage.screenCenter(XY);
+				terminateMessage.cameras = [camOther];
+				terminateMessage.visible = true;
+				if (terminateStep > 0)
+				{
+					terminateSound.volume = 0.6;
+					terminateSound.play(true);
+				}
+				else if (terminateStep == 0)
+				{
+					FlxG.sound.play(Paths.sound('streamervschat/beep2'), 0.85);
+				}
+				terminateStep--;
+			case -1:
+				terminateMessage.visible = false;
+		}
+        super.beatHit();
+    }
+
     override function closeSubState()
     {
         setBoyfriendInvuln(1 / 60);

source/backend/ClientPrefs.hx

@@ -20,7 +20,7 @@ import states.TitleState;
 	public var splashAlpha:Float = 0.6;
 	public var lowQuality:Bool = false;
 	public var shaders:Bool = true;
-	public var cacheOnGPU:Bool = #if !switch false #else true #end; // GPU Caching made by Raltyro
+	public var cacheOnGPU:Bool = false; // GPU Caching made by Raltyro // its buggy lol
 	public var framerate:Int = 60;
 	public var camZooms:Bool = true;
 	public var hideHud:Bool = false;

source/options/MixtapeSettingsSubState.hx

@@ -51,7 +51,7 @@ class MixtapeSettingsSubState extends BaseOptionsMenu
 			"Native", 
 			"Native-old", 
 			"Andromeda (legacy)",
-			"BEAT! Engine", 
+			//"BEAT! Engine", 
 			//"Kade Engine", 
 			//"ZoroForce EK", 
 			//"Mic'ed Up Engine",
@@ -115,7 +115,7 @@ class MixtapeSettingsSubState extends BaseOptionsMenu
 		addOption(option);
 
 		var option:Option = new Option('Freeplay Menu:',
-			"Which freeplay menu do you prefer?\n(This has no effect on Archipelago Mode)\nDOES NOTHING FOR NOW!",
+			"Which freeplay menu do you prefer?\n(This has no effect on Archipelago Mode)\nBASE GAME DOES NOTHING FOR NOW!",
 			'freeplayMenu',
 			STRING,
 			['Mixtape', 'Osu', 'Base Game']);

source/states/MainMenuState.hx

@@ -17,7 +17,7 @@ enum MainMenuColumn {
 class MainMenuState extends MusicBeatState
 {
 	public static var psychEngineVersion:String = '1.0.3'; // This is also used for Discord RPC
-	public static var mixtapeEngineVersion:String = '4.6.0'; // this is used for Discord RPC
+	public static var mixtapeEngineVersion:String = '4.7.0'; // this is used for Discord RPC
 	public static var curSelected:Int = 0;
 	public static var curColumn:MainMenuColumn = CENTER;
 	private var archButton:PsychUIButton;

source/states/editors/DialogueCharacterEditorState.hx

@@ -144,7 +144,7 @@ class DialogueCharacterEditorState extends MusicBeatState implements PsychUIEven
 		addTouchPadCamera();
 		#end
 
-		MusicManager.playEditorMusic(1);
+		MusicManager.playEditorMusic(ClientPrefs.data.editorMusVol);
 
 		super.create();
 	}

source/states/editors/DialogueEditorState.hx

@@ -87,7 +87,7 @@ class DialogueEditorState extends MusicBeatState implements PsychUIEventHandler.
 		changeText();
 		super.create();
 
-		MusicManager.playEditorMusic(1);
+		MusicManager.playEditorMusic(ClientPrefs.data.editorMusVol);
 	}
 
 	var UI_box:PsychUIBox;

source/states/editors/MenuCharacterEditorState.hx

@@ -64,7 +64,7 @@ class MenuCharacterEditorState extends MusicBeatState implements PsychUIEventHan
 		FlxG.mouse.visible = true;
 		updateCharacters();
 
-		MusicManager.playEditorMusic();
+		MusicManager.playEditorMusic(ClientPrefs.data.editorMusVol);
 
 		super.create();
 	}

source/states/editors/NoteSplashEditorState.hx

@@ -117,6 +117,8 @@ class NoteSplashEditorState extends MusicBeatState
         curText.x += 5;
         add(curText);
 
+        MusicManager.playEditorMusic(ClientPrefs.data.editorMusVol);
+
         super.create();
     }
 

source/states/editors/StageEditorState.hx

@@ -114,7 +114,7 @@ class StageEditorState extends MusicBeatState implements PsychUIEventHandler.Psy
 		FlxG.mouse.visible = true;
 		animationEditor = new StageEditorAnimationSubstate();
 
-		MusicManager.playEditorMusic(1);
+		MusicManager.playEditorMusic(ClientPrefs.data.editorMusVol);
 
 		super.create();
 	}

source/states/editors/StickerTest.hx

@@ -38,11 +38,8 @@ class StickerTest extends MusicBeatState {
         BG.updateHitbox();
         add(BG);
         addEditorBox();
-        #if TOUCH_CONTROLS_ALLOWED
-        addTouchPad('NONE','B');
-        #end
         super.create();
-        MusicManager.playEditorMusic(1);
+        MusicManager.playEditorMusic(ClientPrefs.data.editorMusVol);
     }
 
     var UI_box:PsychUIBox;