From 4833c9bd2eb850931e8bd3779da6d1124ea0cfa4 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Mon, 6 Nov 2023 17:51:27 -0500 Subject: [PATCH 1/4] Fix a bug where F5 would crash in Week 6. --- .../funkin/play/cutscene/dialogue/Conversation.hx | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/source/funkin/play/cutscene/dialogue/Conversation.hx b/source/funkin/play/cutscene/dialogue/Conversation.hx index 46acf3f37..b2361c795 100644 --- a/source/funkin/play/cutscene/dialogue/Conversation.hx +++ b/source/funkin/play/cutscene/dialogue/Conversation.hx @@ -581,6 +581,19 @@ class Conversation extends FlxSpriteGroup implements IDialogueScriptedClass } } + /** + * Calls `kill()` on the group's members and then on the group itself. + * You can revive this group later via `revive()` after this. + */ + public override function kill():Void + { + _skipTransformChildren = true; + alive = false; + exists = false; + _skipTransformChildren = false; + if (group != null) group.kill(); + } + public override function toString():String { return 'Conversation($conversationId)'; From 21ba81c79900331e7d211d6810dc5e9438503d08 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Mon, 6 Nov 2023 17:51:56 -0500 Subject: [PATCH 2/4] Fix a bug where returning to a week in Story Mode would not play dialog --- source/funkin/play/PlayState.hx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index 4542b9f98..856941e88 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -1564,6 +1564,9 @@ class PlayState extends MusicBeatSubState regenNoteData(); + var event:ScriptEvent = new ScriptEvent(CREATE, false); + ScriptEventDispatcher.callEvent(currentSong, event); + generatedMusic = true; } From 7db5489a95697410b8653be0d781ef46d97e4974 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Mon, 6 Nov 2023 17:52:03 -0500 Subject: [PATCH 3/4] Update local assets. --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index e634c8f50..2ba807782 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit e634c8f50c34845097283e0f411e1f89409e1498 +Subproject commit 2ba807782fe236693c57a6cec4d5ed6e5c27c80e From d78c36f27e6d6098df861cccc2b599399d185086 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Mon, 6 Nov 2023 19:37:12 -0500 Subject: [PATCH 4/4] Revise dialogue --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 2ba807782..c4543111e 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 2ba807782fe236693c57a6cec4d5ed6e5c27c80e +Subproject commit c4543111e7a31d7bde0e0fdc56636646abb8c963