caught up 11/10/20

Preloader.hx

@@ -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;

assets/data/fresh/fresh.json

@@ -1 +1 @@
-{"song":{"player2":"dad","player1":"bf","speed":1.3000000000000003,"needsVoices":true,"sectionLengths":[],"song":"Fresh","notes":[{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[0,1,0],[250,1,0],[500,3,0],[875,3,0],[1125,1,0],[1250,0,0],[1375,2,0],[1625,1,0],[1750,0,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[2000,1,0],[2250,1,0],[2500,3,0],[2875,3,0],[3125,1,0],[3250,0,0],[3375,2,0],[3625,1,0],[3750,0,250]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[4000,1,0],[4250,1,0],[4500,3,0],[4875,3,0],[5125,1,0],[5250,0,0],[5500,2,0],[5750,0,0],[5875,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[6250,1,0],[6500,3,0],[6875,3,0],[7125,1,0],[7250,0,0],[7750,3,225],[6000,1,0],[7375,2,0],[7625,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[8250,0,0],[8500,1,0],[9000,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[10250,0,0],[10500,1,0],[11000,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[12250,0,0],[12500,2,0],[12750,3,0],[13000,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14250,0,0],[14500,2,0],[14750,3,0],[15000,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16250,0,0],[16750,3,0],[17000,0,0],[16500,1,0],[17500,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[18250,0,0],[18750,3,0],[19000,0,0],[18500,1,0],[19500,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[20000,3,0],[20250,1,0],[20875,2,0],[21125,3,0],[21375,1,0],[21750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[22000,3,0],[22250,1,0],[22875,2,0],[23125,3,0],[23375,1,0],[23750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24000,3,0],[24500,0,0],[25000,1,0],[25250,1,0],[25500,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26000,1,0],[26250,2,0],[26500,3,0],[26750,0,0],[27000,2,0],[27250,3,0],[27500,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[28000,3,0],[28500,0,0],[29000,1,0],[29250,1,0],[29500,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[30000,1,0],[30250,2,0],[30500,3,0],[30750,0,0],[31000,2,0],[31250,3,0],[31500,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[32500,0,0],[32750,3,0],[33000,1,0],[33250,3,0],[33500,1,0],[33750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[34500,3,0],[34250,0,0],[34750,0,0],[35125,2,250],[35500,1,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36500,0,0],[36750,3,0],[37000,1,0],[37250,3,0],[37500,1,0],[37750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[38500,3,0],[38250,0,0],[38750,0,0],[39125,2,250],[39500,1,250]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40250,0,0],[40500,1,0],[41000,2,0],[41500,2,0],[41750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[42250,0,0],[42500,1,0],[43000,2,0],[43500,2,0],[43750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[44250,0,0],[44500,2,0],[44750,3,0],[45000,0,0],[45750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[46250,0,0],[46500,2,0],[46750,3,0],[47000,0,0],[47750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48250,0,0],[48500,1,0],[48750,3,0],[49000,0,0],[49750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50250,0,0],[50500,1,0],[50750,3,0],[51000,0,0],[51750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52000,3,0],[52250,1,0],[52500,1,0],[52750,2,0],[53000,3,0],[53250,1,0],[53750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[54000,3,0],[54250,1,0],[54500,1,0],[54750,2,0],[55000,3,0],[55250,1,0],[55750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[56000,3,0],[56500,0,0],[57000,1,0],[57250,1,0],[57500,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[58000,1,0],[58250,2,0],[58500,3,0],[58750,0,0],[59000,2,0],[59250,3,0],[59500,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[60000,3,0],[60500,0,0],[61000,1,0],[61250,1,0],[61500,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62000,1,0],[62250,2,0],[62500,3,0],[62750,0,0],[63000,2,0],[63250,3,0],[63500,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64500,0,0],[64750,3,0],[65000,1,0],[65250,3,0],[65500,1,0],[65750,2,0]]},{"musLine truncated
+{"song":{"player2":"dad","player1":"bf","speed":1.3,"needsVoices":true,"sectionLengths":[],"song":"Fresh","notes":[{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[0,1,0],[250,1,0],[500,3,0],[875,3,0],[1125,1,0],[1250,0,0],[1375,2,0],[1625,1,0],[1750,0,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[2000,1,0],[2250,1,0],[2500,3,0],[2875,3,0],[3125,1,0],[3250,0,0],[3375,2,0],[3625,1,0],[3750,0,250]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[4000,1,0],[4250,1,0],[4500,3,0],[4875,3,0],[5125,1,0],[5250,0,0],[5500,2,0],[5750,0,0],[5875,3,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[6250,1,0],[6500,3,0],[6875,3,0],[7125,1,0],[7250,0,0],[7750,3,225],[6000,1,0],[7375,2,0],[7625,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[8250,0,0],[8500,1,0],[9000,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[10250,0,0],[10500,1,0],[11000,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[12250,0,0],[12500,2,0],[12750,3,0],[13000,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[14250,0,0],[14500,2,0],[14750,3,0],[15000,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[16250,0,0],[16750,3,0],[17000,0,0],[16500,1,0],[17500,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[18250,0,0],[18750,3,0],[19000,0,0],[18500,1,0],[19500,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[20000,3,0],[20250,1,0],[20875,2,0],[21125,3,0],[21375,1,0],[21750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[22000,3,0],[22250,1,0],[22875,2,0],[23125,3,0],[23375,1,0],[23750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[24000,3,0],[24500,0,0],[25000,1,0],[25250,1,0],[25500,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[26000,1,0],[26250,2,0],[26500,3,0],[26750,0,0],[27000,2,0],[27250,3,0],[27500,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[28000,3,0],[28500,0,0],[29000,1,0],[29250,1,0],[29500,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[30000,1,0],[30250,2,0],[30500,3,0],[30750,0,0],[31000,2,0],[31250,3,0],[31500,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[32500,0,0],[32750,3,0],[33000,1,0],[33250,3,0],[33500,1,0],[33750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[34500,3,0],[34250,0,0],[34750,0,0],[35125,2,250],[35500,1,250]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[36500,0,0],[36750,3,0],[37000,1,0],[37250,3,0],[37500,1,0],[37750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[38500,3,0],[38250,0,0],[38750,0,0],[39125,2,250],[39500,1,250]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[40250,0,0],[40500,1,0],[41000,2,0],[41500,2,0],[41750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[42250,0,0],[42500,1,0],[43000,2,0],[43500,2,0],[43750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[44250,0,0],[44500,2,0],[44750,3,0],[45000,0,0],[45750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[46250,0,0],[46500,2,0],[46750,3,0],[47000,0,0],[47750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[48250,0,0],[48500,1,0],[48750,3,0],[49000,0,0],[49750,2,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[50250,0,0],[50500,1,0],[50750,3,0],[51000,0,0],[51750,2,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[52000,3,0],[52250,1,0],[52500,1,0],[52750,2,0],[53000,3,0],[53250,1,0],[53750,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[54000,3,0],[54250,1,0],[54500,1,0],[54750,2,0],[55000,3,0],[55250,1,0],[55750,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[56000,3,0],[56500,0,0],[57000,1,0],[57250,1,0],[57500,0,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[58000,1,0],[58250,2,0],[58500,3,0],[58750,0,0],[59000,2,0],[59250,3,0],[59500,1,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[60000,3,0],[60500,0,0],[61000,1,0],[61250,1,0],[61500,0,0]]},{"mustHitSection":true,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[62000,1,0],[62250,2,0],[62500,3,0],[62750,0,0],[63000,2,0],[63250,3,0],[63500,1,0]]},{"mustHitSection":false,"typeOfSection":0,"lengthInSteps":16,"sectionNotes":[[64500,0,0],[64750,3,0],[65000,1,0],[65250,3,0],[65500,1,0],[65750,2,0]]},{"mustHitSection":faLine truncated

source/FreeplayState.hx

@@ -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;

source/PlayState.hx

@@ -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);