caught up 11/10/20
This commit is contained in:
parent
127d4f4cb4
commit
74f313feec
|
@ -44,7 +44,7 @@ class Preloader extends FlxBasePreloader
|
||||||
logo.scaleX += Percent / 1280;
|
logo.scaleX += Percent / 1280;
|
||||||
logo.scaleY += Percent / 1280;
|
logo.scaleY += Percent / 1280;
|
||||||
logo.x -= Percent * 0.86;
|
logo.x -= Percent * 0.86;
|
||||||
logo.y -= Percent / 1.5;
|
logo.y -= Percent / 1.4;
|
||||||
}else{
|
}else{
|
||||||
logo.scaleX = this._width / 1280;
|
logo.scaleX = this._width / 1280;
|
||||||
logo.scaleY = this._width / 1280;
|
logo.scaleY = this._width / 1280;
|
||||||
|
|
Binary file not shown.
File diff suppressed because one or more lines are too long
|
@ -8,7 +8,6 @@ import flixel.group.FlxGroup.FlxTypedGroup;
|
||||||
import flixel.math.FlxMath;
|
import flixel.math.FlxMath;
|
||||||
import flixel.text.FlxText;
|
import flixel.text.FlxText;
|
||||||
import flixel.util.FlxColor;
|
import flixel.util.FlxColor;
|
||||||
//import htmlparser.HtmlDocument;
|
|
||||||
import lime.utils.Assets;
|
import lime.utils.Assets;
|
||||||
|
|
||||||
class FreeplayState extends MusicBeatState
|
class FreeplayState extends MusicBeatState
|
||||||
|
@ -120,6 +119,10 @@ class FreeplayState extends MusicBeatState
|
||||||
super.update(elapsed);
|
super.update(elapsed);
|
||||||
|
|
||||||
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4));
|
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4));
|
||||||
|
|
||||||
|
if (Math.abs(lerpScore - intendedScore) <= 10)
|
||||||
|
lerpScore = intendedScore;
|
||||||
|
|
||||||
scoreText.text = "PERSONAL BEST:" + lerpScore;
|
scoreText.text = "PERSONAL BEST:" + lerpScore;
|
||||||
|
|
||||||
var upP = controls.UP_P;
|
var upP = controls.UP_P;
|
||||||
|
@ -169,9 +172,7 @@ class FreeplayState extends MusicBeatState
|
||||||
if (curDifficulty > 2)
|
if (curDifficulty > 2)
|
||||||
curDifficulty = 0;
|
curDifficulty = 0;
|
||||||
|
|
||||||
#if !switch
|
|
||||||
intendedScore = Highscore.getScore(songs[curSelected], curDifficulty);
|
intendedScore = Highscore.getScore(songs[curSelected], curDifficulty);
|
||||||
#end
|
|
||||||
|
|
||||||
switch (curDifficulty)
|
switch (curDifficulty)
|
||||||
{
|
{
|
||||||
|
@ -199,9 +200,7 @@ class FreeplayState extends MusicBeatState
|
||||||
|
|
||||||
// selector.y = (70 * curSelected) + 30;
|
// selector.y = (70 * curSelected) + 30;
|
||||||
|
|
||||||
#if !switch
|
|
||||||
intendedScore = Highscore.getScore(songs[curSelected], curDifficulty);
|
intendedScore = Highscore.getScore(songs[curSelected], curDifficulty);
|
||||||
#end
|
|
||||||
// lerpScore = 0;
|
// lerpScore = 0;
|
||||||
|
|
||||||
var bullShit:Int = 0;
|
var bullShit:Int = 0;
|
||||||
|
|
|
@ -880,7 +880,7 @@ class PlayState extends MusicBeatState
|
||||||
difficulty = '-easy';
|
difficulty = '-easy';
|
||||||
|
|
||||||
if (storyDifficulty == 2)
|
if (storyDifficulty == 2)
|
||||||
difficulty == '-hard';
|
difficulty = '-hard';
|
||||||
|
|
||||||
trace('LOADING NEXT SONG');
|
trace('LOADING NEXT SONG');
|
||||||
trace(PlayState.storyPlaylist[0].toLowerCase() + difficulty);
|
trace(PlayState.storyPlaylist[0].toLowerCase() + difficulty);
|
||||||
|
|
Loading…
Reference in New Issue