refactor(plugin): swap x and y coordinates

Thus the teams will be pitted left against right
rather than top vs bottom.

Author: xeruf

plugin/src/main/sc/plugin2022/Board.kt

@@ -45,7 +45,7 @@ data class Board(
      * @return number of ambers */
     fun checkAmber(position: Coordinates): Int =
             piecePositions[position]?.let { piece ->
-                arrayOf(piece.isAmber, piece.type.isLight && position.y == piece.team.opponent().startLine)
+                arrayOf(piece.isAmber, piece.type.isLight && position.x == piece.team.opponent().startLine)
                         .sumBy { if (it) 1 else 0 }
                         .also { if (it > 0) piecePositions.remove(position) }
             } ?: 0
@@ -116,8 +116,8 @@ data class Board(
                 }
 
         @JvmStatic
-        fun createField(team: ITeam, x: Int, type: PieceType) =
-                Coordinates(if (team.index == 0) x else boardrange.last - x, team.startLine) to Piece(type, team)
+        fun createField(team: ITeam, y: Int, type: PieceType) =
+                Coordinates(team.startLine, if (team.index == 0) y else boardrange.last - y) to Piece(type, team)
     }
 }
 

plugin/src/main/sc/plugin2022/Piece.kt

@@ -7,11 +7,11 @@ import sc.api.plugins.Team
 
 enum class PieceType(val char: Char, vararg val possibleMoves: Vector) {
     /** Bewegt sich nur diagonal vorwärts. */
-    Herzmuschel('H', Vector(1, 1), Vector(-1, 1)),
+    Herzmuschel('H', Vector(1, 1), Vector(1, -1)),
     /** Bewegt sich nur auf Nachbarfelder. */
     Moewe('M', *Vector.cardinals),
     /** Bewegt sich diagonal oder vorwärts. */
-    Seestern('S', *Vector.diagonals, Vector(0, 1)),
+    Seestern('S', *Vector.diagonals, Vector(1, 0)),
     /** Wie ein Springer im Schach. Einzige nicht-Leichtfigur */
     Robbe('R', *Vector.diagonals.flatMap { listOf(it.copy(dx = it.dx * 2), it.copy(dy = it.dy * 2)) }.toTypedArray());
 
@@ -32,7 +32,7 @@ data class Piece(
         @XStreamAsAttribute val count: Int = 1,
 ) {
     val possibleMoves
-        get() = type.possibleMoves.map { it.copy(dy = it.dy * team.direction) }
+        get() = type.possibleMoves.map { it.copy(dx = it.dx * team.direction) }
 
     val isAmber
         get() = count >= 3

plugin/src/test/sc/plugin2022/BoardTest.kt

@@ -9,7 +9,7 @@ import io.kotest.matchers.maps.shouldBeEmpty
 import io.kotest.matchers.maps.shouldHaveSize
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.string.shouldHaveLineCount
-import io.kotest.matchers.string.shouldNotContain
+import io.kotest.matchers.string.shouldMatch
 import sc.api.plugins.Team
 import sc.plugin2022.PieceType.*
 import sc.plugin2022.util.Constants
@@ -22,7 +22,7 @@ class BoardTest: FunSpec({
         test("does not misplace pieces") {
             generatedBoard shouldHaveSize Constants.BOARD_SIZE * 2
             generatedBoard.keys.forAll {
-                it.y shouldBeOneOf listOf(0, Constants.BOARD_SIZE - 1)
+                it.x shouldBeOneOf listOf(0, Constants.BOARD_SIZE - 1)
             }
             generatedBoard.values shouldContainExactlyInAnyOrder values().flatMap { type ->
                 Team.values().map { team ->
@@ -33,13 +33,10 @@ class BoardTest: FunSpec({
         test("is stringified apropriately") {
             val string = generatedBoard.toString()
             string shouldHaveLineCount 8
+            val lineRegex = Regex("\\w\\w------------\\w\\w")
             val lines = string.lines()
-            lines.first() shouldNotContain "-"
-            lines.last() shouldNotContain "-"
-            lines.first().reversed().toLowerCase() shouldBe lines.last()
-            lines.subList(1, 7).forAll {
-                it shouldBe "----------------"
-            }
+            lines.forAll { it shouldMatch lineRegex }
+            lines.joinToString("") { it.substring(0, 2).toLowerCase() }.reversed() shouldBe lines.joinToString("") { it.takeLast(2) }
         }
         test("clones well") {
             val board = makeBoard(0 y 0 to "R", 1 y 2 to "m")
@@ -72,33 +69,33 @@ class BoardTest: FunSpec({
         context("amber") {
             context("from position") {
                 test("not when reaching target line of opponent") {
-                    val board = makeBoard(0 y 6 to "m")
-                    board.movePiece(Move(0 y 6, 0 y 7)) shouldBe 0
+                    val board = makeBoard(6 y 0 to "m")
+                    board.movePiece(Move(6 y 0, 7 y 0)) shouldBe 0
                     board shouldHaveSize 1
                 }
                 test("moewe") {
-                    val board = makeBoard(0 y 6 to "M")
-                    board.movePiece(Move(0 y 6, 0 y 7)) shouldBe 1
+                    val board = makeBoard(6 y 0 to "M")
+                    board.movePiece(Move(6 y 0, 7 y 0)) shouldBe 1
                     board.shouldBeEmpty()
                 }
                 test("not for Robbe") {
-                    val board = makeBoard(0 y 6 to "R")
-                    board.movePiece(Move(0 y 6, 2 y 7)) shouldBe 0
+                    val board = makeBoard(6 y 0 to "R")
+                    board.movePiece(Move(6 y 0, 7 y 2)) shouldBe 0
                     board shouldHaveSize 1
                 }
             }
             context("from tower") {
-                val board = makeBoard(0 y 1 to "M", 0 y 0 to "S2", 1 y 0 to "m", 1 y 1 to "r")
+                val board = makeBoard(1 y 0 to "M", 0 y 0 to "S2", 0 y 1 to "m", 1 y 1 to "r")
                 test("not onto own") {
                     shouldThrow<InvalidMoveException> {
-                        board.movePiece(Move(0 y 0, 0 y 1))
+                        board.movePiece(Move(0 y 0, 1 y 0))
                     }.mistake shouldBe MoveMistake.DESTINATION_BLOCKED
                 }
                 test("move tower") {
                     board.movePiece(Move(0 y 0, 1 y 1)) shouldBe 1
                 }
                 test("move onto tower") {
-                    board.movePiece(Move(1 y 0, 0 y 0)) shouldBe 2
+                    board.movePiece(Move(0 y 1, 0 y 0)) shouldBe 2
                 }
             }
         }

plugin/src/test/sc/plugin2022/PieceTest.kt

@@ -23,7 +23,7 @@ class PieceTest: FunSpec({
         }
     }
     test("can't move backwards") {
-        Piece(Herzmuschel, Team.ONE).possibleMoves shouldContainExactlyInAnyOrder listOf(Vector(1, 1), Vector(-1, 1))
-        Piece(Seestern, Team.ONE).possibleMoves shouldContainExactlyInAnyOrder listOf(*Vector.diagonals, Vector(0, 1))
+        Piece(Herzmuschel, Team.ONE).possibleMoves shouldContainExactlyInAnyOrder listOf(Vector(1, -1), Vector(1, 1))
+        Piece(Seestern, Team.ONE).possibleMoves shouldContainExactlyInAnyOrder listOf(*Vector.diagonals, Vector(1, 0))
     }
 })