diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 464ba7452..6dec6f1a6 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -28,6 +28,8 @@ class FreeplayState extends MusicBeatState private var grpSongs:FlxTypedGroup; private var curPlaying:Bool = false; + private var iconArray:Array = []; + override function create() { var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist')); @@ -88,6 +90,9 @@ class FreeplayState extends MusicBeatState var icon:HealthIcon = new HealthIcon(songs[i].songCharacter); icon.sprTracker = songText; + + // using a FlxGroup is too much fuss! + iconArray.push(icon); add(icon); // songText.x += 40; @@ -271,6 +276,13 @@ class FreeplayState extends MusicBeatState var bullShit:Int = 0; + for (i in 0...iconArray.length) + { + iconArray[i].alpha = 0.6; + } + + iconArray[curSelected].alpha = 1; + for (item in grpSongs.members) { item.targetY = bullShit - curSelected; diff --git a/source/PauseSubState.hx b/source/PauseSubState.hx index 5831ebef1..2e36eda04 100644 --- a/source/PauseSubState.hx +++ b/source/PauseSubState.hx @@ -39,17 +39,27 @@ class PauseSubState extends MusicBeatSubstate var levelInfo:FlxText = new FlxText(20, 15, 0, "", 32); levelInfo.text += PlayState.SONG.song; - levelInfo.text += '\n' + CoolUtil.difficultyString(); levelInfo.scrollFactor.set(); levelInfo.setFormat(Paths.font("vcr.ttf"), 32); levelInfo.updateHitbox(); add(levelInfo); + + var levelDifficulty:FlxText = new FlxText(20, 15 + 32, 0, "", 32); + levelDifficulty.text += CoolUtil.difficultyString(); + levelDifficulty.scrollFactor.set(); + levelDifficulty.setFormat(Paths.font('vcr.ttf'), 32); + levelDifficulty.updateHitbox(); + add(levelDifficulty); + + levelDifficulty.alpha = 0; levelInfo.alpha = 0; levelInfo.x = FlxG.width - (levelInfo.width + 20); + levelDifficulty.x = FlxG.width - (levelDifficulty.width + 20); FlxTween.tween(bg, {alpha: 0.6}, 0.4, {ease: FlxEase.quartInOut}); FlxTween.tween(levelInfo, {alpha: 1, y: 20}, 0.4, {ease: FlxEase.quartInOut, startDelay: 0.3}); + FlxTween.tween(levelDifficulty, {alpha: 1, y: levelDifficulty.y + 5}, 0.4, {ease: FlxEase.quartInOut, startDelay: 0.5}); grpMenuShit = new FlxTypedGroup(); add(grpMenuShit);