RedGuy/RMafia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Role separated text in day

Browse Source
This commit is contained in:
Ilya 2021-02-10 22:11:55 +03:00
parent 4e721afba1
commit bbe190fa2b
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MafiaCommon/Packets/GameStageChangedPacket.cs
View File

@ -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;
}
}
}

16
MafiaGame/MainWindow.xaml.cs
View File

@ -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;
}
}

2
MafiaGame/ServerConnection.cs
View File

@ -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;

2
MafiaServer/Game.cs
View File

@ -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+" был убит!"));
}
}