enhance: general cleanups

Author: xeruf

plugin/src/main/kotlin/sc/plugin2023/GameState.kt

@@ -36,7 +36,7 @@ data class GameState @JvmOverloads constructor(
             if(board[move.from].penguin != currentTeam)
                 throw InvalidMoveException(MoveMistake.WRONG_COLOR, move)
             if(currentPieces.size < PenguinConstants.PENGUINS)
-                throw InvalidMoveException(PenguinsMoveMistake.PENGUINS, move)
+                throw InvalidMoveException(PenguinsMoveMistake.PLACE_PENGUINS_FIRST, move)
             if(!move.to.minus(move.from).straightHex)
                 throw InvalidMoveException(MoveMistake.INVALID_MOVE, move)
             // TODO avoid this check

plugin/src/main/kotlin/sc/plugin2023/util/PenguinsMoveMistake.kt

@@ -10,7 +10,7 @@ import sc.shared.IMoveMistake
  */
 enum class PenguinsMoveMistake(override val message: String): IMoveMistake {
     SINGLE_FISH("Pinguine können nur auf einzelne Fische gesetzt werden"),
-    PENGUINS("Setze zuerst alle Pinguine"),
+    PLACE_PENGUINS_FIRST("Setze zuerst alle Pinguine"),
     MAX_PENGUINS("Bereits alle Pinguine gesetzt");
     override fun toString() = message
 }

plugin2025/src/main/kotlin/sc/plugin2025/GameRuleLogic.kt

@@ -10,6 +10,7 @@ object GameRuleLogic {
      * @param moveCount Anzahl der Felder, um die bewegt wird
      * @return Anzahl der benötigten Karotten
      */
+    @JvmStatic
     fun calculateCarrots(moveCount: Int): Int =
         (moveCount * (moveCount + 1)) / 2
 
@@ -19,6 +20,7 @@ object GameRuleLogic {
      * @param carrots maximal ausgegebene Karotten
      * @return Felder um die maximal bewegt werden kann
      */
+    @JvmStatic
     fun calculateMoveableFields(carrots: Int): Int {
         return when {
             carrots >= 990 -> 44

plugin2025/src/main/kotlin/sc/plugin2025/GameState.kt

@@ -92,7 +92,8 @@ data class GameState @JvmOverloads constructor(
     fun clonePlayer(team: Team = currentTeam, transform: (Hare) -> Unit = {}) =
         copy(players = players.map { if(it.team == team) it.clone().apply(transform) else it })
 
-    override fun getSensibleMoves(): List<Move> = getSensibleMoves(currentPlayer)
+    override fun getSensibleMoves(): List<Move> =
+        getSensibleMoves(currentPlayer)
 
     fun getSensibleMoves(player: Hare): List<Move> {
         if(mustEatSalad(player))

plugin2026/src/test/kotlin/sc/GameRuleLogicTest.java

@@ -0,0 +1,9 @@
+package sc;
+
+import sc.plugin2026.util.GameRuleLogic;
+
+public class GameRuleLogicTest {
+  public static void main(String[] args) {
+    GameRuleLogic.possibleMovesFor(null, null).iterator();
+  }
+}

sdk/src/main/server-api/sc/api/plugins/RectangularBoard.kt

@@ -53,17 +53,17 @@ open class RectangularBoard<FIELD: IField<FIELD>>(
     /** Vergleicht zwei Spielfelder und gibt eine Liste aller Felder zurück, die sich unterscheiden. */
     fun compare(other: RectangularBoard<FIELD>): Collection<FIELD> {
         val entries = this.entries
-        return other.entries.filter {
-            it !in entries
-        }.map { it.value }
+        return other.entries
+            .filter { it !in entries }
+            .map { it.value }
     }
 
     override fun toString() =
             gameField.joinToString(separator = "\n") { row ->
                 row.joinToString(separator = "") { it.toString() }
             }.ifEmpty { "Empty Board@" + System.identityHashCode(this) }
 
-    override val entries: Set<Map.Entry<Coordinates, FIELD>>
+    override val entries: Set<Positioned<FIELD>>
         get() = gameField.flatMapIndexedTo(HashSet()) { y, row ->
             row.mapIndexed { x, field ->
                 Positioned(Coordinates(x, y), field)

sdk/src/main/server-api/sc/framework/plugins/Game.kt

@@ -217,8 +217,10 @@ abstract class AbstractGame<M : IMove>(protected val plugin: IGamePlugin<M>): IG
      * @return WinCondition, or null if game is not regularly over yet
      */
     fun checkWinCondition(): WinCondition? =
-            currentWinner().takeIf { currentState.isOver }
+            currentState.winCondition
 
+    // TODO this function is useless cause it is only used when the game is over
+    //      in which case currentState.winCondition is not null anyway
     fun currentWinner(): WinCondition {
         val teams = Team.values()
         val scores = teams.map { currentState.getPointsForTeam(it) }