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.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;
             }
         }
 

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>();
-                var mindSystem = entityManager.System<MindSystem>();
-                return Target == null || mindSystem.IsCharacterDeadIc(Target) ? 1f : 0f;
+                if (Target == null || Target.OwnedEntity == null)
+                    return 1f;
+
+                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)
         {