Skip to content

Commit 87b1fc9

Browse files
EliteMasterEricEliteMasterEric
committed
Renamed the new controls (I had to edit the margins to make the name fit)
1 parent bb974c2 commit 87b1fc9

File tree

3 files changed

+42
-38
lines changed

3 files changed

+42
-38
lines changed

‎source/funkin/input/Controls.hx

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ class Controls extends FlxActionSet
6767
var _freeplay_left = new FunkinAction(Action.FREEPLAY_LEFT);
6868
var _freeplay_right = new FunkinAction(Action.FREEPLAY_RIGHT);
6969
var _freeplay_char_select = new FunkinAction(Action.FREEPLAY_CHAR_SELECT);
70-
var _freeplay_top_scroll = new FunkinAction(Action.FREEPLAY_TOP_SCROLL);
71-
var _freeplay_bottom_scroll = new FunkinAction(Action.FREEPLAY_BOTTOM_SCROLL);
70+
var _freeplay_jump_to_top = new FunkinAction(Action.FREEPLAY_JUMP_TO_TOP);
71+
var _freeplay_jump_to_bottom = new FunkinAction(Action.FREEPLAY_JUMP_TO_BOTTOM);
7272
var _cutscene_advance = new FunkinAction(Action.CUTSCENE_ADVANCE);
7373
var _debug_menu = new FunkinAction(Action.DEBUG_MENU);
7474
#if FEATURE_CHART_EDITOR
@@ -278,15 +278,15 @@ class Controls extends FlxActionSet
278278
inline function get_FREEPLAY_CHAR_SELECT()
279279
return _freeplay_char_select.check();
280280

281-
public var FREEPLAY_BOTTOM_SCROLL(get, never):Bool;
281+
public var FREEPLAY_JUMP_TO_TOP(get, never):Bool;
282282

283-
inline function get_FREEPLAY_BOTTOM_SCROLL()
284-
return _freeplay_bottom_scroll.check();
283+
inline function get_FREEPLAY_JUMP_TO_TOP()
284+
return _freeplay_jump_to_top.check();
285285

286-
public var FREEPLAY_TOP_SCROLL(get, never):Bool;
286+
public var FREEPLAY_JUMP_TO_BOTTOM(get, never):Bool;
287287

288-
inline function get_FREEPLAY_TOP_SCROLL()
289-
return _freeplay_top_scroll.check();
288+
inline function get_FREEPLAY_JUMP_TO_BOTTOM()
289+
return _freeplay_jump_to_bottom.check();
290290

291291
public var CUTSCENE_ADVANCE(get, never):Bool;
292292

