diff --git a/Systems/DeckManager.gd b/Systems/DeckManager.gd index d16cbb8..2af9739 100644 --- a/Systems/DeckManager.gd +++ b/Systems/DeckManager.gd @@ -23,7 +23,8 @@ func _init(): initializeStartingDeck() func initializeStartingDeck(): - for i in range(9): + deck.clear(); + for i in range(4): deck.append(DoubleTimeCard.new()) deck.append(HopscotchCard.new()) shuffleDeck() diff --git a/Systems/Game/ChessGame.gd b/Systems/Game/ChessGame.gd index 851ee61..15f94d5 100644 --- a/Systems/Game/ChessGame.gd +++ b/Systems/Game/ChessGame.gd @@ -298,6 +298,7 @@ func resetBoard() -> void: p2String.text = str(p2Points) gamecheckMate = false; gamedraw = false; + deckManager.initializeStartingDeck() areas.clear() specialArea.clear() diff --git a/Systems/StateMachine/GameStates/Movement.gd b/Systems/StateMachine/GameStates/Movement.gd index f33892b..8c40935 100644 --- a/Systems/StateMachine/GameStates/Movement.gd +++ b/Systems/StateMachine/GameStates/Movement.gd @@ -167,15 +167,15 @@ func handleCapture(node: Node) -> void: game.updatePoints(capturedPiece) - if capturedPiece.name == "King": - print("Game Over!") - game.gamecheckMate = true - capturedPiece.free() piece.reparent(node) piece.position = Vector2(25, 25) piece.position = Vector2(25, 25) game.currentlyMovingPiece = piece game.resolveMoveEffects() + if capturedPiece.name == "King": + print("Game Over!") + game.gamecheckMate = true + capturedPiece.free() func handleRegularMove(node: Node, consume: bool) -> void: print("handleRegularMove", node)