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

Refactor minds to be entities with components, make roles components (#19591)

Browse Source 
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
DrSmugleaf
2023-08-28 16:53:24 -07:00
committed by GitHub
parent e0ee397af7
commit 15c0211fb2
119 changed files with 1445 additions and 1289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,25 +1,27 @@
using System.Linq;
using Content.Server.Objectives.Interfaces;
using Robust.Shared.Random;
using Robust.Shared.Utility;
using Content.Server.GameTicking.Rules;
using Content.Server.Mind;
using Content.Server.Objectives.Interfaces;
using Content.Server.Roles.Jobs;
using Robust.Shared.Random;
using Robust.Shared.Utility;
namespace Content.Server.Objectives.Conditions
{
[DataDefinition]
public sealed partial class RandomTraitorAliveCondition : IObjectiveCondition
{
private Mind.Mind? _target;
private EntityUid? _target;
public IObjectiveCondition GetAssigned(Mind.Mind mind)
public IObjectiveCondition GetAssigned(EntityUid mindId, MindComponent mind)
{
var entityMgr = IoCManager.Resolve<IEntityManager>();
var traitors = entityMgr.EntitySysManager.GetEntitySystem<TraitorRuleSystem>().GetOtherTraitorsAliveAndConnected(mind).ToList();
var traitors = entityMgr.System<TraitorRuleSystem>().GetOtherTraitorMindsAliveAndConnected(mind).ToList();
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 };
return new RandomTraitorAliveCondition { _target = IoCManager.Resolve<IRobustRandom>().Pick(traitors).Id };
}
public string Title
@@ -27,13 +29,19 @@ namespace Content.Server.Objectives.Conditions
get
{
var targetName = string.Empty;
var jobName = _target?.CurrentJob?.Name ?? "Unknown";
var ents = IoCManager.Resolve<IEntityManager>();
var jobs = ents.System<JobSystem>();
var jobName = jobs.MindTryGetJobName(_target);
if (_target == null)
return Loc.GetString("objective-condition-other-traitor-alive-title", ("targetName", targetName), ("job", jobName));
if (_target.OwnedEntity is {Valid: true} owned)
targetName = IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(owned).EntityName;
var minds = ents.System<MindSystem>();
if (minds.TryGetMind(_target.Value, out _, out var mind) &&
mind.OwnedEntity is { Valid: true } owned)
{
targetName = ents.GetComponent<MetaDataComponent>(owned).EntityName;
}
return Loc.GetString("objective-condition-other-traitor-alive-title", ("targetName", targetName), ("job", jobName));
}
@@ -49,7 +57,11 @@ namespace Content.Server.Objectives.Conditions
{
var entityManager = IoCManager.Resolve<EntityManager>();
var mindSystem = entityManager.System<MindSystem>();
return _target == null || !mindSystem.IsCharacterDeadIc(_target) ? 1f : 0f;
return _target == null ||
!mindSystem.TryGetMind(_target.Value, out _, out var mind) ||
!mindSystem.IsCharacterDeadIc(mind)
? 1f
: 0f;
}
}