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

Coordinates Disks & Shuttle FTL Travel (#23240)

Browse Source 
* Adds the CentComm Disk and configures it to work with direct-use shuttles

* Added functionality for drone shuttles (i.e. cargo shuttle)

* Adds support for pods, and a disk console object for disks to be inserted into. Also sprites.

* Added the disk to HoP's locker

* Removed leftover logs & comments

* Fix for integration test

* Apply suggestions from code review (formatting & proper DataField)

Co-authored-by: 0x6273 <0x40@keemail.me>

* Fix integration test & changes based on code review

* Includes Disk Cases to contain Coordinate Disks, which are now CDs instead of Floppy Disks

* Check pods & non-evac shuttles for CentCom travel, even in FTL

* Import

* Remove CentCom travel restrictions & pod disk consoles

* Major changes that changes the coordinates disk system to work with salvage expeditions

* Missed CC diskcase removal

* Fix build

* Review suggestions and changes

* Major additional changes after merge

* Minor tag miss

* Integration test fix

* review

---------

Co-authored-by: 0x6273 <0x40@keemail.me>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
SlamBamActionman
2024-04-01 06:50:00 +02:00
committed by GitHub
parent cc35f16839
commit bed9e9ac6a
24 changed files with 217 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Salvage/SalvageSystem.ExpeditionConsole.cs
View File

@@ -1,10 +1,16 @@
using Content.Shared.Shuttles.Components;
using Content.Shared.Procedural;
using Content.Shared.Salvage.Expeditions;
using Content.Shared.Dataset;
using Robust.Shared.Prototypes;
namespace Content.Server.Salvage;
public sealed partial class SalvageSystem
{
[ValidatePrototypeId<EntityPrototype>]
public const string CoordinatesDisk = "CoordinatesDisk";
private void OnSalvageClaimMessage(EntityUid uid, SalvageExpeditionConsoleComponent component, ClaimSalvageMessage args)
{
var station = _station.GetOwningStation(uid);
@@ -15,11 +21,16 @@ public sealed partial class SalvageSystem
if (!data.Missions.TryGetValue(args.Index, out var missionparams))
return;
SpawnMission(missionparams, station.Value);
var cdUid = Spawn(CoordinatesDisk, Transform(uid).Coordinates);
SpawnMission(missionparams, station.Value, cdUid);
data.ActiveMission = args.Index;
var mission = GetMission(_prototypeManager.Index<SalvageDifficultyPrototype>(missionparams.Difficulty), missionparams.Seed);
data.NextOffer = _timing.CurTime + mission.Duration + TimeSpan.FromSeconds(1);
_labelSystem.Label(cdUid, GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), missionparams.Seed));
_audio.PlayPvs(component.PrintSound, uid);
UpdateConsoles((station.Value, data));
}

5
Content.Server/Salvage/SalvageSystem.Expeditions.cs
View File

