Skip to content

Commit

Permalink
im bored, probably gonna make a huge pr
Browse files Browse the repository at this point in the history
  • Loading branch information
Joalor64GH authored Jul 29, 2023
1 parent 9d2f258 commit 80ffad0
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
5 changes: 3 additions & 2 deletions TODO
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion assets/scripts/hxsupport.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion source/meta/state/AchievementsMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
16 changes: 8 additions & 8 deletions source/meta/state/editors/CreditsEditorState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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();
}
Expand All @@ -393,7 +393,7 @@ class CreditsEditorState extends MusicBeatState
descInput.text = '';
linkInput.text = '';
colorInput.text = '';
soundInput.text = '';
// soundInput.text = '';
showIconExist(iconInput.text);
iconColorShow();
}
Expand All @@ -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] = ''; */
}
}

Expand Down

0 comments on commit 80ffad0

Please sign in to comment.