feat(plugin): randomise and check starting piece shape

Author: anarchuser

plugin/src/shared/sc/plugin2021/GameState.kt

@@ -14,7 +14,8 @@ class GameState @JvmOverloads constructor(
         override var second: Player = Player(Team.TWO),
         override var lastMove: Move? = null,
         startTurn: Int = 1,
-        val startColor: Color = Color.BLUE
+        val startColor: Color = Color.BLUE,
+        @XStreamAsAttribute val startPiece: PieceShape = GameRuleLogic.getRandomPentomino()
 ): TwoPlayerGameState<Player>(Team.ONE) {
 
     @XStreamAsAttribute

plugin/src/shared/sc/plugin2021/util/GameRuleLogic.kt

@@ -75,9 +75,8 @@ object GameRuleLogic {
                 throw InvalidMoveException("Field $it already borders on ${move.color}", move)
         }
         if (gameState.deployedPieces[move.color].isNullOrEmpty()) {
-            // TODO: Check if the piece is the predetermined pentomino
-            if (move.piece.coordinates.size < 5)
-                throw InvalidMoveException("Piece ${move.piece.kind} is not a pentomino", move)
+            if (move.piece.kind != gameState.startPiece)
+                throw InvalidMoveException("Expected the predetermined staring piece, ${gameState.startPiece}", move)
             // Check if it is placed correctly in a corner
             if (move.piece.coordinates.none { isOnCorner(it)})
                 // TODO: Add expected move to exception
@@ -123,4 +122,12 @@ object GameRuleLogic {
             Coordinates(Constants.BOARD_SIZE - 1, 0),
             Coordinates(Constants.BOARD_SIZE - 1, Constants.BOARD_SIZE - 1),
             Coordinates(0, Constants.BOARD_SIZE - 1)).contains(position)
+    
+    /** Returns a random pentomino which is not the `x` one (Used to get a valid starting piece). */
+    @JvmStatic
+    fun getRandomPentomino() =
+            PieceShape.values()
+                    .slice(9 until Constants.TOTAL_PIECE_SHAPES)
+                    .filter{ it.size == 5 && it != PieceShape.PENTO_X }
+                    .random()
 }

plugin/src/test/sc/plugin2021/GameRuleLogicTest.kt

@@ -12,7 +12,7 @@ import sc.shared.InvalidMoveException
 
 class GameRuleLogicTest: StringSpec({
     "Color validation works correctly" {
-        val gameState = GameState()
+        val gameState = GameState(startPiece = PieceShape.PENTO_U)
 
         assertThrows<InvalidMoveException> {
             val invalidMove = SetMove(Piece(Color.RED))
@@ -47,7 +47,8 @@ class GameRuleLogicTest: StringSpec({
         // PENTO_S is:   # # #
         //           : # #
         val invalidPieces = listOf(
-                Piece(Color.BLUE,   PieceShape.TETRO_O),
+                Piece(Color.GREEN,  PieceShape.TETRO_O),
+                Piece(Color.BLUE,   PieceShape.PENTO_S),
                 Piece(Color.YELLOW, PieceShape.PENTO_S, Rotation.RIGHT, position = Coordinates(Constants.BOARD_SIZE - 4, 0)),
                 Piece(Color.RED,    PieceShape.PENTO_S, position = Coordinates(13, 5)),
                 Piece(Color.GREEN,  PieceShape.PENTO_S, Rotation.LEFT, position = Coordinates(Constants.BOARD_SIZE - 2, 0)),
@@ -61,7 +62,7 @@ class GameRuleLogicTest: StringSpec({
         )
 
         assertDoesNotThrow {
-            val gameState = GameState()
+            val gameState = GameState(startPiece = PieceShape.PENTO_S)
             GameRuleLogic.performMove(gameState, SetMove(validPieces.first()))
             assertThrows<InvalidMoveException> {
                 invalidPieces.forEach {
@@ -70,11 +71,8 @@ class GameRuleLogicTest: StringSpec({
                 }
             }
         }
-        validPieces.forEach{
-            it.coordinates.print(Vector(5, 5)).also{println()}
-        }
         assertDoesNotThrow {
-            val gameState = GameState()
+            val gameState = GameState(startPiece = PieceShape.PENTO_S)
             validPieces.forEach {
                 GameRuleLogic.performMove(gameState, SetMove(it))
                 gameState.turn++

plugin/src/test/sc/plugin2021/GameStateTest.kt

@@ -45,7 +45,7 @@ class GameStateTest: StringSpec({
         gameState.currentColor shouldBe  Color.YELLOW
     }
     "Pieces can only be placed once" {
-        val gameState = GameState()
+        val gameState = GameState(startPiece = PieceShape.PENTO_I)
         val move = SetMove(
                 Piece(Color.BLUE, PieceShape.PENTO_I, Rotation.RIGHT, true))