mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-10-05 17:00:39 +00:00
parent
c7d0fbd2e9
commit
869ad02b0d
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
|
<!--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"-->
|
or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
|
||||||
<app preloader="Preloader" resizable="true" />
|
<!-- <app preloader="Preloader" resizable="true" /> -->
|
||||||
|
|
||||||
<!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2-->
|
<!--Minimum without FLX_NO_GAMEPAD: 11.8, without FLX_NO_NATIVE_CURSOR: 11.2-->
|
||||||
<set name="SWF_VERSION" value="11.8" />
|
<set name="SWF_VERSION" value="11.8" />
|
||||||
|
|
|
@ -648,7 +648,7 @@ class PlayState extends MusicBeatState
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//Conductor.songPosition = FlxG.sound.music.time;
|
// Conductor.songPosition = FlxG.sound.music.time;
|
||||||
Conductor.songPosition += FlxG.elapsed * 1000;
|
Conductor.songPosition += FlxG.elapsed * 1000;
|
||||||
|
|
||||||
if (!paused)
|
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)
|
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(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;
|
vocals.volume = 1;
|
||||||
|
|
||||||
if (SONG.song.toLowerCase() == 'tutorial')
|
if (SONG.song.toLowerCase() == 'tutorial')
|
||||||
|
@ -739,14 +739,16 @@ class PlayState extends MusicBeatState
|
||||||
}
|
}
|
||||||
// better streaming of shit
|
// better streaming of shit
|
||||||
|
|
||||||
//RESET = Quick Game Over Screen
|
// RESET = Quick Game Over Screen
|
||||||
if (controls.RESET){
|
if (controls.RESET)
|
||||||
|
{
|
||||||
health = 0;
|
health = 0;
|
||||||
trace("RESET = True");
|
trace("RESET = True");
|
||||||
}
|
}
|
||||||
|
|
||||||
//CHEAT = brandon's a pussy
|
// CHEAT = brandon's a pussy
|
||||||
if (controls.CHEAT){
|
if (controls.CHEAT)
|
||||||
|
{
|
||||||
health += 1;
|
health += 1;
|
||||||
trace("User is cheating!");
|
trace("User is cheating!");
|
||||||
}
|
}
|
||||||
|
@ -828,7 +830,7 @@ class PlayState extends MusicBeatState
|
||||||
|
|
||||||
if (daNote.y < -daNote.height)
|
if (daNote.y < -daNote.height)
|
||||||
{
|
{
|
||||||
if (daNote.tooLate)
|
if (daNote.tooLate || !daNote.wasGoodHit)
|
||||||
{
|
{
|
||||||
health -= 0.04;
|
health -= 0.04;
|
||||||
vocals.volume = 0;
|
vocals.volume = 0;
|
||||||
|
@ -851,7 +853,6 @@ class PlayState extends MusicBeatState
|
||||||
{
|
{
|
||||||
canPause = false;
|
canPause = false;
|
||||||
|
|
||||||
|
|
||||||
#if !switch
|
#if !switch
|
||||||
Highscore.saveScore(SONG.song, songScore, storyDifficulty);
|
Highscore.saveScore(SONG.song, songScore, storyDifficulty);
|
||||||
#end
|
#end
|
||||||
|
@ -873,7 +874,6 @@ class PlayState extends MusicBeatState
|
||||||
NGio.unlockMedal(60961);
|
NGio.unlockMedal(60961);
|
||||||
Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty);
|
Highscore.saveWeekScore(storyWeek, campaignScore, storyDifficulty);
|
||||||
|
|
||||||
|
|
||||||
FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked;
|
FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked;
|
||||||
FlxG.save.flush();
|
FlxG.save.flush();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue