From 45380c129b31b76494df4245794cec471a8cadaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= Date: Thu, 20 Aug 2020 01:11:43 +0200 Subject: [PATCH] Fix traitors not knowing who their friends are. --- .../Mobs/Roles/SuspicionInnocentRole.cs | 2 +- .../Mobs/Roles/SuspicionTraitorRole.cs | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Content.Server/Mobs/Roles/SuspicionInnocentRole.cs b/Content.Server/Mobs/Roles/SuspicionInnocentRole.cs index e8ab7a96be..570e307c79 100644 --- a/Content.Server/Mobs/Roles/SuspicionInnocentRole.cs +++ b/Content.Server/Mobs/Roles/SuspicionInnocentRole.cs @@ -24,7 +24,7 @@ namespace Content.Server.Mobs.Roles base.Greet(); var chat = IoCManager.Resolve(); - chat.DispatchServerMessage(Mind.Session, $"You're a {Name}!"); + chat.DispatchServerMessage(Mind.Session, $"You're an {Name}!"); chat.DispatchServerMessage(Mind.Session, $"Objective: {Objective}"); } } diff --git a/Content.Server/Mobs/Roles/SuspicionTraitorRole.cs b/Content.Server/Mobs/Roles/SuspicionTraitorRole.cs index 753f5424e1..5279fae886 100644 --- a/Content.Server/Mobs/Roles/SuspicionTraitorRole.cs +++ b/Content.Server/Mobs/Roles/SuspicionTraitorRole.cs @@ -1,5 +1,8 @@ +using Content.Server.GameObjects.Components.Suspicion; using Content.Server.Interfaces.Chat; using Content.Shared.Roles; +using Robust.Shared.GameObjects; +using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; namespace Content.Server.Mobs.Roles @@ -26,6 +29,19 @@ namespace Content.Server.Mobs.Roles var chat = IoCManager.Resolve(); chat.DispatchServerMessage(Mind.Session, $"You're a {Name}!"); chat.DispatchServerMessage(Mind.Session, $"Objective: {Objective}"); + + var traitors = ""; + + foreach (var sus in IoCManager.Resolve().EntityQuery()) + { + if (!sus.IsTraitor()) continue; + if (traitors.Length > 0) + traitors += $", {sus.Owner.Name}"; + else + traitors += sus.Owner.Name; + } + + chat.DispatchServerMessage(Mind.Session, $"The traitors are: {traitors}"); } } }