Rename NoteDPad controls scheme to Arrows
my bad
This commit is contained in:
@@ -461,7 +461,7 @@ class Preferences
|
||||
|
||||
static function get_controlsScheme():String
|
||||
{
|
||||
return Save?.instance?.mobileOptions?.controlsScheme ?? FunkinHitboxControlSchemes.NoteDPad;
|
||||
return Save?.instance?.mobileOptions?.controlsScheme ?? FunkinHitboxControlSchemes.Arrows;
|
||||
}
|
||||
|
||||
static function set_controlsScheme(value:String):String
|
||||
|
||||
@@ -301,7 +301,7 @@ enum abstract FunkinHitboxControlSchemes(String) from String to String
|
||||
final DoubleThumbTriangle = 'doubleThumbTriangle';
|
||||
final DoubleThumbSquare = 'doubleThumbSquare';
|
||||
final DoubleThumbDPad = 'doubleThumbDPad';
|
||||
final NoteDPad = 'noteDPad';
|
||||
final Arrows = 'arrows';
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -396,7 +396,7 @@ class FunkinHitbox extends FlxTypedSpriteGroup<FunkinHint>
|
||||
add(createHintCircle(x, y, hintsNoteDirections[j % hintsNoteDirections.length], hintSize, hintsColors[j % hintsColors.length]));
|
||||
}
|
||||
}
|
||||
case FunkinHitboxControlSchemes.NoteDPad:
|
||||
case FunkinHitboxControlSchemes.Arrows:
|
||||
final hintWidth:Int = 146;
|
||||
final hintHeight:Int = 149;
|
||||
final noteSpacing:Int = 80;
|
||||
|
||||
@@ -61,8 +61,8 @@ class MobileControlsSchemeMenu extends MusicBeatSubState
|
||||
/**
|
||||
* An array of every single scheme.
|
||||
*/
|
||||
final availableSchemes:Array<String> = [
|
||||
FunkinHitboxControlSchemes.NoteDPad,
|
||||
private final availableSchemes:Array<String> = [
|
||||
FunkinHitboxControlSchemes.Arrows,
|
||||
FunkinHitboxControlSchemes.FourLanes,
|
||||
FunkinHitboxControlSchemes.DoubleThumbTriangle,
|
||||
FunkinHitboxControlSchemes.DoubleThumbSquare,
|
||||
@@ -139,7 +139,7 @@ class MobileControlsSchemeMenu extends MusicBeatSubState
|
||||
var hitboxShowcase:HitboxShowcase = new HitboxShowcase(Std.int(FlxG.width * -0.16 + (1500 * i)), 0, i, currentIndex, availableSchemes[i], onSelectHitbox);
|
||||
hitboxShowcases.add(hitboxShowcase);
|
||||
|
||||
if (availableSchemes[i] == FunkinHitboxControlSchemes.NoteDPad)
|
||||
if (availableSchemes[i] == FunkinHitboxControlSchemes.Arrows)
|
||||
{
|
||||
hitboxShowcases.members[i].createOption("Downscroll", Preferences.downscroll, function(value:Bool) {
|
||||
Preferences.downscroll = value;
|
||||
@@ -216,7 +216,7 @@ class MobileControlsSchemeMenu extends MusicBeatSubState
|
||||
|
||||
addHitbox(true, false, availableSchemes[currentIndex]);
|
||||
|
||||
if (Preferences.controlsScheme == FunkinHitboxControlSchemes.NoteDPad)
|
||||
if (Preferences.controlsScheme == FunkinHitboxControlSchemes.Arrows)
|
||||
{
|
||||
hitbox.forEachAlive(function(hint:FunkinHint):Void {
|
||||
hint.alpha = 1;
|
||||
|
||||
@@ -730,7 +730,7 @@ class PlayState extends MusicBeatSubState
|
||||
// Initialize the hitbox for mobile controls
|
||||
addHitbox(false);
|
||||
|
||||
if (Preferences.controlsScheme == FunkinHitboxControlSchemes.NoteDPad)
|
||||
if (Preferences.controlsScheme == FunkinHitboxControlSchemes.Arrows)
|
||||
{
|
||||
for (direction in Strumline.DIRECTIONS)
|
||||
{
|
||||
@@ -1907,7 +1907,7 @@ class PlayState extends MusicBeatSubState
|
||||
opponentStrumline.cameras = [camHUD];
|
||||
|
||||
#if mobile
|
||||
if (Preferences.controlsScheme == FunkinHitboxControlSchemes.NoteDPad)
|
||||
if (Preferences.controlsScheme == FunkinHitboxControlSchemes.Arrows)
|
||||
{
|
||||
initNoteHitbox();
|
||||
}
|
||||
|
||||
@@ -2,9 +2,6 @@ package funkin.save;
|
||||
|
||||
import flixel.util.FlxSave;
|
||||
import funkin.input.Controls.Device;
|
||||
#if mobile
|
||||
import funkin.mobile.ui.FunkinHitbox;
|
||||
#end
|
||||
import funkin.play.scoring.Scoring;
|
||||
import funkin.play.scoring.Scoring.ScoringRank;
|
||||
import funkin.save.migrator.RawSaveData_v1_0_0;
|
||||
@@ -151,14 +148,13 @@ class Save
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
#if mobile
|
||||
mobileOptions:
|
||||
{
|
||||
// Reasonable defaults.
|
||||
screenTimeout: false,
|
||||
vibration: true,
|
||||
controlsScheme: FunkinHitboxControlSchemes.NoteDPad
|
||||
controlsScheme: FunkinHitboxControlSchemes.Arrows
|
||||
},
|
||||
#end
|
||||
|
||||
@@ -663,9 +659,6 @@ class Save
|
||||
|
||||
public function hasBeatenLevel(levelId:String, ?difficultyList:Array<String>):Bool
|
||||
{
|
||||
// need it for testing (REMOVE IT ON RELEASE)
|
||||
return true;
|
||||
|
||||
if (difficultyList == null)
|
||||
{
|
||||
difficultyList = ['easy', 'normal', 'hard'];
|
||||
@@ -1514,8 +1507,8 @@ typedef SaveDataMobileOptions =
|
||||
var vibration:Bool;
|
||||
|
||||
/**
|
||||
* Controls scheme for the hitbox.
|
||||
* @default `fourLanes`
|
||||
* Controls scheme for mobile.
|
||||
* @default `Arrows`
|
||||
*/
|
||||
var controlsScheme:String;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user