escape + kill objective changes (#17890)

* 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>

Content.Server/Objectives/Conditions/EscapeShuttleCondition.cs

@@ -1,10 +1,8 @@
 using Content.Server.Mind;
 using Content.Server.Objectives.Interfaces;
-using Content.Server.Shuttles.Components;
+using Content.Server.Shuttles.Systems;
-using Content.Server.Station.Components;
 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;
+                if (mindSystem.IsCharacterDeadIc(_mind))
-                var agentIsAlive = !mindSystem.IsCharacterDeadIc(_mind);
+                    return 0f;
-                var agentIsEscaping = true;
 
                 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)) {
+                    // You're not escaping if you're restrained!
-                        shuttleContainsAgent = true;
+                    return 0f;
-                        break;
-                    }
                 }
 
-                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;
             }
         }
 

Content.Server/Objectives/Conditions/KillPersonCondition.cs

@@ -1,6 +1,9 @@
 using Content.Server.Mind;
 using Content.Server.Objectives.Interfaces;
+using Content.Server.Shuttles.Systems;
+using Content.Shared.CCVar;
 using Content.Shared.Mobs.Systems;
+using Robust.Shared.Configuration;
 using Robust.Shared.Utility;
 
 namespace Content.Server.Objectives.Conditions
@@ -12,6 +15,11 @@ namespace Content.Server.Objectives.Conditions
         protected Mind.Mind? Target;
         public abstract IObjectiveCondition GetAssigned(Mind.Mind mind);
 
+        /// <summary>
+        /// Whether the target must be truly dead, ignores missing evac.
+        /// </summary>
+        protected bool RequireDead = false;
+
         public string Title
         {
             get
@@ -37,13 +45,37 @@ namespace Content.Server.Objectives.Conditions
         {
             get
             {
-                var entityManager = IoCManager.Resolve<EntityManager>();
+                if (Target == null || Target.OwnedEntity == null)
-                var mindSystem = entityManager.System<MindSystem>();
+                    return 1f;
-                return Target == null || mindSystem.IsCharacterDeadIc(Target) ? 1f : 0f;
+
+                var entMan = IoCManager.Resolve<EntityManager>();
+                var mindSystem = entMan.System<MindSystem>();
+                if (mindSystem.IsCharacterDeadIc(Target))
+                    return 1f;
+
+                if (RequireDead)
+                    return 0f;
+
+                // if evac is disabled then they really do have to be dead
+                var configMan = IoCManager.Resolve<IConfigurationManager>();
+                if (!configMan.GetCVar(CCVars.EmergencyShuttleEnabled))
+                    return 0f;
+
+                // target is escaping so you fail
+                var emergencyShuttle = entMan.System<EmergencyShuttleSystem>();
+                if (emergencyShuttle.IsTargetEscaping(Target.OwnedEntity.Value))
+                    return 0f;
+
+                // evac has left without the target, greentext since the target is afk in space with a full oxygen tank and coordinates off.
+                if (emergencyShuttle.ShuttlesLeft)
+                    return 1f;
+
+                // if evac is still here and target hasn't boarded, show 50% to give you an indicator that you are doing good
+                return emergencyShuttle.EmergencyShuttleArrived ? 0f : 0.5f;
             }
         }
 
-        public float Difficulty => 2f;
+        public float Difficulty => 1.75f;
 
         public bool Equals(IObjectiveCondition? other)
         {

Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs

@@ -71,7 +71,10 @@ public sealed partial class EmergencyShuttleSystem
     /// </summary>
     private bool _launchedShuttles;
 
-    private bool _leftShuttles;
+    /// <summary>
+    /// Have the emergency shuttles left for CentCom?
+    /// </summary>
+    public bool ShuttlesLeft;
 
     /// <summary>
     /// Have we announced the launch?
@@ -209,9 +212,9 @@ public sealed partial class EmergencyShuttleSystem
         }
 
         // Departed
-        if (!_leftShuttles && _consoleAccumulator <= 0f)
+        if (!ShuttlesLeft && _consoleAccumulator <= 0f)
         {
-            _leftShuttles = true;
+            ShuttlesLeft = true;
             _chatSystem.DispatchGlobalAnnouncement(Loc.GetString("emergency-shuttle-left", ("transitTime", $"{TransitTime:0}")));
 
             Timer.Spawn((int) (TransitTime * 1000) + _bufferTime.Milliseconds, () => _roundEnd.EndRound(), _roundEndCancelToken?.Token ?? default);
@@ -309,7 +312,7 @@ public sealed partial class EmergencyShuttleSystem
     {
         _announced = false;
         _roundEndCancelToken = null;
-        _leftShuttles = false;
+        ShuttlesLeft = false;
         _launchedShuttles = false;
         _consoleAccumulator = float.MinValue;
         EarlyLaunchAuthorized = false;

Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs

@@ -382,4 +382,37 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
 
         component.LaunchTime = component.LaunchTime.Value + args.PausedTime;
     }
+
+    /// <summary>
+    /// Returns whether a target is escaping on the emergency shuttle, but only if evac has arrived.
+    /// </summary>
+    public bool IsTargetEscaping(EntityUid target)
+    {
+        // if evac isn't here then sitting in a pod doesn't return true
+        if (!EmergencyShuttleArrived)
+            return false;
+
+        // check each emergency shuttle
+        var xform = Transform(target);
+        foreach (var stationData in EntityQuery<StationEmergencyShuttleComponent>())
+        {
+            if (stationData.EmergencyShuttle == null)
+                continue;
+
+            if (IsOnGrid(xform, stationData.EmergencyShuttle.Value))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private bool IsOnGrid(TransformComponent xform, EntityUid shuttle, MapGridComponent? grid = null, TransformComponent? shuttleXform = null)
+    {
+        if (!Resolve(shuttle, ref grid, ref shuttleXform))
+            return false;
+
+        return shuttleXform.WorldMatrix.TransformBox(grid.LocalAABB).Contains(xform.WorldPosition);
+    }
 }

Resources/Locale/en-US/objectives/conditions/escape-shuttle-condition.ftl

@@ -1,2 +1,2 @@
-objective-condition-escape-shuttle-title = Escape on the emergency shuttle alive and unrestrained.
+objective-condition-escape-shuttle-title = Escape to centcom alive and unrestrained.
 objective-condition-escape-shuttle-description = One of our undercover agents will debrief you when you arrive. Don't show up in cuffs.

Resources/Locale/en-US/objectives/conditions/kill-person-condition.ftl

@@ -1,2 +1,2 @@
-objective-condition-kill-person-title = Kill {$targetName}, {CAPITALIZE($job)}
+objective-condition-kill-person-title = Kill or maroon {$targetName}, {CAPITALIZE($job)}
-objective-condition-kill-person-description = Do it however you like, just make sure they don't last the shift.
+objective-condition-kill-person-description = Do it however you like, just make sure they don't make it to centcom.