Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Nukie win conditions (#10220)

Browse Source 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
This commit is contained in:
Flipp Syder
2022-09-13 19:42:19 -07:00
committed by GitHub
parent 053c70d8d5
commit ffbd0085bc
5 changed files with 334 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Content.Server/Shuttles/Systems/ShuttleSystem.EmergencyShuttle.cs
View File

@@ -38,8 +38,8 @@ public sealed partial class ShuttleSystem
[Dependency] private readonly DockingSystem _dockSystem = default!;
[Dependency] private readonly StationSystem _station = default!;
private MapId? _centComMap;
private EntityUid? _centCom;
public MapId? CentComMap { get; private set; }
public EntityUid? CentCom { get; private set; }
/// <summary>
/// Used for multiple shuttle spawn offsets.
@@ -367,8 +367,8 @@ public sealed partial class ShuttleSystem
_consoleAccumulator = _configManager.GetCVar(CCVars.EmergencyShuttleDockTime);
EmergencyShuttleArrived = true;
if (_centComMap != null)
_mapManager.SetMapPaused(_centComMap.Value, false);
if (CentComMap != null)
_mapManager.SetMapPaused(CentComMap.Value, false);
foreach (var comp in EntityQuery<StationDataComponent>(true))
{
@@ -394,21 +394,21 @@ public sealed partial class ShuttleSystem
private void SetupEmergencyShuttle()
{
if (!_emergencyShuttleEnabled || _centComMap != null && _mapManager.MapExists(_centComMap.Value)) return;
if (!_emergencyShuttleEnabled || CentComMap != null && _mapManager.MapExists(CentComMap.Value)) return;
_centComMap = _mapManager.CreateMap();
_mapManager.SetMapPaused(_centComMap.Value, true);
CentComMap = _mapManager.CreateMap();
_mapManager.SetMapPaused(CentComMap.Value, true);
// Load CentCom
var centComPath = _configManager.GetCVar(CCVars.CentcommMap);
if (!string.IsNullOrEmpty(centComPath))
{
var (_, centcomm) = _loader.LoadGrid(_centComMap.Value, "/Maps/centcomm.yml");
_centCom = centcomm;
var (_, centcomm) = _loader.LoadGrid(CentComMap.Value, "/Maps/centcomm.yml");
CentCom = centcomm;
if (_centCom != null)
AddFTLDestination(_centCom.Value, false);
if (CentCom != null)
AddFTLDestination(CentCom.Value, false);
}
else
{
@@ -423,10 +423,10 @@ public sealed partial class ShuttleSystem
private void AddEmergencyShuttle(StationDataComponent component)
{
if (!_emergencyShuttleEnabled || _centComMap == null || component.EmergencyShuttle != null) return;
if (!_emergencyShuttleEnabled || CentComMap == null || component.EmergencyShuttle != null) return;
// Load escape shuttle
var (_, shuttle) = _loader.LoadGrid(_centComMap.Value, component.EmergencyShuttlePath.ToString(), new MapLoadOptions()
var (_, shuttle) = _loader.LoadGrid(CentComMap.Value, component.EmergencyShuttlePath.ToString(), new MapLoadOptions()
{
// Should be far enough... right? I'm too lazy to bounds check CentCom rn.
Offset = new Vector2(500f + _shuttleIndex, 0f)
@@ -452,13 +452,13 @@ public sealed partial class ShuttleSystem
_shuttleIndex = 0f;
if (_centComMap == null || !_mapManager.MapExists(_centComMap.Value))
if (CentComMap == null || !_mapManager.MapExists(CentComMap.Value))
{
_centComMap = null;
CentComMap = null;
return;
}
_mapManager.DeleteMap(_centComMap.Value);
_mapManager.DeleteMap(CentComMap.Value);
}
/// <summary>