Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 01:55:52 -05:00
Code Issues Projects Releases Packages Wiki Activity

Properly fix the menu background to use the correct line colors. (#493)

Browse source
This commit is contained in:
Cameron Taylor 2024-04-17 20:06:42 -04:00 committed by GitHub
commit 0f858708c9
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 1b12b6c6666af6c84addf5aa0795546aa0d04185 Subproject commit f3d6cf30dee60a237a6773d8140bd1661f62bd4e

10
source/funkin/ui/mainmenu/MainMenuState.hx
View file

@ -57,12 +57,7 @@ class MainMenuState extends MusicBeatState
persistentUpdate = false; persistentUpdate = false;
persistentDraw = true; persistentDraw = true;
var bg = FunkinSprite.create('menuDesat'); var bg:FlxSprite = new FlxSprite(Paths.image('menuBG'));
bg.color = 0xFFFDE871;
// This line accounts for the fact that the base color of menuDesat is #EFEFEF.
flixel.util.FlxColorTransformUtil.setOffsets(bg.colorTransform, 30, 27, 13, 0.0);
bg.scrollFactor.x = 0; bg.scrollFactor.x = 0;
bg.scrollFactor.y = 0.17; bg.scrollFactor.y = 0.17;
bg.setGraphicSize(Std.int(bg.width * 1.2)); bg.setGraphicSize(Std.int(bg.width * 1.2));
@ -73,7 +68,7 @@ class MainMenuState extends MusicBeatState
camFollow = new FlxObject(0, 0, 1, 1); camFollow = new FlxObject(0, 0, 1, 1);
add(camFollow); add(camFollow);
magenta = new FlxSprite(Paths.image('menuDesat')); magenta = new FlxSprite(Paths.image('menuBGMagenta'));
magenta.scrollFactor.x = bg.scrollFactor.x; magenta.scrollFactor.x = bg.scrollFactor.x;
magenta.scrollFactor.y = bg.scrollFactor.y; magenta.scrollFactor.y = bg.scrollFactor.y;
magenta.setGraphicSize(Std.int(bg.width)); magenta.setGraphicSize(Std.int(bg.width));
@ -81,7 +76,6 @@ class MainMenuState extends MusicBeatState
magenta.x = bg.x; magenta.x = bg.x;
magenta.y = bg.y; magenta.y = bg.y;
magenta.visible = false; magenta.visible = false;
magenta.color = 0xFFfd719b;
// TODO: Why doesn't this line compile I'm going fucking feral // TODO: Why doesn't this line compile I'm going fucking feral

3
source/funkin/ui/options/OptionsState.hx
View file

@ -23,8 +23,7 @@ class OptionsState extends MusicBeatState
override function create() override function create()
{ {
var menuBG = new FlxSprite().loadGraphic(Paths.image('menuDesat')); var menuBG = new FlxSprite().loadGraphic(Paths.image('menuBGBlue'));
menuBG.color = 0xFFea71fd;
menuBG.setGraphicSize(Std.int(menuBG.width * 1.1)); menuBG.setGraphicSize(Std.int(menuBG.width * 1.1));
menuBG.updateHitbox(); menuBG.updateHitbox();
menuBG.screenCenter(); menuBG.screenCenter();