diff --git a/CHANGELOG.md b/CHANGELOG.md index c7576acbe..a2b6aac5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,13 @@ All notable changes will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.2.1.2] - 2020-11-06 +### Fixed +- Story mode scores not properly resetting, leading to VERY inflated highscores on the leaderboards. This also requires me to clear the scores that are on the leaderboard right now, sorry! + ## [0.2.1.1] - 2020-11-06 ### Fixed +- Difficulty on storymode and in freeplay scores - Week 2 not unlocking properly ## [0.2.1] - 2020-11-06 diff --git a/Project.xml b/Project.xml index fb5457ab1..1c148e2ff 100644 --- a/Project.xml +++ b/Project.xml @@ -2,7 +2,7 @@ <project> <!-- _________________________ Application Settings _________________________ --> - <app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.1.1" company="ninjamuffin99" /> + <app title="Friday Night Funkin" file="Funkin" packageName="com.ninjamuffin99.funkin" main="Main" version="0.2.1.2" company="ninjamuffin99" /> <!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"--> @@ -104,7 +104,7 @@ <icon path="art/icon.png" /> <!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> --> - <!-- <haxedef name="NG_LOGIN" /> --> + <haxedef name="NG_LOGIN" if="newgrounds" /> </project> diff --git a/assets/images/menuBG.png-autosave.kra b/assets/images/menuBG.png-autosave.kra deleted file mode 100644 index 7fcceeb8c..000000000 Binary files a/assets/images/menuBG.png-autosave.kra and /dev/null differ diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index 50a248ae0..ad336ce8a 100644 --- a/source/FreeplayState.hx +++ b/source/FreeplayState.hx @@ -149,8 +149,11 @@ class FreeplayState extends MusicBeatState { var poop:String = Highscore.formatSong(songs[curSelected].toLowerCase(), curDifficulty); + trace(poop); + PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].toLowerCase()); PlayState.isStoryMode = false; + PlayState.storyDifficulty = curDifficulty; FlxG.switchState(new PlayState()); if (FlxG.sound.music != null) FlxG.sound.music.stop(); diff --git a/source/PlayState.hx b/source/PlayState.hx index 8b9de9971..ab548604a 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -463,7 +463,7 @@ class PlayState extends MusicBeatState daBeats += 1; } - trace(unspawnNotes.length); + // trace(unspawnNotes.length); // playerCounter += 1; unspawnNotes.sort(sortByShit); @@ -586,9 +586,6 @@ class PlayState extends MusicBeatState { super.update(elapsed); - // trace("SONG POS: " + Conductor.songPosition); - // FlxG.sound.music.pitch = 2; - if (FlxG.keys.justPressed.ENTER && startedCountdown) { persistentUpdate = false; @@ -822,8 +819,6 @@ class PlayState extends MusicBeatState function endSong():Void { - trace('SONG DONE' + isStoryMode); - Highscore.saveScore(SONG.song, songScore, storyDifficulty); if (isStoryMode) @@ -1021,7 +1016,6 @@ class PlayState extends MusicBeatState if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate) { possibleNotes.push(daNote); - trace('NOTE-' + daNote.strumTime + ' ADDED'); } }); @@ -1214,7 +1208,6 @@ class PlayState extends MusicBeatState function noteCheck(keyP:Bool, note:Note):Void { - trace(note.noteData + ' note check here ' + keyP); if (keyP) goodNoteHit(note); else diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index 1a0c50c5d..0f4b5c018 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -248,6 +248,7 @@ class StoryMenuState extends MusicBeatState PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + diffic, PlayState.storyPlaylist[0].toLowerCase()); PlayState.storyWeek = curWeek; + PlayState.campaignScore = 0; new FlxTimer().start(1, function(tmr:FlxTimer) { if (FlxG.sound.music != null)