diff --git a/TODO b/TODO index ec6c38aa..b14fcf7b 100644 --- a/TODO +++ b/TODO @@ -1,11 +1,12 @@ -[WILL PROBABLY BE DONE] +[HIGH PRIORITY] - Extra Notes (Hardcoded) - Add an option to make letters float like in Hypno's Lullaby (WIP) - In-Game Crash Handler - NPS Display -[WHEN I GET THE TIME] +[LOW PRIORITY] - Better Startup Screen - Actual Noteskins System +- Freeplay Search Bar - Fix Credits Editor - Stage Editor \ No newline at end of file diff --git a/assets/scripts/hxsupport.lua b/assets/scripts/hxsupport.lua index 84762386..ea9adf3c 100644 --- a/assets/scripts/hxsupport.lua +++ b/assets/scripts/hxsupport.lua @@ -39,7 +39,7 @@ function onCreate(path) --character scripts local chars = {boyfriendName, dadName, gfName} for i,char in pairs(chars) do - if checkFileExists('scripts/characters/'..char..'.hx') then + if checkFileExists('characters/'..char..'.hx') then addScript('characters/'..char..'.hx') end end diff --git a/source/meta/state/AchievementsMenuState.hx b/source/meta/state/AchievementsMenuState.hx index 1650fc99..0d9b43e6 100644 --- a/source/meta/state/AchievementsMenuState.hx +++ b/source/meta/state/AchievementsMenuState.hx @@ -104,7 +104,7 @@ class AchievementsMenuState extends MusicBeatState grpOptions.members[i].text = '?'; } }, function() { - FlxG.sound.play(Paths.sound('confirmMenu')); + FlxG.sound.play(Paths.sound('cancelMenu')); }, false)); } else { openSubState(new Prompt('This action will reset the selected achievement.\nProceed?', 0, function() { diff --git a/source/meta/state/editors/CreditsEditorState.hx b/source/meta/state/editors/CreditsEditorState.hx index ac208c6d..d0217571 100644 --- a/source/meta/state/editors/CreditsEditorState.hx +++ b/source/meta/state/editors/CreditsEditorState.hx @@ -177,7 +177,7 @@ class CreditsEditorState extends MusicBeatState var linkInput:FlxUIInputText; var colorInput:FlxUIInputText; var colorSquare:FlxSprite; - var soundInput:FlxUIInputText; + // var soundInput:FlxUIInputText; // can we fix this please?? function addCreditsUI():Void { @@ -206,7 +206,7 @@ class CreditsEditorState extends MusicBeatState linkInput = new FlxUIInputText(60, descInput.y + yDist, 180, '', 8); colorInput = new FlxUIInputText(60, linkInput.y + yDist, 70, '', 8); colorSquare = new FlxSprite(colorInput.x + 80, colorInput.y).makeGraphic(15, 15, 0xFFFFFFFF); - soundInput = new FlxUIInputText(60, soundInput.y + yDist, 50, '', 8); // we'll probably get this fixed + // soundInput = new FlxUIInputText(60, soundInput.y + yDist, 50, '', 8); var getIconColor:FlxButton = new FlxButton(colorSquare.x + 23, colorSquare.y - 2, "Get Icon Color", function() { var icon:String; @@ -273,13 +273,13 @@ class CreditsEditorState extends MusicBeatState tab_group_credits.add(makeSquareBorder(colorSquare, 18)); tab_group_credits.add(colorSquare); tab_group_credits.add(getIconColor); - tab_group_credits.add(soundInput); + // tab_group_credits.add(soundInput); tab_group_credits.add(new FlxText(creditNameInput.x - 40, creditNameInput.y, 0, 'Name:')); tab_group_credits.add(new FlxText(iconInput.x - 40, iconInput.y, 0, 'Icon:')); tab_group_credits.add(new FlxText(descInput.x - 80, descInput.y, 0, 'Description:')); tab_group_credits.add(new FlxText(linkInput.x - 40, linkInput.y, 0, 'Link:')); tab_group_credits.add(new FlxText(colorInput.x - 40, colorInput.y, 0, 'Color:')); - tab_group_credits.add(new FlxText(soundInput.x - 40, soundInput.y, 0, 'Sound:')); + // tab_group_credits.add(new FlxText(soundInput.x - 40, soundInput.y, 0, 'Sound:')); tab_group_credits.add(titleAdd); tab_group_credits.add(creditAdd); @@ -380,7 +380,7 @@ class CreditsEditorState extends MusicBeatState descInput.text = creditsStuff[curSelected][2]; linkInput.text = creditsStuff[curSelected][3]; colorInput.text = creditsStuff[curSelected][4]; - soundInput.text = creditsStuff[curSelected][5]; + // soundInput.text = creditsStuff[curSelected][5]; showIconExist(iconInput.text); iconColorShow(); } @@ -393,7 +393,7 @@ class CreditsEditorState extends MusicBeatState descInput.text = ''; linkInput.text = ''; colorInput.text = ''; - soundInput.text = ''; + // soundInput.text = ''; showIconExist(iconInput.text); iconColorShow(); } @@ -417,8 +417,8 @@ class CreditsEditorState extends MusicBeatState creditsStuff[curSelected][4] = colorInput.text; } else { creditsStuff[curSelected][4] = 'e1e1e1'; } - if(soundInput.text != null && soundInput.text.length > 0) creditsStuff[curSelected][5] = soundInput.text; - else creditsStuff[curSelected][5] = ''; + /* if(soundInput.text != null && soundInput.text.length > 0) creditsStuff[curSelected][5] = soundInput.text; + else creditsStuff[curSelected][5] = ''; */ } }