diff --git a/Project.xml b/Project.xml index 173659ec2..78c1b3664 100644 --- a/Project.xml +++ b/Project.xml @@ -9,7 +9,7 @@ - + diff --git a/source/PlayState.hx b/source/PlayState.hx index fb155f35d..05dfa83fd 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -648,7 +648,7 @@ class PlayState extends MusicBeatState } else { - //Conductor.songPosition = FlxG.sound.music.time; + // Conductor.songPosition = FlxG.sound.music.time; Conductor.songPosition += FlxG.elapsed * 1000; if (!paused) @@ -679,7 +679,7 @@ class PlayState extends MusicBeatState if (camFollow.x != dad.getMidpoint().x + 150 && !PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection) { camFollow.setPosition(dad.getMidpoint().x + 150, dad.getMidpoint().y - 100); - //camFollow.setPosition(lucky.getMidpoint().x - 120, lucky.getMidpoint().y + 210); + // camFollow.setPosition(lucky.getMidpoint().x - 120, lucky.getMidpoint().y + 210); vocals.volume = 1; if (SONG.song.toLowerCase() == 'tutorial') @@ -739,14 +739,16 @@ class PlayState extends MusicBeatState } // better streaming of shit - //RESET = Quick Game Over Screen - if (controls.RESET){ + // RESET = Quick Game Over Screen + if (controls.RESET) + { health = 0; trace("RESET = True"); } - //CHEAT = brandon's a pussy - if (controls.CHEAT){ + // CHEAT = brandon's a pussy + if (controls.CHEAT) + { health += 1; trace("User is cheating!"); } @@ -828,7 +830,7 @@ class PlayState extends MusicBeatState if (daNote.y < -daNote.height) { - if (daNote.tooLate) + if (daNote.tooLate || !daNote.wasGoodHit) { health -= 0.04; vocals.volume = 0; @@ -851,7 +853,6 @@ class PlayState extends MusicBeatState { canPause = false; - #if !switch Highscore.saveScore(SONG.song, songScore, storyDifficulty); #end @@ -873,7 +874,6 @@ class PlayState extends MusicBeatState NGio.unlockMedal(60961); Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty); - FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked; FlxG.save.flush(); }