From bbe190fa2b5b09db65080f2840744a7a71b4e030 Mon Sep 17 00:00:00 2001 From: Ilya Date: Wed, 10 Feb 2021 22:11:55 +0300 Subject: [PATCH] Role separated text in day --- MafiaCommon/Packets/GameStageChangedPacket.cs | 4 +++- MafiaGame/MainWindow.xaml.cs | 16 ++++++++++++---- MafiaGame/ServerConnection.cs | 2 +- MafiaServer/Game.cs | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/MafiaCommon/Packets/GameStageChangedPacket.cs b/MafiaCommon/Packets/GameStageChangedPacket.cs index 2846d17..686c630 100644 --- a/MafiaCommon/Packets/GameStageChangedPacket.cs +++ b/MafiaCommon/Packets/GameStageChangedPacket.cs @@ -3,10 +3,12 @@ public class GameStageChangedPacket : Packet { public readonly GameState GameState; + public readonly Role Role; - public GameStageChangedPacket(GameState gameState) : base(PacketType.GameStateChanged) + public GameStageChangedPacket(GameState gameState, Role role) : base(PacketType.GameStateChanged) { GameState = gameState; + Role = role; } } } \ No newline at end of file diff --git a/MafiaGame/MainWindow.xaml.cs b/MafiaGame/MainWindow.xaml.cs index a6edaad..1628903 100644 --- a/MafiaGame/MainWindow.xaml.cs +++ b/MafiaGame/MainWindow.xaml.cs @@ -271,18 +271,26 @@ namespace MafiaGame } - public void ShowDay(bool voting) + public void ShowDay(bool voting, Role role) { HideAll(); GameDaySelect.IsEnabled = voting; - if (voting) + if (role == Role.Died) { - GameDayHotBar.Text = "Обсуждай и думай"; + GameDayHotBar.Text = "Коли умер, жди"; } else { - GameDayHotBar.Text = "Голосуй и молись"; + if (voting) + { + GameDayHotBar.Text = "Голосуй и молись"; + } + else + { + GameDayHotBar.Text = "Обсуждай и думай"; + } } + GameDay.Visibility = Visibility.Visible; } } diff --git a/MafiaGame/ServerConnection.cs b/MafiaGame/ServerConnection.cs index 2ad1b4d..6566059 100644 --- a/MafiaGame/ServerConnection.cs +++ b/MafiaGame/ServerConnection.cs @@ -263,7 +263,7 @@ namespace MafiaGame case GameState.Day: App.Current.Dispatcher.Invoke((Action) (() => { - MainWindow.Instance.ShowDay(false); + MainWindow.Instance.ShowDay(false,((GameStageChangedPacket)packet).Role); })); App.Instance.GetRpcClient().UpdateDetails("День"); break; diff --git a/MafiaServer/Game.cs b/MafiaServer/Game.cs index 2069abf..ebb2c1a 100644 --- a/MafiaServer/Game.cs +++ b/MafiaServer/Game.cs @@ -146,7 +146,7 @@ namespace MafiaServer WorkDeath(killed); foreach (PlayerSocketWorker player in _players) { - player.sendPacket(new GameStageChangedPacket(GameState.Day)); + player.sendPacket(new GameStageChangedPacket(GameState.Day,player.Role)); player.sendPacket(new MessageReceivePacket(ChatType.Day,true,"System",killed.PlayerName+" был убит!")); } }