Merge pull request #39 from Mind-Sports-Games/442-backgammon

fix active dice values now that dice can be in any order

Author: JamesHeppell

package.json

@@ -1,6 +1,6 @@
 {
   "name": "chessground",
-  "version": "7.11.1-pstrat2.39",
+  "version": "7.11.1-pstrat2.40",
   "description": "playstrategy.org chess ui, forked from lichess.org",
   "type": "commonjs",
   "main": "chessground.js",

src/drop.ts

@@ -48,7 +48,8 @@ export function drop(s: State, e: cg.MouchEvent): void {
 }
 
 function dropFromPocket(s: State, role: cg.Role): void {
-  const activeDiceValue = s.dice.length > 0 && s.dice[0].isAvailable ? s.dice[0].value : undefined;
+  const activeDiceValue =
+    s.dice.filter(d => d.isAvailable).length > 0 ? s.dice.filter(d => d.isAvailable)[0].value : undefined;
   const activeDiceKey = activeDiceValue
     ? util.pos2key([s.dimensions.width + 1 - activeDiceValue, s.myPlayerIndex === 'p1' ? 2 : 1])
     : undefined;

src/events.ts

@@ -118,7 +118,8 @@ function startDragOrDraw(s: State): MouchBind {
             const isLiftDest =
               s.liftable.liftDests && s.liftable.liftDests.length > 0 && s.liftable.liftDests.includes(orig);
             const hasMovableDest = s.movable.dests && s.movable.dests.has(orig);
-            const activeDiceValue = s.dice.length > 0 && s.dice[0].isAvailable ? s.dice[0].value : undefined;
+            const activeDiceValue =
+              s.dice.filter(d => d.isAvailable).length > 0 ? s.dice.filter(d => d.isAvailable)[0].value : undefined;
             //if a piece can both lift and move then use dice to decide what todo on a single click?
             if (piece && piece.playerIndex === s.turnPlayerIndex && hasMovableDest) {
               const dest = s.movable.dests!.get(orig)![0];