cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-28 23:35:54 +00:00
Code Issues Releases Wiki Activity

Merge branch 'week1-stage-erect' into rewrite/master

Browse source
This commit is contained in:
Cameron Taylor 2024-08-19 19:06:24 -04:00
parent 0aa9c41c5b ec07a476c1
commit 7d3d83b23c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 7bc9a73d87cf288844a522ca825ae22cfa73d5fb Subproject commit 2eac236291775208ce71287a5c27f8f15ae591c9

4
source/funkin/data/stage/StageRegistry.hx
View file

@ -93,8 +93,8 @@ class StageRegistry extends BaseRegistry<Stage, StageData>
public function listBaseGameStageIds():Array<String> public function listBaseGameStageIds():Array<String>
{ {
return [ return [
"mainStage", "spookyMansion", "phillyTrain", "phillyTrainErect", "limoRide", "limoRideErect", "mallXmas", "mallEvil", "school", "schoolEvil", "mainStage", "mainStageErect", "spookyMansion", "phillyTrain", "phillyTrainErect", "limoRide", "limoRideErect", "mallXmas", "mallEvil", "school",
"tankmanBattlefield", "phillyStreets", "phillyBlazin", "schoolEvil", "tankmanBattlefield", "phillyStreets", "phillyBlazin",
]; ];
} }

2
source/funkin/ui/debug/charting/ChartEditorState.hx
View file

@ -5699,7 +5699,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
// TODO: Rework asset system so we can remove this jank. // TODO: Rework asset system so we can remove this jank.
switch (currentSongStage) switch (currentSongStage)
{ {
case 'mainStage': case 'mainStage' | 'mainStageErect':
PlayStatePlaylist.campaignId = 'week1'; PlayStatePlaylist.campaignId = 'week1';
case 'spookyMansion' | 'spookyMansionErect': case 'spookyMansion' | 'spookyMansionErect':
PlayStatePlaylist.campaignId = 'week2'; PlayStatePlaylist.campaignId = 'week2';