Skip to content
This repository has been archived by the owner on Jan 17, 2023. It is now read-only.

Commit

Permalink
final push
Browse files Browse the repository at this point in the history
  • Loading branch information
YoshiCrafter29 committed Mar 18, 2022
1 parent dee2c62 commit 7921064
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion source/FreeplayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ class FreeplayState extends MusicBeatState

freeplayScript.executeFunc("create", []);

refresh();
add(advancedBG);
add(scoreBG);
add(diffText);
Expand All @@ -287,7 +288,6 @@ class FreeplayState extends MusicBeatState
add(accuracyText);
add(missesText);
add(graph);
refresh();

if (!Settings.engineSettings.data.autoplayInFreeplay) {
var t = new FlxText(0, 0, FlxG.width, '[Space] Listen to selected song | Selected Mod: ${ModSupport.getModName(Settings.engineSettings.data.selectedMod)} - Press [Tab] to switch.');
Expand Down
2 changes: 1 addition & 1 deletion source/MainMenuState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class MainMenuState extends MusicBeatState
FlxTransitionableState.skipNextTransOut = true;
OptionsMenu.fromFreeplay = false;
// smooth af transition
FlxG.switchState(new OptionsMenu(0, -camFollow.y * 0.18));
FlxG.switchState(new OptionsMenu(0, -FlxG.camera.scroll.y * 0.18));
}, Paths.getSparrowAtlas('FNF_main_menu_assets'), 'options basic', 'options white');

// persistentUpdate = false;
Expand Down
17 changes: 12 additions & 5 deletions source/OptionsMenu.hx
Original file line number Diff line number Diff line change
Expand Up @@ -1365,22 +1365,29 @@ class OptionsMenu extends MusicBeatState
// yBG.updateHitbox();
// yBG.screenCenter();
var yBG = CoolUtil.addBG(this);
yBG.scrollFactor.set(1, 1);
yBG.x = -80;
yBG.scrollFactor.x = 0;
yBG.scrollFactor.y = 0.18;
yBG.scale.x = yBG.scale.y = 1.2;
yBG.y = -menuBGy + 23;
yBG.antialiasing = true;
yBG.updateHitbox();
yBG.screenCenter();
yBG.y -= menuBGy;
add(yBG);

// var menuBG:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuDesat'));
var menuBG = CoolUtil.addWhiteBG(this);
menuBG.color = 0xFFfd719b;
menuBG.x = -80;
menuBG.scrollFactor.x = 0;
menuBG.scrollFactor.y = 0.18;
menuBG.scale.x = menuBG.scale.y = 1.2;
menuBG.scrollFactor.set(1, 1);
menuBG.updateHitbox();
menuBG.screenCenter();
menuBG.y -= menuBGy;
// menuBG.color = 0xFF494949;
// menuBG.setGraphicSize(Std.int(menuBG.width * 1.1));
// menuBG.updateHitbox();
// menuBG.screenCenter();
menuBG.y = -menuBGy + 23;
menuBG.antialiasing = true;
add(menuBG);

Expand Down
4 changes: 2 additions & 2 deletions update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"1.7.0 - CUSTOM STATES AND MENUS",
"",
"- /!\\ Added Custom States",
"- /!\\ New updater! Yoshi Engine updates now can be installed in game (windows only for now, bg art by siivkoi)",
"- Added support for replaceable menu assets",
"- Fixed Downscroll's long strums behaving weirdly",
"- Pitch support for FlxSounds (including music)",
Expand All @@ -11,8 +12,7 @@
"- Removed akifox-asynchttp",
"- Fixed the Play Song feature in Freeplay",
"- Fixed Stage Editor import bug",
"- Fixed Vocals desync issue",
"- New updater! Yoshi Engine updates now can be installed in game (windows only for now)"
"- Fixed Vocals desync issue"
],
"version" : [1,7,0],
"url" : "https://github.com/YoshiCrafter29/YoshiEngine/releases/latest"
Expand Down

0 comments on commit 7921064

Please sign in to comment.