feat(gameLogic): Add miss moves

Author: SKoschnicke

plugin/src/shared/sc/plugin2020/Move.kt

@@ -13,3 +13,8 @@ data class SetMove(val piece: Piece, val destination: CubeCoordinates): IMove {
 data class DragMove(val start: CubeCoordinates, val destination: CubeCoordinates): IMove {
     override fun toString() = String.format("Drag from %s to %s", this.start, this.destination)
 }
+
+@XStreamAlias(value = "missmove")
+data class MissMove(val type: String = "miss"): IMove {
+    override fun toString() = "Miss move"
+}

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

@@ -4,8 +4,6 @@ import sc.api.plugins.IMove
 import sc.plugin2020.*
 import sc.shared.InvalidMoveException
 import sc.shared.PlayerColor
-import java.util.*
-import kotlin.collections.ArrayList
 import kotlin.math.abs
 
 object GameRuleLogic {
@@ -86,10 +84,19 @@ object GameRuleLogic {
         when (move) {
             is SetMove -> validateSetMove(gameState, move)
             is DragMove -> validateDragMove(gameState, move)
+            is MissMove -> validateMissMove(gameState)
         }
         return true
     }
-
+    
+    private fun validateMissMove(gameState: GameState): Boolean {
+        if(this.getPossibleMoves(gameState).isNotEmpty())
+            throw InvalidMoveException("Missing a turn is only allowed when no other moves can be made.")
+        if(gameState.round == 3 && !hasPlayerPlacedBee(gameState))
+            throw InvalidMoveException("The bee must be placed in fourth round latest")
+        return true
+    }
+    
     @Throws(InvalidMoveException::class)
     @JvmStatic
     fun validateSetMove(gameState: GameState, move: SetMove): Boolean {
@@ -107,7 +114,7 @@ object GameRuleLogic {
             }
         } else {
             if (gameState.round == 3 && !hasPlayerPlacedBee(gameState) && move.piece.type != PieceType.BEE)
-                throw InvalidMoveException("The Bee must be placed in fourth round latest")
+                throw InvalidMoveException("The bee must be placed in fourth round latest")
 
             if (!gameState.getUndeployedPieces(gameState.currentPlayerColor).contains(move.piece))
                 throw InvalidMoveException("Piece is not a undeployed piece of the current player")

plugin/src/test/sc/plugin2020/GamePlayTest.kt

@@ -342,6 +342,8 @@ class GamePlayTest {
             state.turn = 6
             val setAnt = SetMove(Piece(PlayerColor.RED, PieceType.ANT), CubeCoordinates(-4, 5))
             assertThrows(InvalidMoveException::class.java) { GameRuleLogic.validateMove(state, setAnt) }
+            val miss = MissMove()
+            assertThrows(InvalidMoveException::class.java) { GameRuleLogic.validateMove(state, miss) }
             val setBee = SetMove(Piece(PlayerColor.RED, PieceType.BEE), CubeCoordinates(-4, 5))
             assertTrue(GameRuleLogic.validateMove(state, setBee))
         }
@@ -1206,4 +1208,40 @@ class GamePlayTest {
             assertEquals(1, GameRuleLogic.getPossibleDragMoves(state).size)
         }
     }
+    
+    @Test
+    fun missMoveTest() {
+        run {
+            TestGameUtil.updateGamestateWithBoard(state, "" +
+                    "     ------------" +
+                    "    --------------" +
+                    "   ----------------" +
+                    "  RGBG--------------" +
+                    " --------------------" +
+                    "----------------------" +
+                    " --------------------" +
+                    "  ------------------" +
+                    "   ----------------" +
+                    "    --------------" +
+                    "     ------------")
+            val invalid = MissMove()
+            assertThrows(InvalidMoveException::class.java) { GameRuleLogic.validateMove(state, invalid) }
+        }
+        run {
+            TestGameUtil.updateGamestateWithBoard(state, "" +
+                    "     RA----------" +
+                    "    --BG----------" +
+                    "   ----------------" +
+                    "  ------------------" +
+                    " --------------------" +
+                    "----------------------" +
+                    " --------------------" +
+                    "  ------------------" +
+                    "   ----------------" +
+                    "    --------------" +
+                    "     ------------")
+            val valid = MissMove()
+            assertTrue(GameRuleLogic.validateMove(state, valid))
+        }
+    }
 }