Objectives all use a consistent definition of "dead" defined in Mind now. DieCondition is no longer inverted. (#4006)

More brain fixes, mainly
2021-05-15 16:46:55 +01:00
parent ae8887dea6
commit f6a2daffa9
4 changed files with 40 additions and 44 deletions
--- a/Content.Server/Objectives/Conditions/StayAliveCondition.cs
+++ b/Content.Server/Objectives/Conditions/StayAliveCondition.cs
@@ -26,12 +26,7 @@ namespace Content.Server.Objectives.Conditions

        public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Objects/Misc/skub.rsi"), "icon"); //didn't know what else would have been a good icon for staying alive

-        public float Progress => _mind?
-            .OwnedEntity?
-            .GetComponentOrNull<IMobStateComponent>()?
-            .IsDead() ?? false
-            ? 0f
-            : 1f;
+        public float Progress => (_mind?.CharacterDeadIC ?? false) ? 0f : 1f;

        public float Difficulty => 1f;