tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

escape + kill objective changes (#17890)

Browse Source 
* 3 space indent at start of line jumpscare

* _leftShuttles -> ShuttlesLeft

* stuff

* RequireDead override for the future

* fix 50% logic

* rouge

* pod 1984

* technically more "difficult"

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-07-09 22:00:08 +00:00
committed by GitHub
parent 53a0d1bc83
commit c346640ade
6 changed files with 441 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Content.Server/Objectives/Conditions/EscapeShuttleCondition.cs
View File

@@ -1,10 +1,8 @@
using Content.Server.Mind;
using Content.Server.Objectives.Interfaces;
using Content.Server.Shuttles.Components;
using Content.Server.Station.Components;
using Content.Server.Shuttles.Systems;
using Content.Shared.Cuffs.Components;
using JetBrains.Annotations;
using Robust.Shared.Map.Components;
using Robust.Shared.Utility;
namespace Content.Server.Objectives.Conditions
@@ -28,22 +26,6 @@ namespace Content.Server.Objectives.Conditions
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ("Structures/Furniture/chairs.rsi"), "shuttle");
private bool IsAgentOnShuttle(TransformComponent agentXform, EntityUid? shuttle)
{
if (shuttle == null)
return false;
var entMan = IoCManager.Resolve<IEntityManager>();
if (!entMan.TryGetComponent<MapGridComponent>(shuttle, out var shuttleGrid) ||
!entMan.TryGetComponent<TransformComponent>(shuttle, out var shuttleXform))
{
return false;
}
return shuttleXform.WorldMatrix.TransformBox(shuttleGrid.LocalAABB).Contains(agentXform.WorldPosition);
}
public float Progress
{
get {
@@ -54,25 +36,22 @@ namespace Content.Server.Objectives.Conditions
|| !entMan.TryGetComponent<TransformComponent>(_mind.OwnedEntity, out var xform))
return 0f;
var shuttleContainsAgent = false;
var agentIsAlive = !mindSystem.IsCharacterDeadIc(_mind);
var agentIsEscaping = true;
if (mindSystem.IsCharacterDeadIc(_mind))
return 0f;
if (entMan.TryGetComponent<CuffableComponent>(_mind.OwnedEntity, out var cuffed)
&& cuffed.CuffedHandCount > 0)
// You're not escaping if you're restrained!
agentIsEscaping = false;
// Any emergency shuttle counts for this objective.
foreach (var stationData in entMan.EntityQuery<StationEmergencyShuttleComponent>())
{
if (IsAgentOnShuttle(xform, stationData.EmergencyShuttle)) {
shuttleContainsAgent = true;
break;
}
// You're not escaping if you're restrained!
return 0f;
}
return (shuttleContainsAgent && agentIsAlive && agentIsEscaping) ? 1f : 0f;
// Any emergency shuttle counts for this objective, but not pods.
var emergencyShuttle = entMan.System<EmergencyShuttleSystem>();
if (!emergencyShuttle.IsTargetEscaping(_mind.OwnedEntity.Value))
return 0f;
return 1f;
}
}