WOHO FINALLY (mostly) WORKING SUSTAINS FOR REAL THIS TIME WOOOOOOOOOOOOOOOOOOOOOO

oh, and maina mode too is kinda cool ig

Author: Z11Coding

assets/shared/images/SpraycanPile.png

@@ -105,6 +105,7 @@ import states.TitleState;
 		'loopModeC' => false,
 		'loopPlayMult' => 1.05,
 		'bothMode' => false,
+		'maniaMode' => false,
 	];
 
 	// public var inputSystem:String = 'Native';
@@ -147,6 +148,8 @@ import states.TitleState;
 	public var deathlink:Bool = false;
 	public var stageGimmick:Bool = false;
 	public var healthMode:String = 'Mixtape';
+	public var iconBounce:String = 'Mixtape';
+	public var pauseBPM:Int = 102;
 }
 
 class ClientPrefs {

assets/shared/images/phillyStreets/phillyHighwayLights_lightmap.png

@@ -17,12 +17,14 @@ typedef SwagSong =
 
 	var player1:String;
 	var player2:String;
+	var player4:String;
+	var player5:String;
 	var gfVersion:String;
 	var stage:String;
 	var format:String;
 
-	var mania:Int;
-	var startMania:Int;
+	var mania:Null<Int>;
+	var startMania:Null<Int>;
 
 	@:optional var gameOverChar:String;
 	@:optional var gameOverSound:String;
@@ -42,6 +44,7 @@ typedef SwagSection =
 	var mustHitSection:Bool;
 	@:optional var altAnim:Bool;
 	@:optional var gfSection:Bool;
+	@:optional var exSection:Bool;
 	@:optional var bpm:Float;
 	@:optional var changeBPM:Bool;
 }

assets/shared/images/phillyStreets/phillySmog.png

@@ -561,12 +561,14 @@ class ModManager {
 			}
 		}
 
-		obj.updateHitbox();
-		if (obj.objType == NOTE) {
-			var cum:Note = cast obj;
-			cum.offset.x += cum.typeOffsetX;
-			cum.offset.y += cum.typeOffsetY;
-		}
+		try {
+			obj.updateHitbox();	
+			if (obj.objType == NOTE) {
+				var cum:Note = cast obj;
+				cum.offset.x += cum.typeOffsetX;
+				cum.offset.y += cum.typeOffsetY;
+			}
+		} catch(e) {trace("Something went wrong trying to update this note!");}
 	}
 
 	public inline function getBaseVisPosD(diff:Float, songSpeed:Float = 1)

source/backend/ClientPrefs.hx

@@ -0,0 +1,12 @@
+package metadata;
+
+typedef MetadataFile = {
+    var song:SongMetaSection;
+}
+
+typedef SongMetaSection = {
+    var name:String;
+    var artist:String;
+    var charter:String;
+    var mod:String;
+}

source/backend/Song.hx

@@ -861,14 +861,11 @@ class Note extends NoteObject
 
 		mania = PlayState.mania;
 
