From 4b98b0ba317f544ec3753a5dc41fa4a6c4f8aa0a Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Wed, 22 Feb 2023 02:26:03 +0100 Subject: [PATCH] fixes --- buildnumber.txt | 2 +- source/funkin/game/PlayState.hx | 2 +- source/funkin/menus/StoryMenuState.hx | 20 +++----------------- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/buildnumber.txt b/buildnumber.txt index 96a7bd4c..c88f845d 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -2371 \ No newline at end of file +2373 \ No newline at end of file diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index aee876e1..e74848a0 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1229,7 +1229,7 @@ class PlayState extends MusicBeatState if (validScore) { // TODO: more week info saving - Highscore.saveWeekScore(storyWeek.name, { + Highscore.saveWeekScore(storyWeek.id, { score: campaignScore }, difficulty); } diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx index 1f6410fd..34aed9cb 100644 --- a/source/funkin/menus/StoryMenuState.hx +++ b/source/funkin/menus/StoryMenuState.hx @@ -171,6 +171,7 @@ class StoryMenuState extends MusicBeatState { e.targetY = k - curWeek; } tracklist.text = 'TRACKS\n\n${[for(e in weeks[curWeek].songs) if (!e.hide) e.name.toUpperCase()].join('\n')}'; + weekTitle.text = weeks[curWeek].name.getDefault(""); for(i in 0...3) characterSprites.members[i].changeCharacter(characters[weeks[curWeek].chars[i]]); @@ -227,6 +228,7 @@ class StoryMenuState extends MusicBeatState { } var weekObj:WeekData = { name: week.att.name, + id: weekName, sprite: week.getAtt('sprite').getDefault(weekName), chars: [null, null, null], songs: [], @@ -344,27 +346,11 @@ class StoryMenuState extends MusicBeatState { }); weekSprites.members[curWeek].startFlashing(); } - - public function loadXML(xmlPath:String) { - try { - var xml = new Access(Xml.parse(Assets.getText(xmlPath)).firstElement()); - - for(el in xml.elements) { - switch(el.name) { - case 'characters': - - case 'weeks': - - } - } - } catch(e) { - Logs.trace('Failed to parse data/weeks.xml: $e', ERROR); - } - } } typedef WeekData = { var name:String; + var id:String; var sprite:String; var chars:Array; var songs:Array;