diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e690df3a..aae8fa867 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### 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! - Difficulty on storymode and in freeplay scores +- Hard mode difficulty on campaign levels have been fixed ## [0.2.1.1] - 2020-11-06 ### Fixed - Week 2 not unlocking properly diff --git a/Project.xml b/Project.xml index 961a5f09c..3487d181f 100644 --- a/Project.xml +++ b/Project.xml @@ -39,8 +39,10 @@ - - + + + + diff --git a/source/FreeplayState.hx b/source/FreeplayState.hx index ad336ce8a..b402456ba 100644 --- a/source/FreeplayState.hx +++ b/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 diff --git a/source/PlayState.hx b/source/PlayState.hx index ab548604a..1eebd82f6 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -849,7 +849,10 @@ class PlayState extends MusicBeatState difficulty = '-easy'; if (storyDifficulty == 2) - difficulty == '-hard'; + difficulty = '-hard'; + + trace('LOADING NEXT SONG'); + trace(PlayState.storyPlaylist[0].toLowerCase() + difficulty); PlayState.SONG = Song.loadFromJson(PlayState.storyPlaylist[0].toLowerCase() + difficulty, PlayState.storyPlaylist[0]); FlxG.switchState(new PlayState()); diff --git a/source/TitleState.hx b/source/TitleState.hx index 0c7a870e8..a9b93c05c 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -13,6 +13,8 @@ import flixel.group.FlxGroup; import flixel.input.gamepad.FlxGamepad; import flixel.math.FlxPoint; import flixel.math.FlxRect; +import flixel.system.FlxSound; +import flixel.system.ui.FlxSoundTray; import flixel.text.FlxText; import flixel.tweens.FlxEase; import flixel.tweens.FlxTween; @@ -104,6 +106,10 @@ class TitleState extends MusicBeatState transIn = FlxTransitionableState.defaultTransIn; transOut = FlxTransitionableState.defaultTransOut; + // var music:FlxSound = new FlxSound(); + // music.loadStream('assets/music/freakyMenu' + TitleState.soundExt); + // FlxG.sound.list.add(music); + // music.play(); FlxG.sound.playMusic('assets/music/freakyMenu' + TitleState.soundExt, 0); FlxG.sound.music.fadeIn(4, 0, 0.7);