diff --git a/WZIMopoly/Models/GameScene/TradeModel.cs b/WZIMopoly/Models/GameScene/TradeModel.cs index 329ebd2..40888c1 100644 --- a/WZIMopoly/Models/GameScene/TradeModel.cs +++ b/WZIMopoly/Models/GameScene/TradeModel.cs @@ -92,6 +92,18 @@ public TradeModel(List tiles, List playerI /// public int TotalValue => ChosenOfferorTilesValue + ChosenRecipientTilesValue + Math.Abs(OfferedMoney); + /// + /// Resets the trade model. + /// + public void Reset() + { + Offeror = null; + Recipient = null; + ChosenOfferorTiles.Clear(); + ChosenRecipientTiles.Clear(); + OfferedMoney = 0; + } + /// /// Updates the trade model. /// diff --git a/WZIMopoly/Scenes/GameScene.cs b/WZIMopoly/Scenes/GameScene.cs index 0a96634..1f4a416 100644 --- a/WZIMopoly/Scenes/GameScene.cs +++ b/WZIMopoly/Scenes/GameScene.cs @@ -451,15 +451,14 @@ private void InitializeButtons() if (GameSettings.CurrentPlayer.PlayerStatus == PlayerStatus.Trading) { GameSettings.CurrentPlayer.PlayerStatus = PlayerStatus.BeforeRollingDice; + var tradeModel = _tradeController.Model; + tradeModel.Reset(); } else if (GameSettings.CurrentPlayer.PlayerStatus == PlayerStatus.BeforeRollingDice) { var tradeModel = _tradeController.Model; + tradeModel.Reset(); tradeModel.Offeror = GameSettings.CurrentPlayer; - tradeModel.Recipient = null; - tradeModel.OfferedMoney = 0; - tradeModel.ChosenOfferorTiles.Clear(); - tradeModel.ChosenRecipientTiles.Clear(); GameSettings.CurrentPlayer.PlayerStatus = PlayerStatus.Trading; } };