From 19bad8e31bd87320f10b64deb956f39ed52075d8 Mon Sep 17 00:00:00 2001 From: Lasercar Date: Wed, 29 Jan 2025 02:32:54 +1000 Subject: [PATCH 1/2] angry senpai fix --- preload/data/dialogue/boxes/roses.json | 2 +- preload/data/dialogue/conversations/roses.json | 6 ------ preload/data/songs/senpai/senpai-chart.json | 3 ++- preload/scripts/songs/roses.hxc | 11 ++++++++++- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/preload/data/dialogue/boxes/roses.json b/preload/data/dialogue/boxes/roses.json index a8b0ae6bb..72b7c4d4f 100644 --- a/preload/data/dialogue/boxes/roses.json +++ b/preload/data/dialogue/boxes/roses.json @@ -56,7 +56,7 @@ "name": "angrySenpai", "prefix": "SENPAI ANGRY IMPACT SPEECH0", "offsets": [0, 0], - "frameRate": 24 + "frameRate": 11 } ] } diff --git a/preload/data/dialogue/conversations/roses.json b/preload/data/dialogue/conversations/roses.json index 218484501..8a920edfa 100644 --- a/preload/data/dialogue/conversations/roses.json +++ b/preload/data/dialogue/conversations/roses.json @@ -7,12 +7,6 @@ "color": "#BFB3DFD8" }, - "music": { - "asset": "Lunchbox", - "fadeTime": 2.0, - "looped": true - }, - "outro": { "type": "fade", "fadeTime": 1.0 diff --git a/preload/data/songs/senpai/senpai-chart.json b/preload/data/songs/senpai/senpai-chart.json index 5c461dd50..23a4da44d 100644 --- a/preload/data/songs/senpai/senpai-chart.json +++ b/preload/data/songs/senpai/senpai-chart.json @@ -25,7 +25,8 @@ { "e": "FocusCamera", "t": 73333, "v": { "char": 1 } }, { "e": "FocusCamera", "t": 76666, "v": { "char": 0 } }, { "e": "FocusCamera", "t": 80000, "v": { "char": 1 } }, - { "e": "FocusCamera", "t": 86666, "v": { "char": 0 } } + { "e": "FocusCamera", "t": 86666, "v": { "char": 0 } }, + { "e": "FocusCamera", "t": 96666, "v": { "char": 1 } } ], "notes": { "easy": [ diff --git a/preload/scripts/songs/roses.hxc b/preload/scripts/songs/roses.hxc index c9200b607..f46e3e176 100644 --- a/preload/scripts/songs/roses.hxc +++ b/preload/scripts/songs/roses.hxc @@ -9,6 +9,7 @@ import funkin.audio.FunkinSound; import flixel.tweens.FlxTween; import flixel.tweens.FlxEase; import funkin.ui.options.PreferencesMenu; +import flixel.util.FlxTimer; class RosesSong extends Song { var hasPlayedCutscene:Bool; @@ -31,11 +32,17 @@ class RosesSong extends Song { event.cancel(); // CANCEL THE COUNTDOWN! // Play a SFX + FunkinSound.playOnce(Paths.sound('ANGRY_TEXT_BOX'), 1.0); FunkinSound.playOnce(Paths.sound('ANGRY'), 1.0); PlayState.instance.currentStage.pause(); - startDialogue(); + //So that the bars don't fade in and ruin the moment + PlayState.instance.camHUD.visible = false; + new FlxTimer().start(2, function(tmr) + { + startDialogue(); + }); } } @@ -91,6 +98,8 @@ class RosesSong extends Song { } public override function onDialogueEnd() { + //Ok, we can enable the HUD again + PlayState.instance.camHUD.visible = true; // We may need to wait for the outro to play. Countdown.performCountdown(); } From b2b502b779cfeaa33f126c4d4bab4b1504722203 Mon Sep 17 00:00:00 2001 From: Lasercar Date: Wed, 29 Jan 2025 11:15:29 +1000 Subject: [PATCH 2/2] I didn't remove the music for the censored dialogue --- preload/data/dialogue/conversations/roses-censored.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/preload/data/dialogue/conversations/roses-censored.json b/preload/data/dialogue/conversations/roses-censored.json index b25361de8..e5fb7ce93 100644 --- a/preload/data/dialogue/conversations/roses-censored.json +++ b/preload/data/dialogue/conversations/roses-censored.json @@ -7,12 +7,6 @@ "color": "#BFB3DFD8" }, - "music": { - "asset": "Lunchbox", - "fadeTime": 2.0, - "looped": true - }, - "outro": { "type": "fade", "fadeTime": 1.0