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

Fix SSS role being repeated in the examine tooltip (#1714)

Browse Source
This commit is contained in:
DrSmugleaf
2020-08-16 18:41:16 +02:00
committed by GitHub
parent fa49eb5895
commit 772eb2c966
3 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/GameTicking/GamePresets/PresetSuspicion.cs
View File

@@ -10,11 +10,12 @@ using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameObjects.Components.Suspicion;
using Content.Shared.Roles;
using Robust.Shared.GameObjects;
using Robust.Shared.Log;
using Robust.Shared.Maths;
namespace Content.Server.GameTicking.GamePresets
{
public class PresetSuspicion : GamePreset
@@ -54,6 +55,8 @@ namespace Content.Server.GameTicking.GamePresets
{
prefList.Add(player);
}
player.AttachedEntity?.EnsureComponent<SuspicionRoleComponent>();
}
var numTraitors = FloatMath.Clamp(readyPlayers.Count % PlayersPerTraitor,

24
Content.Server/GameTicking/GameRules/RuleSuspicion.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Threading;
using Content.Server.GameObjects.Components.Mobs;
using Content.Server.Interfaces.Chat;
@@ -7,7 +7,6 @@ using Content.Server.Mobs.Roles;
using Content.Server.Players;
using Robust.Server.Interfaces.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Timer = Robust.Shared.Timers.Timer;
@@ -24,7 +23,6 @@ namespace Content.Server.GameTicking.GameRules
#pragma warning disable 649
[Dependency] private readonly IPlayerManager _playerManager;
[Dependency] private readonly IChatManager _chatManager;
[Dependency] private readonly IEntityManager _entityManager;
[Dependency] private readonly IGameTicker _gameTicker;
#pragma warning restore 649
@@ -32,28 +30,9 @@ namespace Content.Server.GameTicking.GameRules
public override void Added()
{
_entityManager.EventBus.SubscribeEvent<MobDamageStateChangedMessage>(EventSource.Local, this, _onMobDamageStateChanged);
Timer.SpawnRepeating(DeadCheckDelay, _checkWinConditions, _checkTimerCancel.Token);
}
private void _onMobDamageStateChanged(MobDamageStateChangedMessage message)
{
var owner = message.Species.Owner;
if (!(message.Species.CurrentDamageState is DeadState))
return;
if (!owner.TryGetComponent<MindComponent>(out var mind))
return;
if (!mind.HasMind)
return;
message.Species.Owner.Description +=
mind.Mind.HasRole<SuspicionTraitorRole>() ? "\nThey were a traitor!" : "\nThey were an innocent!";
}
public override void Removed()
{
base.Removed();
@@ -78,6 +57,7 @@ namespace Content.Server.GameTicking.GameRules
{
continue;
}
if (playerSession.ContentData().Mind.HasRole<SuspicionTraitorRole>())
traitorsAlive++;
else