man I love bugs

especially when they BREAK EVERYTHING

Author: Z11Coding

source/archipelago/APPlayState.hx

@@ -1154,7 +1154,7 @@ effectMap = [
 		trace(validWords.length + " words accepted");
 		trace(validWords);
 		controlButtons.resize(0);
-		for (thing in [
+		/*for (thing in [
             ClientPrefs.keyBinds.get('note_left').copy().toString(),
             ClientPrefs.keyBinds.get('note_down').copy().toString(),
             ClientPrefs.keyBinds.get('note_up').copy().toString(),
@@ -1170,7 +1170,7 @@ effectMap = [
 		])
 		{
 			controlButtons.push(StringTools.trim(thing).toLowerCase());
-		}
+		}*/
 
         if (FlxG.save.data.activeItems == null)
 		{
@@ -2353,7 +2353,7 @@ public function doEffect(effect:String)
                     if (note.isSustainNote && !note.animation.curAnim.name.endsWith('tail'))
                         time += 0.15;
 
-                    strumPlayAnim(false, Std.int(Math.abs(note.noteData)) % Note.ammo[PlayState.mania], time, /*note*/);
+                    strumPlayAnim(field, note.column % field.keyCount, time, /*note*/);
                 }
                 else
                 {

source/archipelago/Client.hx

@@ -403,6 +403,8 @@ class Client {
 	public var _hOnThrow(null, default):(String, Dynamic) -> Void = (_, _) -> {};
 	#end
 
+	public var dontTryToReconnect:Bool = false;
+
 	/**
 		Creates a new instance of the Archipelago client.
 		@param uuid The unique ID for this client. Deprecated, and likely to be removed in a later version.
@@ -1050,8 +1052,8 @@ class Client {
 					_hOnThrow("poll", new Exception("Connect timed out"));
 					trace("Connect timed out. Retrying.");
 				} else
-					trace("Reconnecting to server");
-				connect_socket();
+				if (!dontTryToReconnect) trace("Reconnecting to server");
+				if (!dontTryToReconnect) connect_socket();
 			}
 		}
 	}
@@ -1599,6 +1601,7 @@ class Client {
 
 	/** Creates a new websocket client and connects to the server. **/
 	private function connect_socket() {
+		dontTryToReconnect = false; 
 		if (_ws != null)
 			_ws.close();
 		if (uri.length == 0) {
@@ -1636,6 +1639,7 @@ class Client {
 		if (_ws != null) {
 			_ws.close();
 			state = State.DISCONNECTED;
+			dontTryToReconnect = true;
 		}
 	}
 

source/backend/Song.hx

@@ -70,6 +70,49 @@ class Song
 	public var gfVersion:String = 'gf';
 	public var format:String = 'psych_v1';
 
+	private static function convertMixtape(songJson:Dynamic) // Convert old charts to mixtape format
+	{
+		if(songJson.gfVersion == null)
+		{
+			songJson.gfVersion = songJson.player3;
+			songJson.player3 = null;
+		}
+
+		if(songJson.events == null)
+		{
+			songJson.events = [];
+			for (secNum in 0...songJson.notes.length)
+			{
+				var sec:SwagSection = songJson.notes[secNum];
+
+				var i:Int = 0;
+				var notes:Array<Dynamic> = sec.sectionNotes;
+				var len:Int = notes.length;
+				while(i < len)
+				{
+					var note:Array<Dynamic> = notes[i];
+					if(note[1] < 0)
+					{
+						songJson.events.push([note[0], [[note[2], note[3], note[4]]]]);
+						notes.remove(note);
+						len = notes.length;
+					}
+					else i++;
+				}
+			}
+		}
+		if (songJson.mania == null)
+		{
+			songJson.mania = Note.defaultMania;
+			//trace("Song mania value is NULL, set to " + Note.defaultMania);
+		}
+		if (songJson.startMania == null)
+		{
+			songJson.startMania = Note.defaultMania;
+			//trace("Song mania value is NULL, set to " + Note.defaultMania);
+		}
+	}
+
 	public static function convert(songJson:Dynamic) // Convert old charts to psych_v1 format
 	{
 		if(songJson.gfVersion == null)
@@ -181,6 +224,14 @@ class Song
 						songJson.format = 'psych_v1_convert';
 						convert(songJson);
 					}
+
+				case 'mixtape_v1':
+					if(!fmt.startsWith('mixtape_v1')) //Convert to Mixtape 1.0 format
+					{
+						trace('converting chart $nameForError with format $fmt to Mixtape_v1 format...');
+						songJson.format = 'mixtape_v1_convert';
+						convertMixtape(songJson);
+					}
 			}
 		}
 		return songJson;

source/backend/modchart/ModManager.hx

@@ -1,9 +1,11 @@
 package backend.modchart;
 // @author Nebula_Zorua
 
+import objects.StrumNote;
 import objects.playfields.NoteField;
 import backend.modchart.Modifier;
 import backend.modchart.modifiers.*;
+import backend.modchart.modifiers.extra.*;
 import backend.modchart.events.*;
 import backend.math.Vector3;
 import flixel.tweens.FlxEase;
@@ -88,6 +90,7 @@ class ModManager {
 			ConfusionModifier, 
 			OpponentModifier, 
 			TransformModifier, 
+			//PsychTransformModifier,
 			InfinitePathModifier,
 			PathModifier,
 			AccelModifier,
@@ -542,34 +545,26 @@ class ModManager {
 	}
 
 	public function updateObject(beat:Float, obj:NoteObject, player:Int){
-		if (obj != null && obj.active) {
-			for (name in getActiveMods(player))
-			{
-				/*if (!obj.active)
-					continue;*/
+		if (obj.active)
+		for (name in getActiveMods(player))
+		{
+			/*if (!obj.active)
+				continue;*/
 
-				var mod:Modifier = notemodRegister.get(name);
-				if (mod==null) continue;
-				
-				if(obj.objType == NOTE){
-					if (mod.ignoreUpdateNote()) continue;
-					mod.updateNote(beat, cast obj, player);
-				}
-				else if(obj.objType == STRUM){
-					if (mod.ignoreUpdateReceptor()) continue;
-					mod.updateReceptor(beat, cast obj, player);
-				}
+			var mod:Modifier = notemodRegister.get(name);
+			if (mod==null) continue;
+			
+			if(obj.objType == NOTE){
+				if (mod.ignoreUpdateNote()) continue;
+				mod.updateNote(beat, cast obj, player);
+			}
+			else if(obj.objType == STRUM){
+				if (mod.ignoreUpdateReceptor()) continue;
+				mod.updateReceptor(beat, cast obj, player);
 			}
-				
-			try {
-				if (obj.objType == NOTE) {
-					obj.updateHitbox();
-					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!");}
 		}
+		
+		obj.updateHitbox();
 	}
 
 	public inline function getBaseVisPosD(diff:Float, songSpeed:Float = 1)

source/backend/modchart/Modifier.hx

@@ -191,6 +191,10 @@ class Modifier {
 	inline public function setOtherValue(modName:String, endValue:Float, player:Int)
 		return modMgr.setValue(modName, endValue, player);
 
+	public function getDefaultValues():Null<Map<String, Float>>{
+		return null;
+	}
+
 	public function new(modMgr:ModManager, ?parent:Modifier)
 	{
 		this.modMgr = modMgr;