Skip to content

Input Moves With Keyboard to Include Berserk #14492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 18, 2024
Merged

Input Moves With Keyboard to Include Berserk #14492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f3a1b28
Added berserk keyboard shortcut
Carbrex Jan 17, 2024
7775fa4
Berserk test and formatting
Carbrex Jan 17, 2024
2b8d2d3
Fixed keyboardMove test for berserk
Carbrex Jan 17, 2024
37e9bf0
Merge branch 'lichess-org:master' into patch-5
Carbrex Jan 17, 2024
0b9153f
Removed unnecessary comment
Carbrex Jan 18, 2024
794ed68
Merge branch 'lichess-org:master' into patch-5
Carbrex Jan 18, 2024
35704d3
Added condition for playing berserk sound
Carbrex Jan 18, 2024
234e520
Fixed berserk sound playing even when round doesn't support berserk
Carbrex Jan 18, 2024
941e86d
Fixed berserk sound playing even when round doesn't support berserk
Carbrex Jan 18, 2024
ec04be2
Merge remote-tracking branch 'refs/remotes/origin/patch-5' into patch-5
Carbrex Jan 18, 2024
51e6d6b
Fixed formatting
Carbrex Jan 18, 2024
59c0e3c
remove unused functions
ornicar Jan 18, 2024
f1a78de
Merge branch 'patch-5' of https://github.com/Carbrex/lila into patch-5
ornicar Jan 18, 2024
5bb8862
mirror the keyboardMove optional functions
ornicar Jan 18, 2024
850ba07
check that keyboard functions are available during parsing
ornicar Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/views/site/help.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ object help:
row(kbd("who"), readOutOpponentName()),
row(kbd("draw"), offerOrAcceptDraw()),
row(kbd("resign"), trans.resignTheGame()),
row(kbd("zerk"), trans.arena.berserk()),
row(kbd("next"), trans.puzzle.nextPuzzle()),
row(kbd("upv"), trans.puzzle.upVote()),
row(kbd("downv"), trans.puzzle.downVote()),
Expand Down
1 change: 1 addition & 0 deletions ui/chess/src/moveRootCtrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export interface MoveRootCtrl {
solve?: () => void;
blindfold?: (v?: boolean) => boolean;
speakClock?: () => void;
goBerserk?: () => void;
}

export interface MoveUpdate {
Expand Down
6 changes: 4 additions & 2 deletions ui/keyboardMove/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ export interface KeyboardMove {
helpModalOpen: Prop<boolean>;
checker?: KeyboardChecker;
opponent?: string;
speakClock(): void;
speakClock?: () => void;
goBerserk?: () => void;
}

const sanToRole: { [key: string]: cg.Role } = {
Expand Down Expand Up @@ -135,7 +136,8 @@ export function ctrl(root: KeyboardMoveRootCtrl): KeyboardMove {
isFocused,
checker: root.speakClock ? new KeyboardChecker() : undefined,
opponent: root.data.opponent?.user?.username,
speakClock: () => root.speakClock?.(),
speakClock: root.speakClock,
goBerserk: root.goBerserk,
};
}

Expand Down
17 changes: 17 additions & 0 deletions ui/keyboardMove/src/plugins/keyboardMove.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const unexpectedErrorThrower = (name: string) => () => {
};
const defaultCtrl = {
speakClock: unexpectedErrorThrower('clock'),
goBerserk: unexpectedErrorThrower('berserk'),
confirmMove: () => null,
draw: unexpectedErrorThrower('draw'),
next: unexpectedErrorThrower('next'),
Expand Down Expand Up @@ -149,6 +150,22 @@ describe('keyboardMove', () => {
expect(input.value).toBe('');
});

test('berserks a game', () => {
input.value = 'zerk';
const goBerserk = jest.fn();
const keyboardMovePlugin = keyboardMove({
input,
ctrl: {
...defaultCtrl,
goBerserk,
},
}) as any;

keyboardMovePlugin(startingFen, toMap({}), true);
expect(goBerserk.mock.calls.length).toBe(1);
expect(input.value).toBe('');
});

test('opens help modal with ?', () => {
input.value = '?';
const mockSetHelpModalOpen = jest.fn();
Expand Down
9 changes: 7 additions & 2 deletions ui/keyboardMove/src/plugins/keyboardMove.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,14 @@ export function initModule(opts: Opts) {
opts.ctrl.drop(v.slice(2) as Key, v[0].toUpperCase());
clear();
}
} else if (v.length > 0 && 'clock'.startsWith(v.toLowerCase())) {
} else if (v.length > 0 && 'clock'.startsWith(v.toLowerCase()) && opts.ctrl.speakClock) {
if ('clock' === v.toLowerCase()) {
opts.ctrl?.speakClock();
opts.ctrl.speakClock();
clear();
}
} else if (v.length > 0 && 'zerk'.startsWith(v.toLowerCase()) && opts.ctrl.goBerserk) {
if ('zerk' === v.toLowerCase()) {
opts.ctrl.goBerserk();
clear();
}
} else if (v.length > 0 && 'who'.startsWith(v.toLowerCase())) {
Expand Down
2 changes: 2 additions & 0 deletions ui/round/src/ctrl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,8 @@ export default class RoundController implements MoveRootCtrl {
};

goBerserk = () => {
if (!game.berserkableBy(this.data)) return;
if (this.goneBerserk[this.data.player.color]) return;
this.socket.berserk();
lichess.sound.play('berserk');
};
Expand Down