Merge pull request lichess-org#12277 from 370417/pentatonic-puzzles

Pentatonic sound for puzzles
BurraAbhishek · Jan 29, 2023 · 258eb83 · 258eb83
2 parents 20614f0 + ab22bfc
commit 258eb83
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 72 deletions.
diff --git a/public/javascripts/music/replay.js b/public/javascripts/music/replay.js
diff --git a/ui/analyse/src/ctrl.ts b/ui/analyse/src/ctrl.ts
@@ -163,10 +163,10 @@ export default class AnalyseCtrl {
 
     lichess.pubsub.on('sound_set', (set: string) => {
       if (!this.music && set === 'music')
-        lichess.loadScript('javascripts/music/replay.js').then(() => {
-          this.music = window.lichessReplayMusic();
+        lichess.loadScript('javascripts/music/play.js').then(() => {
+          this.music = lichess.playMusic();
         });
-      if (this.music && set !== 'music') this.music = null;
+      if (this.music && set !== 'music') this.music = undefined;
     });
 
     lichess.pubsub.on('ply.trigger', () =>

diff --git a/ui/puzzle/src/ctrl.ts b/ui/puzzle/src/ctrl.ts
@@ -75,6 +75,7 @@ export default function (opts: PuzzleOpts, redraw: Redraw): Controller {
     good: loadSound('lisp/PuzzleStormGood', 0.7, 500),
     end: loadSound('lisp/PuzzleStormEnd', 1, 1000),
   };
+  let music: any;
 
   let flipped = false;
 
@@ -255,6 +256,7 @@ export default function (opts: PuzzleOpts, redraw: Redraw): Controller {
     reorderChildren(path);
     redraw();
     speech.node(node, false);
+    if (music) music.jump(node);
   }
 
   function reorderChildren(path: Tree.Path, recursive?: boolean): void {
@@ -477,6 +479,7 @@ export default function (opts: PuzzleOpts, redraw: Redraw): Controller {
     withGround(g => g.selectSquare(null));
     jump(path);
     speech.node(vm.node, true);
+    if (music) music.jump(vm.node);
   }
 
   function userJumpPlyDelta(plyDelta: Ply) {
@@ -580,6 +583,14 @@ export default function (opts: PuzzleOpts, redraw: Redraw): Controller {
 
   speech.setup();
 
+  lichess.pubsub.on('sound_set', (set: string) => {
+    if (!music && set === 'music')
+      lichess.loadScript('javascripts/music/play.js').then(() => {
+        music = lichess.playMusic();
+      });
+    if (music && set !== 'music') music = undefined;
+  });
+
   lichess.pubsub.on('zen', () => {
     const zen = $('body').toggleClass('zen').hasClass('zen');
     window.dispatchEvent(new Event('resize'));

diff --git a/ui/round/src/ctrl.ts b/ui/round/src/ctrl.ts
@@ -148,7 +148,7 @@ export default class RoundController {
       this.redraw();
     });
 
-    lichess.pubsub.on('sound_set', set => {
+    lichess.pubsub.on('sound_set', (set: string) => {
       if (!this.music && set === 'music')
         lichess.loadScript('javascripts/music/play.js').then(() => {
           this.music = lichess.playMusic();

diff --git a/ui/storm/src/ctrl.ts b/ui/storm/src/ctrl.ts
@@ -7,6 +7,7 @@ import { Clock } from 'puz/clock';
 import { Combo } from 'puz/combo';
 import { getNow, puzzlePov, sound } from 'puz/util';
 import { makeCgOpts } from 'puz/run';
+import { makeSan } from 'chessops/san';
 import { parseUci } from 'chessops/util';
 import { PromotionCtrl } from 'chess/promotion';
 import { prop, Prop } from 'common';
@@ -18,6 +19,7 @@ import { StormOpts, StormData, StormVm, StormRecap, StormPrefs } from './interfa
 export default class StormCtrl implements PuzCtrl {
   private data: StormData;
   private redraw: () => void;
+  private music?: any;
   pref: StormPrefs;
   run: Run;
   vm: StormVm;
@@ -63,6 +65,13 @@ export default class StormCtrl implements PuzCtrl {
         this.redraw();
       }
     }, config.timeToStart + 1000);
+    lichess.pubsub.on('sound_set', (set: string) => {
+      if (!this.music && set === 'music')
+        lichess.loadScript('javascripts/music/play.js').then(() => {
+          this.music = lichess.playMusic();
+        });
+      if (this.music && set !== 'music') this.music = undefined;
+    });
     lichess.pubsub.on('zen', () => {
       const zen = $('body').toggleClass('zen').hasClass('zen');
       window.dispatchEvent(new Event('resize'));
@@ -140,6 +149,7 @@ export default class StormCtrl implements PuzCtrl {
         if (this.run.clock.flag()) this.end();
         else if (!this.incPuzzle()) this.end();
       }
+      if (this.music) this.music.jump({ san: makeSan(pos, move), uci });
       this.redraw();
       this.redrawQuick();
       this.redrawSlow();