Skip to content

Commit

Permalink
fix bg color on state reset
Browse files Browse the repository at this point in the history
  • Loading branch information
Vortex2Oblivion committed Jan 9, 2025
1 parent 1fd7e72 commit 32bdef4
Show file tree
Hide file tree
Showing 9 changed files with 177 additions and 572 deletions.
4 changes: 4 additions & 0 deletions mods/Friday Night Funkin'/data/stage data/evil-school.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,9 @@
[325, 918],
[645, 834]
],
"camera_Offsets": [
[0, -150],
[0, 0]
],
"camera_Zoom": 1
}
Binary file modified mods/Friday Night Funkin'/images/icons/bf-pixel-icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mods/Friday Night Funkin'/images/icons/senpai-angry-icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified mods/Friday Night Funkin'/images/icons/senpai-icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 4 additions & 25 deletions source/states/OptionsMenu.hx
Original file line number Diff line number Diff line change
@@ -1,32 +1,11 @@
package states;

import utilities.Options;
import substates.UISkinSelect;
import substates.ControlMenuSubstate;
import utilities.MusicUtilities;
import ui.Option;
import ui.Checkbox;
import flixel.group.FlxGroup;
import toolbox.ChartingState;
import toolbox.StageMakingState;
import flixel.sound.FlxSound;
import toolbox.CharacterCreator;
import utilities.Controls.Control;
import openfl.text.TextField;
import flixel.FlxG;
import flixel.FlxSprite;
import flixel.addons.display.FlxGridOverlay;
import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.input.keyboard.FlxKey;
import flixel.math.FlxMath;
import flixel.text.FlxText;
import flixel.util.FlxColor;
import lime.utils.Assets;
import ui.Alphabet;
import game.SongLoader;
import toolbox.StageMakingState;
import game.Highscore;
import openfl.utils.Assets as OpenFLAssets;
import openfl.utils.Assets;

using utilities.BackgroundUtil;

Expand All @@ -35,7 +14,7 @@ class OptionsMenu extends MusicBeatState {

public var inMenu = false;

public var pages:Map<String, Array<Dynamic>> = [
public var pages:Map<String, Array<Option>> = [
"Categories" => [
new PageOption("Gameplay", "Gameplay", "Test Description"),
new PageOption("Graphics", "Graphics"),
Expand Down Expand Up @@ -111,8 +90,8 @@ class OptionsMenu extends MusicBeatState {
new PageOption("Back", "Graphics"),
new DisplayFontOption("Display Font", [
"_sans",
OpenFLAssets.getFont(Paths.font("vcr.ttf")).fontName,
OpenFLAssets.getFont(Paths.font("pixel.otf")).fontName
Assets.getFont(Paths.font("vcr.ttf")).fontName,
Assets.getFont(Paths.font("pixel.otf")).fontName
],
"infoDisplayFont"),
new BoolOption("FPS Counter", "fpsCounter"),
Expand Down
Loading

0 comments on commit 32bdef4

Please sign in to comment.