From 9d85d423c6d9db326378e210cacbee336e189ae4 Mon Sep 17 00:00:00 2001 From: FabsTheFabs Date: Mon, 19 Aug 2024 04:29:22 +0100 Subject: [PATCH 1/3] add stage to registry and chart editor --- source/funkin/data/stage/StageRegistry.hx | 4 ++-- source/funkin/ui/debug/charting/ChartEditorState.hx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/funkin/data/stage/StageRegistry.hx b/source/funkin/data/stage/StageRegistry.hx index 1f0504247..7754c380e 100644 --- a/source/funkin/data/stage/StageRegistry.hx +++ b/source/funkin/data/stage/StageRegistry.hx @@ -93,8 +93,8 @@ class StageRegistry extends BaseRegistry public function listBaseGameStageIds():Array { return [ - "mainStage", "spookyMansion", "phillyTrain", "phillyTrainErect", "limoRide", "limoRideErect", "mallXmas", "mallEvil", "school", "schoolEvil", - "tankmanBattlefield", "phillyStreets", "phillyBlazin", + "mainStage", "mainStageErect", "spookyMansion", "phillyTrain", "phillyTrainErect", "limoRide", "limoRideErect", "mallXmas", "mallEvil", "school", + "schoolEvil", "tankmanBattlefield", "phillyStreets", "phillyBlazin", ]; } diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx index 09a06661d..ebfbe5eac 100644 --- a/source/funkin/ui/debug/charting/ChartEditorState.hx +++ b/source/funkin/ui/debug/charting/ChartEditorState.hx @@ -5699,7 +5699,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState // TODO: Rework asset system so we can remove this jank. switch (currentSongStage) { - case 'mainStage': + case 'mainStage' | 'mainStageErect': PlayStatePlaylist.campaignId = 'week1'; case 'spookyMansion' | 'spookyMansionErect': PlayStatePlaylist.campaignId = 'week2'; From 8a03cc7b2ac39ad9271e55536a5f6ec0734e4ddf Mon Sep 17 00:00:00 2001 From: FabsTheFabs Date: Mon, 19 Aug 2024 04:29:28 +0100 Subject: [PATCH 2/3] assets submod --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index ac95dcfb5..45de6c66a 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit ac95dcfb5e702d76852badc21f19706518ceb6e2 +Subproject commit 45de6c66a04f806d475eb95fa1a364d63466fdec From ec07a476c16dba410313b5316deba4fb23c139ca Mon Sep 17 00:00:00 2001 From: Cameron Taylor Date: Mon, 19 Aug 2024 19:06:07 -0400 Subject: [PATCH 3/3] assets submod --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 45de6c66a..2eac23629 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 45de6c66a04f806d475eb95fa1a364d63466fdec +Subproject commit 2eac236291775208ce71287a5c27f8f15ae591c9