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

View File

@@ -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;