-		if (hitByOpponent)
-				wasGoodHit = true;
-			var diff = (strumTime - Conductor.songPosition);
-			if (diff < -Conductor.safeZoneOffset && !wasGoodHit)
-				tooLate = true;
-		
-		if (hitByOpponent)
-			wasGoodHit = true;
+		if (hitByOpponent) wasGoodHit = true;
+
+		var diff = (strumTime - Conductor.songPosition);
+		if (diff < -Conductor.safeZoneOffset && !wasGoodHit)
+			tooLate = true;
 
 		if (tooLate && !inEditor)
 		{

source/backend/modchart/ModManager.hx

@@ -347,8 +347,11 @@ class NoteField extends FieldBase
 	var crotchet:Float = Conductor.getCrotchetAtTime(0.0) / 4.0;
 	function drawHold(hold:Note, ?prevAlpha:Float, ?prevGlow:Float):Null<RenderObject>
 	{
-		if (hold.animation.curAnim == null || hold.scale == null || hold.frame == null)
+		try {if (hold.animation.curAnim == null || hold.scale == null || hold.frame == null) return null;}
+		catch(e) {
+			trace("Note was null!");
 			return null;
+		}
 
 		var render:Bool = false;
 		for (camera in cameras) {

source/metadata/STMetaFile.hx

@@ -18,6 +18,8 @@ import backend.Rating;
 import objects.Character;
 import objects.NoteSplash;
 import flixel.FlxBasic;
+import objects.NoteObject;
+import objects.Note.SustainPart;
 
 /*
 The system is seperated into 3 classes:
@@ -323,6 +325,21 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 			{
 				case "Native":
 					if(data > keyCount || data < 0)return null;
+					
+					var noteList = getNotesWithEnd(data, Conductor.songPosition + ClientPrefs.data.badWindow, (note:Note) -> !note.tooLate);
+					#if PE_MOD_COMPATIBILITY
+					noteList.sort((a, b) -> Std.int((b.strumTime + (b.lowPriority ? 10000 : 0)) - (a.strumTime + (a.lowPriority ? 10000 : 0)))); // so lowPriority actually works (even though i hate it lol!)
+					#else
+					noteList.sort((a, b) -> Std.int(b.strumTime - a.strumTime)); //so lowPriority actually works (even though i hate it lol!)
+					#end
+					while (noteList.length > 0)
+					{	
+						var note:Note = noteList.pop();
+						if (!note.blockHit) noteHitCallback(note, this);
+						return note;
+					}
+				case "Native-old":
+					if(data > keyCount || data < 0)return null;
 
 					var noteList = getNotesWithEnd(data, Conductor.songPosition + ClientPrefs.data.badWindow, (note:Note) -> note.requiresTap);
 					#if PE_MOD_COMPATIBILITY
@@ -666,7 +683,7 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 							PlayState.instance.mashViolations++;
 					}
 
-				case "Andromeda Engine (legacy)":
+				case "Andromeda (legacy)":
 					var noteList = getNotesWithEnd(data, Conductor.songPosition + ClientPrefs.data.badWindow, (note:Note) -> !note.isSustainNote && note.requiresTap);
 					noteList.sort((a,b)->Std.int(a.strumTime-b.strumTime)); // SHOULD be in order?
 					// But just incase, we do this sort
@@ -882,13 +899,14 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 			modManager.updateObject(curDecBeat, daNote, modNumber);
 
 			// check for hold inputs
-			if(daNote.isSustainNote){
+			if(!daNote.isSustainNote){
 				if(daNote.column > keyCount-1){
 					garbage.push(daNote);
 					continue;
 				}
 				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 wasHeld:Bool = daNote.isHeld;
                         daNote.isHeld = isHeld;
@@ -907,9 +925,7 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 						var receptor = strumNotes[daNote.column];
 						var oldSteps:Int = Math.floor(daNote.holdingTime / Conductor.stepCrochet);
 						var lastTime:Float = daNote.holdingTime;
-						daNote.holdingTime = daNote.sustainLength;
-						if (daNote.holdingTime > daNote.sustainLength)
-							daNote.holdingTime = daNote.sustainLength;
+						daNote.holdingTime = Conductor.songPosition - daNote.strumTime + 120;
 						var currentSteps:Int = Math.floor(daNote.holdingTime / Conductor.stepCrochet);
 						if(oldSteps < currentSteps)
 							if(holdStepCallback != null)
@@ -923,7 +939,7 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 
 							daNote.tripProgress = 1.0;
 						}else
-							daNote.tripProgress -= elapsed / (daNote.maxReleaseTime);
+							daNote.tripProgress -= elapsed / (daNote.maxReleaseTime * 1);
 
 						// if rolls are ever implemented, uncomment this
 						/*if(autoPlayed && daNote.tripProgress <= 0.5)
@@ -966,6 +982,19 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 					}
 				}
 			}
+
+			//kade is just evil lmao
+			if (daNote.isParent && daNote.tooLate && !daNote.isSustainNote)
+			{
+				PlayState.instance.health -= 0.15; // give a health punishment for failing a LN
+				trace("hold fell over at the start");
+				for (i in daNote.childs)
+				{
+					i.alpha = 0.3;
+					i.susActive = false;
+				}
+			}
+
 			// check for note deletion
 			if (daNote.garbage)
 				garbage.push(daNote);
@@ -1027,7 +1056,7 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 		}else{
 			for(data in 0...keyCount){
 				if (keysPressed[data]){
-					var noteList = getNotesWithEnd(data, Conductor.songPosition);
+					var noteList = getNotesWithEnd(data, Conductor.songPosition, (note:Note) -> note.isSustainNote && note.prevNote != null);
 					#if PE_MOD_COMPATIBILITY
 					// so lowPriority actually works (even though i hate it lol!)
 					noteList.sort((a, b) -> Std.int((b.strumTime + (b.lowPriority ? 10000 : 0)) - (a.strumTime + (a.lowPriority ? 10000 : 0)))); 
@@ -1038,7 +1067,6 @@ class PlayField extends FlxTypedGroup<FlxBasic>
 					{
 						var note:Note = noteList.pop();
 						noteHitCallback(note, this);
-						if (!note.isSustainNote) keysPressed[data] = false;
 					}
 				}
 			}