Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-30 11:26:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

lil oopsies and random cleanup of old shit

Browse source
This commit is contained in:
MtH 2021-09-08 22:28:30 +02:00
parent 187706c71c
commit 908372d296
2 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
source/PlayState.hx
View file

@ -1770,7 +1770,7 @@ class PlayState extends MusicBeatState
if (vocalsFinished) if (vocalsFinished)
return; return;
vocals.time = Conductor.songPosition; vocals.time = FlxG.sound.music.time;
vocals.play(); vocals.play();
} }
@ -1780,9 +1780,6 @@ class PlayState extends MusicBeatState
override public function update(elapsed:Float) override public function update(elapsed:Float)
{ {
// makes the lerp non-dependant on the framerate
// FlxG.camera.followLerp = CoolUtil.camLerpShit(0.04);
#if !debug #if !debug
perfectMode = false; perfectMode = false;
#else #else
@ -1873,6 +1870,7 @@ class PlayState extends MusicBeatState
paused = true; paused = true;
// 1 / 1000 chance for Gitaroo Man easter egg // 1 / 1000 chance for Gitaroo Man easter egg
// can this please move to dying it's kinda fucked up that pausing has a 1/1000 chance ur forced to restart
if (FlxG.random.bool(0.1)) if (FlxG.random.bool(0.1))
{ {
// gitaroo man easter egg // gitaroo man easter egg
@ -1904,9 +1902,6 @@ class PlayState extends MusicBeatState
if (FlxG.keys.justPressed.NINE) if (FlxG.keys.justPressed.NINE)
iconP1.swapOldIcon(); iconP1.swapOldIcon();
// FlxG.watch.addQuick('VOL', vocals.amplitudeLeft);
// FlxG.watch.addQuick('VOLRight', vocals.amplitudeRight);
iconP1.setGraphicSize(Std.int(CoolUtil.coolLerp(iconP1.width, 150, 0.15))); iconP1.setGraphicSize(Std.int(CoolUtil.coolLerp(iconP1.width, 150, 0.15)));
iconP2.setGraphicSize(Std.int(CoolUtil.coolLerp(iconP2.width, 150, 0.15))); iconP2.setGraphicSize(Std.int(CoolUtil.coolLerp(iconP2.width, 150, 0.15)));
@ -1973,24 +1968,9 @@ class PlayState extends MusicBeatState
gfSpeed = 2; gfSpeed = 2;
case 112: case 112:
gfSpeed = 1; gfSpeed = 1;
case 163:
// FlxG.sound.music.stop();
// FlxG.switchState(new TitleState());
} }
} }
if (curSong == 'Bopeebo')
{
switch (curBeat)
{
case 128, 129, 130:
vocals.volume = 0;
// FlxG.sound.music.stop();
// FlxG.switchState(new PlayState());
}
}
// better streaming of shit
if (!inCutscene && !_exiting) if (!inCutscene && !_exiting)
{ {
// RESET = Quick Game Over Screen // RESET = Quick Game Over Screen
@ -2223,6 +2203,7 @@ class PlayState extends MusicBeatState
daPos += 4 * (1000 * 60 / daBPM); daPos += 4 * (1000 * 60 / daBPM);
} }
Conductor.songPosition = FlxG.sound.music.time = daPos; Conductor.songPosition = FlxG.sound.music.time = daPos;
Conductor.songPosition += Conductor.offset;
updateCurStep(); updateCurStep();
resyncVocals(); resyncVocals();
} }
@ -2963,11 +2944,6 @@ class PlayState extends MusicBeatState
{ {
resyncVocals(); resyncVocals();
} }
if (dad.curCharacter == 'spooky' && curStep % 4 == 2)
{
// dad.dance();
}
} }
var lightningStrikeBeat:Int = 0; var lightningStrikeBeat:Int = 0;

2
source/TitleState.hx
View file

@ -51,7 +51,7 @@ class TitleState extends MusicBeatState
var ngSpr:FlxSprite; var ngSpr:FlxSprite;
var curWacky:Array<String> = []; var curWacky:Array<String> = [];
var lastBeat:Int = -1; var lastBeat:Int = 0;
var swagShader:ColorSwap; var swagShader:ColorSwap;
var alphaShader:BuildingShaders; var alphaShader:BuildingShaders;