fix "Issues I found while i was playtesting" (#11)

this also includes moving rearrange to the z property macro

Author: TechnikTil

Project.hxp

@@ -176,7 +176,8 @@ class Project extends HXProject
 		addHaxeFlag('-dce no');
 		addHaxeFlag("--macro include('funkin')");
 		addHaxeFlag("--macro include('flixel', true, ['flixel.addons.editors.spine.*', 'flixel.addons.nape.*', 'flixel.system.macros.*', 'flixel.addons.tile.FlxRayCastTilemap'])");
-		addHaxeFlag("--macro addMetadata('@:build(funkin.macros.ZProperty.build())', 'flixel.FlxBasic')");
+		addHaxeFlag("--macro addMetadata('@:build(funkin.macros.ZProperty.buildZProperty())', 'flixel.FlxBasic')");
+		addHaxeFlag("--macro addMetadata('@:build(funkin.macros.ZProperty.buildRearrangeFunction())', 'flixel.group.FlxTypedGroup')");
 		addHaxeFlag('--no-output', FUNKIN_DOX_GENERATION.isEnabled(this));
 		addHaxeFlag('-xml docs/dox/' + Std.string(target).toLowerCase() + '.xml', FUNKIN_DOX_GENERATION.isEnabled(this));
 	}

src/funkin/macros/ZProperty.hx

@@ -12,7 +12,7 @@ class ZProperty
 	 * Builds the field for the `z` property.
 	 * @return New z field.
 	 */
-	public static macro function build():Array<Field>
+	public static macro function buildZProperty():Array<Field>
 	{
 		var fields:Array<Field> = Context.getBuildFields();
 
@@ -26,6 +26,38 @@ class ZProperty
 
 		return fields;
 	}
+
+	/**
+	 * Builds the field for the `rearrange` function.
+	 * @return New z field.
+	 */
+	public static macro function buildRearrangeFunction():Array<Field>
+	{
+		var fields:Array<Field> = Context.getBuildFields();
+
+		var todo:haxe.macro.Function = {
+			args: []
+		};
+		todo.expr = macro
+			{
+				this.sort((i:Int, basic1:flixel.FlxBasic, basic2:flixel.FlxBasic) ->
+				{
+					return flixel.util.FlxSort.byValues(i, basic1.z, basic2.z);
+				}, flixel.util.FlxSort.ASCENDING);
+			};
+		todo.ret = macro :Void;
+
+		fields.push({
+			name: "rearrange",
+			pos: Context.currentPos(),
+			kind: FFun(todo),
+			access: [Access.APublic],
+			doc: 'Rearranges all FlxBasic objects by their Z value.',
+			meta: [],
+		});
+
+		return fields;
+	}
 }
 #end
 #end

src/funkin/states/FunkinState.hx

@@ -80,15 +80,4 @@ class FunkinState extends FlxState
 	 * This function is called after the conductor section changes.
 	 */
 	public function sectionHit():Void {}
-
-	/**
-	 * Rearranges all FlxBasic objects by their Z value.
-	 */
-	public function rearrange():Void
-	{
-		sort((i:Int, basic1:FlxBasic, basic2:FlxBasic) ->
-		{
-			return FlxSort.byValues(i, basic1.z, basic2.z);
-		}, FlxSort.ASCENDING);
-	}
 }

src/funkin/states/ui/FreeplayState.hx

