diff --git a/assets/data/weeks.xml b/assets/data/weeks.xml new file mode 100644 index 00000000..3012a986 --- /dev/null +++ b/assets/data/weeks.xml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/images/menus/storymenu/assets.png b/assets/images/menus/storymenu/assets.png index 992185a0..9744e40c 100644 Binary files a/assets/images/menus/storymenu/assets.png and b/assets/images/menus/storymenu/assets.png differ diff --git a/assets/images/menus/storymenu/assets.xml b/assets/images/menus/storymenu/assets.xml index df85370c..8960abf4 100644 --- a/assets/images/menus/storymenu/assets.xml +++ b/assets/images/menus/storymenu/assets.xml @@ -2,12 +2,9 @@ - - - - - - - - + + + + + diff --git a/assets/images/menus/storymenu/characters.png b/assets/images/menus/storymenu/characters.png deleted file mode 100644 index ddb991df..00000000 Binary files a/assets/images/menus/storymenu/characters.png and /dev/null differ diff --git a/assets/images/menus/storymenu/characters.xml b/assets/images/menus/storymenu/characters.xml deleted file mode 100644 index 79b862b3..00000000 --- a/assets/images/menus/storymenu/characters.xml +++ /dev/null @@ -1,161 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/assets/images/menus/storymenu/characters/bf.png b/assets/images/menus/storymenu/characters/bf.png new file mode 100644 index 00000000..4754f31f Binary files /dev/null and b/assets/images/menus/storymenu/characters/bf.png differ diff --git a/assets/images/menus/storymenu/characters/dad.png b/assets/images/menus/storymenu/characters/dad.png new file mode 100644 index 00000000..22692902 Binary files /dev/null and b/assets/images/menus/storymenu/characters/dad.png differ diff --git a/assets/images/menus/storymenu/characters/gf.png b/assets/images/menus/storymenu/characters/gf.png new file mode 100644 index 00000000..9e7116ba Binary files /dev/null and b/assets/images/menus/storymenu/characters/gf.png differ diff --git a/assets/images/menus/storymenu/characters/mom.png b/assets/images/menus/storymenu/characters/mom.png new file mode 100644 index 00000000..3c7d7c91 Binary files /dev/null and b/assets/images/menus/storymenu/characters/mom.png differ diff --git a/assets/images/menus/storymenu/characters/parents-christmas.png b/assets/images/menus/storymenu/characters/parents-christmas.png new file mode 100644 index 00000000..175b46fa Binary files /dev/null and b/assets/images/menus/storymenu/characters/parents-christmas.png differ diff --git a/assets/images/menus/storymenu/characters/pico.png b/assets/images/menus/storymenu/characters/pico.png new file mode 100644 index 00000000..405ee2b3 Binary files /dev/null and b/assets/images/menus/storymenu/characters/pico.png differ diff --git a/assets/images/menus/storymenu/difficulties/easy.png b/assets/images/menus/storymenu/difficulties/easy.png new file mode 100644 index 00000000..984ff367 Binary files /dev/null and b/assets/images/menus/storymenu/difficulties/easy.png differ diff --git a/assets/images/menus/storymenu/difficulties/hard.png b/assets/images/menus/storymenu/difficulties/hard.png new file mode 100644 index 00000000..720205e1 Binary files /dev/null and b/assets/images/menus/storymenu/difficulties/hard.png differ diff --git a/assets/images/menus/storymenu/difficulties/normal.png b/assets/images/menus/storymenu/difficulties/normal.png new file mode 100644 index 00000000..596f55cd Binary files /dev/null and b/assets/images/menus/storymenu/difficulties/normal.png differ diff --git a/assets/images/menus/storymenu/week0.png b/assets/images/menus/storymenu/weeks/tutorial.png similarity index 100% rename from assets/images/menus/storymenu/week0.png rename to assets/images/menus/storymenu/weeks/tutorial.png diff --git a/assets/images/menus/storymenu/week1.png b/assets/images/menus/storymenu/weeks/week1.png similarity index 100% rename from assets/images/menus/storymenu/week1.png rename to assets/images/menus/storymenu/weeks/week1.png diff --git a/assets/images/menus/storymenu/week2.png b/assets/images/menus/storymenu/weeks/week2.png similarity index 100% rename from assets/images/menus/storymenu/week2.png rename to assets/images/menus/storymenu/weeks/week2.png diff --git a/assets/images/menus/storymenu/week3.png b/assets/images/menus/storymenu/weeks/week3.png similarity index 100% rename from assets/images/menus/storymenu/week3.png rename to assets/images/menus/storymenu/weeks/week3.png diff --git a/assets/images/menus/storymenu/week4.png b/assets/images/menus/storymenu/weeks/week4.png similarity index 100% rename from assets/images/menus/storymenu/week4.png rename to assets/images/menus/storymenu/weeks/week4.png diff --git a/assets/images/menus/storymenu/week5.png b/assets/images/menus/storymenu/weeks/week5.png similarity index 100% rename from assets/images/menus/storymenu/week5.png rename to assets/images/menus/storymenu/weeks/week5.png diff --git a/assets/images/menus/storymenu/week6.png b/assets/images/menus/storymenu/weeks/week6.png similarity index 100% rename from assets/images/menus/storymenu/week6.png rename to assets/images/menus/storymenu/weeks/week6.png diff --git a/buildnumber.txt b/buildnumber.txt index cebfe351..db8b6957 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -946 \ No newline at end of file +948 \ No newline at end of file diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx index 6ab06a94..3e49a798 100644 --- a/source/funkin/menus/StoryMenuState.hx +++ b/source/funkin/menus/StoryMenuState.hx @@ -113,8 +113,6 @@ class StoryMenuState extends MusicBeatState grpLocks = new FlxTypedGroup(); add(grpLocks); - - trace("Line 70"); #if desktop // Updating Discord Rich Presence @@ -145,8 +143,6 @@ class StoryMenuState extends MusicBeatState } } - trace("Line 96"); - for (char in 0...3) { var weekCharacterThing:MenuCharacter = new MenuCharacter((FlxG.width * 0.25) * (1 + char) - 150, weekCharacters[curWeek][char]); @@ -178,8 +174,6 @@ class StoryMenuState extends MusicBeatState difficultySelectors = new FlxGroup(); add(difficultySelectors); - trace("Line 124"); - leftArrow = new FlxSprite(grpWeekText.members[0].x + grpWeekText.members[0].width + 10, grpWeekText.members[0].y + 10); leftArrow.frames = ui_tex; leftArrow.animation.addByPrefix('idle', "arrow left"); @@ -203,9 +197,7 @@ class StoryMenuState extends MusicBeatState rightArrow.animation.addByPrefix('press', "arrow push right", 24, false); rightArrow.animation.play('idle'); difficultySelectors.add(rightArrow); - - trace("Line 150"); - + add(yellowBG); add(grpWeekCharacters);