From 9cb269a19cb35965cc7645962cf69655bbb13689 Mon Sep 17 00:00:00 2001 From: MtH Date: Wed, 23 Mar 2022 19:29:02 +0100 Subject: [PATCH] pixel pause & misc --- source/funkin/Note.hx | 4 ++-- source/funkin/PauseSubState.hx | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source/funkin/Note.hx b/source/funkin/Note.hx index 290fea0b6..5cffd9f32 100644 --- a/source/funkin/Note.hx +++ b/source/funkin/Note.hx @@ -79,8 +79,8 @@ class Note extends FlxSprite public static var RED_NOTE:Int = 3; // SCORING STUFF - public static var safeFrames:Int = 10; - public static var HIT_WINDOW:Float = (safeFrames / 60) * 1000; // 166.67 ms hit window + public static var HIT_WINDOW:Float = (10 / 60) * 1000; // 166.67 ms hit window (10 frames at 60fps) + // thresholds are fractions of HIT_WINDOW ^^ // anything above bad threshold is shit public static var BAD_THRESHOLD:Float = 0.8; // 125ms , 8 frames public static var GOOD_THRESHOLD:Float = 0.55; // 91.67ms , 5.5 frames diff --git a/source/funkin/PauseSubState.hx b/source/funkin/PauseSubState.hx index 14cbb63a8..87161dfa9 100644 --- a/source/funkin/PauseSubState.hx +++ b/source/funkin/PauseSubState.hx @@ -39,7 +39,10 @@ class PauseSubState extends MusicBeatSubstate menuItems = pauseOG; - pauseMusic = new FlxSound().loadEmbedded(Paths.music('breakfast'), true, true); + if (PlayState.storyWeek == 6) // consistent with logic that decides asset lib!! + pauseMusic = new FlxSound().loadEmbedded(Paths.music('breakfast-pixel'), true, true); + else + pauseMusic = new FlxSound().loadEmbedded(Paths.music('breakfast'), true, true); pauseMusic.volume = 0; pauseMusic.play(false, FlxG.random.int(0, Std.int(pauseMusic.length / 2)));