mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-11-30 18:53:35 +00:00
Merge pull request #288 from PKPenguin321/controls-options
Very rudimentary options UI for controls changes
This commit is contained in:
commit
85041ad157
|
@ -22,7 +22,7 @@ class MainMenuState extends MusicBeatState
|
||||||
var menuItems:FlxTypedGroup<FlxSprite>;
|
var menuItems:FlxTypedGroup<FlxSprite>;
|
||||||
|
|
||||||
#if !switch
|
#if !switch
|
||||||
var optionShit:Array<String> = ['story mode', 'freeplay', 'donate'];
|
var optionShit:Array<String> = ['story mode', 'freeplay', 'donate', 'options'];
|
||||||
#else
|
#else
|
||||||
var optionShit:Array<String> = ['story mode', 'freeplay'];
|
var optionShit:Array<String> = ['story mode', 'freeplay'];
|
||||||
#end
|
#end
|
||||||
|
|
|
@ -1,14 +1,29 @@
|
||||||
package;
|
package;
|
||||||
|
|
||||||
|
import flash.text.TextField;
|
||||||
import flixel.FlxG;
|
import flixel.FlxG;
|
||||||
import flixel.FlxSprite;
|
import flixel.FlxSprite;
|
||||||
|
import flixel.addons.display.FlxGridOverlay;
|
||||||
|
import flixel.group.FlxGroup.FlxTypedGroup;
|
||||||
|
import flixel.math.FlxMath;
|
||||||
|
import flixel.text.FlxText;
|
||||||
import flixel.util.FlxColor;
|
import flixel.util.FlxColor;
|
||||||
|
import lime.utils.Assets;
|
||||||
|
|
||||||
class OptionsMenu extends MusicBeatState
|
class OptionsMenu extends MusicBeatState
|
||||||
{
|
{
|
||||||
|
|
||||||
|
var selector:FlxText;
|
||||||
|
var curSelected:Int = 0;
|
||||||
|
|
||||||
|
var controlsStrings:Array<String> = [];
|
||||||
|
|
||||||
|
private var grpControls:FlxTypedGroup<Alphabet>;
|
||||||
|
|
||||||
override function create()
|
override function create()
|
||||||
{
|
{
|
||||||
var menuBG:FlxSprite = new FlxSprite().loadGraphic('assets/images/menuDesat.png');
|
var menuBG:FlxSprite = new FlxSprite().loadGraphic('assets/images/menuDesat.png');
|
||||||
|
controlsStrings = CoolUtil.coolTextFile('assets/data/controls.txt');
|
||||||
menuBG.color = 0xFFea71fd;
|
menuBG.color = 0xFFea71fd;
|
||||||
menuBG.setGraphicSize(Std.int(menuBG.width * 1.1));
|
menuBG.setGraphicSize(Std.int(menuBG.width * 1.1));
|
||||||
menuBG.updateHitbox();
|
menuBG.updateHitbox();
|
||||||
|
@ -16,14 +31,69 @@ class OptionsMenu extends MusicBeatState
|
||||||
menuBG.antialiasing = true;
|
menuBG.antialiasing = true;
|
||||||
add(menuBG);
|
add(menuBG);
|
||||||
|
|
||||||
|
grpControls = new FlxTypedGroup<Alphabet>();
|
||||||
|
add(grpControls);
|
||||||
|
|
||||||
|
for (i in 0...controlsStrings.length)
|
||||||
|
{
|
||||||
|
if(controlsStrings[i].indexOf('set') != -1){
|
||||||
|
var controlLabel:Alphabet = new Alphabet(0, (70 * i) + 30, controlsStrings[i].substring(3)+': '+controlsStrings[i+1], true, false);
|
||||||
|
controlLabel.isMenuItem = true;
|
||||||
|
controlLabel.targetY = i;
|
||||||
|
grpControls.add(controlLabel);
|
||||||
|
}
|
||||||
|
// DONT PUT X IN THE FIRST PARAMETER OF new ALPHABET() !!
|
||||||
|
}
|
||||||
|
|
||||||
super.create();
|
super.create();
|
||||||
}
|
}
|
||||||
|
|
||||||
override function update(elapsed:Float)
|
override function update(elapsed:Float)
|
||||||
{
|
{
|
||||||
|
super.update(elapsed);
|
||||||
|
|
||||||
if (controls.BACK)
|
if (controls.BACK)
|
||||||
FlxG.switchState(new MainMenuState());
|
FlxG.switchState(new MainMenuState());
|
||||||
|
if(controls.UP_P)
|
||||||
super.update(elapsed);
|
changeSelection(-1);
|
||||||
|
if(controls.DOWN_P)
|
||||||
|
changeSelection(1);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function changeSelection(change:Int = 0)
|
||||||
|
{
|
||||||
|
#if !switch
|
||||||
|
NGio.logEvent('Fresh');
|
||||||
|
#end
|
||||||
|
|
||||||
|
FlxG.sound.play('assets/sounds/scrollMenu' + TitleState.soundExt, 0.4);
|
||||||
|
|
||||||
|
curSelected += change;
|
||||||
|
|
||||||
|
if (curSelected < 0)
|
||||||
|
curSelected = controlsStrings.length - 1;
|
||||||
|
if (curSelected >= controlsStrings.length)
|
||||||
|
curSelected = 0;
|
||||||
|
|
||||||
|
// selector.y = (70 * curSelected) + 30;
|
||||||
|
|
||||||
|
var bullShit:Int = 0;
|
||||||
|
|
||||||
|
for (item in grpControls.members)
|
||||||
|
{
|
||||||
|
item.targetY = bullShit - curSelected;
|
||||||
|
bullShit++;
|
||||||
|
|
||||||
|
item.alpha = 0.6;
|
||||||
|
// item.setGraphicSize(Std.int(item.width * 0.8));
|
||||||
|
|
||||||
|
if (item.targetY == 0)
|
||||||
|
{
|
||||||
|
item.alpha = 1;
|
||||||
|
// item.setGraphicSize(Std.int(item.width));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue