From d2fea3a8687dd76892521da80b982272ee06a8c6 Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Sun, 27 Nov 2022 23:47:13 +0100 Subject: [PATCH] removed the hardcoding curse!! --- assets/data/charts/fresh/gf-speed.hx | 12 ++++++++ source/funkin/game/PlayState.hx | 41 ---------------------------- 2 files changed, 12 insertions(+), 41 deletions(-) create mode 100644 assets/data/charts/fresh/gf-speed.hx diff --git a/assets/data/charts/fresh/gf-speed.hx b/assets/data/charts/fresh/gf-speed.hx new file mode 100644 index 00000000..f1d4536c --- /dev/null +++ b/assets/data/charts/fresh/gf-speed.hx @@ -0,0 +1,12 @@ +function beatHit(curBeat) { + switch(curBeat) { + case 16: + gfSpeed = 2; + case 48: + gfSpeed = 1; + case 80: + gfSpeed = 2; + case 112: + gfSpeed = 1; + } +} \ No newline at end of file diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index c763c858..273df4ac 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -988,36 +988,6 @@ class PlayState extends MusicBeatState FlxG.watch.addQuick("beatShit", curBeat); FlxG.watch.addQuick("stepShit", curStep); - if (curSong == 'Fresh') - { - switch (curBeat) - { - case 16: - camZooming = true; - gfSpeed = 2; - case 48: - gfSpeed = 1; - case 80: - gfSpeed = 2; - case 112: - 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 // RESET = Quick Game Over Screen if (controls.RESET) @@ -1173,17 +1143,6 @@ class PlayState extends MusicBeatState trace('LOADING NEXT SONG'); trace(PlayState.storyPlaylist[0].toLowerCase(), difficulty); - if (SONG.song.toLowerCase() == 'eggnog') - { - var blackShit:FlxSprite = new FlxSprite(-FlxG.width * FlxG.camera.zoom, - -FlxG.height * FlxG.camera.zoom).makeGraphic(FlxG.width * 3, FlxG.height * 3, FlxColor.BLACK); - blackShit.scrollFactor.set(); - add(blackShit); - camHUD.visible = false; - - FlxG.sound.play(Paths.sound('Lights_Shut_off')); - } - FlxTransitionableState.skipNextTransIn = true; FlxTransitionableState.skipNextTransOut = true; prevCamFollow = camFollow;