squ

Author: PurSnake

assets

@@ -18,6 +18,8 @@ class CharSelectCursors extends FlxTypedSpriteContainer<FunkinSprite>
   var cursorConfirmed:FunkinSprite;
   var cursorDenied:FunkinSprite;
 
+  var cursorsIntroOutroOffset:Float = 240;
+
   public function new()
   {
     super();
@@ -103,4 +105,38 @@ class CharSelectCursors extends FlxTypedSpriteContainer<FunkinSprite>
     cursorDenied.x = main.x - 2;
     cursorDenied.y = main.y - 4;
   }
+
+  public function snapToLocation(intendedPosition:FlxPoint):Void
+  {
+    main.setPosition(intendedPosition.x, intendedPosition.y);
+    lightBlue.setPosition(intendedPosition.x, intendedPosition.y); // Using intendedPosition since we anyway snapping them
+    darkBlue.setPosition(intendedPosition.x, intendedPosition.y);
+    cursorConfirmed.setPosition(main.x - 2, main.x - 4);
+    cursorDenied.setPosition(main.x - 2, main.x - 4);
+  }
+
+  public function slide(slideIn:Bool)
+  {
+    if (slideIn)
+    {
+      main.alpha = 0;
+      lightBlue.alpha = 0;
+      darkBlue.alpha = 0;
+
+      main.y += cursorsIntroOutroOffset;
+      lightBlue.y += cursorsIntroOutroOffset;
+      darkBlue.y += cursorsIntroOutroOffset;
+
+      FlxTween.tween(main, {alpha: 1, y: main.y - cursorsIntroOutroOffset}, 0.9, {ease: FlxEase.expoOut});
+      FlxTween.tween(lightBlue, {alpha: 1, y: lightBlue.y - cursorsIntroOutroOffset}, 0.95, {ease: FlxEase.expoOut});
+      FlxTween.tween(darkBlue, {alpha: 1, y: darkBlue.y - cursorsIntroOutroOffset}, 1.0, {ease: FlxEase.expoOut});
+    }
+    else
+    {
+      FlxTween.tween(main, {alpha: 0, y: main.y + cursorsIntroOutroOffset}, 0.8, {ease: FlxEase.backIn});
+      FlxTween.tween(lightBlue, {alpha: 0, y: lightBlue.y + cursorsIntroOutroOffset}, 0.82, {ease: FlxEase.backIn});
+      FlxTween.tween(darkBlue, {alpha: 0, y: darkBlue.y + cursorsIntroOutroOffset}, 0.84, {ease: FlxEase.backIn});
+      FlxTween.tween(cursorConfirmed, {alpha: 0, y: cursorConfirmed.y + cursorsIntroOutroOffset}, 0.8, {ease: FlxEase.expoOut});
+    }
+  }
 }

source/funkin/ui/charSelect/CharSelectCursors.hx

@@ -357,48 +357,14 @@ class CharSelectSubState extends MusicBeatSubState
       FlxTween.tween(member, {y: member.y - 300}, 1, {ease: FlxEase.expoOut});
     }
 
-    /*
-      cursor.scrollFactor.set();
-      cursorBlue.scrollFactor.set();
-      cursorDarkBlue.scrollFactor.set();
-
-      FlxTween.color(cursor, 0.2, 0xFFFFFF00, 0xFFFFCC00, {type: PINGPONG});
-
-      cursorLocIntended.x = (cursorFactor * cursorX) + (FlxG.width / 2) - cursor.width / 2;
-      cursorLocIntended.y = (cursorFactor * cursorY) + (FlxG.height / 2) - cursor.height / 2;
-
-      cursorLocIntended.x += cursorOffsetX;
-      cursorLocIntended.y += cursorOffsetY;
-
-      cursor.x = cursorLocIntended.x;
-      cursor.y = cursorLocIntended.y;
-
-      cursorBlue.x = cursor.x;
-      cursorBlue.y = cursor.y;
-
-      cursorDarkBlue.x = cursorLocIntended.x;
-      cursorDarkBlue.y = cursorLocIntended.y;
-
-      cursorConfirmed.x = cursor.x - 2;
-      cursorConfirmed.y = cursor.y - 4;
-
-      cursorDenied.x = cursor.x - 2;
-      cursorDenied.y = cursor.y - 4;
-
-      var cursorsIntroOffset:Float = 240;
-
-      // start invisible and slightly offset (slide up into place)
-      cursor.alpha = 0;
-      cursorBlue.alpha = 0;
-      cursorDarkBlue.alpha = 0;
+    cursorLocIntended.x = (cursorFactor * cursorX) + (FlxG.width / 2) - cursors.main.width / 2;
+    cursorLocIntended.y = (cursorFactor * cursorY) + (FlxG.height / 2) - cursors.main.height / 2;
 
-      cursor.y += cursorsIntroOffset;
-      cursorBlue.y += cursorsIntroOffset;
-      cursorDarkBlue.y += cursorsIntroOffset;
+    cursorLocIntended.x += cursorOffsetX;
+    cursorLocIntended.y += cursorOffsetY;
 
-      FlxTween.tween(cursor, {alpha: 1, y: cursor.y - cursorsIntroOffset}, 0.9, {ease: FlxEase.expoOut});
-      FlxTween.tween(cursorBlue, {alpha: 1, y: cursorBlue.y - cursorsIntroOffset}, 0.95, {ease: FlxEase.expoOut});
-      FlxTween.tween(cursorDarkBlue, {alpha: 1, y: cursorDarkBlue.y - cursorsIntroOffset}, 1.0, {ease: FlxEase.expoOut}); */
+    cursors.snapToLocation(cursorLocIntended);
+    cursors.slide(true);
 
     FlxG.debugger.addTrackerProfile(new TrackerProfile(CharSelectSubState, ["curChar", "grpXSpread", "grpYSpread"]));
     FlxG.debugger.track(this);
@@ -726,13 +692,7 @@ class CharSelectSubState extends MusicBeatSubState
     }
     #end
 
-    FlxTween.tween(cursors, {alpha: 0}, 0.8, {ease: FlxEase.expoOut});
-
-    /*var cursorsOutroOffset:Float = 240;
-      FlxTween.tween(cursor, {alpha: 0, y: cursor.y + cursorsOutroOffset}, 0.8, {ease: FlxEase.backIn});
-      FlxTween.tween(cursorBlue, {alpha: 0, y: cursorBlue.y + cursorsOutroOffset}, 0.82, {ease: FlxEase.backIn});
-      FlxTween.tween(cursorDarkBlue, {alpha: 0, y: cursorDarkBlue.y + cursorsOutroOffset}, 0.84, {ease: FlxEase.backIn});
-      FlxTween.tween(cursorConfirmed, {alpha: 0}, 0.8, {ease: FlxEase.expoOut}); */
+    cursors.slide(false);
 
     FlxTween.tween(barthing, {y: barthing.y + 80}, 0.8, {ease: FlxEase.backIn});
     FlxTween.tween(nametag, {y: nametag.y + 80}, 0.8, {ease: FlxEase.backIn});