Skip to content

Commit

Permalink
i will test tomorrow cuz sleep
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesisfeline committed Nov 9, 2023
1 parent c861a4b commit da5a4af
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 20 deletions.
2 changes: 1 addition & 1 deletion source/options/NotesSubState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class NotesSubState extends MusicBeatSubstate
super();

var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuDesat'));
bg.color = 0xFFEA71FD;
bg.color = 0xFF88FD71;
bg.screenCenter();
bg.antialiasing = ClientPrefs.data.antialiasing;
add(bg);
Expand Down
2 changes: 1 addition & 1 deletion source/options/OptionsState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class OptionsState extends MusicBeatState

var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuDesat'));
bg.antialiasing = ClientPrefs.data.antialiasing;
bg.color = 0xFFea71fd;
bg.color = 0xfffdbc71;
bg.updateHitbox();

bg.screenCenter();
Expand Down
16 changes: 14 additions & 2 deletions source/states/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class MainMenuState extends MusicBeatState
for (i in 0...optionShit.length)
{
var offset:Float = 108 - (Math.max(optionShit.length, 4) - 4) * 80;
var menuItem:FlxSprite = new FlxSprite(0, (i * 140) + offset);
var menuItem:FlxSprite = new FlxSprite(100, (i * 140) + offset);
menuItem.antialiasing = ClientPrefs.data.antialiasing;
menuItem.scale.x = scale;
menuItem.scale.y = scale;
Expand All @@ -114,13 +114,25 @@ class MainMenuState extends MusicBeatState
menuItem.animation.addByPrefix('selected', optionShit[i] + " white", 24);
menuItem.animation.play('idle');
menuItem.ID = i;
menuItem.screenCenter(X);
//menuItem.screenCenter(X);
menuItems.add(menuItem);
var scr:Float = (optionShit.length - 4) * 0.135;
if(optionShit.length < 6) scr = 0;
menuItem.scrollFactor.set(0, scr);
menuItem.updateHitbox();
}
gfDance.frames = Paths.getSparrowAtlas('gfDanceTitle');//foxa is vibing!
gfDance.animation.addByPrefix('danceLeft', 'dance', 24, false);
gfDance.animation.addByPrefix('danceRight','dance', 24, false);

var char = new FlxSprite(820, 170);
char.frames = Paths.getSparrowAtlas('gfDanceTitle');//here put the name of the xml
char.animation.addByPrefix('idle', 'dance', 24, true);//on 'idle normal' change it to your xml one
char.animation.play('idle');//you can rename the anim however you want to
char.scrollFactor.set();
char.flipX = true;
char.antialiasing = ClientPrefs.data.ntialiasing;
add(char);

FlxG.camera.follow(camFollow, null, 0);

Expand Down
6 changes: 6 additions & 0 deletions source/states/ModsMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ class ModsMenuState extends MusicBeatState
add(bg);
bg.screenCenter();

var grid:FlxBackdrop = new FlxBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x33525252, 0x0));
grid.velocity.set(40, 40);
grid.alpha = 0;
FlxTween.tween(grid, {alpha: 1}, 0.5, {ease: FlxEase.quadOut});
add(grid);

bgList = FlxSpriteUtil.drawRoundRect(new FlxSprite(40, 40).makeGraphic(340, 440, FlxColor.TRANSPARENT), 0, 0, 340, 440, 15, 15, FlxColor.BLACK);
bgList.alpha = 0.6;

Expand Down
6 changes: 6 additions & 0 deletions source/states/TitleState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,12 @@ class TitleState extends MusicBeatState
// bg.updateHitbox();
add(bg);

var grid:FlxBackdrop = new FlxBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x4DDB5BEC, 0x0));
grid.velocity.set(40, 40);
grid.alpha = 0;
FlxTween.tween(grid, {alpha: 1}, 0.5, {ease: FlxEase.quadOut});
add(grid);

logoBl = new FlxSprite(titleJSON.titlex, titleJSON.titley);
logoBl.frames = Paths.getSparrowAtlas('logoBumpin');
logoBl.antialiasing = ClientPrefs.data.antialiasing;
Expand Down
2 changes: 1 addition & 1 deletion source/states/editors/ChartingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ class ChartingState extends MusicBeatState
bg.color = 0xFF222222;
add(bg);

var grid:FlxBackdrop = new FlxBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x33FFFFFF, 0x0));
var grid:FlxBackdrop = new FlxBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x33EB4FDE, 0x0));
grid.velocity.set(40, 40);
grid.alpha = 0;
FlxTween.tween(grid, {alpha: 1}, 0.5, {ease: FlxEase.quadOut});
Expand Down
4 changes: 2 additions & 2 deletions source/states/editors/MasterEditorMenu.hx
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,11 @@ class MasterEditorMenu extends MusicBeatState

WeekData.setDirectoryFromWeek();
if(directories[curDirectory] == null || directories[curDirectory].length < 1)
directoryTxt.text = '< No Mod Loaded >';
directoryTxt.text = 'Editors Menu - < No Mod Loaded >';
else
{
Mods.currentModDirectory = directories[curDirectory];
directoryTxt.text = '< Mod: ' + Mods.currentModDirectory + ' >';
directoryTxt.text = 'Editors Menu - < Selected Mod: ' + Mods.currentModDirectory + ' >';
}
directoryTxt.text = directoryTxt.text.toUpperCase();
}
Expand Down
6 changes: 6 additions & 0 deletions source/states/editors/NoteSplashDebugState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ class NoteSplashDebugState extends MusicBeatState
selection.alpha = 0.4;
add(selection);

var grid:FlxBackdrop = new FlxBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x33525252, 0x0));
grid.velocity.set(40, 40);
grid.alpha = 0;
FlxTween.tween(grid, {alpha: 1}, 0.5, {ease: FlxEase.quadOut});
add(grid);

#if desktop
// Updating Discord Rich Presence
DiscordClient.changePresence("Note Splash Menu", null);
Expand Down
6 changes: 0 additions & 6 deletions source/substates/GameplayChangersSubstate.hx
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,6 @@ class GameplayChangersSubstate extends MusicBeatSubstate
bg.alpha = 0.6;
add(bg);

var grid:FlxBackdrop = new FlxBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x33FFFFFF, 0x0));
grid.velocity.set(40, 40);
grid.alpha = 0;
FlxTween.tween(grid, {alpha: 1}, 0.5, {ease: FlxEase.quadOut});
add(grid);

// avoids lagspikes while scrolling through menus!
grpOptions = new FlxTypedGroup<Alphabet>();
add(grpOptions);
Expand Down
8 changes: 1 addition & 7 deletions source/substates/ResetScoreSubState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,7 @@ class ResetScoreSubState extends MusicBeatSubstate
bg.alpha = 0;
bg.scrollFactor.set();
add(bg);

var grid:FlxBackdrop = new FlxBackdrop(FlxGridOverlay.createGrid(80, 80, 160, 160, true, 0x33FFFFFF, 0x0));
grid.velocity.set(40, 40);
grid.alpha = 0;
FlxTween.tween(grid, {alpha: 1}, 0.5, {ease: FlxEase.quadOut});
add(grid);


var tooLong:Float = (name.length > 18) ? 0.8 : 1; //Fucking Winter Horrorland
var text:Alphabet = new Alphabet(0, 180, "Reset the score of", true);
text.screenCenter(X);
Expand Down

0 comments on commit da5a4af

Please sign in to comment.