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

Lower shuttle time + recall turning point (#9328)

Browse Source
This commit is contained in:
Kara
2022-07-01 13:40:36 -07:00
committed by GitHub
parent e643699dc4
commit 43b0f303c3
6 changed files with 72 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/RoundEnd/RoundEndSystem.cs
View File

@@ -42,7 +42,10 @@ namespace Content.Server.RoundEnd
private CancellationTokenSource? _countdownTokenSource = null;
private CancellationTokenSource? _cooldownTokenSource = null;
public TimeSpan? LastCountdownStart { get; set; } = null;
public TimeSpan? ExpectedCountdownEnd { get; set; } = null;
public TimeSpan? ExpectedShuttleLength => ExpectedCountdownEnd - LastCountdownStart;
public TimeSpan? ShuttleTimeLeft => ExpectedCountdownEnd - _gameTiming.CurTime;
public override void Initialize()
{
@@ -64,11 +67,12 @@ namespace Content.Server.RoundEnd
_cooldownTokenSource = null;
}
LastCountdownStart = null;
ExpectedCountdownEnd = null;
RaiseLocalEvent(RoundEndSystemChangedEvent.Default);
}
public bool CanCall()
public bool CanCallOrRecall()
{
return _cooldownTokenSource == null;
}
@@ -133,6 +137,7 @@ namespace Content.Server.RoundEnd
SoundSystem.Play("/Audio/Announcements/shuttlecalled.ogg", Filter.Broadcast());
LastCountdownStart = _gameTiming.CurTime;
ExpectedCountdownEnd = _gameTiming.CurTime + countdownTime;
Timer.Spawn(countdownTime, _shuttle.CallEmergencyShuttle, _countdownTokenSource.Token);
@@ -163,6 +168,7 @@ namespace Content.Server.RoundEnd
SoundSystem.Play("/Audio/Announcements/shuttlerecalled.ogg", Filter.Broadcast());
LastCountdownStart = null;
ExpectedCountdownEnd = null;
ActivateCooldown();
RaiseLocalEvent(RoundEndSystemChangedEvent.Default);
@@ -171,6 +177,7 @@ namespace Content.Server.RoundEnd
public void EndRound()
{
if (_gameTicker.RunLevel != GameRunLevel.InRound) return;
LastCountdownStart = null;
ExpectedCountdownEnd = null;
RaiseLocalEvent(RoundEndSystemChangedEvent.Default);
_gameTicker.EndRound();