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

new social traitor objective + fix targeting for other traitor alive (#11775)

Browse Source
This commit is contained in:
Rane
2022-10-09 15:09:45 -04:00
committed by GitHub
parent 8beb7c2abd
commit 65534f847d
4 changed files with 165 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Server/Objectives/Conditions/RandomTraitorAliveCondition.cs
View File

@@ -1,9 +1,6 @@
using Content.Server.Mind.Components;
using Content.Server.Objectives.Interfaces;
using Robust.Shared.Random;
using Robust.Shared.Utility;
using Content.Server.Traitor;
using Content.Server.Mind;
using Content.Server.GameTicking.Rules;
namespace Content.Server.Objectives.Conditions
@@ -17,8 +14,28 @@ namespace Content.Server.Objectives.Conditions
{
var entityMgr = IoCManager.Resolve<IEntityManager>();
var traitors = EntitySystem.Get<TraitorRuleSystem>().Traitors;
List<Traitor.TraitorRole> removeList = new();
if (traitors.Count == 0) return new RandomTraitorAliveCondition { _target = mind }; //You were made a traitor by admins, and are the first/only.
foreach (var traitor in traitors)
{
if (traitor.Mind == null)
{
removeList.Add(traitor);
continue;
}
if (traitor.Mind == mind) // we have different objectives for defending ourselves.
{
removeList.Add(traitor);
continue;
}
}
foreach (var traitor in removeList)
{
traitors.Remove(traitor);
}
if (traitors.Count == 0) return new EscapeShuttleCondition{}; //You were made a traitor by admins, and are the first/only.
return new RandomTraitorAliveCondition { _target = IoCManager.Resolve<IRobustRandom>().Pick(traitors).Mind };
}