fix(plugin): ensure a game is running smoothly with random moves

Author: anarchuser

plugin/src/server/sc/plugin2021/Game.kt

@@ -27,6 +27,7 @@ class Game(UUID: String = GamePlugin.PLUGIN_UUID): RoundBasedGameInstance<Player
 
     override fun start() {
         players.forEach {it.notifyListeners(WelcomeMessage(it.color)) }
+//        next(players.first(), true)
         super.start()
     }
 

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

@@ -44,6 +44,9 @@ class GameState @JvmOverloads constructor(
     override val currentTeam
         get() = currentColor.team
 
+    override val currentPlayer
+        get() = getPlayer(currentTeam)!!
+    
     @XStreamAsAttribute
     val orderedColors: MutableList<Color> = mutableListOf()
 

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

@@ -2,9 +2,11 @@ package sc.plugin2021
 
 import io.kotlintest.matchers.collections.shouldContainExactly
 import io.kotlintest.shouldBe
+import io.kotlintest.shouldNotBe
 import io.kotlintest.specs.StringSpec
 import org.junit.jupiter.api.assertThrows
 import sc.plugin2020.util.Constants
+import sc.plugin2021.util.GameRuleLogic
 import sc.shared.InvalidMoveException
 import sc.shared.PlayerScore
 import sc.shared.ScoreCause
@@ -28,12 +30,33 @@ class GameTest: StringSpec({
             game.onAction(state.currentPlayer, PassMove(state.currentColor))
         }
 
-        println(game.winners)
         game.winners shouldBe listOf(second)
 
         game.playerScores shouldContainExactly listOf(
                 PlayerScore(ScoreCause.RULE_VIOLATION, e.message, Constants.LOSE_SCORE, -178),
                 PlayerScore(ScoreCause.REGULAR, "", Constants.WIN_SCORE, -178)
         )
     }
+    "A few moves can be performd without issues" {
+        val game = Game()
+        val state = game.gameState
+        Pair(game.onPlayerJoined(), game.onPlayerJoined())
+        game.start()
+        
+        while (true) {
+            try {
+                val condition = game.checkWinCondition()
+                if (condition != null) {
+                    println(condition)
+                    break
+                }
+                val moves = GameRuleLogic.getPossibleMoves(state)
+                moves shouldNotBe emptySet<SetMove>()
+                game.onAction(state.currentPlayer, moves.random())
+            } catch (e: Exception) {
+                println(e.message)
+                break
+            }
+        }
+    }
 })

socha-sdk/src/server-api/sc/framework/plugins/RoundBasedGameInstance.java

@@ -67,7 +67,9 @@ public final void onAction(Player fromPlayer, ProtocolMessage data)
         errorMsg = Optional.of("We didn't request a data from you yet.");
       }
     } else {
-      errorMsg = Optional.of("It's not your turn yet.");
+      errorMsg = Optional.of(String.format(
+              "It's not your turn yet; expected: %s, got: %s (msg was %s).",
+              this.activePlayer, fromPlayer, data));
     }
     if (errorMsg.isPresent()) {
       fromPlayer.notifyListeners(new ProtocolErrorMessage(data, errorMsg.get()));
@@ -90,7 +92,7 @@ protected abstract void onRoundBasedAction(Player fromPlayer, ProtocolMessage da
    * @return WinCondition with winner and reason or null, if no win condition is
    * yet met.
    */
-  protected abstract WinCondition checkWinCondition();
+  public abstract WinCondition checkWinCondition();
 
   /**
    * At any time this method might be invoked by the server. Any open handles