I love indie cross

and there's other stuff too

Author: Z11Coding

source/archipelago/APPlayState.hx

@@ -184,15 +184,15 @@ class APPlayState extends PlayState {
             'colorblind' => function() {
                 var ttl:Float = 16;
                 var onEnd:(Void->Void) = function() {
-                    camHUDfilters.remove(filterMap.get("Grayscale").filter);
-                    camGamefilters.remove(filterMap.get("Grayscale").filter);
+                    camHUD.filters.remove(filterMap.get("Grayscale").filter);
+                    camGame.filters.remove(filterMap.get("Grayscale").filter);
                 };
                 var playSound:String = "colorblind";
                 var playSoundVol:Float = 0.8;
                 var noIcon:Bool = false;
 
-                camHUDfilters.push(filterMap.get("Grayscale").filter);
-                camGamefilters.push(filterMap.get("Grayscale").filter);
+                camGame.filters.push(filterMap.get("Grayscale").filter);
+                camGame.filters.push(filterMap.get("Grayscale").filter);
 
                 applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, 'colorblind');
             },
@@ -304,12 +304,12 @@ class APPlayState extends PlayState {
             'spin' => function() {
                 var ttl:Float = 15;
                 var onEnd:(Void->Void) = function() {
-                    modManager.setValue('roll', 0);
+                    modManager.setValue('twirl', 0);
                 };
                 var playSound:String = "spin";
                 var playSoundVol:Float = 1;
                 var noIcon:Bool = false;
-                modManager.setValue('roll', (FlxG.random.bool() ? 1 : -1) * FlxG.random.float(333 * 0.8, 333 * 1.15));
+                modManager.setValue('twirl', 1);
                 applyEffect(ttl, onEnd, playSound, playSoundVol, noIcon, 'spin');
             },
             'songslower' => function() {
@@ -1982,6 +1982,7 @@ class APPlayState extends PlayState {
         super.update(elapsed);
     }
 
+    var alreadySent:Bool = false;
     override function doDeathCheck(?skipHealthCheck:Bool = false):Bool
     {
         if (activeItems[0] <= 0)
@@ -1996,8 +1997,10 @@ class APPlayState extends PlayState {
                 noiseSound.pause();
             }
         }
-        if (health <= 0 && bfkilledcheck && !deathByLink) 
+        if (health <= 0 && bfkilledcheck && !deathByLink && !alreadySent) { 
+            alreadySent = true; // because indie cross likes to spam this every frame for some reason
             APEntryState.apGame.info().sendDeathLink(COD.COD);
+        }
         super.doDeathCheck();
         return true;
     }

source/states/FirstCheckState.hx

@@ -158,7 +158,12 @@ class FirstCheckState extends MusicBeatState
 									trace('versions arent matching!');
 									MusicBeatState.switchState(new states.OutdatedState());
 								}
-								else FlxG.switchState(new APCheckState());
+								else {
+									if (ClientPrefs.data.checkAPWorld)
+										FlxG.switchState(new APCheckState());
+									else
+										FlxG.switchState(new states.SplashScreen());
+								}
 							}
 
 							http.onError = function(error)
@@ -255,7 +260,12 @@ class FirstCheckState extends MusicBeatState
 						trace('versions arent matching!');
 						MusicBeatState.switchState(new states.OutdatedState());
 					}
-					else FlxG.switchState(new APCheckState());
+					else {
+						if (ClientPrefs.data.checkAPWorld)
+							FlxG.switchState(new APCheckState());
+						else
+							FlxG.switchState(new states.SplashScreen());
+					}
 				}
 
 				http.onError = function(error)

source/states/FreeplayState.hx

@@ -527,7 +527,7 @@ class FreeplayState extends MusicBeatState
 					{
 						colors = [146, 113, 253];
 					}
-					if ((ClientPrefs.data.showMods && leWeek.folder.toLowerCase() == CategoryState.loadWeekForce.toLowerCase()) || (CategoryState.loadWeekForce == "all" && (leWeek.folder != '' || leWeek.folder != null)))
+					if ((ClientPrefs.data.showMods && leWeek.folder.toLowerCase() == CategoryState.loadWeekForce.toLowerCase()) || (CategoryState.loadWeekForce == "all" && (leWeek.folder != '' || leWeek.folder != null) && !APEntryState.inArchipelagoMode))
 					{
 						addSong(song[0], i, song[1], FlxColor.fromRGB(colors[0], colors[1], colors[2]));
 					}

source/states/PlayState.hx

@@ -3820,7 +3820,7 @@ class PlayState extends MusicBeatState
 
 		super.update(elapsed);
 		vocals.volume *= vocalVolumeMultiplier;
-		FlxG.sound.music.volume *= instVolumeMultiplier;
+		FlxG.sound.music.volume = 1 * instVolumeMultiplier;
 		updateVisualPosition();
 		modManager.update(elapsed, curDecBeat, curDecStep);
 
@@ -4232,7 +4232,7 @@ class PlayState extends MusicBeatState
 				case SINGLE:
 					iconP1.animation.curAnim.curFrame = 0;
 				case WINNING:
-					iconP1.animation.curAnim.curFrame = (healthBar.percent > 80 ? 2 : (healthBar.percent < 20 ? 1 : 0));
+					iconP1.animation.curAnim.curFrame = (healthBar.percent > 80 ? 0 : (healthBar.percent < 20 ? 2 : 0));
 				default:
 					iconP1.animation.curAnim.curFrame = (healthBar.percent < 20 ? 1 : 0);
 			}
@@ -5676,7 +5676,7 @@ class PlayState extends MusicBeatState
 	public var totalPlayed:Int = 0;
 	public var totalNotesHit:Float = 0.0;
 
-	public var showCombo:Bool = false;
+	public var showCombo:Bool = true;
 	public var showComboNum:Bool = true;
 	public var showRating:Bool = true;
 
@@ -5831,7 +5831,7 @@ class PlayState extends MusicBeatState
 			if(showComboNum)
 				comboGroup.add(numScore);
 
-			FlxTween.tween(numScore, {alpha: 0}, 0.2 / playbackRate, {
+			FlxTween.tween(numScore, {alpha: 0, angle: FlxG.random.int(-25, 25)}, 0.2 / playbackRate, {
 				onComplete: function(tween:FlxTween)
 				{
 					numScore.destroy();
@@ -5843,11 +5843,11 @@ class PlayState extends MusicBeatState
 			if(numScore.x > xThing) xThing = numScore.x;
 		}
 		comboSpr.x = xThing + 50;
-		FlxTween.tween(rating, {alpha: 0}, 0.2 / playbackRate, {
+		FlxTween.tween(rating, {alpha: 0, angle: FlxG.random.int(-25, 25)}, 0.2 / playbackRate, {
 			startDelay: Conductor.crochet * 0.001 / playbackRate
 		});
 
-		FlxTween.tween(comboSpr, {alpha: 0}, 0.2 / playbackRate, {
+		FlxTween.tween(comboSpr, {alpha: 0, angle: FlxG.random.int(-25, 25)}, 0.2 / playbackRate, {
 			onComplete: function(tween:FlxTween)
 			{
 				comboSpr.destroy();