Merge pull request #16220 from Zinkelburger/add_checkmate_sound

Add "checkmate" sound to robot voice
lichess-org · Oct 14, 2024 · bce53c8 · bce53c8
2 parents 8c580ab + f4d2e47
commit bce53c8
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 4 deletions.
diff --git a/public/oops/sounds.html b/public/oops/sounds.html
@@ -78,6 +78,7 @@ <h1>Sound Test Page</h1>
         'draw',
         'berserk',
         'check',
+        'checkmate',
         'newChallenge',
         'newPM',
         'confirmation',

diff --git a/public/sound/futuristic/Checkmate.mp3 b/public/sound/futuristic/Checkmate.mp3
@@ -0,0 +1 @@
+Check.mp3
diff --git a/public/sound/futuristic/Checkmate.ogg b/public/sound/futuristic/Checkmate.ogg
@@ -0,0 +1 @@
+Check.ogg
diff --git a/public/sound/instrument/Checkmate.mp3 b/public/sound/instrument/Checkmate.mp3
@@ -0,0 +1 @@
+Check.mp3
diff --git a/public/sound/instrument/Checkmate.ogg b/public/sound/instrument/Checkmate.ogg
@@ -0,0 +1 @@
+Check.ogg
diff --git a/public/sound/lisp/Checkmate.mp3 b/public/sound/lisp/Checkmate.mp3
@@ -0,0 +1 @@
+Check.mp3
diff --git a/public/sound/lisp/Checkmate.ogg b/public/sound/lisp/Checkmate.ogg
@@ -0,0 +1 @@
+Check.ogg
diff --git a/public/sound/nes/Checkmate.mp3 b/public/sound/nes/Checkmate.mp3
@@ -0,0 +1 @@
+Check.mp3
diff --git a/public/sound/nes/Checkmate.ogg b/public/sound/nes/Checkmate.ogg
@@ -0,0 +1 @@
+Check.ogg
diff --git a/public/sound/piano/Checkmate.mp3 b/public/sound/piano/Checkmate.mp3
@@ -0,0 +1 @@
+Check.mp3
diff --git a/public/sound/piano/Checkmate.ogg b/public/sound/piano/Checkmate.ogg
@@ -0,0 +1 @@
+Check.ogg
diff --git a/public/sound/robot/Checkmate.mp3 b/public/sound/robot/Checkmate.mp3
diff --git a/public/sound/robot/Checkmate.ogg b/public/sound/robot/Checkmate.ogg
diff --git a/public/sound/sfx/Checkmate.mp3 b/public/sound/sfx/Checkmate.mp3
@@ -0,0 +1 @@
+Check.mp3
diff --git a/public/sound/sfx/Checkmate.ogg b/public/sound/sfx/Checkmate.ogg
@@ -0,0 +1 @@
+Check.ogg
diff --git a/public/sound/standard/Checkmate.mp3 b/public/sound/standard/Checkmate.mp3
@@ -0,0 +1 @@
+Check.mp3
diff --git a/public/sound/standard/Checkmate.ogg b/public/sound/standard/Checkmate.ogg
@@ -0,0 +1 @@
+Check.ogg
diff --git a/public/sound/woodland/Checkmate.mp3 b/public/sound/woodland/Checkmate.mp3
@@ -0,0 +1 @@
+Check.mp3
diff --git a/public/sound/woodland/Checkmate.ogg b/public/sound/woodland/Checkmate.ogg
@@ -0,0 +1 @@
+Check.ogg
diff --git a/ui/round/src/ctrl.ts b/ui/round/src/ctrl.ts
@@ -442,7 +442,11 @@ export default class RoundController implements MoveRootCtrl {
         },
         check: !!o.check,
       });
-      if (o.check) site.sound.play('check', o.volume);
+      if (o.status?.name === 'mate') {
+        site.sound.play('checkmate', o.volume);
+      } else if (o.check) {
+        site.sound.play('check', o.volume);
+      }
       blur.onMove();
       pubsub.emit('ply', this.ply);
     }

diff --git a/ui/site/src/sound.ts b/ui/site/src/sound.ts
@@ -51,7 +51,7 @@ export default new (class implements SoundI {
     if (!this.enabled()) return;
     let dir = this.theme;
     if (this.theme === 'music' || this.speech()) {
-      if (['move', 'capture', 'check'].includes(name)) return;
+      if (['move', 'capture', 'check', 'checkmate'].includes(name)) return;
       dir = 'standard';
     }
     return this.url(`${dir}/${name[0].toUpperCase() + name.slice(1)}.mp3`);
@@ -76,7 +76,11 @@ export default new (class implements SoundI {
       else {
         if (o?.san?.includes('x')) this.throttled('capture', volume);
         else this.throttled('move', volume);
-        if (o?.san?.includes('#') || o?.san?.includes('+')) this.throttled('check', volume);
+        if (o?.san?.includes('#')) {
+          this.throttled('checkmate', volume);
+        } else if (o?.san?.includes('+')) {
+          this.throttled('check', volume);
+        }
       }
     }
     if (o?.filter === 'game' || this.theme !== 'music') return;
@@ -193,7 +197,7 @@ export default new (class implements SoundI {
   }
 
   preloadBoardSounds() {
-    for (const name of ['move', 'capture', 'check', 'genericNotify']) this.load(name);
+    for (const name of ['move', 'capture', 'check', 'checkmate', 'genericNotify']) this.load(name);
   }
 
   async resumeWithTest(): Promise<boolean> {