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

[HOTFIX] Fix maroon objective, change the text (#36990)

Browse Source 
* test

* text

* capital C

* guh
This commit is contained in:
ScarKy0
2025-04-28 11:31:42 +02:00
committed by GitHub
parent fba07c69a9
commit 14cca7990a
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
View File

@@ -39,8 +39,7 @@ public sealed class KillPersonConditionSystem : EntitySystem
return 1f;
var targetDead = _mind.IsCharacterDeadIc(mind);
var targetMarooned = !_emergencyShuttle.IsTargetEscaping(target) &&
_emergencyShuttle.ShuttlesLeft;
var targetOnShuttle = _emergencyShuttle.IsTargetEscaping(mind.OwnedEntity.Value);
if (!_config.GetCVar(CCVars.EmergencyShuttleEnabled) && requireMaroon)
{
requireDead = true;
@@ -50,8 +49,17 @@ public sealed class KillPersonConditionSystem : EntitySystem
if (requireDead && !targetDead)
return 0f;
if (requireMaroon) // if evac is still here and target hasn't boarded, show 50% to give you an indicator that you are doing good
return targetMarooned ? 1f : _emergencyShuttle.EmergencyShuttleArrived ? 0.5f : 0f;
// Always failed if the target needs to be marooned and the shuttle hasn't even arrived yet
if (requireMaroon && !_emergencyShuttle.EmergencyShuttleArrived)
return 0f;
// If the shuttle hasn't left, give 50% progress if the target isn't on the shuttle as a "almost there!"
if (requireMaroon && !_emergencyShuttle.ShuttlesLeft)
return targetOnShuttle ? 0f : 0.5f;
// If the shuttle has already left, and the target isn't on it, 100%
if (requireMaroon && _emergencyShuttle.ShuttlesLeft)
return targetOnShuttle ? 0f : 1f;
return 1f; // Good job you did it woohoo
}