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

Add map names to stuff (#21760)

Browse Source 
- Station map
- FTL map
This commit is contained in:
metalgearsloth
2023-11-22 15:35:37 +11:00
committed by GitHub
parent 1ef0ed132b
commit ee3e3583bd
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameTicking/GameTicker.RoundFlow.cs
View File

@@ -163,6 +163,8 @@ namespace Content.Server.GameTicking
var gridIds = _map.LoadMap(targetMapId, ev.GameMap.MapPath.ToString(), ev.Options);
_metaData.SetEntityName(_mapManager.GetMapEntityId(targetMapId), "Station map");
var gridUids = gridIds.ToList();
RaiseLocalEvent(new PostGameMapLoad(map, targetMapId, gridUids, stationName));

7
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
View File

@@ -213,7 +213,7 @@ public sealed partial class ShuttleSystem
if (HasComp<FTLComponent>(uid))
{
_sawmill.Warning($"Tried queuing {ToPrettyString(uid)} which already has HyperspaceComponent?");
Log.Warning($"Tried queuing {ToPrettyString(uid)} which already has HyperspaceComponent?");
return false;
}
@@ -404,7 +404,7 @@ public sealed partial class ShuttleSystem
_console.RefreshShuttleConsoles(uid);
break;
default:
_sawmill.Error($"Found invalid FTL state {comp.State} for {uid}");
Log.Error($"Found invalid FTL state {comp.State} for {uid}");
RemComp<FTLComponent>(uid);
break;
}
@@ -453,7 +453,8 @@ public sealed partial class ShuttleSystem
return;
_hyperSpaceMap = _mapManager.CreateMap();
_sawmill.Info($"Setup hyperspace map at {_hyperSpaceMap.Value}");
_metadata.SetEntityName(_mapManager.GetMapEntityId(_hyperSpaceMap.Value), "FTL");
Log.Debug($"Setup hyperspace map at {_hyperSpaceMap.Value}");
DebugTools.Assert(!_mapManager.IsMapPaused(_hyperSpaceMap.Value));
var parallax = EnsureComp<ParallaxComponent>(_mapManager.GetMapEntityId(_hyperSpaceMap.Value));
parallax.Parallax = "FastSpace";

4
Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs
View File

@@ -80,7 +80,7 @@ public sealed partial class ShuttleSystem
if (!valid)
{
_sawmill.Error($"Error loading gridspawn for {ToPrettyString(uid)} / {path}");
Log.Error($"Error loading gridspawn for {ToPrettyString(uid)} / {path}");
}
}
@@ -129,7 +129,7 @@ public sealed partial class ShuttleSystem
if (!valid)
{
_sawmill.Error($"Error loading gridfill dock for {ToPrettyString(uid)} / {component.Path}");
Log.Error($"Error loading gridfill dock for {ToPrettyString(uid)} / {component.Path}");
}
_mapManager.DeleteMap(mapId);

4
Content.Server/Shuttles/Systems/ShuttleSystem.cs
View File

@@ -33,6 +33,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
[Dependency] private readonly EntityLookupSystem _lookup = default!;
[Dependency] private readonly FixtureSystem _fixtures = default!;
[Dependency] private readonly MapLoaderSystem _loader = default!;
[Dependency] private readonly MetaDataSystem _metadata = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
@@ -43,14 +44,11 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
[Dependency] private readonly ThrusterSystem _thruster = default!;
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
private ISawmill _sawmill = default!;
public const float TileMassMultiplier = 0.5f;
public override void Initialize()
{
base.Initialize();
_sawmill = Logger.GetSawmill("shuttles");
InitializeFTL();
InitializeGridFills();