diff --git a/CHANGELOG.md b/CHANGELOG.md index 718e337..8d48303 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Clear section button to note editor - Swap button in note editor - a new boot text or two -- automatic check for when you're on an old version of the game! +- automatic check for when you're on an old version of the game! ### Changed - Made Spookeez on Normal easier. - Mouse is now visible in note editor diff --git a/art/build-NG-HTML-RELEASE.bat b/art/build-NG-HTML-RELEASE.bat index 3c61a90..d58b30a 100644 --- a/art/build-NG-HTML-RELEASE.bat +++ b/art/build-NG-HTML-RELEASE.bat @@ -3,7 +3,7 @@ color 0a cd .. @echo on echo BUILDING GAME -lime build html5 -final +lime build html5 -final -Dng echo ZIPPING cd export 7z a -tzip -r swag release\html5\bin diff --git a/assets/images/campaign_menu_UI_characters.png b/assets/images/campaign_menu_UI_characters.png index 78e51f2..058970b 100644 Binary files a/assets/images/campaign_menu_UI_characters.png and b/assets/images/campaign_menu_UI_characters.png differ diff --git a/assets/images/campaign_menu_UI_characters.xml b/assets/images/campaign_menu_UI_characters.xml index af2bb07..0788e9d 100644 --- a/assets/images/campaign_menu_UI_characters.xml +++ b/assets/images/campaign_menu_UI_characters.xml @@ -28,92 +28,106 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/MenuCharacter.hx b/source/MenuCharacter.hx index e25c892..361aede 100644 --- a/source/MenuCharacter.hx +++ b/source/MenuCharacter.hx @@ -22,7 +22,7 @@ class MenuCharacter extends FlxSprite animation.addByPrefix('dad', "Dad idle dance BLACK LINE", 24); animation.addByPrefix('spooky', "spooky dance idle BLACK LINES", 24); animation.addByPrefix('pico', "Pico Idle Dance", 24); - animation.addByPrefix('mom', "Mom Idle Black Lines smol", 24); + animation.addByPrefix('mom', "Mom Idle BLACK LINES", 24); animation.play(character); updateHitbox(); diff --git a/source/MenuItem.hx b/source/MenuItem.hx index 6c18fc8..17a5f63 100644 --- a/source/MenuItem.hx +++ b/source/MenuItem.hx @@ -23,7 +23,7 @@ class MenuItem extends FlxSpriteGroup week.animation.addByPrefix('week1', "WEEK1 select", 24); week.animation.addByPrefix('week2', "week2 select", 24); week.animation.addByPrefix('week3', "Week 3 press", 24); - week.animation.addByPrefix('week3', "Week 4 press", 24); + week.animation.addByPrefix('week4', "Week 4 press", 24); add(week); week.animation.play('week' + weekNum); diff --git a/source/StoryMenuState.hx b/source/StoryMenuState.hx index bc48cb7..7c3129f 100644 --- a/source/StoryMenuState.hx +++ b/source/StoryMenuState.hx @@ -8,6 +8,7 @@ import flixel.group.FlxGroup; import flixel.math.FlxMath; import flixel.text.FlxText; import flixel.tweens.FlxTween; +import flixel.util.FlxColor; import flixel.util.FlxTimer; import lime.net.curl.CURLCode; @@ -74,6 +75,9 @@ class StoryMenuState extends MusicBeatState grpWeekText = new FlxTypedGroup(); add(grpWeekText); + var blackBarThingie:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, 56, FlxColor.BLACK); + add(blackBarThingie); + grpWeekCharacters = new FlxTypedGroup(); grpLocks = new FlxTypedGroup(); diff --git a/source/TitleState.hx b/source/TitleState.hx index a91ed23..e89a91b 100644 --- a/source/TitleState.hx +++ b/source/TitleState.hx @@ -64,7 +64,9 @@ class TitleState extends MusicBeatState if (FlxG.save.data.weekUnlocked != null) { - StoryMenuState.weekUnlocked = FlxG.save.data.weekUnlocked; + // FIX LATER!!! + // WEEK UNLOCK PROGRESSION!! + // StoryMenuState.weekUnlocked = FlxG.save.data.weekUnlocked; if (StoryMenuState.weekUnlocked.length < 4) StoryMenuState.weekUnlocked.insert(0, true);