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

Fixed random traitor alive objective lacking the name of the other tr… (#19624)

Browse Source
This commit is contained in:
DrSmugleaf
2023-08-28 23:23:19 -07:00
committed by GitHub
parent d1174827fb
commit e221819ef0
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@ namespace Content.Server.Objectives.Conditions
[DataDefinition] [DataDefinition]
public sealed partial class RandomTraitorAliveCondition : IObjectiveCondition public sealed partial class RandomTraitorAliveCondition : IObjectiveCondition
{ {
private EntityUid? _target; private EntityUid? _targetMind;
public IObjectiveCondition GetAssigned(EntityUid mindId, MindComponent mind) public IObjectiveCondition GetAssigned(EntityUid mindId, MindComponent mind)
{ {
@@ -21,7 +21,7 @@ namespace Content.Server.Objectives.Conditions
if (traitors.Count == 0) if (traitors.Count == 0)
return new EscapeShuttleCondition(); //You were made a traitor by admins, and are the first/only. return new EscapeShuttleCondition(); //You were made a traitor by admins, and are the first/only.
return new RandomTraitorAliveCondition { _target = IoCManager.Resolve<IRobustRandom>().Pick(traitors).Id }; return new RandomTraitorAliveCondition { _targetMind = IoCManager.Resolve<IRobustRandom>().Pick(traitors).Id };
} }
public string Title public string Title
@@ -31,14 +31,13 @@ namespace Content.Server.Objectives.Conditions
var targetName = string.Empty; var targetName = string.Empty;
var ents = IoCManager.Resolve<IEntityManager>(); var ents = IoCManager.Resolve<IEntityManager>();
var jobs = ents.System<JobSystem>(); var jobs = ents.System<JobSystem>();
var jobName = jobs.MindTryGetJobName(_target); var jobName = jobs.MindTryGetJobName(_targetMind);
if (_target == null) if (_targetMind == null)
return Loc.GetString("objective-condition-other-traitor-alive-title", ("targetName", targetName), ("job", jobName)); return Loc.GetString("objective-condition-other-traitor-alive-title", ("targetName", targetName), ("job", jobName));
var minds = ents.System<MindSystem>(); if (ents.TryGetComponent(_targetMind, out MindComponent? mind) &&
if (minds.TryGetMind(_target.Value, out _, out var mind) && mind.OwnedEntity is {Valid: true} owned)
mind.OwnedEntity is { Valid: true } owned)
{ {
targetName = ents.GetComponent<MetaDataComponent>(owned).EntityName; targetName = ents.GetComponent<MetaDataComponent>(owned).EntityName;
} }
@@ -57,8 +56,7 @@ namespace Content.Server.Objectives.Conditions
{ {
var entityManager = IoCManager.Resolve<EntityManager>(); var entityManager = IoCManager.Resolve<EntityManager>();
var mindSystem = entityManager.System<MindSystem>(); var mindSystem = entityManager.System<MindSystem>();
return _target == null || return !entityManager.TryGetComponent(_targetMind, out MindComponent? mind) ||
!mindSystem.TryGetMind(_target.Value, out _, out var mind) ||
!mindSystem.IsCharacterDeadIc(mind) !mindSystem.IsCharacterDeadIc(mind)
? 1f ? 1f
: 0f; : 0f;
@@ -69,7 +67,7 @@ namespace Content.Server.Objectives.Conditions
public bool Equals(IObjectiveCondition? other) public bool Equals(IObjectiveCondition? other)
{ {
return other is RandomTraitorAliveCondition kpc && Equals(_target, kpc._target); return other is RandomTraitorAliveCondition kpc && Equals(_targetMind, kpc._targetMind);
} }
public override bool Equals(object? obj) public override bool Equals(object? obj)
@@ -81,7 +79,7 @@ namespace Content.Server.Objectives.Conditions
public override int GetHashCode() public override int GetHashCode()
{ {
return _target?.GetHashCode() ?? 0; return _targetMind?.GetHashCode() ?? 0;
} }
} }
} }

18
Content.Server/Objectives/Conditions/RandomTraitorProgressCondition.cs
View File

@@ -12,7 +12,7 @@ namespace Content.Server.Objectives.Conditions
public sealed partial class RandomTraitorProgressCondition : IObjectiveCondition public sealed partial class RandomTraitorProgressCondition : IObjectiveCondition
{ {
// TODO ecs all of this // TODO ecs all of this
private EntityUid? _target; private EntityUid? _targetMind;
public IObjectiveCondition GetAssigned(EntityUid mindId, MindComponent mind) public IObjectiveCondition GetAssigned(EntityUid mindId, MindComponent mind)
{ {
@@ -42,7 +42,7 @@ namespace Content.Server.Objectives.Conditions
} }
if (traitors.Count == 0) return new EscapeShuttleCondition{}; //You were made a traitor by admins, and are the first/only. if (traitors.Count == 0) return new EscapeShuttleCondition{}; //You were made a traitor by admins, and are the first/only.
return new RandomTraitorProgressCondition { _target = IoCManager.Resolve<IRobustRandom>().Pick(traitors).Id }; return new RandomTraitorProgressCondition { _targetMind = IoCManager.Resolve<IRobustRandom>().Pick(traitors).Id };
} }
public string Title public string Title
@@ -52,12 +52,12 @@ namespace Content.Server.Objectives.Conditions
var targetName = string.Empty; var targetName = string.Empty;
var entities = IoCManager.Resolve<IEntityManager>(); var entities = IoCManager.Resolve<IEntityManager>();
var jobs = entities.System<JobSystem>(); var jobs = entities.System<JobSystem>();
var jobName = jobs.MindTryGetJobName(_target); var jobName = jobs.MindTryGetJobName(_targetMind);
if (_target == null) if (_targetMind == null)
return Loc.GetString("objective-condition-other-traitor-progress-title", ("targetName", targetName), ("job", jobName)); return Loc.GetString("objective-condition-other-traitor-progress-title", ("targetName", targetName), ("job", jobName));
if (entities.TryGetComponent(_target, out MindComponent? mind) && if (entities.TryGetComponent(_targetMind, out MindComponent? mind) &&
mind.OwnedEntity is {Valid: true} owned) mind.OwnedEntity is {Valid: true} owned)
{ {
targetName = entities.GetComponent<MetaDataComponent>(owned).EntityName; targetName = entities.GetComponent<MetaDataComponent>(owned).EntityName;
@@ -78,14 +78,14 @@ namespace Content.Server.Objectives.Conditions
float total = 0f; // how much progress they have float total = 0f; // how much progress they have
float max = 0f; // how much progress is needed for 100% float max = 0f; // how much progress is needed for 100%
if (_target == null) if (_targetMind == null)
{ {
Logger.Error("Null target on RandomTraitorProgressCondition."); Logger.Error("Null target on RandomTraitorProgressCondition.");
return 1f; return 1f;
} }
var entities = IoCManager.Resolve<IEntityManager>(); var entities = IoCManager.Resolve<IEntityManager>();
if (entities.TryGetComponent(_target, out MindComponent? mind)) if (entities.TryGetComponent(_targetMind, out MindComponent? mind))
{ {
foreach (var objective in mind.AllObjectives) foreach (var objective in mind.AllObjectives)
{ {
@@ -116,7 +116,7 @@ namespace Content.Server.Objectives.Conditions
public bool Equals(IObjectiveCondition? other) public bool Equals(IObjectiveCondition? other)
{ {
return other is RandomTraitorProgressCondition kpc && Equals(_target, kpc._target); return other is RandomTraitorProgressCondition kpc && Equals(_targetMind, kpc._targetMind);
} }
public override bool Equals(object? obj) public override bool Equals(object? obj)
@@ -128,7 +128,7 @@ namespace Content.Server.Objectives.Conditions
public override int GetHashCode() public override int GetHashCode()
{ {
return _target?.GetHashCode() ?? 0; return _targetMind?.GetHashCode() ?? 0;
} }
} }
} }