Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago

Author: Yuta12342

source/states/PlayState.hx

@@ -6611,7 +6611,7 @@ class PlayState extends MusicBeatState
 			return;
 		}
 
-		if (curBeat % 32 == 0 && RandomSpeedChange && !songAboutToLoop)
+		if ((curBeat % 32 == 0 && RandomSpeedChange || curBeat % 8 == 0 && RandomSpeedChange && RandomSpeedChangeWild) && !songAboutToLoop)
 		{
 			// goes up to 3x speed cuz screw you thats why
 			var randomSpeed = RandomSpeedChangeWild ? FlxG.random.float(0.2, 5) : FlxG.random.float(0.45, 2);

source/yutautil/AprilFools.hx

@@ -16,7 +16,7 @@ class AprilFools {
     }
 
     public static function randomModchartEffect(){
-        switch(FlxG.random.int(0, 54)) {
+        switch(FlxG.random.int(0, 54, [23, 24])) {
             case 0:
                 PlayState.instance.modManager.setValue('boost', 1);
             case 1:
@@ -62,11 +62,7 @@ class AprilFools {
             case 21:
                 PlayState.instance.modManager.setValue('bounceZ', 1);
             case 22:
-                PlayState.instance.modManager.setValue('tornadoTan', 1);
-            case 23:
-                PlayState.instance.modManager.setValue('tornadoZ', 1);
-            case 24:
-                PlayState.instance.modManager.setValue('tornadoTanZ', 1);
+                PlayState.instance.modManager.setValue('tornado', 1);
             case 25:
                 PlayState.instance.modManager.setValue('itgTornado', 1);
             case 26: