e

Author: Yuta12342

source/backend/MusicBeatState.hx

@@ -311,6 +311,38 @@ class MusicBeatState extends FlxState
 		}
 	}
 
+	var preloadFunction:()->Void = null;
+
+	public function preloadState(switchState:Bool = false):Void
+	{
+		var preloader = function()
+		{
+			if (preloadFunction != null)
+			{
+				preloadFunction();
+				preloadFunction = null;
+			}
+			if (switchState)
+				return MusicBeatState.switchState(this);
+		 }
+
+		 yutautil.Threader.runInThread(preloader(), 1, 'State Preloader - ${Type.getClassName(Type.getClass(this))}');
+		}	
+
+
+	public static function preloadAndSwitchState(state:MusicBeatState)
+	{
+		if (state == null)
+			state = cast(FlxG.state, MusicBeatState);
+		if (state == FlxG.state)
+		{
+			resetState();
+			return;
+		}
+
+		state.preloadState(true);
+	}
+
 	public static function switchState(nextState:FlxState = null)
 	{
 		if (nextState == null)

source/objects/Note.hx

@@ -84,6 +84,7 @@ class Note extends NoteObject
 			mustPress: this.mustPress,
 			canBeHit: this.canBeHit,
 			tooLate: this.tooLate,
+			botNote: this.botNote,
 			wasGoodHit: this.wasGoodHit,
 			missed: this.missed,
 			ignoreNote: this.ignoreNote,
@@ -457,6 +458,8 @@ class Note extends NoteObject
 		],
 	];
 
+	public var botNote:Bool = false;
+
 	public static var pixelScales:Array<Float> = [
         1.2, //1k
         1.15, //2k
@@ -488,7 +491,8 @@ class Note extends NoteObject
 		'Hey!',
 		'Hurt Note',
 		'GF Sing',
-		'No Animation'
+		'No Animation',
+		'Botplay Note'
 	];
 	public var strumTime:Float = 0;
 
@@ -762,6 +766,9 @@ class Note extends NoteObject
 					noMissAnimation = true;
 				case 'GF Sing':
 					gfNote = true;
+				case 'Botplay Note':
+					botNote = true;
+					hitsoundChartEditor = false;
 			}
 			if (value != null && value.length > 1) NoteTypesConfig.applyNoteTypeData(this, value);
 			if (hitsound != 'hitsound' && hitsoundVolume > 0) Paths.sound(hitsound); //precache new sound for being idiot-proof

source/objects/playfields/PlayField.hx

@@ -938,7 +938,7 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 				if(daNote.holdingTime < daNote.sustainLength && inControl && !daNote.blockHit){
 					if(!daNote.tooLate && daNote.wasGoodHit){
 						trace("hitting tail hold");
-						var isHeld:Bool = autoPlayed || keysPressed[daNote.column];
+						var isHeld:Bool = autoPlayed || keysPressed[daNote.column] || daNote.botNote;
                         var wasHeld:Bool = daNote.isHeld;
                         daNote.isHeld = isHeld;
                         isHolding[daNote.column] = true;
@@ -1068,6 +1068,19 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 				}
 			}
 		}else{
+
+			// Check for Bot Notes.
+			for(i in 0...keyCount){
+				for (daNote in getNotes(i, (note:Note) -> !note.tooLate && !note.wasGoodHit && !note.ignoreNote && !note.hitCausesMiss && note.botNote)){
+					var hitDiff = Conductor.songPosition - daNote.strumTime;
+					if (!daNote.isSustainNote && hitDiff >= 0 || daNote.isSustainNote && hitDiff + 80 >= 0){
+						noteHitCallback(daNote, this);
+					}
+				}
+			}
+
+
+
 			for(data in 0...keyCount){
 				if (keysPressed[data]){
 					var noteList = getNotesWithEnd(data, Conductor.songPosition, (note:Note) -> (note.isSustainNote || note.istail) && (note.prevNote != null || note.unhitTail.length > -1));

source/states/editors/ChartingStateOG.hx

@@ -64,8 +64,10 @@ class ChartingStateOG extends backend.MusicBeatChartingState
 		}
 	}
 
-	public static var noteTypeList:Array<String> = // Used for backwards compatibility with 0.1 - 0.3.2 charts, though, you should add your hardcoded custom note types here too.
-		[
+	public static var noteTypeList:Array<String> = getNoteTypeList();
+
+	private static function getNoteTypeList():Array<String> {
+		var notes = [
 			'',
 			'Alt Animation',
 			'Hey!',
@@ -78,6 +80,8 @@ class ChartingStateOG extends backend.MusicBeatChartingState
 			'Both Note',
 			'Both Alt Note'
 		];
+		return notes.concat(Note.defaultNoteTypes.filter(type -> !notes.contains(type)));
+	}
 
 	private var didAThing = false;