chore: codestyle Variant.piecesAfterAction

use match case when working with Option: not using get anymore, when possible

Author: vincentfrochot

src/main/scala/abalone/format/Forsyth.scala

@@ -88,7 +88,7 @@ object Forsyth {
       empty = 0
       for (x <- File.all) {
         board(x, y) match {
-          case None        => if(Pos.fromKey(s"${x.toString}${y.toString}").isDefined) empty = empty + 1
+          case None        => if(Pos(x, y).isDefined) empty = empty + 1
           case Some(piece) =>
             if (empty > 0) {
               fen.append(empty)

src/main/scala/abalone/variant/Variant.scala

@@ -223,36 +223,38 @@ abstract class Variant private[variant] (
             - 2nd direction : we know what direction we want to apply to all these 2 or 3 marbles
   */
   private def piecesAfterAction(pieces: PieceMap, orig: Pos, dest: Pos, directions: Directions): (PieceMap) = {
-    val lineDir: Option[Direction] = directions.headOption
-    val sideDir: Option[Direction] = directions.reverse.headOption
-    val origLineMove: Option[Pos] = lineDir.map((direction) => direction(orig).get)
-    val origSideMove: Option[Pos] = sideDir.map((direction) => direction(orig).get)
-    val diagonalMove: Option[Pos] = (lineDir, origSideMove) match {
+    val lineDir: Option[Direction]    = directions.headOption
+    val sideDir: Option[Direction]    = directions.reverse.headOption
+    val origLineMove: Option[Pos]     = lineDir.flatMap(direction => direction(orig))
+    val origSideMove: Option[Pos]     = sideDir.flatMap(direction => direction(orig))
+    val destLineMove: Option[Pos]     = lineDir.flatMap(direction => direction(dest))
+    val destLineOneMove: Option[Pos]  = lineDir.flatMap(direction => if (destLineMove.isDefined) direction(destLineMove.get) else None)
+    val destLineTwoMove: Option[Pos]  = lineDir.flatMap(direction => if (destLineOneMove.isDefined) direction(destLineOneMove.get) else None)
+    val origDiagonalMove: Option[Pos] = (lineDir, origSideMove) match {
       case ( Some(lineDir), Some(sideMove) ) => lineDir.apply(sideMove)
       case _ => None
     }
 
     if (directions.size == 0) // line move
       pieces + (dest -> pieces(orig)) - (orig)
     else if (directions.size == 1) // push
-      if(directions(0)(dest) == None) // __(_)o\
-        pieces + (dest -> pieces(orig)) - orig
-      else if (!pieces.contains(directions(0)(dest).get)) // __(_)o.
-        pieces + (directions(0)(dest).get -> pieces(dest)) + (dest -> pieces(orig)) - orig
-      else if (directions(0)((directions(0)(dest)).get) == None) // ___oo\
-        pieces + ((directions(0)(dest)).get -> pieces(dest)) + (dest -> pieces(orig)) - orig
-      else // ___oo.
-        pieces + (directions(0)((directions(0)(dest)).get).get -> pieces(dest)) + (dest -> pieces(orig)) - orig
+      ( destLineMove, destLineOneMove, destLineTwoMove ) match {
+        case ( (None, _, _) ) => pieces + (dest -> pieces(orig)) - orig // __(_)o\
+        case ( (Some(destLinePos), _, _) ) if (!pieces.contains(destLinePos)) => pieces + (destLinePos -> pieces(dest)) + (dest -> pieces(orig)) - orig // __(_)o.
+        case ( (Some(destLinePos), None, _) ) => pieces + (destLinePos -> pieces(dest)) + (dest -> pieces(orig)) - orig // ___oo\
+        case ( (_, _, Some(desLineTwoPos)) ) => pieces + (desLineTwoPos -> pieces(dest)) + (dest -> pieces(orig)) - orig // ___oo.
+        case ( _ ) => pieces
+      }
     else // side move
-      (origLineMove, origSideMove, diagonalMove)  match {
+      (origLineMove, origSideMove, origDiagonalMove)  match {
         case ( Some(lineMovePos), Some(sideMovePos), Some(diagonalPos) ) =>
           if (diagonalPos.index == dest.index) // oo
             pieces + (sideMovePos -> pieces(orig)) - orig +
               (diagonalPos -> pieces(lineMovePos)) - lineMovePos
           else // ooo
             pieces + (sideMovePos -> pieces(orig)) - orig +
               (diagonalPos -> pieces(lineMovePos)) - lineMovePos +
-              (directions(1)(lineMovePos).get -> pieces(lineMovePos)) - diagonalPos
+              (diagonalPos -> pieces(lineMovePos)) - diagonalPos
         case _ => pieces
       }
   }