From 1a6b2e51a7e7454c6f96467ac6898425d77acf21 Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Tue, 2 Mar 2021 00:46:28 -0500 Subject: [PATCH] freeplay stuff in progress --- source/FreeplayState.hx | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 6dec6f1a6..d13f74d9b 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -7,6 +7,7 @@ import flixel.addons.display.FlxGridOverlay; import flixel.group.FlxGroup.FlxTypedGroup; import flixel.math.FlxMath; import flixel.text.FlxText; +import flixel.tweens.FlxTween; import flixel.util.FlxColor; import lime.utils.Assets; @@ -25,10 +26,13 @@ class FreeplayState extends MusicBeatState var lerpScore:Int = 0; var intendedScore:Int = 0; + var coolColors:Array = [0xff223344, 0xff123456, 0xFFFFFFFF, 0xFFADAD]; + private var grpSongs:FlxTypedGroup; private var curPlaying:Bool = false; private var iconArray:Array = []; + var bg:FlxSprite; override function create() { @@ -75,7 +79,7 @@ class FreeplayState extends MusicBeatState // LOAD CHARACTERS - var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuBGBlue')); + bg = new FlxSprite().loadGraphic(Paths.image('menuDesat')); add(bg); grpSongs = new FlxTypedGroup(); @@ -105,7 +109,7 @@ class FreeplayState extends MusicBeatState scoreText.setFormat(Paths.font("vcr.ttf"), 32, FlxColor.WHITE, RIGHT); // scoreText.alignment = RIGHT; - var scoreBG:FlxSprite = new FlxSprite(scoreText.x - 6, 0).makeGraphic(Std.int(FlxG.width * 0.35), 66, 0xFF000000); + var scoreBG:FlxSprite = new FlxSprite(scoreText.x - 6, 0).makeGraphic(Std.int(FlxG.width * 0.3), 66, 0xFF000000); scoreBG.alpha = 0.6; add(scoreBG); @@ -178,6 +182,7 @@ class FreeplayState extends MusicBeatState } lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4)); + bg.color = FlxColor.interpolate(bg.color, coolColors[curSelected % coolColors.length], 0.045); if (Math.abs(lerpScore - intendedScore) <= 10) lerpScore = intendedScore; @@ -236,15 +241,11 @@ class FreeplayState extends MusicBeatState intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty); #end - switch (curDifficulty) - { - case 0: - diffText.text = "EASY"; - case 1: - diffText.text = 'NORMAL'; - case 2: - diffText.text = "HARD"; - } + PlayState.storyDifficulty = curDifficulty; + + diffText.text = "< " + CoolUtil.difficultyString() + " >"; + diffText.x = FlxG.width * 0.85; + diffText.x -= (diffText.width / 2); } function changeSelection(change:Int = 0)