fix(plugin): clone lastMove & expand GameState clone test

fixes #235

Author: Xerus

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

@@ -16,7 +16,8 @@ class GameState @JvmOverloads constructor(
         override var board: Board = Board(),
         turn: Int = 0,
         private val undeployedRedPieces: MutableList<Piece> = parsePiecesString(Constants.STARTING_PIECES, PlayerColor.RED),
-        private val undeployedBluePieces: MutableList<Piece> = parsePiecesString(Constants.STARTING_PIECES, PlayerColor.BLUE)
+        private val undeployedBluePieces: MutableList<Piece> = parsePiecesString(Constants.STARTING_PIECES, PlayerColor.BLUE),
+        override var lastMove: Move? = null
 ): TwoPlayerGameState<Player>() {
 
     @XStreamOmitField
@@ -33,8 +34,6 @@ class GameState @JvmOverloads constructor(
             currentPlayerColor = currentPlayerFromTurn()
         }
 
-    override var lastMove: Move? = null
-    
     val gameStats: Array<IntArray>
         get() = PlayerColor.values().map { getPlayerStats(it) }.toTypedArray()
 
@@ -44,7 +43,7 @@ class GameState @JvmOverloads constructor(
     }
 
     /** Copy constructor to create a new deeply copied state from the given [state]. */
-    constructor(state: GameState): this(state.red.clone(), state.blue.clone(), state.board.clone(), state.turn, ArrayList(state.undeployedRedPieces), ArrayList(state.undeployedBluePieces))
+    constructor(state: GameState): this(state.red.clone(), state.blue.clone(), state.board.clone(), state.turn, ArrayList(state.undeployedRedPieces), ArrayList(state.undeployedBluePieces), state.lastMove)
 
     /** Creates a deep copy of this [GameState]. */
     public override fun clone() = GameState(this)

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

@@ -29,5 +29,9 @@ class CloneTest: StringSpec({
         clone shouldBe state
         clone shouldNotBeSameInstanceAs state
         clone.getDeployedPieces(PlayerColor.RED) shouldBe state.getDeployedPieces(PlayerColor.RED)
+        clone.currentPlayerColor shouldBe state.currentPlayerColor
+        clone.currentPlayer shouldNotBeSameInstanceAs state.currentPlayer
+        clone.lastMove shouldBe state.lastMove
+        clone.board shouldBe state.board
     }
 })

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

@@ -859,10 +859,6 @@ class GamePlayTest {
         val xstream = Configuration.xStream
         val xml = """
             |<state startPlayerColor="RED" currentPlayerColor="BLUE" turn="3">
-            |  <lastMove class="setmove">
-            |    <piece owner="BLUE" type="GRASSHOPPER"/>
-            |    <destination x="-2" y="4" z="-2"/>
-            |  </lastMove>
             |  <red color="RED" displayName=""/>
             |  <blue color="BLUE" displayName="aBluePlayer"/>
             |  <board>
@@ -1038,6 +1034,10 @@ class GamePlayTest {
             |    <piece owner="BLUE" type="ANT"/>
             |    <piece owner="BLUE" type="ANT"/>
             |  </undeployedBluePieces>
+            |  <lastMove class="setmove">
+            |    <piece owner="BLUE" type="GRASSHOPPER"/>
+            |    <destination x="-2" y="4" z="-2"/>
+            |  </lastMove>
             |</state>""".trimMargin()
         assertEquals(xml, xstream.toXML(state))
         val fromXml = xstream.fromXML(xml) as GameState