From 65422393cfaddf85c7fe4144dde5959205a764c7 Mon Sep 17 00:00:00 2001
From: Cameron Taylor <cameron.taylor.ninja@gmail.com>
Date: Fri, 4 Aug 2023 18:09:40 -0400
Subject: [PATCH] letter sort
---
source/funkin/FreeplayState.hx | 2 +-
source/funkin/freeplayStuff/LetterSort.hx | 18 +++++++++++++-----
source/funkin/freeplayStuff/SongMenuItem.hx | 4 ++--
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/source/funkin/FreeplayState.hx b/source/funkin/FreeplayState.hx
index 42d29bfc9..0c51dae59 100644
--- a/source/funkin/FreeplayState.hx
+++ b/source/funkin/FreeplayState.hx
@@ -376,7 +376,7 @@ class FreeplayState extends MusicBeatSubState
speed: 0.26
});
- var letterSort:LetterSort = new LetterSort(300, 100);
+ var letterSort:LetterSort = new LetterSort(400, 75);
add(letterSort);
exitMovers.set([letterSort],
diff --git a/source/funkin/freeplayStuff/LetterSort.hx b/source/funkin/freeplayStuff/LetterSort.hx
index c3b22f973..f0425dfc9 100644
--- a/source/funkin/freeplayStuff/LetterSort.hx
+++ b/source/funkin/freeplayStuff/LetterSort.hx
@@ -17,24 +17,32 @@ class LetterSort extends FlxTypedSpriteGroup<FreeplayLetter>
{
super(x, y);
- var leftArrow:FreeplayLetter = new FreeplayLetter(-20, 0);
+ var leftArrow:FreeplayLetter = new FreeplayLetter(-20, 20);
leftArrow.animation.play("arrow");
+ leftArrow.flipX = true;
add(leftArrow);
- for (i in 0...6)
+ for (i in 0...5)
{
var letter:FreeplayLetter = new FreeplayLetter(i * 80, 0, i);
add(letter);
letters.push(letter);
- if (i == 3) letter.alpha = 0.6;
+ if (i == 2) letter.alpha = 0.6;
- var sep:FreeplayLetter = new FreeplayLetter((i * 80) + 50, 0);
+ // don't put the last seperator
+ if (i == 4) continue;
+
+ var sep:FreeplayLetter = new FreeplayLetter((i * 80) + 60, 20);
sep.animation.play("seperator");
add(sep);
}
+ var rightArrow:FreeplayLetter = new FreeplayLetter(380, 20);
+ rightArrow.animation.play("arrow");
+ add(rightArrow);
+
// changeSelection(-3);
}
@@ -51,7 +59,7 @@ class LetterSort extends FlxTypedSpriteGroup<FreeplayLetter>
for (letter in letters)
letter.changeLetter(diff);
- if (changeSelectionCallback != null) changeSelectionCallback(letters[3].arr[letters[3].curLetter]); // bullshit and long lol!
+ if (changeSelectionCallback != null) changeSelectionCallback(letters[2].arr[letters[2].curLetter]); // bullshit and long lol!
}
}
diff --git a/source/funkin/freeplayStuff/SongMenuItem.hx b/source/funkin/freeplayStuff/SongMenuItem.hx
index 6476a1258..5649d1187 100644
--- a/source/funkin/freeplayStuff/SongMenuItem.hx
+++ b/source/funkin/freeplayStuff/SongMenuItem.hx
@@ -43,7 +43,7 @@ class SongMenuItem extends FlxSpriteGroup
songText.color = 0xFF43C1EA;
add(songText);
- favIcon = new FlxSprite(440, 40);
+ favIcon = new FlxSprite(400, 40);
favIcon.frames = Paths.getSparrowAtlas('freeplay/favHeart');
favIcon.animation.addByPrefix('fav', "favorite heart", 24, false);
favIcon.animation.play('fav');
@@ -116,7 +116,7 @@ class SongMenuItem extends FlxSpriteGroup
public function intendedY(index:Int):Float
{
- return (index * ((height * realScaled) + 10)) + 160;
+ return (index * ((height * realScaled) + 10)) + 120;
}
function set_selected(value:Bool):Bool