@@ -349,8 +349,8 @@ class Controls extends FlxActionSet
349349
add(_freeplay_left);
350350
add(_freeplay_right);
351351
add(_freeplay_char_select);
352-
add(_freeplay_bottom_scroll);
353-
add(_freeplay_top_scroll);
352+
add(_freeplay_jump_to_top);
353+
add(_freeplay_jump_to_bottom);
354354
add(_cutscene_advance);
355355
add(_debug_menu);
356356
#if FEATURE_CHART_EDITOR add(_debug_chart); #end
@@ -476,8 +476,8 @@ class Controls extends FlxActionSet
476476
case FREEPLAY_LEFT: _freeplay_left;
477477
case FREEPLAY_RIGHT: _freeplay_right;
478478
case FREEPLAY_CHAR_SELECT: _freeplay_char_select;
479-
case FREEPLAY_BOTTOM_SCROLL: _freeplay_bottom_scroll;
480-
case FREEPLAY_TOP_SCROLL: _freeplay_top_scroll;
479+
case FREEPLAY_JUMP_TO_TOP: _freeplay_jump_to_top;
480+
case FREEPLAY_JUMP_TO_BOTTOM: _freeplay_jump_to_bottom;
481481
case CUTSCENE_ADVANCE: _cutscene_advance;
482482
case DEBUG_MENU: _debug_menu;
483483
#if FEATURE_CHART_EDITOR case DEBUG_CHART: _debug_chart; #end
@@ -558,10 +558,10 @@ class Controls extends FlxActionSet
558558
func(_freeplay_right, JUST_PRESSED);
559559
case FREEPLAY_CHAR_SELECT:
560560
func(_freeplay_char_select, JUST_PRESSED);
561-
case FREEPLAY_BOTTOM_SCROLL:
562-
func(_freeplay_bottom_scroll, JUST_PRESSED);
563-
case FREEPLAY_TOP_SCROLL:
564-
func(_freeplay_top_scroll, JUST_PRESSED);
561+
case FREEPLAY_JUMP_TO_TOP:
562+
func(_freeplay_jump_to_top, JUST_PRESSED);
563+
case FREEPLAY_JUMP_TO_BOTTOM:
564+
func(_freeplay_jump_to_bottom, JUST_PRESSED);
565565
case CUTSCENE_ADVANCE:
566566
func(_cutscene_advance, JUST_PRESSED);
567567
case DEBUG_MENU:
@@ -790,8 +790,8 @@ class Controls extends FlxActionSet
790790
bindKeys(Control.FREEPLAY_LEFT, getDefaultKeybinds(scheme, Control.FREEPLAY_LEFT));
791791
bindKeys(Control.FREEPLAY_RIGHT, getDefaultKeybinds(scheme, Control.FREEPLAY_RIGHT));
792792
bindKeys(Control.FREEPLAY_CHAR_SELECT, getDefaultKeybinds(scheme, Control.FREEPLAY_CHAR_SELECT));
793-
bindKeys(Control.FREEPLAY_BOTTOM_SCROLL, getDefaultKeybinds(scheme, Control.FREEPLAY_BOTTOM_SCROLL));
794-
bindKeys(Control.FREEPLAY_TOP_SCROLL, getDefaultKeybinds(scheme, Control.FREEPLAY_TOP_SCROLL));
793+
bindKeys(Control.FREEPLAY_JUMP_TO_TOP, getDefaultKeybinds(scheme, Control.FREEPLAY_JUMP_TO_TOP));
794+
bindKeys(Control.FREEPLAY_JUMP_TO_BOTTOM, getDefaultKeybinds(scheme, Control.FREEPLAY_JUMP_TO_BOTTOM));
795795
bindKeys(Control.CUTSCENE_ADVANCE, getDefaultKeybinds(scheme, Control.CUTSCENE_ADVANCE));
796796
bindKeys(Control.DEBUG_MENU, getDefaultKeybinds(scheme, Control.DEBUG_MENU));
797797
#if FEATURE_CHART_EDITOR
@@ -832,8 +832,8 @@ class Controls extends FlxActionSet
832832
case Control.FREEPLAY_LEFT: return [Q]; // Switch tabs on the menu
833833
case Control.FREEPLAY_RIGHT: return [E]; // Switch tabs on the menu
834834
case Control.FREEPLAY_CHAR_SELECT: return [TAB];
835-
case Control.FREEPLAY_BOTTOM_SCROLL: return [END];
836-
case Control.FREEPLAY_TOP_SCROLL: return [HOME];
835+
case Control.FREEPLAY_JUMP_TO_TOP: return [HOME];
836+
case Control.FREEPLAY_JUMP_TO_BOTTOM: return [END];
837837
case Control.CUTSCENE_ADVANCE: return [Z, ENTER];
838838
case Control.DEBUG_MENU: return [GRAVEACCENT];
839839
#if FEATURE_CHART_EDITOR case Control.DEBUG_CHART: return []; #end
@@ -863,8 +863,8 @@ class Controls extends FlxActionSet
863863
case Control.FREEPLAY_LEFT: return [Q]; // Switch tabs on the menu
864864
case Control.FREEPLAY_RIGHT: return [E]; // Switch tabs on the menu
865865
case Control.FREEPLAY_CHAR_SELECT: return [TAB];
866-
case Control.FREEPLAY_BOTTOM_SCROLL: return [END];
867-
case Control.FREEPLAY_TOP_SCROLL: return [HOME];
866+
case Control.FREEPLAY_JUMP_TO_TOP: return [HOME];
867+
case Control.FREEPLAY_JUMP_TO_BOTTOM: return [END];
868868
case Control.CUTSCENE_ADVANCE: return [G, Z];
869869
case Control.DEBUG_MENU: return [GRAVEACCENT];
870870
#if FEATURE_CHART_EDITOR case Control.DEBUG_CHART: return []; #end
@@ -894,8 +894,8 @@ class Controls extends FlxActionSet
894894
case Control.FREEPLAY_LEFT: return [];
895895
case Control.FREEPLAY_RIGHT: return [];
896896
case Control.FREEPLAY_CHAR_SELECT: return [];
897-
case Control.FREEPLAY_BOTTOM_SCROLL: return [];
898-
case Control.FREEPLAY_TOP_SCROLL: return [];
897+
case Control.FREEPLAY_JUMP_TO_TOP: return [];
898+
case Control.FREEPLAY_JUMP_TO_BOTTOM: return [];
899899
case Control.CUTSCENE_ADVANCE: return [ENTER];
900900
case Control.DEBUG_MENU: return [];
901901
#if FEATURE_CHART_EDITOR case Control.DEBUG_CHART: return []; #end
@@ -1012,8 +1012,8 @@ class Controls extends FlxActionSet
10121012
Control.FREEPLAY_LEFT => getDefaultGamepadBinds(Control.FREEPLAY_LEFT),
10131013
Control.FREEPLAY_RIGHT => getDefaultGamepadBinds(Control.FREEPLAY_RIGHT),
10141014
Control.FREEPLAY_CHAR_SELECT => getDefaultGamepadBinds(Control.FREEPLAY_CHAR_SELECT),
1015-
Control.FREEPLAY_BOTTOM_SCROLL => getDefaultGamepadBinds(Control.FREEPLAY_BOTTOM_SCROLL),
1016-
Control.FREEPLAY_TOP_SCROLL => getDefaultGamepadBinds(Control.FREEPLAY_TOP_SCROLL),
1015+
Control.FREEPLAY_JUMP_TO_TOP => getDefaultGamepadBinds(Control.FREEPLAY_JUMP_TO_TOP),
1016+
Control.FREEPLAY_JUMP_TO_BOTTOM => getDefaultGamepadBinds(Control.FREEPLAY_JUMP_TO_BOTTOM),
10171017
Control.VOLUME_UP => getDefaultGamepadBinds(Control.VOLUME_UP),
10181018
Control.VOLUME_DOWN => getDefaultGamepadBinds(Control.VOLUME_DOWN),
10191019
Control.VOLUME_MUTE => getDefaultGamepadBinds(Control.VOLUME_MUTE),
@@ -1071,9 +1071,9 @@ class Controls extends FlxActionSet
10711071
return [RIGHT_SHOULDER];
10721072
case Control.FREEPLAY_CHAR_SELECT:
10731073
return [X];
1074-
case Control.FREEPLAY_BOTTOM_SCROLL:
1074+
case Control.FREEPLAY_JUMP_TO_TOP:
10751075
return [];
1076-
case Control.FREEPLAY_TOP_SCROLL:
1076+
case Control.FREEPLAY_JUMP_TO_BOTTOM:
10771077
return [];
10781078
case Control.VOLUME_UP:
10791079
[];
@@ -1654,8 +1654,8 @@ enum Control
16541654
FREEPLAY_LEFT;
16551655
FREEPLAY_RIGHT;
16561656
FREEPLAY_CHAR_SELECT;
1657-
FREEPLAY_BOTTOM_SCROLL;
1658-
FREEPLAY_TOP_SCROLL;
1657+
FREEPLAY_JUMP_TO_TOP;
1658+
FREEPLAY_JUMP_TO_BOTTOM;
16591659
// WINDOW
16601660
#if FEATURE_SCREENSHOTS WINDOW_SCREENSHOT; #end
16611661
WINDOW_FULLSCREEN;
@@ -1713,8 +1713,8 @@ enum abstract Action(String) to String from String
17131713
var FREEPLAY_LEFT = "freeplay_left";
17141714
var FREEPLAY_RIGHT = "freeplay_right";
17151715
var FREEPLAY_CHAR_SELECT = "freeplay_char_select";
1716-
var FREEPLAY_BOTTOM_SCROLL = "freeplay_bottom_scroll";
1717-
var FREEPLAY_TOP_SCROLL = "freeplay_top_scroll";
1716+
var FREEPLAY_JUMP_TO_TOP = "freeplay_jump_to_top";
1717+
var FREEPLAY_JUMP_TO_BOTTOM = "freeplay_jump_to_bottom";
17181718
// VOLUME
17191719
var VOLUME_UP = "volume_up";
17201720
var VOLUME_DOWN = "volume_down";

