Skip to content

Commit 57064e9

Browse files
committed
add analog scroll and isolate up down to own statement for dpad
1 parent 9f9f47d commit 57064e9

File tree

1 file changed

+33
-10
lines changed

1 file changed

+33
-10
lines changed

frontend/js/index.js

+33-10
Original file line numberDiff line numberDiff line change
@@ -555,24 +555,46 @@ async function rendermenu(datas) {
555555
if (window.location.hash != "#game") {
556556
gameStarted = false;
557557
if (!scrollDelay) {
558-
if ((buttonsMissing([1,3],[13])) && (gp.axes[1] > .5 || gp.axes[3] > .5 || gp.buttons[13].pressed)) {
558+
// Analog down
559+
if ((buttonsMissing([1,3],[])) && (gp.axes[1] > .5 || gp.axes[3] > .5)) {
559560
scrollDelay = setTimeout(() => scrollDelay = undefined, 200);
560-
if (gp.axes[1] >= .75 || gp.axes[3] >= .75)
561-
moveDown(5);
562-
else
563-
moveDown();
564-
} else if ((buttonsMissing([1,3],[12])) && (gp.axes[1] < -.5 || gp.axes[3] < -.5 || gp.buttons[12].pressed)) {
561+
moveDown();
562+
// Analog up
563+
} else if ((buttonsMissing([1,3],[])) && (gp.axes[1] < -.5 || gp.axes[3] < -.5)) {
565564
scrollDelay = setTimeout(() => scrollDelay = undefined, 200);
566-
if (gp.axes[1] <= -.75 || gp.axes[3] <= -.75)
567-
moveUp(5);
568-
else
569-
moveUp();
565+
moveUp();
566+
// D-pad down
567+
} else if ((buttonsMissing([],[13])) && (gp.buttons[13].pressed)) {
568+
scrollDelay = setTimeout(() => scrollDelay = undefined, 200);
569+
moveDown();
570+
// D-pad up
571+
} else if ((buttonsMissing([],[12])) && (gp.buttons[12].pressed)) {
572+
scrollDelay = setTimeout(() => scrollDelay = undefined, 200);
573+
moveUp();
574+
// R1 index down
570575
} else if ((buttonsMissing([],[5])) && (gp.buttons[5].pressed)) {
571576
scrollDelay = setTimeout(() => scrollDelay = undefined, 200);
572577
indexDown();
578+
// L1 index up
573579
} else if ((buttonsMissing([],[4])) && (gp.buttons[4].pressed)) {
574580
scrollDelay = setTimeout(() => scrollDelay = undefined, 200);
575581
indexUp();
582+
// Analog L2 scroll up by strength
583+
} else if ((buttonsMissing([],[6])) && (gp.buttons[6].pressed)) {
584+
if (gp.buttons[6].value) {
585+
scrollDelay = setTimeout(() => scrollDelay = undefined, (Math.abs(gp.buttons[6].value - 1) * 200) + 40);
586+
} else {
587+
scrollDelay = setTimeout(() => scrollDelay = undefined, 40);
588+
}
589+
moveUp();
590+
// Analog R2 scroll down by strength
591+
} else if ((buttonsMissing([],[7])) && (gp.buttons[7].pressed)) {
592+
if (gp.buttons[7].value) {
593+
scrollDelay = setTimeout(() => scrollDelay = undefined, (Math.abs(gp.buttons[7].value - 1) * 200) + 40);
594+
} else {
595+
scrollDelay = setTimeout(() => scrollDelay = undefined, 40);
596+
}
597+
moveDown();
576598
}
577599
}
578600
if (gp.timestamp == gpUpdate) {
@@ -607,6 +629,7 @@ async function rendermenu(datas) {
607629
} catch (e) {
608630
console.log(e);
609631
}
632+
// Press home button 3 times to exit game
610633
if ((buttonsMissing([],[16])) && (!gp.buttons[16].pressed && homePressed)) {
611634
home++;
612635
homePressed = false;

0 commit comments

Comments
 (0)