@@ -247,6 +247,7 @@ class FreeplayState extends FunkinState
 			{
 				backingCard.confirm();
 				dj.confirm();
+				blockInputs = true;
 
 				new FlxTimer().start(2, (_) ->
 				{

src/funkin/states/ui/OptionsState.hx

@@ -248,8 +248,6 @@ class OptionsState extends FunkinState
 
 	var lerpXPosArrow:Float = 0;
 
-	var justExitedTimeout:Int = -1;
-
 	override public function update(elapsed:Float):Void
 	{
 		switch (currentStatus)
@@ -283,7 +281,7 @@ class OptionsState extends FunkinState
 				}
 				#end
 
-				if (controls.justPressed.BACK && justExitedTimeout == -1)
+				if (controls.justPressed.BACK)
 				{
 					#if FLX_MOUSE
 					FlxG.mouse.visible = false;
@@ -305,7 +303,6 @@ class OptionsState extends FunkinState
 				if (controls.justPressed.BACK)
 				{
 					FlxG.sound.play(Paths.content.audio('ui/menu/cancelMenu'));
-					justExitedTimeout = 2;
 
 					playCategoryTweens(false);
 					currentStatus = CATEGORY;
@@ -314,15 +311,6 @@ class OptionsState extends FunkinState
 		}
 
 		super.update(elapsed);
-
-		// fixes stupid bug that exists for some odd reason (ill fix it as soon as im integrating flxcontrols)
-		if (justExitedTimeout > 0)
-		{
-			justExitedTimeout -= 1;
-
-			if (justExitedTimeout == 0)
-				justExitedTimeout = -1;
-		}
 	}
 
 	function changeCategory(?indexHop:Int = 0):Void
@@ -371,6 +359,8 @@ class OptionsState extends FunkinState
 
 		FlxTween.cancelTweensOf(categoryCamera);
 		FlxTween.tween(categoryCamera, {y: cameraY, zoom: cameraZoom}, 0.4, {ease: FlxEase.expoInOut});
+
+		categoryArrow.x = lerpXPosArrow; // just in case
 	}
 
 	function generateCategoryOptions():Void

src/funkin/states/ui/StoryState.hx

@@ -41,7 +41,6 @@ class StoryState extends FunkinState
 		#end
 
 		grpWeekItems = new FlxTypedGroup<WeekItem>();
-		grpWeekItems.z = 10;
 		add(grpWeekItems);
 
 		txtTracklist = new FlxText(FlxG.width * 0.05, 500, 0, "", 32);
@@ -50,26 +49,21 @@ class StoryState extends FunkinState
 		add(txtTracklist);
 
 		var topBlackBar:FunkinSprite = new FunkinSprite().loadTexture('#000000', FlxG.width, 56);
-		topBlackBar.z = 20;
 		add(topBlackBar);
 
 		scoreText = new FlxText(10, 10, 0, "SCORE: 0", 36);
 		scoreText.setFormat("VCR OSD Mono", 32);
-		scoreText.z = 30;
 		add(scoreText);
 
 		weekMotto = new FlxText(FlxG.width, 10, 0, "", 32);
 		weekMotto.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, RIGHT);
 		weekMotto.alpha = 0.7;
-		weekMotto.z = 40;
 		add(weekMotto);
 
 		colorBG = new FunkinSprite(0, 56).loadTexture('#FFFFFF', FlxG.width, 400);
-		colorBG.z = 50;
 		add(colorBG);
 
 		grpOfWeekSprGrps = new FlxTypedSpriteGroup<FunkinSpriteGroup>(0, 56);
-		grpOfWeekSprGrps.z = 100;
 		add(grpOfWeekSprGrps);
 
 		for (i => week in loadedWeeks)
@@ -82,6 +76,7 @@ class StoryState extends FunkinState
 			weekSpr.screenCenter(X);
 
 			var weekSprGrp:FunkinSpriteGroup = week.buildSprites();
+			weekSprGrp.group.rearrange();
 			grpOfWeekSprGrps.add(weekSprGrp);
 
 			// TODO: ADD LOCK SPRITE
@@ -111,7 +106,6 @@ class StoryState extends FunkinState
 
 		super.create();
 
-		rearrange();
 		changeItem();
 	}
 

src/funkin/substates/FunkinSubState.hx

@@ -64,15 +64,4 @@ class FunkinSubState extends FlxSubState
 	 * This function is called after the conductor section changes.
 	 */
 	public function sectionHit():Void {}
-
-	/**
-	 * Rearranges all FlxBasic objects by their Z value.
-	 */
-	public function rearrange():Void
-	{
-		sort((i:Int, basic1:FlxBasic, basic2:FlxBasic) ->
-		{
-			return FlxSort.byValues(i, basic1.z, basic2.z);
-		}, FlxSort.ASCENDING);
-	}
 }