‎source/funkin/ui/freeplay/FreeplayState.hx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,14 +1400,14 @@ class FreeplayState extends MusicBeatSubState
14001400
}
14011401
}
14021402

1403-
if (controls.FREEPLAY_BOTTOM_SCROLL && !busy)
1403+
if (controls.FREEPLAY_JUMP_TO_TOP && !busy)
14041404
{
1405-
changeSelection(grpCapsules.countLiving() - curSelected - 1);
1405+
changeSelection(-curSelected);
14061406
}
14071407

1408-
if (controls.FREEPLAY_TOP_SCROLL && !busy)
1408+
if (controls.FREEPLAY_JUMP_TO_BOTTOM && !busy)
14091409
{
1410-
changeSelection(-curSelected);
1410+
changeSelection(grpCapsules.countLiving() - curSelected - 1);
14111411
}
14121412

14131413
lerpScore = MathUtil.smoothLerp(lerpScore, intendedScore, elapsed, 0.5);

‎source/funkin/ui/options/ControlsMenu.hx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ class ControlsMenu extends funkin.ui.options.OptionsState.Page
5050
var currentDevice:Device = Keys;
5151
var deviceListSelected:Bool = false;
5252

53+
static final CONTROL_BASE_X = 50;
54+
static final CONTROL_MARGIN_X = 700;
55+
static final CONTROL_SPACING_X = 300;
56+
5357
public function new()
5458
{
5559
super();
@@ -142,10 +146,10 @@ class ControlsMenu extends funkin.ui.options.OptionsState.Page
142146
if (currentHeader != null && name.indexOf(currentHeader) == 0) name = name.substr(currentHeader.length);
143147

144148
var formatName = name.replace('_', ' ');
145-
var label = labels.add(new AtlasText(100, y, formatName, AtlasFont.BOLD));
149+
var label = labels.add(new AtlasText(CONTROL_BASE_X, y, formatName, AtlasFont.BOLD));
146150
label.alpha = 0.6;
147151
for (i in 0...COLUMNS)
148-
createItem(label.x + 550 + i * 400, y, control, i);
152+
createItem(label.x + CONTROL_MARGIN_X + i * CONTROL_SPACING_X, y, control, i);
149153

150154
y += spacer;
151155
}

0 commit comments

Comments
 (0)