AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Some fun features"

Browse Source
This commit is contained in:
Kade M
2021-04-25 11:10:46 -07:00
committed by GitHub
parent 6cf0b1a089
commit 200ae101c4
4 changed files with 57 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
source/FreeplayState.hx
View File

@ -8,9 +8,6 @@ import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.math.FlxMath;
import flixel.text.FlxText;
import flixel.util.FlxColor;
import flixel.util.FlxTimer;
import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween;
import lime.utils.Assets;
@ -38,8 +35,6 @@ class FreeplayState extends MusicBeatState
private var iconArray:Array<HealthIcon> = [];
var bg:FlxSprite;
override function create()
{
var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist'));
@ -73,7 +68,7 @@ class FreeplayState extends MusicBeatState
// LOAD CHARACTERS
bg = new FlxSprite().loadGraphic(Paths.image('menuDesat'));
var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuBGBlue'));
add(bg);
grpSongs = new FlxTypedGroup<Alphabet>();
@ -166,8 +161,6 @@ class FreeplayState extends MusicBeatState
}
}
var lockedIn:Bool = false;
override function update(elapsed:Float)
{
super.update(elapsed);
@ -213,8 +206,6 @@ class FreeplayState extends MusicBeatState
trace(poop);
lockedIn = true;
PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].songName.toLowerCase());
PlayState.isStoryMode = false;
PlayState.storyDifficulty = curDifficulty;
@ -259,7 +250,6 @@ class FreeplayState extends MusicBeatState
curSelected += change;
if (curSelected < 0)
curSelected = songs.length - 1;
if (curSelected >= songs.length)
@ -267,57 +257,24 @@ class FreeplayState extends MusicBeatState
// selector.y = (70 * curSelected) + 30;
#if !switch
intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty);
// lerpScore = 0;
#end
#if PRELOAD_ALL
FlxG.sound.playMusic(Paths.inst(songs[curSelected].songName), 0);
#end
var bullShit:Int = 0;
for (i in 0...iconArray.length)
{
iconArray[i].alpha = 0.6;
}
var bullShit:Int = 0;
iconArray[curSelected].alpha = 1;
if (curSelected >= 0)
{
if (curSelected >= 4)
{
if (curSelected >= 7)
{
if (curSelected >= 10)
{
if (curSelected >= 13)
{
if (curSelected >= 16)
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(219, 101, 217));
}
else
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(161, 212, 230));
}
}
else
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(230, 129, 221));
}
}
else
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(99, 12, 22));
}
}
else
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(39, 46, 66));
}
}
else
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(96, 66, 245));
}
}
for (item in grpSongs.members)
{
item.targetY = bullShit - curSelected;
@ -332,23 +289,6 @@ class FreeplayState extends MusicBeatState
// item.setGraphicSize(Std.int(item.width));
}
}
var temp:Int = curSelected;
new FlxTimer().start(FlxG.random.float(0.7), function(tmr:FlxTimer)
{
if (curSelected == temp && !lockedIn)
{
#if !switch
intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty);
// lerpScore = 0;
#end
#if PRELOAD_ALL
FlxG.sound.playMusic(Paths.inst(songs[curSelected].songName), 0);
#end
}
});
}
}