cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-27 01:03:35 +00:00
Code Issues Releases Wiki Activity

caught up 11/10/20

Browse source
This commit is contained in:
Brandon 2020-11-10 13:08:18 -05:00
parent 11ba4ac690
commit 6c04bb8e23
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Preloader.hx
View file

@ -44,7 +44,7 @@ class Preloader extends FlxBasePreloader
logo.scaleX += Percent / 1280;
logo.scaleY += Percent / 1280;
logo.x -= Percent * 0.86;
logo.y -= Percent / 1.5;
logo.y -= Percent / 1.4;
}else{
logo.scaleX = this._width / 1280;
logo.scaleY = this._width / 1280;

9
source/FreeplayState.hx
View file

@ -8,7 +8,6 @@ import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.math.FlxMath;
import flixel.text.FlxText;
import flixel.util.FlxColor;
//import htmlparser.HtmlDocument;
import lime.utils.Assets;
class FreeplayState extends MusicBeatState
@ -120,6 +119,10 @@ class FreeplayState extends MusicBeatState
super.update(elapsed);
lerpScore = Math.floor(FlxMath.lerp(lerpScore, intendedScore, 0.4));
if (Math.abs(lerpScore - intendedScore) <= 10)
lerpScore = intendedScore;
scoreText.text = "PERSONAL BEST:" + lerpScore;
var upP = controls.UP_P;
@ -169,9 +172,7 @@ class FreeplayState extends MusicBeatState
if (curDifficulty > 2)
curDifficulty = 0;
#if !switch
intendedScore = Highscore.getScore(songs[curSelected], curDifficulty);
#end
switch (curDifficulty)
{
@ -199,9 +200,7 @@ class FreeplayState extends MusicBeatState
// selector.y = (70 * curSelected) + 30;
#if !switch
intendedScore = Highscore.getScore(songs[curSelected], curDifficulty);
#end
// lerpScore = 0;
var bullShit:Int = 0;

2
source/PlayState.hx
View file

@ -880,7 +880,7 @@ class PlayState extends MusicBeatState
difficulty = '-easy';
if (storyDifficulty == 2)
difficulty == '-hard';
difficulty = '-hard';
trace('LOADING NEXT SONG');
trace(PlayState.storyPlaylist[0].toLowerCase() + difficulty);