Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Suspicion improvements:

Browse Source 
1. pull settings from cvars.
2. Fix greet.

Fixes #1823
This commit is contained in:
Pieter-Jan Briers
2020-08-20 22:04:55 +02:00
parent 3d75f0d753
commit 82c4c3eb4a
3 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Content.Server/Mobs/Roles/SuspicionTraitorRole.cs
View File

@@ -1,9 +1,8 @@
using Content.Server.GameObjects.Components.Suspicion;
using System.Collections.Generic;
using System.Linq;
using Content.Server.Interfaces.Chat;
using Content.Shared.Roles;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
namespace Content.Server.Mobs.Roles
{
@@ -22,26 +21,25 @@ namespace Content.Server.Mobs.Roles
public string Objective => Prototype.Objective;
public override bool Antagonist { get; }
public override void Greet()
public void GreetSuspicion(List<SuspicionTraitorRole> traitors, IChatManager chatMgr)
{
base.Greet();
chatMgr.DispatchServerMessage(Mind.Session, Loc.GetString("You're a {0}!", Name));
chatMgr.DispatchServerMessage(Mind.Session, Loc.GetString("Objective: {0}", Objective));
var chat = IoCManager.Resolve<IChatManager>();
chat.DispatchServerMessage(Mind.Session, $"You're a {Name}!");
chat.DispatchServerMessage(Mind.Session, $"Objective: {Objective}");
var traitors = "";
foreach (var sus in IoCManager.Resolve<IComponentManager>().EntityQuery<SuspicionRoleComponent>())
if (traitors.Count == 1)
{
if (!sus.IsTraitor()) continue;
if (traitors.Length > 0)
traitors += $", {sus.Owner.Name}";
else
traitors += sus.Owner.Name;
// Only traitor.
chatMgr.DispatchServerMessage(Mind.Session, Loc.GetString("You're on your own. Good luck!"));
return;
}
chat.DispatchServerMessage(Mind.Session, $"The traitors are: {traitors}");
var text = string.Join(", ", traitors.Where(p => p != this).Select(p => p.Mind.CharacterName));
var pluralText = Loc.GetPluralString("Your partner in crime is: {0}",
"Your partners in crime are: {0}",
traitors.Count-1, text);
chatMgr.DispatchServerMessage(Mind.Session, pluralText);
}
}
}