feat(plugin): split streamPossibleMoves up into start/nonStart parts

Author: anarchuser

player/src/sc/player2021/logic/Logic.kt

@@ -45,7 +45,7 @@ class Logic(private val client: SimpleClient): IGameHandler{
         client.sendMove(move)
     }
 
-    override fun gameEnded(data: GameResult, team: Team?, errorMessage: String) {
+    override fun gameEnded(data: GameResult, team: Team?, errorMessage: String?) {
         logger.info("Das Spiel ist beendet.")
     }
 

plugin/src/client/sc/plugin2021/AbstractClient.kt

@@ -47,7 +47,7 @@ abstract class AbstractClient @Throws(IOException::class) constructor(
     }
 
     /** Storage for the reason of a rule violation, if any occurs. */
-    private lateinit var error: String
+    private var error: String? = null
     fun getError() = error
 
     private lateinit var roomID: String

plugin/src/client/sc/plugin2021/IGameHandler.kt

@@ -34,6 +34,6 @@ interface IGameHandler {
      * @param team         Team des Spielers
      * @param errorMessage Fehlernachricht
      */
-    fun gameEnded(data: GameResult, team: Team?, errorMessage: String)
+    fun gameEnded(data: GameResult, team: Team?, errorMessage: String?)
 
 }

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

@@ -1,6 +1,7 @@
 package sc.plugin2021
 
 import com.thoughtworks.xstream.annotations.XStreamAlias
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute
 import sc.api.plugins.IBoard
 import sc.plugin2021.util.Constants
 

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

@@ -80,7 +80,7 @@ object GameRuleLogic {
             if (bordersOnColor(gameState.board, it, move.color))
                 throw InvalidMoveException("Field $it already borders on ${move.color}", move)
         }
-        if (gameState.deployedPieces?.getValue(move.color).isNullOrEmpty()) {
+        if (isFirstMove(gameState)) {
             // Check if it's the requested shape
             if (move.piece.kind != gameState.startPiece)
                 throw InvalidMoveException("Expected the predetermined staring piece, ${gameState.startPiece}", move)
@@ -154,6 +154,11 @@ object GameRuleLogic {
     fun getPossibleMoves(gameState: GameState) =
             streamPossibleMoves(gameState).toSet()
 
+    /** Returns a list of all possible SetMoves, regardless of whether it's the first round. */
+    @JvmStatic
+    fun getAllPossibleMoves(gameState: GameState) =
+            streamAllPossibleMoves(gameState).toSet()
+    
     /** Returns a list of possible SetMoves if it's the first round. */
     @JvmStatic
     fun getPossibleStartMoves(gameState: GameState) =
@@ -196,16 +201,22 @@ object GameRuleLogic {
     fun streamPossibleMoves(gameState: GameState) =
             if (isFirstMove(gameState))
                 streamPossibleStartMoves(gameState)
-            else sequence<SetMove> {
-                val color = gameState.currentColor
-                gameState.undeployedPieceShapes.getValue(color).map {
-                    val area = it.coordinates.area()
-                    for (y in 0 until Constants.BOARD_SIZE - area.dy)
-                        for (x in 0 until Constants.BOARD_SIZE - area.dx)
-                            for (variant in it.variants)
-                                yield(SetMove(Piece(color, it, variant.key, Coordinates(x, y))))
-                }
-            }.filter { isValidSetMove(gameState, it) }
+            else
+                streamAllPossibleMoves(gameState)
+    
+    /** Streams all possible moves regardless of whether it's the first turn. */
+    @JvmStatic
+    fun streamAllPossibleMoves(gameState: GameState) = sequence<SetMove> {
+        val color = gameState.currentColor
+        gameState.undeployedPieceShapes.getValue(color).map {
+            val area = it.coordinates.area()
+            for (y in 0 until Constants.BOARD_SIZE - area.dy)
+                for (x in 0 until Constants.BOARD_SIZE - area.dx)
+                    for (variant in it.variants) {
+                        yield(SetMove(Piece(color, it, variant.key, Coordinates(x, y))))
+                    }
+        }
+    }.filter { isValidSetMove(gameState, it) }
 
     /** Streams all possible moves if it's the first turn of [gameState]. */
     @JvmStatic

server/test/sc/server/plugins/TestGame.java

@@ -37,7 +37,7 @@ protected void onRoundBasedAction(Player fromPlayer, ProtocolMessage data) {
   }
 
   @Override
-  protected WinCondition checkWinCondition() {
+  public WinCondition checkWinCondition() {
     if (this.getRound() > 1) {
       logger.info("Someone won");
       return new WinCondition(((TestGameState) this.getCurrentState()).getState() % 2 == 0 ? TestTeam.RED : TestTeam.BLUE, WinReason.ROUND_LIMIT_FREE_FIELDS);