Skip to content

Commit 673d334

Browse files
chore: scalafmtAll
1 parent c9f3462 commit 673d334

File tree

2 files changed

+41
-39
lines changed

2 files changed

+41
-39
lines changed

src/main/scala/abalone/Pos.scala

+36-37
Original file line numberDiff line numberDiff line change
@@ -75,23 +75,23 @@ Abalone official coordinates system and "standard start position" are drawn belo
7575
sealed trait DirectionString
7676

7777
object DirectionString {
78-
case object Left extends DirectionString
79-
case object UpLeft extends DirectionString
80-
case object UpRight extends DirectionString
81-
case object Right extends DirectionString
78+
case object Left extends DirectionString
79+
case object UpLeft extends DirectionString
80+
case object UpRight extends DirectionString
81+
case object Right extends DirectionString
8282
case object DownRight extends DirectionString
83-
case object DownLeft extends DirectionString
83+
case object DownLeft extends DirectionString
8484

8585
val all: List[DirectionString] = List(Left, UpLeft, UpRight, Right, DownRight, DownLeft)
8686
}
8787

8888
sealed trait DiagonalDirectionString
8989

9090
object DiagonalDirectionString {
91-
case object UpLeft extends DiagonalDirectionString
92-
case object UpRight extends DiagonalDirectionString
91+
case object UpLeft extends DiagonalDirectionString
92+
case object UpRight extends DiagonalDirectionString
9393
case object DownRight extends DiagonalDirectionString
94-
case object DownLeft extends DiagonalDirectionString
94+
case object DownLeft extends DiagonalDirectionString
9595

9696
val all: List[DiagonalDirectionString] = List(UpLeft, UpRight, DownRight, DownLeft)
9797
}
@@ -280,7 +280,6 @@ case class Pos private (index: Int) extends AnyVal {
280280
def officialNotationKey = s"${File(rank.index).getOrElse("")}${Rank(file.index).getOrElse("")}"
281281
override def toString = key
282282

283-
284283
private def diagonalDirectionString(dest: Pos): DiagonalDirectionString =
285284
(file.index - dest.file.index, rank.index - dest.rank.index) match {
286285
case (0, rankDiff) =>
@@ -338,74 +337,74 @@ object Pos {
338337
else None
339338

340339
def directionFromDirectionString(directionString: DirectionString): Direction = directionString match {
341-
case DirectionString.Left => _.left
342-
case DirectionString.UpLeft => _.upLeft
343-
case DirectionString.UpRight => _.upRight
344-
case DirectionString.Right => _.right
340+
case DirectionString.Left => _.left
341+
case DirectionString.UpLeft => _.upLeft
342+
case DirectionString.UpRight => _.upRight
343+
case DirectionString.Right => _.right
345344
case DirectionString.DownRight => _.downRight
346-
case DirectionString.DownLeft => _.downLeft
345+
case DirectionString.DownLeft => _.downLeft
347346
}
348347

349348
// used by valid moves generator, based on the Direction currently considered
350349
def diagonalDirectionsFromDirection(direction: Direction): Directions = {
351350
directionStringFromDirection(direction) match {
352-
case DirectionString.Left => List(_.downLeft, _.upLeft)
353-
case DirectionString.UpLeft => List(_.left, _.upRight)
354-
case DirectionString.UpRight => List(_.upLeft, _.right)
355-
case DirectionString.Right => List(_.upRight, _.downRight)
351+
case DirectionString.Left => List(_.downLeft, _.upLeft)
352+
case DirectionString.UpLeft => List(_.left, _.upRight)
353+
case DirectionString.UpRight => List(_.upLeft, _.right)
354+
case DirectionString.Right => List(_.upRight, _.downRight)
356355
case DirectionString.DownRight => List(_.right, _.downLeft)
357-
case DirectionString.DownLeft => List(_.downRight, _.left)
356+
case DirectionString.DownLeft => List(_.downRight, _.left)
358357
}
359358
}
360359

361-
def potentialLineDirsFromSideMoveDir(sideMoveDirection: Direction): Directions = {
360+
def potentialLineDirsFromSideMoveDir(sideMoveDirection: Direction): Directions = {
362361
diagonalDirectionStringFromDirection(sideMoveDirection) match {
363-
case DiagonalDirectionString.UpLeft => List(_.left, _.upLeft)
364-
case DiagonalDirectionString.UpRight => List(_.upLeft, _.upRight, _.right)
362+
case DiagonalDirectionString.UpLeft => List(_.left, _.upLeft)
363+
case DiagonalDirectionString.UpRight => List(_.upLeft, _.upRight, _.right)
365364
case DiagonalDirectionString.DownRight => List(_.right, _.downRight)
366-
case DiagonalDirectionString.DownLeft => List(_.downRight, _.downLeft, _.left)
365+
case DiagonalDirectionString.DownLeft => List(_.downRight, _.downLeft, _.left)
367366
}
368367
}
369368

370-
def potentialSideMoveDirsFromGlobalDir(globalDir: Direction): Directions = {
369+
def potentialSideMoveDirsFromGlobalDir(globalDir: Direction): Directions = {
371370
diagonalDirectionStringFromDirection(globalDir) match {
372-
case DiagonalDirectionString.UpLeft => List(_.left, _.upLeft)
373-
case DiagonalDirectionString.UpRight => List(_.upLeft, _.upRight, _.right)
371+
case DiagonalDirectionString.UpLeft => List(_.left, _.upLeft)
372+
case DiagonalDirectionString.UpRight => List(_.upLeft, _.upRight, _.right)
374373
case DiagonalDirectionString.DownRight => List(_.right, _.downRight)
375-
case DiagonalDirectionString.DownLeft => List(_.downLeft, _.left, _.downRight)
374+
case DiagonalDirectionString.DownLeft => List(_.downLeft, _.left, _.downRight)
376375
}
377376
}
378377

379378
def deducePotentialSideDirs(globalDir: Direction, lineDir: Direction): Directions = {
380379
diagonalDirectionStringFromDirection(globalDir) match {
381-
case DiagonalDirectionString.DownLeft => {
380+
case DiagonalDirectionString.DownLeft => {
382381
directionStringFromDirection(lineDir) match {
383382
case DirectionString.DownLeft => List(_.left, _.downRight)
384383
case DirectionString.DownRight => List(_.downLeft)
385384
case DirectionString.Left => List(_.downLeft)
386-
case _ => List()
385+
case _ => List()
387386
}
388387
}
389-
case DiagonalDirectionString.UpRight => {
388+
case DiagonalDirectionString.UpRight => {
390389
directionStringFromDirection(lineDir) match {
391390
case DirectionString.UpLeft => List(_.upRight)
392391
case DirectionString.UpRight => List(_.right, _.upLeft)
393-
case DirectionString.Right => List(_.upRight)
394-
case _ => List()
392+
case DirectionString.Right => List(_.upRight)
393+
case _ => List()
395394
}
396395
}
397-
case DiagonalDirectionString.UpLeft => {
396+
case DiagonalDirectionString.UpLeft => {
398397
directionStringFromDirection(lineDir) match {
399398
case DirectionString.UpLeft => List(_.left)
400-
case DirectionString.Left => List(_.upLeft)
401-
case _ => List()
399+
case DirectionString.Left => List(_.upLeft)
400+
case _ => List()
402401
}
403402
}
404403
case DiagonalDirectionString.DownRight => {
405404
directionStringFromDirection(lineDir) match {
406405
case DirectionString.DownRight => List(_.right)
407-
case DirectionString.Right => List(_.downRight)
408-
case _ => List()
406+
case DirectionString.Right => List(_.downRight)
407+
case _ => List()
409408
}
410409
}
411410
}

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,14 @@ abstract class Variant private[variant] (
364364
case direction if direction == DirectionString.UpRight || direction == DirectionString.DownLeft =>
365365
if (
366366
(orig
367-
.|<>|(square => square.index == dest.index, Pos.directionFromDirectionString(orig.directionString(dest))))
367+
.|<>|(
368+
square => square.index == dest.index,
369+
Pos.directionFromDirectionString(orig.directionString(dest))
370+
))
368371
.contains(dest)
369372
) false
370373
else true
371-
case _ => orig.rank.index != dest.rank.index && orig.file.index != dest.file.index
374+
case _ => orig.rank.index != dest.rank.index && orig.file.index != dest.file.index
372375
}
373376

374377
private def turnPieces(situation: Situation): PieceMap = situation.board.piecesOf(situation.player)

0 commit comments

Comments
 (0)