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

Cargo shuttle changes (#14363)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-23 16:10:49 +11:00
committed by GitHub
parent 7f4bb7fe8a
commit 569f30b721
26 changed files with 523 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Shared/Cargo/BUI/CargoShuttleConsoleBoundUserInterfaceState.cs
View File

@@ -8,18 +8,6 @@ public sealed class CargoShuttleConsoleBoundUserInterfaceState : BoundUserInterf
public string AccountName;
public string ShuttleName;
// Unfortunately shuttles have essentially 3 states so can't just use a nullable var for it:
// 1. stowed
// 2. called but not recallable
// 3. called and recallable
// The reason we have 2 is so people don't spam the recall button in the UI.
public bool CanRecall;
/// <summary>
/// When the shuttle is expected to be usable.
/// </summary>
public TimeSpan? ShuttleETA;
/// <summary>
/// List of orders expected on the delivery.
/// </summary>
@@ -28,14 +16,10 @@ public sealed class CargoShuttleConsoleBoundUserInterfaceState : BoundUserInterf
public CargoShuttleConsoleBoundUserInterfaceState(
string accountName,
string shuttleName,
bool canRecall,
TimeSpan? shuttleETA,
List<CargoOrderData> orders)
{
AccountName = accountName;
ShuttleName = shuttleName;
CanRecall = canRecall;
ShuttleETA = shuttleETA;
Orders = orders;
}
}

15
Content.Shared/Cargo/Components/CargoShuttleComponent.cs
View File

@@ -10,21 +10,6 @@ namespace Content.Shared.Cargo.Components;
[RegisterComponent, Access(typeof(SharedCargoSystem))]
public sealed class CargoShuttleComponent : Component
{
[ViewVariables(VVAccess.ReadWrite), DataField("nextCall")]
public TimeSpan? NextCall;
[ViewVariables(VVAccess.ReadWrite), DataField("cooldown")]
public float Cooldown = 30f;
[ViewVariables]
public bool CanRecall;
/// <summary>
/// The shuttle's assigned coordinates on the cargo map.
/// </summary>
[ViewVariables]
public EntityCoordinates Coordinates;
/// <summary>
/// The assigned station for this cargo shuttle.
/// </summary>

12
Content.Shared/Cargo/Events/CargoCallShuttleMessage.cs
View File

@@ -1,12 +0,0 @@
using Robust.Shared.Serialization;
namespace Content.Shared.Cargo.Events;
/// <summary>
/// Raised on a cargo console requesting the cargo shuttle.
/// </summary>
[Serializable, NetSerializable]
public sealed class CargoCallShuttleMessage : BoundUserInterfaceMessage
{
}

12
Content.Shared/Cargo/Events/CargoRecallShuttleMessage.cs
View File

@@ -1,12 +0,0 @@
using Robust.Shared.Serialization;
namespace Content.Shared.Cargo.Events;
/// <summary>
/// Raised on a client request cargo shuttle recall
/// </summary>
[Serializable, NetSerializable]
public sealed class CargoRecallShuttleMessage : BoundUserInterfaceMessage
{
}