@@ -8,6 +8,7 @@ using Content.Shared.Salvage.Expeditions;
using Robust.Shared.CPUJob.JobQueues;
using Robust.Shared.CPUJob.JobQueues.Queues;
using Robust.Shared.GameStates;
using Robust.Shared.Map;
namespace Content.Server.Salvage;
@@ -148,7 +149,7 @@ public sealed partial class SalvageSystem
return new SalvageExpeditionConsoleState(component.NextOffer, component.Claimed, component.Cooldown, component.ActiveMission, missions);
}
private void SpawnMission(SalvageMissionParams missionParams, EntityUid station)
private void SpawnMission(SalvageMissionParams missionParams, EntityUid station, EntityUid? coordinatesDisk)
{
var cancelToken = new CancellationTokenSource();
var job = new SpawnSalvageMissionJob(
@@ -162,7 +163,9 @@ public sealed partial class SalvageSystem
_biome,
_dungeon,
_metaData,
_transform,
station,
coordinatesDisk,
missionParams,
cancelToken.Token);

3
Content.Server/Salvage/SalvageSystem.cs
View File

@@ -32,6 +32,7 @@ using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Map.Components;
using Robust.Shared.Timing;
using Content.Server.Labels;
namespace Content.Server.Salvage
{
@@ -39,6 +40,7 @@ namespace Content.Server.Salvage
{
[Dependency] private readonly IChatManager _chat = default!;
[Dependency] private readonly IConfigurationManager _configurationManager = default!;
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly ILogManager _logManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
@@ -48,6 +50,7 @@ namespace Content.Server.Salvage
[Dependency] private readonly BiomeSystem _biome = default!;
[Dependency] private readonly DungeonSystem _dungeon = default!;
[Dependency] private readonly GravitySystem _gravity = default!;
[Dependency] private readonly LabelSystem _labelSystem = default!;
[Dependency] private readonly MapLoaderSystem _map = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
[Dependency] private readonly RadioSystem _radioSystem = default!;

26
Content.Server/Salvage/SpawnSalvageMissionJob.cs
View File

@@ -33,6 +33,9 @@ using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
using Content.Server.Shuttles.Components;
using Content.Shared.Coordinates;
using Content.Shared.Shuttles.Components;
namespace Content.Server.Salvage;
@@ -46,8 +49,10 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
private readonly BiomeSystem _biome;
private readonly DungeonSystem _dungeon;
private readonly MetaDataSystem _metaData;
private readonly SharedTransformSystem _xforms;
public readonly EntityUid Station;
public readonly EntityUid? CoordinatesDisk;
private readonly SalvageMissionParams _missionParams;
private readonly ISawmill _sawmill;
@@ -63,7 +68,9 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
BiomeSystem biome,
DungeonSystem dungeon,
MetaDataSystem metaData,
SharedTransformSystem xform,
EntityUid station,
EntityUid? coordinatesDisk,
SalvageMissionParams missionParams,
CancellationToken cancellation = default) : base(maxTime, cancellation)
{
@@ -75,7 +82,9 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
_biome = biome;
_dungeon = dungeon;
_metaData = metaData;
_xforms = xform;
Station = station;
CoordinatesDisk = coordinatesDisk;
_missionParams = missionParams;
_sawmill = logManager.GetSawmill("salvage_job");
#if !DEBUG
@@ -94,6 +103,18 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
var random = new Random(_missionParams.Seed);
var destComp = _entManager.AddComponent<FTLDestinationComponent>(mapUid);
destComp.BeaconsOnly = true;
destComp.RequireCoordinateDisk = true;
destComp.Enabled = true;
_metaData.SetEntityName(mapUid, SharedSalvageSystem.GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), _missionParams.Seed));
_entManager.AddComponent<FTLBeaconComponent>(mapUid);
// Saving the mission mapUid to a CD is made optional, in case one is somehow made in a process without a CD entity
if (CoordinatesDisk.HasValue)
{
var cd = _entManager.EnsureComponent<ShuttleDestinationCoordinatesComponent>(CoordinatesDisk.Value);
cd.Destination = mapUid;
_entManager.Dirty(CoordinatesDisk.Value, cd);
}
// Setup mission configs
// As we go through the config the rating will deplete so we'll go for most important to least important.
@@ -144,11 +165,6 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
expedition.EndTime = _timing.CurTime + mission.Duration;
expedition.MissionParams = _missionParams;
// Don't want consoles to have the incorrect name until refreshed.
var ftlUid = _entManager.CreateEntityUninitialized("FTLPoint", new EntityCoordinates(mapUid, grid.TileSizeHalfVector));
_metaData.SetEntityName(ftlUid, SharedSalvageSystem.GetFTLName(_prototypeManager.Index<DatasetPrototype>("names_borer"), _missionParams.Seed));
_entManager.InitializeAndStartEntity(ftlUid);
var landingPadRadius = 24;
var minDungeonOffset = landingPadRadius + 4;

2
Content.Server/Shuttles/Components/EscapePodComponent.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Server.Shuttles.Components;
[RegisterComponent, Access(typeof(EmergencyShuttleSystem)), AutoGenerateComponentPause]
public sealed partial class EscapePodComponent : Component
{
[DataField("launchTime", customTypeSerializer:typeof(TimeOffsetSerializer))]
[DataField(customTypeSerializer:typeof(TimeOffsetSerializer))]
[AutoPausedField]
public TimeSpan? LaunchTime;
}

6
Content.Server/Shuttles/Components/ShuttleConsoleComponent.cs
View File

@@ -14,5 +14,11 @@ namespace Content.Server.Shuttles.Components
/// </summary>
[DataField("zoom")]
public Vector2 Zoom = new(1.5f, 1.5f);
/// <summary>
/// Should this console have access to restricted FTL destinations?
/// </summary>
[ViewVariables(VVAccess.ReadWrite), DataField("whitelistSpecific")]
public List<EntityUid> FTLWhitelist = new List<EntityUid>();
}
}

2
Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
View File

@@ -418,7 +418,7 @@ public sealed partial class EmergencyShuttleSystem : EntitySystem
}
var mapId = _mapManager.CreateMap();
var grid = _map.LoadGrid(mapId, component.Map.ToString(), new MapLoadOptions()
var grid = _map.LoadGrid(mapId, component.Map.ToString(), new MapLoadOptions()
{
LoadMap = false,
});

6
Content.Server/Shuttles/Systems/ShuttleConsoleSystem.FTL.cs
View File

@@ -44,6 +44,10 @@ public sealed partial class ShuttleConsoleSystem
}
var nCoordinates = new NetCoordinates(GetNetEntity(targetXform.ParentUid), targetXform.LocalPosition);
if (targetXform.ParentUid == EntityUid.Invalid)
{
nCoordinates = new NetCoordinates(GetNetEntity(beaconEnt), targetXform.LocalPosition);
}
// Check target exists
if (!_shuttle.CanFTLBeacon(nCoordinates))
@@ -128,7 +132,7 @@ public sealed partial class ShuttleConsoleSystem
}
// Check shuttle can FTL to this target.
if (!_shuttle.CanFTLTo(shuttleUid.Value, targetMap))
if (!_shuttle.CanFTLTo(shuttleUid.Value, targetMap, ent))
{
return;
}