From 77a8e16104ad932b9426756a47813db20ce62a7a Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 23 Jun 2022 14:36:47 +1000
Subject: [PATCH] Add cargo shuttle (#8686)
---
.../CargoOrderConsoleBoundUserInterface.cs} | 105 +-
.../CargoShuttleConsoleBoundUserInterface.cs | 57 +
.../Components/CargoOrderDatabaseComponent.cs | 56 -
.../{ => Systems}/CargoSystem.Telepad.cs | 2 +-
.../Cargo/{ => Systems}/CargoSystem.cs | 2 +-
Content.Client/Cargo/UI/CargoConsoleMenu.xaml | 27 +-
.../Cargo/UI/CargoConsoleMenu.xaml.cs | 104 +-
.../Cargo/UI/CargoProductRow.xaml.cs | 1 +
Content.Client/Cargo/UI/CargoShuttleMenu.xaml | 47 +
.../Cargo/UI/CargoShuttleMenu.xaml.cs | 128 ++
.../Cargo/UI/GalacticBankSelectionMenu.cs | 45 -
Content.Client/Entry/EntryPoint.cs | 1 -
.../BUI/RadarConsoleBoundUserInterface.cs | 1 +
.../BUI/ShuttleConsoleBoundUserInterface.cs | 2 +
.../Shuttles/Systems/DockingSystem.cs | 18 +-
Content.Client/Shuttles/UI/DockingControl.cs | 12 +-
.../Shuttles/UI/RadarConsoleWindow.xaml.cs | 6 +
Content.Client/Shuttles/UI/RadarControl.cs | 33 +-
.../Shuttles/UI/ShuttleConsoleWindow.xaml.cs | 72 +-
Content.IntegrationTests/Tests/CargoTest.cs | 39 +
.../AtmosphereSystem.Commands.cs | 2 -
Content.Server/Cargo/CargoBankAccount.cs | 33 -
Content.Server/Cargo/CargoOrderDatabase.cs | 129 --
.../Cargo/Components/CargoConsoleComponent.cs | 205 --
.../Components/CargoOrderConsoleComponent.cs | 17 +
.../Components/CargoOrderDatabaseComponent.cs | 26 -
.../Cargo/Components/CargoPalletComponent.cs | 7 +
.../Components/CargoPilotConsoleComponent.cs | 15 +
.../CargoShuttleConsoleComponent.cs | 10 +
.../Cargo/Components/CargoTelepadComponent.cs | 5 +-
.../Components/StationBankAccountComponent.cs | 19 +
.../StationCargoOrderDatabaseComponent.cs | 33 +
Content.Server/Cargo/ICargoBankAccount.cs | 10 -
.../Cargo/Systems/CargoSystem.Console.cs | 240 --
.../Cargo/Systems/CargoSystem.Orders.cs | 324 +++
.../Cargo/Systems/CargoSystem.Shuttle.cs | 528 +++++
.../Cargo/Systems/CargoSystem.Telepad.cs | 49 +-
Content.Server/Cargo/Systems/CargoSystem.cs | 20 +
.../GameTicking/Rules/NukeopsRuleSystem.cs | 21 +-
.../Gravity/EntitySystems/WeightlessSystem.cs | 7 +
.../Physics/Controllers/MoverController.cs | 14 +-
.../Shuttles/Events/ConsoleShuttleEvent.cs | 12 +
.../Shuttles/Systems/RadarConsoleSystem.cs | 11 +-
.../Shuttles/Systems/ShuttleConsoleSystem.cs | 45 +-
.../Cargo/BUI/CargoConsoleInterfaceState.cs | 22 +
...goShuttleConsoleBoundUserInterfaceState.cs | 41 +
Content.Shared/Cargo/CargoOrderData.cs | 4 +-
.../Cargo/Components/CargoShuttleComponent.cs | 31 +
.../Components/SharedCargoConsoleComponent.cs | 95 -
.../SharedCargoOrderDatabaseComponent.cs | 21 -
.../Cargo/Events/CargoCallShuttleMessage.cs | 12 +
.../Events/CargoConsoleAddOrderMessage.cs | 23 +
.../Events/CargoConsoleApproveOrderMessage.cs | 17 +
.../Events/CargoConsoleRemoveOrderMessage.cs | 17 +
.../Cargo/Events/CargoRecallShuttleMessage.cs | 12 +
.../{ => Prototypes}/CargoProductPrototype.cs | 4 +-
.../Cargo/Prototypes/CargoShuttlePrototype.cs | 20 +
Content.Shared/Cargo/SharedCargoSystem.cs | 8 +
.../RadarConsoleBoundInterfaceState.cs | 18 +-
.../ShuttleConsoleBoundInterfaceState.cs | 5 +-
.../Components/RadarConsoleComponent.cs | 2 +-
Resources/Audio/Effects/Cargo/buzz_sigh.ogg | Bin 0 -> 8972 bytes
Resources/Audio/Effects/Cargo/buzz_two.ogg | Bin 0 -> 12724 bytes
Resources/Audio/Effects/Cargo/licenses.txt | 7 +
Resources/Audio/Effects/Cargo/ping.ogg | Bin 0 -> 8578 bytes
Resources/Audio/Effects/error.ogg | Bin 14629 -> 0 bytes
.../en-US/cargo/cargo-console-component.ftl | 43 +
.../cargo-console-order-component.ftl | 0
.../cargo-order-database-component.ftl | 0
.../components/cargo-console-component.ftl | 27 -
.../cargo/galactic-bank-selection-menu.ftl | 1 -
.../{components => }/price-gun-component.ftl | 0
Resources/Maps/Salvage/stationstation.yml | 4 +-
Resources/Maps/atlas.yml | 16 +-
Resources/Maps/bagel.yml | 21 +-
Resources/Maps/barratry.yml | 14 +-
Resources/Maps/cargo_shuttle.yml | 2011 +++++++++++++++++
Resources/Maps/delta.yml | 54 +-
Resources/Maps/marathon.yml | 13 +-
Resources/Maps/nss_pillar.yml | 11 +-
Resources/Maps/packedstation.yml | 11 +-
Resources/Maps/packedstationxmas.yml | 8 +-
Resources/Maps/saltern.yml | 20 +-
Resources/Maps/splitstation.yml | 9 +-
Resources/Maps/ssreach.yml | 4 +-
Resources/Maps/waystation.yml | 13 +-
.../Catalog/Cargo/cargo_materials.yml | 4 +-
.../Datasets/Names/cargo_shuttle.yml | 11 +
.../Prototypes/Entities/Mobs/NPCs/animals.yml | 7 +-
.../Prototypes/Entities/Mobs/NPCs/pets.yml | 4 +
.../Entities/Mobs/NPCs/simplemob.yml | 2 +
.../Entities/Mobs/Player/admin_ghost.yml | 9 +-
.../Devices/Circuitboards/computer.yml | 4 +-
.../Objects/Specific/Cargo/cargo_pallet.yml | 12 +
.../Machines/Computers/computers.yml | 56 +-
.../Structures/Shuttles/thrusters.yml | 25 +
.../Entities/Structures/cargo_console.yml | 51 +
.../Entities/Structures/cargo_telepad.yml | 52 -
Resources/Prototypes/shuttles.yml | 4 +
99 files changed, 4064 insertions(+), 1356 deletions(-)
rename Content.Client/Cargo/{CargoConsoleBoundUserInterface.cs => BUI/CargoOrderConsoleBoundUserInterface.cs} (55%)
create mode 100644 Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs
delete mode 100644 Content.Client/Cargo/Components/CargoOrderDatabaseComponent.cs
rename Content.Client/Cargo/{ => Systems}/CargoSystem.Telepad.cs (98%)
rename Content.Client/Cargo/{ => Systems}/CargoSystem.cs (88%)
create mode 100644 Content.Client/Cargo/UI/CargoShuttleMenu.xaml
create mode 100644 Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
delete mode 100644 Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs
create mode 100644 Content.IntegrationTests/Tests/CargoTest.cs
delete mode 100644 Content.Server/Cargo/CargoBankAccount.cs
delete mode 100644 Content.Server/Cargo/CargoOrderDatabase.cs
delete mode 100644 Content.Server/Cargo/Components/CargoConsoleComponent.cs
create mode 100644 Content.Server/Cargo/Components/CargoOrderConsoleComponent.cs
delete mode 100644 Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs
create mode 100644 Content.Server/Cargo/Components/CargoPalletComponent.cs
create mode 100644 Content.Server/Cargo/Components/CargoPilotConsoleComponent.cs
create mode 100644 Content.Server/Cargo/Components/CargoShuttleConsoleComponent.cs
create mode 100644 Content.Server/Cargo/Components/StationBankAccountComponent.cs
create mode 100644 Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
delete mode 100644 Content.Server/Cargo/ICargoBankAccount.cs
delete mode 100644 Content.Server/Cargo/Systems/CargoSystem.Console.cs
create mode 100644 Content.Server/Cargo/Systems/CargoSystem.Orders.cs
create mode 100644 Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
create mode 100644 Content.Server/Shuttles/Events/ConsoleShuttleEvent.cs
create mode 100644 Content.Shared/Cargo/BUI/CargoConsoleInterfaceState.cs
create mode 100644 Content.Shared/Cargo/BUI/CargoShuttleConsoleBoundUserInterfaceState.cs
create mode 100644 Content.Shared/Cargo/Components/CargoShuttleComponent.cs
delete mode 100644 Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs
delete mode 100644 Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs
create mode 100644 Content.Shared/Cargo/Events/CargoCallShuttleMessage.cs
create mode 100644 Content.Shared/Cargo/Events/CargoConsoleAddOrderMessage.cs
create mode 100644 Content.Shared/Cargo/Events/CargoConsoleApproveOrderMessage.cs
create mode 100644 Content.Shared/Cargo/Events/CargoConsoleRemoveOrderMessage.cs
create mode 100644 Content.Shared/Cargo/Events/CargoRecallShuttleMessage.cs
rename Content.Shared/Cargo/{ => Prototypes}/CargoProductPrototype.cs (97%)
create mode 100644 Content.Shared/Cargo/Prototypes/CargoShuttlePrototype.cs
create mode 100644 Resources/Audio/Effects/Cargo/buzz_sigh.ogg
create mode 100644 Resources/Audio/Effects/Cargo/buzz_two.ogg
create mode 100644 Resources/Audio/Effects/Cargo/licenses.txt
create mode 100644 Resources/Audio/Effects/Cargo/ping.ogg
delete mode 100644 Resources/Audio/Effects/error.ogg
create mode 100644 Resources/Locale/en-US/cargo/cargo-console-component.ftl
rename Resources/Locale/en-US/cargo/{components => }/cargo-console-order-component.ftl (100%)
rename Resources/Locale/en-US/cargo/{components => }/cargo-order-database-component.ftl (100%)
delete mode 100644 Resources/Locale/en-US/cargo/components/cargo-console-component.ftl
delete mode 100644 Resources/Locale/en-US/cargo/galactic-bank-selection-menu.ftl
rename Resources/Locale/en-US/cargo/{components => }/price-gun-component.ftl (100%)
create mode 100644 Resources/Maps/cargo_shuttle.yml
create mode 100644 Resources/Prototypes/Datasets/Names/cargo_shuttle.yml
create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Cargo/cargo_pallet.yml
create mode 100644 Resources/Prototypes/Entities/Structures/cargo_console.yml
delete mode 100644 Resources/Prototypes/Entities/Structures/cargo_telepad.yml
create mode 100644 Resources/Prototypes/shuttles.yml
diff --git a/Content.Client/Cargo/CargoConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs
similarity index 55%
rename from Content.Client/Cargo/CargoConsoleBoundUserInterface.cs
rename to Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs
index ac03a59fe9..1d9f4a4cf5 100644
--- a/Content.Client/Cargo/CargoConsoleBoundUserInterface.cs
+++ b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs
@@ -1,45 +1,46 @@
-using Content.Client.Cargo.Components;
using Content.Client.Cargo.UI;
+using Content.Shared.Access.Systems;
using Content.Shared.Cargo;
+using Content.Shared.Cargo.BUI;
using Content.Shared.Cargo.Components;
+using Content.Shared.Cargo.Events;
+using Content.Shared.Cargo.Prototypes;
using Robust.Client.GameObjects;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.ViewVariables;
-using static Content.Shared.Cargo.Components.SharedCargoConsoleComponent;
+using Robust.Client.Player;
+using Robust.Shared.Prototypes;
using static Robust.Client.UserInterface.Controls.BaseButton;
-namespace Content.Client.Cargo
+namespace Content.Client.Cargo.BUI
{
- public sealed class CargoConsoleBoundUserInterface : BoundUserInterface
+ public sealed class CargoOrderConsoleBoundUserInterface : BoundUserInterface
{
[ViewVariables]
private CargoConsoleMenu? _menu;
+ ///
+ /// This is the separate popup window for individual orders.
+ ///
[ViewVariables]
private CargoConsoleOrderMenu? _orderMenu;
[ViewVariables]
- public CargoOrderDatabaseComponent? Orders { get; private set; }
-
- [ViewVariables]
- public bool RequestOnly { get; private set; }
-
- [ViewVariables]
- public int BankId { get; private set; }
-
- [ViewVariables]
- public string? BankName { get; private set; }
+ public string? AccountName { get; private set; }
[ViewVariables]
public int BankBalance { get; private set; }
[ViewVariables]
- public (int CurrentCapacity, int MaxCapacity) ShuttleCapacity { get; private set; }
+ public int OrderCapacity { get; private set; }
+ [ViewVariables]
+ public int OrderCount { get; private set; }
+
+ ///
+ /// Currently selected product
+ ///
private CargoProductPrototype? _product;
- public CargoConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
+ public CargoOrderConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey)
{
}
@@ -47,30 +48,29 @@ namespace Content.Client.Cargo
{
base.Open();
- var entMan = IoCManager.Resolve();
- if (!entMan.TryGetComponent(Owner.Owner, out CargoOrderDatabaseComponent? orders)) return;
+ var entityManager = IoCManager.Resolve();
+ var sysManager = entityManager.EntitySysManager;
+ var spriteSystem = sysManager.GetEntitySystem();
+ _menu = new CargoConsoleMenu(IoCManager.Resolve(), spriteSystem);
+ var localPlayer = IoCManager.Resolve()?.LocalPlayer?.ControlledEntity;
- Orders = orders;
+ string orderRequester;
+
+ if (entityManager.TryGetComponent(localPlayer, out var metadata))
+ orderRequester = metadata.EntityName;
+ else
+ orderRequester = string.Empty;
- _menu = new CargoConsoleMenu(this);
_orderMenu = new CargoConsoleOrderMenu();
_menu.OnClose += Close;
- _menu.Populate();
-
- Orders.OnDatabaseUpdated += _menu.PopulateOrders;
-
- _menu.CallShuttleButton.OnPressed += (_) =>
- {
- SendMessage(new CargoConsoleShuttleMessage());
- };
_menu.OnItemSelected += (args) =>
{
if (args.Button.Parent is not CargoProductRow row)
return;
_product = row.Product;
- _orderMenu.Requester.Text = "";
+ _orderMenu.Requester.Text = orderRequester;
_orderMenu.Reason.Text = "";
_orderMenu.Amount.Value = 1;
_orderMenu.OpenCentered();
@@ -86,7 +86,15 @@ namespace Content.Client.Cargo
};
_menu.OpenCentered();
+ }
+ private void Populate(List orders)
+ {
+ if (_menu == null) return;
+
+ _menu.PopulateProducts();
+ _menu.PopulateCategories();
+ _menu.PopulateOrders(orders);
}
protected override void UpdateState(BoundUserInterfaceState state)
@@ -95,17 +103,16 @@ namespace Content.Client.Cargo
if (state is not CargoConsoleInterfaceState cState)
return;
- if (RequestOnly != cState.RequestOnly)
- {
- RequestOnly = cState.RequestOnly;
- _menu?.UpdateRequestOnly();
- }
- BankId = cState.BankId;
- BankName = cState.BankName;
- BankBalance = cState.BankBalance;
- ShuttleCapacity = cState.ShuttleCapacity;
- _menu?.UpdateCargoCapacity();
- _menu?.UpdateBankData();
+
+ OrderCapacity = cState.Capacity;
+ OrderCount = cState.Count;
+ BankBalance = cState.Balance;
+
+ AccountName = cState.Name;
+
+ Populate(cState.Orders);
+ _menu?.UpdateCargoCapacity(OrderCount, OrderCapacity);
+ _menu?.UpdateBankData(AccountName, BankBalance);
}
protected override void Dispose(bool disposing)
@@ -114,11 +121,6 @@ namespace Content.Client.Cargo
if (!disposing) return;
- if (Orders != null && _menu != null)
- {
- Orders.OnDatabaseUpdated -= _menu.PopulateOrders;
- }
-
_menu?.Dispose();
_orderMenu?.Dispose();
}
@@ -126,7 +128,7 @@ namespace Content.Client.Cargo
private bool AddOrder()
{
int orderAmt = _orderMenu?.Amount.Value ?? 0;
- if (orderAmt < 1 || orderAmt > ShuttleCapacity.MaxCapacity)
+ if (orderAmt < 1 || orderAmt > OrderCapacity)
{
return false;
}
@@ -153,11 +155,12 @@ namespace Content.Client.Cargo
if (args.Button.Parent?.Parent is not CargoOrderRow row || row.Order == null)
return;
- if (ShuttleCapacity.CurrentCapacity == ShuttleCapacity.MaxCapacity)
+ if (OrderCount >= OrderCapacity)
return;
SendMessage(new CargoConsoleApproveOrderMessage(row.Order.OrderNumber));
- _menu?.UpdateCargoCapacity();
+ // Most of the UI isn't predicted anyway so.
+ // _menu?.UpdateCargoCapacity(OrderCount + row.Order.Amount, OrderCapacity);
}
}
}
diff --git a/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs
new file mode 100644
index 0000000000..6dd3df5f6e
--- /dev/null
+++ b/Content.Client/Cargo/BUI/CargoShuttleConsoleBoundUserInterface.cs
@@ -0,0 +1,57 @@
+using Content.Client.Cargo.UI;
+using Content.Shared.Cargo.BUI;
+using Content.Shared.Cargo.Events;
+using Robust.Client.GameObjects;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Cargo.BUI;
+
+public sealed class CargoShuttleConsoleBoundUserInterface : BoundUserInterface
+{
+ private CargoShuttleMenu? _menu;
+
+ public CargoShuttleConsoleBoundUserInterface(ClientUserInterfaceComponent owner, object uiKey) : base(owner, uiKey) {}
+
+ protected override void Open()
+ {
+ base.Open();
+ _menu = new CargoShuttleMenu(IoCManager.Resolve(), IoCManager.Resolve(), EntitySystem.Get());
+
+ _menu.ShuttleCallRequested += OnShuttleCall;
+ _menu.ShuttleRecallRequested += OnShuttleRecall;
+ _menu.OnClose += Close;
+
+ _menu.OpenCentered();
+ }
+
+ protected override void Dispose(bool disposing)
+ {
+ base.Dispose(disposing);
+ if (disposing)
+ {
+ _menu?.Dispose();
+ }
+ }
+
+ private void OnShuttleRecall()
+ {
+ SendMessage(new CargoRecallShuttleMessage());
+ }
+
+ private void OnShuttleCall()
+ {
+ SendMessage(new CargoCallShuttleMessage());
+ }
+
+ protected override void UpdateState(BoundUserInterfaceState state)
+ {
+ base.UpdateState(state);
+ if (state is not CargoShuttleConsoleBoundUserInterfaceState cargoState) return;
+ _menu?.SetAccountName(cargoState.AccountName);
+ _menu?.SetShuttleName(cargoState.ShuttleName);
+ _menu?.SetShuttleETA(cargoState.ShuttleETA);
+ _menu?.SetOrders(cargoState.Orders);
+ _menu?.SetCanRecall(cargoState.CanRecall);
+ }
+}
diff --git a/Content.Client/Cargo/Components/CargoOrderDatabaseComponent.cs b/Content.Client/Cargo/Components/CargoOrderDatabaseComponent.cs
deleted file mode 100644
index 5279e6dc0e..0000000000
--- a/Content.Client/Cargo/Components/CargoOrderDatabaseComponent.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Content.Shared.Cargo;
-using Content.Shared.Cargo.Components;
-using Robust.Shared.GameObjects;
-
-namespace Content.Client.Cargo.Components
-{
- [RegisterComponent]
- public sealed class CargoOrderDatabaseComponent : SharedCargoOrderDatabaseComponent
- {
- private readonly List _orders = new();
-
- public IReadOnlyList Orders => _orders;
- ///
- /// Event called when the database is updated.
- ///
- public event Action? OnDatabaseUpdated;
-
- // TODO add account selector menu
-
- ///
- /// Removes all orders from the database.
- ///
- public void Clear()
- {
- _orders.Clear();
- }
-
- ///
- /// Adds an order to the database.
- ///
- /// The order to be added.
- public void AddOrder(CargoOrderData order)
- {
- if (!_orders.Contains(order))
- _orders.Add(order);
- }
-
- public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
- {
- base.HandleComponentState(curState, nextState);
- if (curState is not CargoOrderDatabaseState state)
- return;
- Clear();
- if (state.Orders == null)
- return;
- foreach (var order in state.Orders)
- {
- AddOrder(order);
- }
-
- OnDatabaseUpdated?.Invoke();
- }
- }
-}
diff --git a/Content.Client/Cargo/CargoSystem.Telepad.cs b/Content.Client/Cargo/Systems/CargoSystem.Telepad.cs
similarity index 98%
rename from Content.Client/Cargo/CargoSystem.Telepad.cs
rename to Content.Client/Cargo/Systems/CargoSystem.Telepad.cs
index 6074d637ac..4d73caacb2 100644
--- a/Content.Client/Cargo/CargoSystem.Telepad.cs
+++ b/Content.Client/Cargo/Systems/CargoSystem.Telepad.cs
@@ -3,7 +3,7 @@ using Robust.Client.Animations;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
-namespace Content.Client.Cargo;
+namespace Content.Client.Cargo.Systems;
public sealed partial class CargoSystem
{
diff --git a/Content.Client/Cargo/CargoSystem.cs b/Content.Client/Cargo/Systems/CargoSystem.cs
similarity index 88%
rename from Content.Client/Cargo/CargoSystem.cs
rename to Content.Client/Cargo/Systems/CargoSystem.cs
index ce26dc7ecf..3ffb0636d0 100644
--- a/Content.Client/Cargo/CargoSystem.cs
+++ b/Content.Client/Cargo/Systems/CargoSystem.cs
@@ -1,7 +1,7 @@
using Content.Shared.Cargo;
using Robust.Client.GameObjects;
-namespace Content.Client.Cargo;
+namespace Content.Client.Cargo.Systems;
public sealed partial class CargoSystem : SharedCargoSystem
{
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
index 9b92e43091..5262f43d6b 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml
@@ -1,7 +1,8 @@
-
+
-
-
-
-
-
-
-
-
-
+
diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
index dac0b70d86..ccda7d6467 100644
--- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs
@@ -1,31 +1,24 @@
-using System;
-using System.Collections.Generic;
-using Content.Client.Stylesheets;
+using System.Linq;
+using Content.Client.UserInterface;
using Content.Shared.Cargo;
+using Content.Shared.Cargo.Prototypes;
using Robust.Client.AutoGenerated;
-using Robust.Client.Graphics;
+using Robust.Client.GameObjects;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Client.Utility;
-using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
-using Robust.Shared.Localization;
-using Robust.Shared.Log;
-using Robust.Shared.Maths;
using Robust.Shared.Utility;
using static Robust.Client.UserInterface.Controls.BaseButton;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
namespace Content.Client.Cargo.UI
{
[GenerateTypedNameReferences]
- public sealed partial class CargoConsoleMenu : DefaultWindow
+ public sealed partial class CargoConsoleMenu : FancyWindow
{
- [Dependency]
- private IPrototypeManager _prototypeManager = default!;
-
- public CargoConsoleBoundUserInterface Owner { get; private set; }
+ private IPrototypeManager _protoManager;
+ private SpriteSystem _spriteSystem;
public event Action? OnItemSelected;
public event Action? OnOrderApproved;
@@ -34,25 +27,18 @@ namespace Content.Client.Cargo.UI
private readonly List _categoryStrings = new();
private string? _category;
- public CargoConsoleMenu(CargoConsoleBoundUserInterface owner)
+ public CargoConsoleMenu(IPrototypeManager protoManager, SpriteSystem spriteSystem)
{
RobustXamlLoader.Load(this);
- IoCManager.InjectDependencies(this);
- Owner = owner;
+ _protoManager = protoManager;
+ _spriteSystem = spriteSystem;
- Title = Loc.GetString(Owner.RequestOnly
- ? "cargo-console-menu-request-only-title"
- : "cargo-console-menu-title");
+ Title = Loc.GetString("cargo-console-menu-title");
- CallShuttleButton.OnPressed += OnCallShuttleButtonPressed;
SearchBar.OnTextChanged += OnSearchBarTextChanged;
Categories.OnItemSelected += OnCategoryItemSelected;
}
- private void OnCallShuttleButtonPressed(ButtonEventArgs args)
- {
- }
-
private void OnCategoryItemSelected(OptionButton.ItemSelectedEventArgs args)
{
SetCategoryText(args.Id);
@@ -70,7 +56,7 @@ namespace Content.Client.Cargo.UI
Categories.SelectId(id);
}
- public IEnumerable ProductPrototypes => _prototypeManager.EnumeratePrototypes();
+ public IEnumerable ProductPrototypes => _protoManager.EnumeratePrototypes();
///
/// Populates the list of products that will actually be shown, using the current filters.
@@ -78,9 +64,12 @@ namespace Content.Client.Cargo.UI
public void PopulateProducts()
{
Products.RemoveAllChildren();
+ var products = ProductPrototypes.ToList();
+ products.Sort((x, y) =>
+ string.Compare(x.Name, y.Name, StringComparison.Ordinal));
var search = SearchBar.Text.Trim().ToLowerInvariant();
- foreach (var prototype in ProductPrototypes)
+ foreach (var prototype in products)
{
// if no search or category
// else if search
@@ -94,7 +83,7 @@ namespace Content.Client.Cargo.UI
Product = prototype,
ProductName = { Text = prototype.Name },
PointCost = { Text = prototype.PointCost.ToString() },
- Icon = { Texture = prototype.Icon.Frame0() },
+ Icon = { Texture = _spriteSystem.Frame0(prototype.Icon) },
};
button.MainButton.OnPressed += args =>
{
@@ -132,31 +121,20 @@ namespace Content.Client.Cargo.UI
///
/// Populates the list of orders and requests.
///
- public void PopulateOrders()
+ public void PopulateOrders(IEnumerable orders)
{
- Orders.RemoveAllChildren();
- Requests.RemoveAllChildren();
+ Orders.DisposeAllChildren();
+ Requests.DisposeAllChildren();
- if (Owner.Orders == null)
+ foreach (var order in orders)
{
- return;
- }
-
- foreach (var order in Owner.Orders.Orders)
- {
- if (!_prototypeManager.TryIndex(order.ProductId, out CargoProductPrototype? product))
- {
- DebugTools.Assert(false);
- Logger.ErrorS("cargo", $"Unable to find product name for {order.ProductId}");
- continue;
- }
-
+ var product = _protoManager.Index(order.ProductId);
var productName = product.Name;
var row = new CargoOrderRow
{
Order = order,
- Icon = { Texture = product.Icon.Frame0() },
+ Icon = { Texture = _spriteSystem.Frame0(product.Icon) },
ProductName =
{
Text = Loc.GetString(
@@ -177,43 +155,23 @@ namespace Content.Client.Cargo.UI
}
else
{
- if (Owner.RequestOnly)
- row.Approve.Visible = false;
- else
- row.Approve.OnPressed += (args) => { OnOrderApproved?.Invoke(args); };
+ // TODO: Disable based on access.
+ row.Approve.OnPressed += (args) => { OnOrderApproved?.Invoke(args); };
Requests.AddChild(row);
}
}
}
- public void Populate()
+ public void UpdateCargoCapacity(int count, int capacity)
{
- PopulateProducts();
- PopulateCategories();
- PopulateOrders();
+ // TODO: Rename + Loc.
+ ShuttleCapacityLabel.Text = $"{count}/{capacity}";
}
- public void UpdateCargoCapacity()
+ public void UpdateBankData(string name, int points)
{
- ShuttleCapacityLabel.Text = $"{Owner.ShuttleCapacity.CurrentCapacity}/{Owner.ShuttleCapacity.MaxCapacity}";
- }
-
- public void UpdateBankData()
- {
- AccountNameLabel.Text = Owner.BankName;
- PointsLabel.Text = Owner.BankBalance.ToString();
- }
-
- ///
- /// Show/Hide Call Shuttle button and Approve buttons
- ///
- public void UpdateRequestOnly()
- {
- CallShuttleButton.Visible = !Owner.RequestOnly;
- foreach (CargoOrderRow row in Requests.Children)
- {
- row.Approve.Visible = !Owner.RequestOnly;
- }
+ AccountNameLabel.Text = name;
+ PointsLabel.Text = points.ToString();
}
}
}
diff --git a/Content.Client/Cargo/UI/CargoProductRow.xaml.cs b/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
index 0f3796dac2..5afa7633a5 100644
--- a/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
+++ b/Content.Client/Cargo/UI/CargoProductRow.xaml.cs
@@ -1,4 +1,5 @@
using Content.Shared.Cargo;
+using Content.Shared.Cargo.Prototypes;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
diff --git a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml
new file mode 100644
index 0000000000..5d5d0cbf88
--- /dev/null
+++ b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
new file mode 100644
index 0000000000..0319d1b03b
--- /dev/null
+++ b/Content.Client/Cargo/UI/CargoShuttleMenu.xaml.cs
@@ -0,0 +1,128 @@
+using Content.Client.UserInterface;
+using Content.Shared.Cargo;
+using Content.Shared.Cargo.Prototypes;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.Graphics;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+
+namespace Content.Client.Cargo.UI
+{
+ [GenerateTypedNameReferences]
+ public sealed partial class CargoShuttleMenu : FancyWindow
+ {
+ private readonly IGameTiming _timing;
+ private readonly IPrototypeManager _protoManager;
+ private readonly SpriteSystem _spriteSystem;
+
+ public Action? ShuttleCallRequested;
+ public Action? ShuttleRecallRequested;
+
+ private TimeSpan? _shuttleEta;
+
+ public CargoShuttleMenu(IGameTiming timing, IPrototypeManager protoManager, SpriteSystem spriteSystem)
+ {
+ RobustXamlLoader.Load(this);
+ _timing = timing;
+ _protoManager = protoManager;
+ _spriteSystem = spriteSystem;
+ ShuttleCallButton.OnPressed += OnCallPressed;
+ ShuttleRecallButton.OnPressed += OnRecallPressed;
+ Title = Loc.GetString("cargo-shuttle-console-menu-title");
+ }
+
+ public void SetAccountName(string name)
+ {
+ AccountNameLabel.Text = name;
+ }
+
+ public void SetShuttleName(string name)
+ {
+ ShuttleNameLabel.Text = name;
+ }
+
+ public void SetShuttleETA(TimeSpan? eta)
+ {
+ _shuttleEta = eta;
+
+ if (eta == null)
+ {
+ ShuttleCallButton.Visible = false;
+ ShuttleRecallButton.Visible = true;
+ }
+ else
+ {
+ ShuttleRecallButton.Visible = false;
+ ShuttleCallButton.Visible = true;
+ ShuttleCallButton.Disabled = true;
+ }
+ }
+
+ private void OnRecallPressed(BaseButton.ButtonEventArgs obj)
+ {
+ ShuttleRecallRequested?.Invoke();
+ }
+
+ private void OnCallPressed(BaseButton.ButtonEventArgs obj)
+ {
+ ShuttleCallRequested?.Invoke();
+ }
+
+ public void SetOrders(List orders)
+ {
+ Orders.DisposeAllChildren();
+
+ foreach (var order in orders)
+ {
+ var product = _protoManager.Index(order.ProductId);
+ var productName = product.Name;
+
+ var row = new CargoOrderRow
+ {
+ Order = order,
+ Icon = { Texture = _spriteSystem.Frame0(product.Icon) },
+ ProductName =
+ {
+ Text = Loc.GetString(
+ "cargo-console-menu-populate-orders-cargo-order-row-product-name-text",
+ ("productName", productName),
+ ("orderAmount", order.Amount),
+ ("orderRequester", order.Requester))
+ },
+ Description = {Text = Loc.GetString("cargo-console-menu-order-reason-description",
+ ("reason", order.Reason))}
+ };
+
+ row.Approve.Visible = false;
+ row.Cancel.Visible = false;
+
+ Orders.AddChild(row);
+ }
+ }
+
+ public void SetCanRecall(bool canRecall)
+ {
+ ShuttleRecallButton.Disabled = !canRecall;
+ }
+
+ protected override void Draw(DrawingHandleScreen handle)
+ {
+ base.Draw(handle);
+
+ var remaining = _shuttleEta - _timing.CurTime;
+
+ if (remaining == null || remaining <= TimeSpan.Zero)
+ {
+ ShuttleStatusLabel.Text = $"Available";
+ ShuttleCallButton.Disabled = false;
+ }
+ else
+ {
+ ShuttleStatusLabel.Text = $"Available in: {remaining.Value.TotalSeconds:0.0}";
+ }
+ }
+ }
+}
diff --git a/Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs b/Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs
deleted file mode 100644
index b742676829..0000000000
--- a/Content.Client/Cargo/UI/GalacticBankSelectionMenu.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-
-namespace Content.Client.Cargo.UI
-{
- public sealed class GalacticBankSelectionMenu : DefaultWindow
- {
- private readonly ItemList _accounts;
- private int _accountCount;
- private string[] _accountNames = System.Array.Empty();
- private int[] _accountIds = System.Array.Empty();
- private int _selectedAccountId = -1;
-
- public GalacticBankSelectionMenu(CargoConsoleBoundUserInterface owner)
- {
- MinSize = SetSize = (300, 300);
- IoCManager.InjectDependencies(this);
-
- Title = Loc.GetString("galactic-bank-selection-menu-title");
-
- _accounts = new ItemList { SelectMode = ItemList.ItemListSelectMode.Single };
-
- Contents.AddChild(_accounts);
- }
-
- public void Populate(int accountCount, string[] accountNames, int[] accountIds, int selectedAccountId)
- {
- _accountCount = accountCount;
- _accountNames = accountNames;
- _accountIds = accountIds;
- _selectedAccountId = selectedAccountId;
-
- _accounts.Clear();
- for (var i = 0; i < _accountCount; i++)
- {
- var id = _accountIds[i];
- _accounts.AddItem($"ID: {id} || {_accountNames[i]}");
- if (id == _selectedAccountId)
- _accounts[id].Selected = true;
- }
- }
- }
-}
diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs
index f2aa214e14..8bec3815e2 100644
--- a/Content.Client/Entry/EntryPoint.cs
+++ b/Content.Client/Entry/EntryPoint.cs
@@ -74,7 +74,6 @@ namespace Content.Client.Entry
factory.RegisterClass();
factory.RegisterClass();
factory.RegisterClass();
- factory.RegisterClass();
factory.RegisterClass();
factory.RegisterClass();
factory.RegisterClass();
diff --git a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
index 4c5b4edea8..0c2e8bc726 100644
--- a/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/RadarConsoleBoundUserInterface.cs
@@ -24,6 +24,7 @@ public sealed class RadarConsoleBoundUserInterface : BoundUserInterface
base.UpdateState(state);
if (state is not RadarConsoleBoundInterfaceState cState) return;
+ _window?.SetMatrix(cState.Coordinates, cState.Angle);
_window?.UpdateState(cState);
}
}
diff --git a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
index cb60508c31..0b8b83acc9 100644
--- a/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
+++ b/Content.Client/Shuttles/BUI/ShuttleConsoleBoundUserInterface.cs
@@ -65,6 +65,8 @@ public sealed class ShuttleConsoleBoundUserInterface : BoundUserInterface
{
base.UpdateState(state);
if (state is not ShuttleConsoleBoundInterfaceState cState) return;
+
+ _window?.SetMatrix(cState.Coordinates, cState.Angle);
_window?.UpdateState(cState);
}
}
diff --git a/Content.Client/Shuttles/Systems/DockingSystem.cs b/Content.Client/Shuttles/Systems/DockingSystem.cs
index 61f0b8d06c..143f0a971b 100644
--- a/Content.Client/Shuttles/Systems/DockingSystem.cs
+++ b/Content.Client/Shuttles/Systems/DockingSystem.cs
@@ -2,20 +2,4 @@ using Content.Shared.Shuttles.Events;
namespace Content.Client.Shuttles.Systems;
-public sealed class DockingSystem : EntitySystem
-{
- public void StartAutodock(EntityUid uid)
- {
- RaiseNetworkEvent(new AutodockRequestMessage {Entity = uid});
- }
-
- public void StopAutodock(EntityUid uid)
- {
- RaiseNetworkEvent(new StopAutodockRequestMessage() {Entity = uid});
- }
-
- public void Undock(EntityUid uid)
- {
- RaiseNetworkEvent(new UndockRequestMessage() {Entity = uid});
- }
-}
+public sealed class DockingSystem : EntitySystem {}
diff --git a/Content.Client/Shuttles/UI/DockingControl.cs b/Content.Client/Shuttles/UI/DockingControl.cs
index dfa5023a8a..2c37f62357 100644
--- a/Content.Client/Shuttles/UI/DockingControl.cs
+++ b/Content.Client/Shuttles/UI/DockingControl.cs
@@ -31,6 +31,9 @@ public class DockingControl : Control
public EntityUid? ViewedDock;
public EntityUid? GridEntity;
+ public EntityCoordinates? Coordinates;
+ public Angle? Angle;
+
///
/// Stored by GridID then by docks
///
@@ -69,11 +72,12 @@ public class DockingControl : Control
handle.DrawLine((MidPoint, MidPoint) - aExtent, (MidPoint, MidPoint) + aExtent, gridLines);
}
- if (!_entManager.TryGetComponent(ViewedDock, out var xform) ||
+ if (Coordinates == null ||
+ Angle == null ||
!_entManager.TryGetComponent(GridEntity, out var gridXform)) return;
- var rotation = Matrix3.CreateRotation(xform.LocalRotation);
- var matrix = Matrix3.CreateTranslation(-xform.LocalPosition);
+ var rotation = Matrix3.CreateRotation(Angle.Value);
+ var matrix = Matrix3.CreateTranslation(-Coordinates.Value.Position);
// Draw the fixtures around the dock before drawing it
if (_entManager.TryGetComponent(GridEntity, out var fixtures))
@@ -128,7 +132,7 @@ public class DockingControl : Control
ScalePosition(rotation.Transform(new Vector2(0.5f, -0.5f)))), Color.Green);
// Draw nearby grids
- var worldPos = gridXform.WorldMatrix.Transform(xform.LocalPosition);
+ var worldPos = gridXform.WorldMatrix.Transform(Coordinates.Value.Position);
var gridInvMatrix = gridXform.InvWorldMatrix;
Matrix3.Multiply(in gridInvMatrix, in matrix, out var invMatrix);
diff --git a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
index 7274cc23c8..4a297a2a88 100644
--- a/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/RadarConsoleWindow.xaml.cs
@@ -3,6 +3,7 @@ using Content.Client.UserInterface;
using Content.Shared.Shuttles.BUIStates;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Map;
namespace Content.Client.Shuttles.UI;
@@ -19,4 +20,9 @@ public sealed partial class RadarConsoleWindow : FancyWindow,
{
RadarScreen.UpdateState(scc);
}
+
+ public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
+ {
+ RadarScreen.SetMatrix(coordinates, angle);
+ }
}
diff --git a/Content.Client/Shuttles/UI/RadarControl.cs b/Content.Client/Shuttles/UI/RadarControl.cs
index eda8fb08d8..adf69b03cb 100644
--- a/Content.Client/Shuttles/UI/RadarControl.cs
+++ b/Content.Client/Shuttles/UI/RadarControl.cs
@@ -25,9 +25,11 @@ public sealed class RadarControl : Control
private const float GridLinesDistance = 32f;
///
- /// Entity used to transform all of the radar objects.
+ /// Used to transform all of the radar objects. Typically is a shuttle console parented to a grid.
///
- private EntityUid? _entity;
+ private EntityCoordinates? _coordinates;
+
+ private Angle? _rotation;
private float _radarMinRange = 64f;
private float _radarMaxRange = 256f;
@@ -61,6 +63,12 @@ public sealed class RadarControl : Control
MinSize = (SizeFull, SizeFull);
}
+ public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
+ {
+ _coordinates = coordinates;
+ _rotation = angle;
+ }
+
public void UpdateState(RadarConsoleBoundInterfaceState ls)
{
_radarMaxRange = ls.MaxRange;
@@ -74,7 +82,6 @@ public sealed class RadarControl : Control
if (_radarMaxRange < _radarMinRange)
_radarMinRange = _radarMaxRange;
- _entity = ls.Entity;
_docks.Clear();
foreach (var state in ls.Docks)
@@ -109,7 +116,7 @@ public sealed class RadarControl : Control
handle.DrawCircle((MidPoint, MidPoint), ScaledMinimapRadius, Color.Black);
// No data
- if (_entity == null)
+ if (_coordinates == null || _rotation == null)
{
Clear();
return;
@@ -135,8 +142,8 @@ public sealed class RadarControl : Control
var xformQuery = _entManager.GetEntityQuery();
var fixturesQuery = _entManager.GetEntityQuery();
var bodyQuery = _entManager.GetEntityQuery();
- var xform = xformQuery.GetComponent(_entity.Value);
- var mapPosition = xform.MapPosition;
+
+ var mapPosition = _coordinates.Value.ToMap(_entManager);
if (mapPosition.MapId == MapId.Nullspace)
{
@@ -144,28 +151,30 @@ public sealed class RadarControl : Control
return;
}
- // Can also use ourGridBody.LocalCenter
- var offset = xform.Coordinates.Position;
- var offsetMatrix = Matrix3.CreateTranslation(-offset);
+ var offset = _coordinates.Value.Position;
Matrix3 matrix;
// Draw our grid in detail
- var ourGridId = xform.GridUid;
+ var ourGridId = _coordinates.Value.GetGridUid(_entManager);
if (ourGridId != null)
{
- matrix = xform.InvWorldMatrix;
+ var offsetMatrix = Matrix3.CreateInverseTransform(offset.X, offset.Y, (float) _rotation.Value.Theta);
var ourGridFixtures = fixturesQuery.GetComponent(ourGridId.Value);
// Draw our grid; use non-filled boxes so it doesn't look awful.
DrawGrid(handle, offsetMatrix, ourGridFixtures, Color.Yellow);
DrawDocks(handle, ourGridId.Value, offsetMatrix);
+
+ var ourGridMatrix = xformQuery.GetComponent(ourGridId.Value).InvWorldMatrix;
+
+ Matrix3.Multiply(in ourGridMatrix, in offsetMatrix, out matrix);
}
else
{
matrix = Matrix3.CreateTranslation(-offset);
}
- var invertedPosition = xform.Coordinates.Position - offset;
+ var invertedPosition = _coordinates.Value.Position - offset;
invertedPosition.Y = -invertedPosition.Y;
// Don't need to transform the InvWorldMatrix again as it's already offset to its position.
diff --git a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
index 4a2d945889..0a52fa33ae 100644
--- a/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
+++ b/Content.Client/Shuttles/UI/ShuttleConsoleWindow.xaml.cs
@@ -7,6 +7,7 @@ using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Map;
using Robust.Shared.Utility;
namespace Content.Client.Shuttles.UI;
@@ -17,10 +18,7 @@ public sealed partial class ShuttleConsoleWindow : FancyWindow,
{
private readonly IEntityManager _entManager;
- ///
- /// EntityUid of the open console.
- ///
- private EntityUid? _entity;
+ private EntityUid? _shuttleUid;
///
/// Currently selected dock button for camera.
@@ -84,9 +82,14 @@ public sealed partial class ShuttleConsoleWindow : FancyWindow,
UndockPressed?.Invoke(DockingScreen.ViewedDock.Value);
}
+ public void SetMatrix(EntityCoordinates? coordinates, Angle? angle)
+ {
+ _shuttleUid = coordinates?.EntityId;
+ RadarScreen.SetMatrix(coordinates, angle);
+ }
+
public void UpdateState(ShuttleConsoleBoundInterfaceState scc)
{
- _entity = scc.Entity;
UpdateDocks(scc.Docks);
RadarScreen.UpdateState(scc);
MaxRadarRange.Text = $"{scc.MaxRange:0}";
@@ -110,21 +113,16 @@ public sealed partial class ShuttleConsoleWindow : FancyWindow,
DockPorts.DisposeAllChildren();
DockingScreen.Docks = _docks;
- if (!_entManager.TryGetComponent(_entity, out var xform)
- || !xform.GridUid.HasValue)
- {
- // TODO: Show Placeholder
- return;
- }
- if (_docks.TryGetValue(xform.GridUid.Value, out var gridDocks))
+ // TODO: Show Placeholder
+ if (_shuttleUid != null && _docks.TryGetValue(_shuttleUid.Value, out var gridDocks))
{
var index = 1;
foreach (var state in gridDocks)
{
- var ent = state.Entity;
- var pressed = ent == DockingScreen.ViewedDock;
+ var pressed = state.Entity == DockingScreen.ViewedDock;
+
string suffix;
if (state.Connected)
@@ -143,21 +141,26 @@ public sealed partial class ShuttleConsoleWindow : FancyWindow,
Pressed = pressed,
};
- button.OnMouseEntered += args => OnDockMouseEntered(args, ent);
- button.OnMouseExited += args => OnDockMouseExited(args, ent);
- button.OnToggled += args => OnDockToggled(args, ent);
+ if (pressed)
+ {
+ _selectedDock = button;
+ }
+
+ button.OnMouseEntered += args => OnDockMouseEntered(args, state);
+ button.OnMouseExited += args => OnDockMouseExited(args, state);
+ button.OnToggled += args => OnDockToggled(args, state);
DockPorts.AddChild(button);
index++;
}
}
}
- private void OnDockMouseEntered(GUIMouseHoverEventArgs obj, EntityUid uid)
+ private void OnDockMouseEntered(GUIMouseHoverEventArgs obj, DockingInterfaceState state)
{
- RadarScreen.HighlightedDock = uid;
+ RadarScreen.HighlightedDock = state.Entity;
}
- private void OnDockMouseExited(GUIMouseHoverEventArgs obj, EntityUid uid)
+ private void OnDockMouseExited(GUIMouseHoverEventArgs obj, DockingInterfaceState state)
{
RadarScreen.HighlightedDock = null;
}
@@ -165,10 +168,18 @@ public sealed partial class ShuttleConsoleWindow : FancyWindow,
///
/// Shows a docking camera instead of radar screen.
///
- private void OnDockToggled(BaseButton.ButtonEventArgs obj, EntityUid ent)
+ private void OnDockToggled(BaseButton.ButtonEventArgs obj, DockingInterfaceState state)
{
+ var ent = state.Entity;
+
if (_selectedDock != null)
{
+ // If it got untoggled via other means then we'll stop viewing the old dock.
+ if (DockingScreen.ViewedDock != null && DockingScreen.ViewedDock != state.Entity)
+ {
+ StopAutodockPressed?.Invoke(DockingScreen.ViewedDock.Value);
+ }
+
_selectedDock.Pressed = false;
_selectedDock = null;
}
@@ -187,15 +198,23 @@ public sealed partial class ShuttleConsoleWindow : FancyWindow,
}
else
{
- // DebugTools.Assert(DockingScreen.ViewedDock == null);
- _entManager.TryGetComponent(_entity, out var xform);
+ if (_shuttleUid != null)
+ {
+ DockingScreen.Coordinates = state.Coordinates;
+ DockingScreen.Angle = state.Angle;
+ }
+ else
+ {
+ DockingScreen.Coordinates = null;
+ DockingScreen.Angle = null;
+ }
UndockButton.Disabled = false;
RadarScreen.Visible = false;
DockingScreen.Visible = true;
DockingScreen.ViewedDock = ent;
StartAutodockPressed?.Invoke(ent);
- DockingScreen.GridEntity = xform?.GridUid;
+ DockingScreen.GridEntity = _shuttleUid;
_selectedDock = obj.Button;
}
}
@@ -215,9 +234,8 @@ public sealed partial class ShuttleConsoleWindow : FancyWindow,
{
base.Draw(handle);
- if (!_entManager.TryGetComponent(_entity, out var entXform) ||
- !_entManager.TryGetComponent(entXform.GridUid, out var gridBody) ||
- !_entManager.TryGetComponent(entXform.GridUid, out var gridXform))
+ if (!_entManager.TryGetComponent(_shuttleUid, out var gridBody) ||
+ !_entManager.TryGetComponent(_shuttleUid, out var gridXform))
{
return;
}
diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs
new file mode 100644
index 0000000000..4ce1d3a720
--- /dev/null
+++ b/Content.IntegrationTests/Tests/CargoTest.cs
@@ -0,0 +1,39 @@
+using System.Threading.Tasks;
+using Content.Server.Cargo.Systems;
+using Content.Shared.Cargo.Prototypes;
+using NUnit.Framework;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Map;
+using Robust.Shared.Maths;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests;
+
+[TestFixture]
+public sealed class CargoTest
+{
+ [Test]
+ public async Task NoArbitrage()
+ {
+ await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings() {NoClient = true});
+ var server = pairTracker.Pair.Server;
+
+ var entManager = server.ResolveDependency();
+ var mapManager = server.ResolveDependency();
+ var protoManager = server.ResolveDependency();
+ var pricing = server.ResolveDependency().GetEntitySystem();
+
+ await server.WaitAssertion(() =>
+ {
+ var mapId = mapManager.CreateMap();
+
+ foreach (var proto in protoManager.EnumeratePrototypes())
+ {
+ var ent = entManager.SpawnEntity(proto.Product, new MapCoordinates(Vector2.Zero, mapId));
+ var price = pricing.GetPrice(ent);
+
+ Assert.That(price, Is.LessThan(proto.PointCost), $"Found arbitrage on {proto.ID} cargo product!");
+ }
+ });
+ }
+}
diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
index 585160ee47..149ce7e353 100644
--- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
+++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs
@@ -57,8 +57,6 @@ public sealed partial class AtmosphereSystem
mixtures[5].AdjustMoles(Gas.Plasma, Atmospherics.MolesCellGasMiner);
mixtures[5].Temperature = 5000f;
- var entMan = IoCManager.Resolve();
-
foreach (var gid in args)
{
if(!EntityUid.TryParse(gid, out var euid))
diff --git a/Content.Server/Cargo/CargoBankAccount.cs b/Content.Server/Cargo/CargoBankAccount.cs
deleted file mode 100644
index 3dbe7da5c1..0000000000
--- a/Content.Server/Cargo/CargoBankAccount.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace Content.Server.Cargo
-{
- public sealed class CargoBankAccount : ICargoBankAccount
- {
- [ViewVariables]
- public int Id { get; }
- [ViewVariables]
- public string Name { get; }
-
- private int _balance;
- [ViewVariables(VVAccess.ReadWrite)]
- public int Balance
- {
- get => _balance;
- set
- {
- if (_balance == value)
- return;
- _balance = value;
- OnBalanceChange?.Invoke();
- }
- }
-
- public event Action? OnBalanceChange;
-
- public CargoBankAccount(int id, string name, int balance)
- {
- Id = id;
- Name = name;
- Balance = balance;
- }
- }
-}
diff --git a/Content.Server/Cargo/CargoOrderDatabase.cs b/Content.Server/Cargo/CargoOrderDatabase.cs
deleted file mode 100644
index fdf517a265..0000000000
--- a/Content.Server/Cargo/CargoOrderDatabase.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using Content.Shared.Cargo;
-
-namespace Content.Server.Cargo
-{
- public sealed class CargoOrderDatabase
- {
- private readonly Dictionary _orders = new();
- private int _orderNumber = 0;
-
- public CargoOrderDatabase(int id)
- {
- Id = id;
- CurrentOrderSize = 0;
- MaxOrderSize = 20;
- }
-
- public int Id { get; private set; }
- public int CurrentOrderSize { get; private set; }
- public int MaxOrderSize { get; private set; }
-
- ///
- /// Removes all orders from the database.
- ///
- public void Clear()
- {
- _orders.Clear();
- }
-
- ///
- /// Returns a list of all orders.
- ///
- /// A list of orders
- public List GetOrders()
- {
- return _orders.Values.ToList();
- }
-
- public bool TryGetOrder(int id, [NotNullWhen(true)] out CargoOrderData? order)
- {
- return _orders.TryGetValue(id, out order);
- }
-
- public List SpliceApproved()
- {
- var orders = _orders.Values.Where(order => order.Approved).ToList();
- foreach (var order in orders)
- _orders.Remove(order.OrderNumber);
- return orders;
- }
-
- ///
- /// Adds an order to the database.
- ///
- /// The person who requested the item.
- /// The reason the product was requested.
- /// The ID of the product requested.
- /// The amount of the products requested.
- /// The ID of the bank account paying for the order.
- /// Whether the order will be bought when the orders are processed.
- public void AddOrder(string requester, string reason, string productId, int amount, int payingAccountId)
- {
- var order = new CargoOrderData(_orderNumber, requester, reason, productId, amount, payingAccountId);
- if (Contains(order))
- return;
- _orders.Add(_orderNumber, order);
- _orderNumber += 1;
- }
-
- ///
- /// Removes an order from the database.
- ///
- /// The order to be removed.
- /// Whether it could be removed or not
- public bool RemoveOrder(int orderNumber)
- {
- return _orders.Remove(orderNumber);
- }
-
- ///
- /// Approves an order in the database.
- ///
- /// The order to be approved.
- public bool ApproveOrder(string approver, int orderNumber)
- {
- if (CurrentOrderSize == MaxOrderSize ||
- !_orders.TryGetValue(orderNumber, out var order) ||
- order.Approved)
- {
- return false;
- }
- else if (CurrentOrderSize + order.Amount > MaxOrderSize)
- {
- AddOrder(
- order.Requester,
- Loc.GetString("cargo-order-database-order-overflow-message", ("placeholder", order.Reason.Replace(" (Overflow)", string.Empty))),
- order.ProductId,
- order.Amount - MaxOrderSize - CurrentOrderSize, order.PayingAccountId);
-
- order.Amount = MaxOrderSize - CurrentOrderSize;
- }
-
- order.Approved = true;
- order.Approver = approver;
-
- CurrentOrderSize += order.Amount;
- return true;
- }
-
- ///
- /// Returns whether the database contains the order or not.
- ///
- /// The order to check
- /// Whether the database contained the order or not.
- public bool Contains(CargoOrderData order)
- {
- return _orders.ContainsValue(order);
- }
-
- ///
- /// Clears the current order capacity. This allows more orders to be processed and is invoked after an order is dispatched.
- ///
- public void ClearOrderCapacity()
- {
- CurrentOrderSize = 0;
- }
- }
-}
diff --git a/Content.Server/Cargo/Components/CargoConsoleComponent.cs b/Content.Server/Cargo/Components/CargoConsoleComponent.cs
deleted file mode 100644
index 890b8ac3ca..0000000000
--- a/Content.Server/Cargo/Components/CargoConsoleComponent.cs
+++ /dev/null
@@ -1,205 +0,0 @@
-using Content.Server.Cargo.Systems;
-using Content.Server.Power.Components;
-using Content.Server.UserInterface;
-using Content.Shared.Cargo;
-using Content.Shared.Cargo.Components;
-using Content.Shared.Sound;
-using Content.Server.MachineLinking.Components;
-using Content.Shared.MachineLinking;
-using Robust.Server.GameObjects;
-using Robust.Shared.Audio;
-using Robust.Shared.Player;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
-
-namespace Content.Server.Cargo.Components
-{
- [RegisterComponent]
- public sealed class CargoConsoleComponent : SharedCargoConsoleComponent
- {
- [Dependency] private readonly IEntityManager _entMan = default!;
-
- private CargoBankAccount? _bankAccount;
-
- [ViewVariables]
- public CargoBankAccount? BankAccount
- {
- get => _bankAccount;
- private set
- {
- if (_bankAccount == value)
- {
- return;
- }
-
- if (_bankAccount != null)
- {
- _bankAccount.OnBalanceChange -= UpdateUIState;
- }
-
- _bankAccount = value;
-
- if (value != null)
- {
- value.OnBalanceChange += UpdateUIState;
- }
-
- UpdateUIState();
- }
- }
-
- [DataField("requestOnly")]
- private bool _requestOnly = false;
-
- [DataField("errorSound")]
- private SoundSpecifier _errorSound = new SoundPathSpecifier("/Audio/Effects/error.ogg");
-
- private bool Powered => !_entMan.TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) || receiver.Powered;
- private CargoSystem _cargoConsoleSystem = default!;
-
- [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(CargoConsoleUiKey.Key);
-
- [DataField("senderPort", customTypeSerializer: typeof(PrototypeIdSerializer))]
- public string SenderPort = "OrderSender";
-
- protected override void Initialize()
- {
- base.Initialize();
-
- Owner.EnsureComponentWarn(out CargoOrderDatabaseComponent _);
-
- if (UserInterface != null)
- {
- UserInterface.OnReceiveMessage += UserInterfaceOnOnReceiveMessage;
- }
-
- _cargoConsoleSystem = EntitySystem.Get();
- BankAccount = _cargoConsoleSystem.StationAccount;
- }
-
- protected override void OnRemove()
- {
- if (UserInterface != null)
- {
- UserInterface.OnReceiveMessage -= UserInterfaceOnOnReceiveMessage;
- }
-
- base.OnRemove();
- }
-
- private void UserInterfaceOnOnReceiveMessage(ServerBoundUserInterfaceMessage serverMsg)
- {
- if (!_entMan.TryGetComponent(Owner, out CargoOrderDatabaseComponent? orders))
- {
- return;
- }
-
- var message = serverMsg.Message;
- if (orders.Database == null)
- return;
- if (!Powered)
- return;
- switch (message)
- {
- case CargoConsoleAddOrderMessage msg:
- {
- if (msg.Amount <= 0 || _bankAccount == null)
- {
- break;
- }
-
- if (!_cargoConsoleSystem.AddOrder(orders.Database.Id, msg.Requester, msg.Reason, msg.ProductId,
- msg.Amount, _bankAccount.Id))
- {
- SoundSystem.Play(_errorSound.GetSound(), Filter.Pvs(Owner), Owner, AudioParams.Default);
- }
- break;
- }
- case CargoConsoleRemoveOrderMessage msg:
- {
- _cargoConsoleSystem.RemoveOrder(orders.Database.Id, msg.OrderNumber);
- break;
- }
- case CargoConsoleApproveOrderMessage msg:
- {
- if (_requestOnly ||
- !orders.Database.TryGetOrder(msg.OrderNumber, out var order) ||
- _bankAccount == null)
- {
- break;
- }
-
- if (msg.Session.AttachedEntity is not {Valid: true} player)
- break;
-
- PrototypeManager.TryIndex(order.ProductId, out CargoProductPrototype? product);
- if (product == null!)
- break;
- var capacity = _cargoConsoleSystem.GetCapacity(orders.Database.Id);
- if (
- (capacity.CurrentCapacity == capacity.MaxCapacity
- || capacity.CurrentCapacity + order.Amount > capacity.MaxCapacity
- || !_cargoConsoleSystem.CheckBalance(_bankAccount.Id, (-product.PointCost) * order.Amount)
- || !_cargoConsoleSystem.ApproveOrder(Owner, player, orders.Database.Id, msg.OrderNumber)
- || !_cargoConsoleSystem.ChangeBalance(_bankAccount.Id, (-product.PointCost) * order.Amount))
- )
- {
- SoundSystem.Play(_errorSound.GetSound(), Filter.Pvs(Owner), Owner, AudioParams.Default);
- break;
- }
-
- UpdateUIState();
- break;
- }
- case CargoConsoleShuttleMessage _:
- {
- // Jesus fucking christ Glass
- //var approvedOrders = _cargoOrderDataManager.RemoveAndGetApprovedFrom(orders.Database);
- //orders.Database.ClearOrderCapacity();
-
- // TODO replace with shuttle code
- EntityUid? cargoTelepad = null;
-
- if (_entMan.TryGetComponent(Owner, out var transmitter) &&
- transmitter.Outputs.TryGetValue(SenderPort, out var telepad) &&
- telepad.Count > 0)
- {
- // use most recent link
- var pad = telepad[^1].Uid;
- if (_entMan.HasComponent(pad) &&
- _entMan.TryGetComponent(pad, out var powerReceiver) &&
- powerReceiver.Powered)
- cargoTelepad = pad;
- }
-
- if (cargoTelepad != null)
- {
- if (_entMan.TryGetComponent(cargoTelepad.Value, out var telepadComponent))
- {
- var approvedOrders = _cargoConsoleSystem.RemoveAndGetApprovedOrders(orders.Database.Id);
- orders.Database.ClearOrderCapacity();
- foreach (var order in approvedOrders)
- {
- _cargoConsoleSystem.QueueTeleport(telepadComponent, order);
- }
- }
- }
- break;
- }
- }
- }
-
- private void UpdateUIState()
- {
- if (_bankAccount == null || !_entMan.EntityExists(Owner))
- {
- return;
- }
-
- var id = _bankAccount.Id;
- var name = _bankAccount.Name;
- var balance = _bankAccount.Balance;
- var capacity = _cargoConsoleSystem.GetCapacity(id);
- UserInterface?.SetState(new CargoConsoleInterfaceState(_requestOnly, id, name, balance, capacity));
- }
- }
-}
diff --git a/Content.Server/Cargo/Components/CargoOrderConsoleComponent.cs b/Content.Server/Cargo/Components/CargoOrderConsoleComponent.cs
new file mode 100644
index 0000000000..8e1687427e
--- /dev/null
+++ b/Content.Server/Cargo/Components/CargoOrderConsoleComponent.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Sound;
+
+namespace Content.Server.Cargo.Components
+{
+ ///
+ /// Handles sending order requests to cargo. Doesn't handle orders themselves via shuttle or telepads.
+ ///
+ [RegisterComponent]
+ public sealed class CargoOrderConsoleComponent : Component
+ {
+ [DataField("soundError")] public SoundSpecifier ErrorSound =
+ new SoundPathSpecifier("/Audio/Effects/Cargo/buzz_sigh.ogg");
+
+ [DataField("soundConfirm")]
+ public SoundSpecifier ConfirmSound = new SoundPathSpecifier("/Audio/Effects/Cargo/ping.ogg");
+ }
+}
diff --git a/Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs b/Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs
deleted file mode 100644
index 10489ec406..0000000000
--- a/Content.Server/Cargo/Components/CargoOrderDatabaseComponent.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using Content.Server.Cargo.Systems;
-using Content.Shared.Cargo.Components;
-
-namespace Content.Server.Cargo.Components
-{
- [RegisterComponent]
- public sealed class CargoOrderDatabaseComponent : SharedCargoOrderDatabaseComponent
- {
- public CargoOrderDatabase? Database { get; set; }
- public bool ConnectedToDatabase => Database != null;
-
- protected override void Initialize()
- {
- base.Initialize();
-
- Database = EntitySystem.Get().StationOrderDatabase;
- }
-
- public override ComponentState GetComponentState()
- {
- if (!ConnectedToDatabase)
- return new CargoOrderDatabaseState(null);
- return new CargoOrderDatabaseState(Database?.GetOrders());
- }
- }
-}
diff --git a/Content.Server/Cargo/Components/CargoPalletComponent.cs b/Content.Server/Cargo/Components/CargoPalletComponent.cs
new file mode 100644
index 0000000000..24fd2eda9e
--- /dev/null
+++ b/Content.Server/Cargo/Components/CargoPalletComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server.Cargo.Components;
+
+///
+/// Any entities intersecting when a shuttle is recalled will be sold.
+///
+[RegisterComponent]
+public sealed class CargoPalletComponent : Component {}
diff --git a/Content.Server/Cargo/Components/CargoPilotConsoleComponent.cs b/Content.Server/Cargo/Components/CargoPilotConsoleComponent.cs
new file mode 100644
index 0000000000..6b7ccfcf16
--- /dev/null
+++ b/Content.Server/Cargo/Components/CargoPilotConsoleComponent.cs
@@ -0,0 +1,15 @@
+using Content.Server.Shuttles.Components;
+
+namespace Content.Server.Cargo.Components;
+
+///
+/// Lets you remotely control the cargo shuttle.
+///
+[RegisterComponent]
+public sealed class CargoPilotConsoleComponent : Component
+{
+ ///
+ /// that we're proxied into.
+ ///
+ public EntityUid? Entity;
+}
diff --git a/Content.Server/Cargo/Components/CargoShuttleConsoleComponent.cs b/Content.Server/Cargo/Components/CargoShuttleConsoleComponent.cs
new file mode 100644
index 0000000000..a7ff0185cf
--- /dev/null
+++ b/Content.Server/Cargo/Components/CargoShuttleConsoleComponent.cs
@@ -0,0 +1,10 @@
+using Content.Shared.Sound;
+
+namespace Content.Server.Cargo.Components;
+
+[RegisterComponent]
+public sealed class CargoShuttleConsoleComponent : Component
+{
+ [ViewVariables(VVAccess.ReadWrite), DataField("soundDeny")]
+ public SoundSpecifier DenySound = new SoundPathSpecifier("/Audio/Effects/Cargo/buzz_two.ogg");
+}
diff --git a/Content.Server/Cargo/Components/CargoTelepadComponent.cs b/Content.Server/Cargo/Components/CargoTelepadComponent.cs
index 00a6e4c5c3..1b946d1693 100644
--- a/Content.Server/Cargo/Components/CargoTelepadComponent.cs
+++ b/Content.Server/Cargo/Components/CargoTelepadComponent.cs
@@ -15,7 +15,7 @@ namespace Content.Server.Cargo.Components
public sealed class CargoTelepadComponent : SharedCargoTelepadComponent
{
[DataField("delay")]
- public float Delay = 20f;
+ public float Delay = 45f;
///
/// How much time we've accumulated until next teleport.
@@ -24,9 +24,6 @@ namespace Content.Server.Cargo.Components
[DataField("accumulator")]
public float Accumulator = 0f;
- [ViewVariables]
- public readonly Stack TeleportQueue = new();
-
[ViewVariables]
public CargoTelepadState CurrentState = CargoTelepadState.Unpowered;
diff --git a/Content.Server/Cargo/Components/StationBankAccountComponent.cs b/Content.Server/Cargo/Components/StationBankAccountComponent.cs
new file mode 100644
index 0000000000..a2d56b3fd8
--- /dev/null
+++ b/Content.Server/Cargo/Components/StationBankAccountComponent.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Cargo;
+
+namespace Content.Server.Cargo.Components;
+
+///
+/// Added to the abstract representation of a station to track its money.
+///
+[RegisterComponent, Access(typeof(SharedCargoSystem))]
+public sealed class StationBankAccountComponent : Component
+{
+ [ViewVariables(VVAccess.ReadWrite), DataField("balance")]
+ public int Balance = 2000;
+
+ ///
+ /// How much the bank balance goes up per second, every Delay period. Rounded down when multiplied.
+ ///
+ [ViewVariables(VVAccess.ReadWrite), DataField("increasePerSecond")]
+ public int IncreasePerSecond = 10;
+}
diff --git a/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
new file mode 100644
index 0000000000..a3e5ab644d
--- /dev/null
+++ b/Content.Server/Cargo/Components/StationCargoOrderDatabaseComponent.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Cargo;
+
+namespace Content.Server.Cargo.Components;
+
+///
+/// Stores all of cargo orders for a particular station.
+///
+[RegisterComponent]
+public sealed class StationCargoOrderDatabaseComponent : Component
+{
+ ///
+ /// Maximum amount of orders a station is allowed, approved or not.
+ ///
+ [ViewVariables(VVAccess.ReadWrite), DataField("capacity")]
+ public int Capacity = 20;
+
+ [ViewVariables(VVAccess.ReadWrite), DataField("orders")]
+ public Dictionary Orders = new();
+
+ ///
+ /// Tracks the next order index available.
+ ///
+ public int Index;
+
+ [ViewVariables, DataField("cargoShuttleProto")]
+ public string? CargoShuttleProto = "CargoShuttle";
+
+ ///
+ /// The cargo shuttle assigned to this station.
+ ///
+ [ViewVariables, DataField("shuttle")]
+ public EntityUid? Shuttle;
+}
diff --git a/Content.Server/Cargo/ICargoBankAccount.cs b/Content.Server/Cargo/ICargoBankAccount.cs
deleted file mode 100644
index d7a22448ac..0000000000
--- a/Content.Server/Cargo/ICargoBankAccount.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace Content.Server.Cargo
-{
- public interface ICargoBankAccount
- {
- int Id { get; }
- string Name { get; }
- int Balance { get; }
- public event Action OnBalanceChange;
- }
-}
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Console.cs b/Content.Server/Cargo/Systems/CargoSystem.Console.cs
deleted file mode 100644
index 3659d5f9b8..0000000000
--- a/Content.Server/Cargo/Systems/CargoSystem.Console.cs
+++ /dev/null
@@ -1,240 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-using Content.Server.Access.Systems;
-using Content.Server.Cargo.Components;
-using Content.Server.MachineLinking.System;
-using Content.Shared.Access.Components;
-using Content.Shared.Access.Systems;
-using Content.Shared.Cargo;
-using Content.Shared.GameTicking;
-
-namespace Content.Server.Cargo.Systems
-{
- public sealed partial class CargoSystem
- {
- ///
- /// How much time to wait (in seconds) before increasing bank accounts balance.
- ///
- private const float Delay = 10f;
- ///
- /// How many points to give to every bank account every seconds.
- ///
- private const int PointIncrease = 150;
-
- ///
- /// Keeps track of how much time has elapsed since last balance increase.
- ///
- private float _timer;
- ///
- /// Stores all bank accounts.
- ///
- private readonly Dictionary _accountsDict = new();
-
- private readonly Dictionary _databasesDict = new();
- ///
- /// Used to assign IDs to bank accounts. Incremental counter.
- ///
- private int _accountIndex;
- ///
- /// Enumeration of all bank accounts.
- ///
- public IEnumerable BankAccounts => _accountsDict.Values;
- ///
- /// The station's bank account.
- ///
- public CargoBankAccount StationAccount => GetBankAccount(0);
-
- public CargoOrderDatabase StationOrderDatabase => GetOrderDatabase(0);
-
- [Dependency] private readonly IdCardSystem _idCardSystem = default!;
- [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
- [Dependency] private readonly SignalLinkerSystem _linker = default!;
-
- private void InitializeConsole()
- {
- SubscribeLocalEvent(OnInit);
- SubscribeLocalEvent(Reset);
- Reset();
- }
- private void OnInit(EntityUid uid, CargoConsoleComponent console, ComponentInit args)
- {
- _linker.EnsureTransmitterPorts(uid, console.SenderPort);
- }
-
- private void Reset(RoundRestartCleanupEvent ev)
- {
- Reset();
- }
-
- private void Reset()
- {
- _accountsDict.Clear();
- _databasesDict.Clear();
- _timer = 0;
- _accountIndex = 0;
-
- CreateBankAccount("Space Station 14", 1000);
- CreateOrderDatabase(0);
- }
-
- private void UpdateConsole(float frameTime)
- {
- _timer += frameTime;
-
- while (_timer > Delay)
- {
- _timer -= Delay;
-
- foreach (var account in BankAccounts)
- {
- account.Balance += PointIncrease;
- }
- }
- }
-
- ///
- /// Creates a new bank account.
- ///
- public void CreateBankAccount(string name, int balance)
- {
- var account = new CargoBankAccount(_accountIndex, name, balance);
- _accountsDict.Add(_accountIndex, account);
- _accountIndex += 1;
- }
-
- public void CreateOrderDatabase(int id)
- {
- _databasesDict.Add(id, new CargoOrderDatabase(id));
- }
-
- ///
- /// Returns the bank account associated with the given ID.
- ///
- public CargoBankAccount GetBankAccount(int id)
- {
- return _accountsDict[id];
- }
-
- public CargoOrderDatabase GetOrderDatabase(int id)
- {
- return _databasesDict[id];
- }
-
- ///
- /// Returns whether the account exists, eventually passing the account in the out parameter.
- ///
- public bool TryGetBankAccount(int id, [NotNullWhen(true)] out CargoBankAccount? account)
- {
- return _accountsDict.TryGetValue(id, out account);
- }
-
- public bool TryGetOrderDatabase(int id, [NotNullWhen(true)] out CargoOrderDatabase? database)
- {
- return _databasesDict.TryGetValue(id, out database);
- }
- ///
- /// Verifies if there is enough money in the account's balance to pay the amount.
- /// Returns false if there's no account associated with the given ID
- /// or if the balance would end up being negative.
- ///
- public bool CheckBalance(int id, int amount)
- {
- if (!TryGetBankAccount(id, out var account))
- {
- return false;
- }
-
- if (account.Balance + amount < 0)
- {
- return false;
- }
-
- return true;
- }
- ///
- /// Attempts to change the given account's balance.
- /// Returns false if there's no account associated with the given ID
- /// or if the balance would end up being negative.
- ///
- public bool ChangeBalance(int id, int amount)
- {
- if (!TryGetBankAccount(id, out var account))
- {
- return false;
- }
-
- account.Balance += amount;
- return true;
- }
-
- public bool AddOrder(int id, string requester, string reason, string productId, int amount, int payingAccountId)
- {
- if (amount < 1 || !TryGetOrderDatabase(id, out var database) || amount > database.MaxOrderSize)
- {
- return false;
- }
-
- database.AddOrder(requester, reason, productId, amount, payingAccountId);
- SyncComponentsWithId(id);
- return true;
- }
-
- public bool RemoveOrder(int id, int orderNumber)
- {
- if (!TryGetOrderDatabase(id, out var database))
- return false;
- database.RemoveOrder(orderNumber);
- SyncComponentsWithId(id);
- return true;
- }
-
- public bool ApproveOrder(EntityUid uid, EntityUid approver, int id, int orderNumber, AccessReaderComponent? reader = null)
- {
- // does the approver have permission to approve orders?
- if (Resolve(uid, ref reader) && !_accessReaderSystem.IsAllowed(approver, reader))
- return false;
-
- // get the approver's name
- _idCardSystem.TryFindIdCard(approver, out var idCard);
- var approverName = idCard?.FullName ?? string.Empty;
-
- if (!TryGetOrderDatabase(id, out var database))
- return false;
-
- if (!database.TryGetOrder(orderNumber, out var order))
- return false;
-
- if (!database.ApproveOrder(approverName, orderNumber))
- return false;
-
- SyncComponentsWithId(id);
- return true;
- }
-
- public List RemoveAndGetApprovedOrders(int id)
- {
- if (!TryGetOrderDatabase(id, out var database))
- return new List();
- var approvedOrders = database.SpliceApproved();
- SyncComponentsWithId(id);
- return approvedOrders;
- }
-
- public (int CurrentCapacity, int MaxCapacity) GetCapacity(int id)
- {
- if (!TryGetOrderDatabase(id, out var database))
- return (0,0);
- return (database.CurrentOrderSize, database.MaxOrderSize);
- }
-
- private void SyncComponentsWithId(int id)
- {
- foreach (var comp in EntityManager.EntityQuery(true))
- {
- if (comp.Database == null || comp.Database.Id != id)
- continue;
-
- Dirty(comp);
- }
- }
- }
-}
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
new file mode 100644
index 0000000000..ccee28f087
--- /dev/null
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -0,0 +1,324 @@
+using System.Linq;
+using Content.Server.Access.Systems;
+using Content.Server.Cargo.Components;
+using Content.Server.MachineLinking.System;
+using Content.Server.Popups;
+using Content.Server.Station.Systems;
+using Content.Shared.Access.Systems;
+using Content.Shared.Cargo;
+using Content.Shared.Cargo.BUI;
+using Content.Shared.Cargo.Events;
+using Content.Shared.Cargo.Prototypes;
+using Content.Shared.GameTicking;
+using Robust.Server.GameObjects;
+using Robust.Shared.Audio;
+using Robust.Shared.Player;
+using Robust.Shared.Players;
+
+namespace Content.Server.Cargo.Systems
+{
+ public sealed partial class CargoSystem
+ {
+ ///
+ /// How much time to wait (in seconds) before increasing bank accounts balance.
+ ///
+ private const int Delay = 10;
+
+ ///
+ /// Keeps track of how much time has elapsed since last balance increase.
+ ///
+ private float _timer;
+
+ [Dependency] private readonly IdCardSystem _idCardSystem = default!;
+ [Dependency] private readonly AccessReaderSystem _accessReaderSystem = default!;
+ [Dependency] private readonly SignalLinkerSystem _linker = default!;
+ [Dependency] private readonly PopupSystem _popup = default!;
+ [Dependency] private readonly StationSystem _station = default!;
+ [Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
+
+ private void InitializeConsole()
+ {
+ SubscribeLocalEvent(OnAddOrderMessage);
+ SubscribeLocalEvent(OnRemoveOrderMessage);
+ SubscribeLocalEvent(OnApproveOrderMessage);
+ SubscribeLocalEvent(OnOrderUIOpened);
+ SubscribeLocalEvent(OnInit);
+ SubscribeLocalEvent(Reset);
+ Reset();
+ }
+
+ private void OnInit(EntityUid uid, CargoOrderConsoleComponent orderConsole, ComponentInit args)
+ {
+ var station = _station.GetOwningStation(uid);
+ UpdateOrderState(orderConsole, station);
+ }
+
+ private void Reset(RoundRestartCleanupEvent ev)
+ {
+ Reset();
+ }
+
+ private void Reset()
+ {
+ _timer = 0;
+ }
+
+ private void UpdateConsole(float frameTime)
+ {
+ _timer += frameTime;
+
+ while (_timer > Delay)
+ {
+ _timer -= Delay;
+
+ foreach (var account in EntityQuery())
+ {
+ account.Balance += account.IncreasePerSecond * Delay;
+ }
+
+ foreach (var comp in EntityQuery())
+ {
+ if (!_uiSystem.IsUiOpen(comp.Owner, CargoConsoleUiKey.Orders)) continue;
+
+ var station = _station.GetOwningStation(comp.Owner);
+ UpdateOrderState(comp, station);
+ }
+ }
+ }
+
+ #region Interface
+
+ private void OnApproveOrderMessage(EntityUid uid, CargoOrderConsoleComponent component, CargoConsoleApproveOrderMessage args)
+ {
+ if (args.Session.AttachedEntity is not {Valid: true} player)
+ return;
+
+ if (!_accessReaderSystem.IsAllowed(player, uid))
+ {
+ ConsolePopup(args.Session, Loc.GetString("cargo-console-order-not-allowed"));
+ PlayDenySound(uid, component);
+ return;
+ }
+
+ var orderDatabase = GetOrderDatabase(component);
+ var bankAccount = GetBankAccount(component);
+
+ // No station to deduct from.
+ if (orderDatabase == null || bankAccount == null)
+ {
+ ConsolePopup(args.Session, Loc.GetString("cargo-console-station-not-found"));
+ PlayDenySound(uid, component);
+ return;
+ }
+
+ // No order to approve?
+ if (!orderDatabase.Orders.TryGetValue(args.OrderNumber, out var order) ||
+ order.Approved) return;
+
+ // Invalid order
+ if (!_protoMan.TryIndex(order.ProductId, out var product))
+ {
+ ConsolePopup(args.Session, Loc.GetString("cargo-console-invalid-product"));
+ PlayDenySound(uid, component);
+ return;
+ }
+
+ var amount = GetOrderCount(orderDatabase);
+ var capacity = orderDatabase.Capacity;
+
+ // Too many orders, avoid them getting spammed in the UI.
+ if (amount >= capacity)
+ {
+ ConsolePopup(args.Session, Loc.GetString("cargo-console-too-many"));
+ PlayDenySound(uid, component);
+ return;
+ }
+
+ // Cap orders so someone can't spam thousands.
+ var orderAmount = Math.Min(capacity - amount, order.Amount);
+
+ if (orderAmount != order.Amount)
+ {
+ order.Amount = orderAmount;
+ ConsolePopup(args.Session, Loc.GetString("cargo-console-snip-snip"));
+ PlayDenySound(uid, component);
+ }
+
+ var cost = product.PointCost * order.Amount;
+
+ // Not enough balance
+ if (cost > bankAccount.Balance)
+ {
+ ConsolePopup(args.Session, Loc.GetString("cargo-console-insufficient-funds", ("cost", cost)));
+ PlayDenySound(uid, component);
+ return;
+ }
+
+ order.Approved = true;
+ _idCardSystem.TryFindIdCard(player, out var idCard);
+ order.Approver = idCard?.FullName ?? string.Empty;
+
+
+ SoundSystem.Play(component.ConfirmSound.GetSound(), Filter.Pvs(uid, entityManager: EntityManager), uid);
+
+ DeductFunds(bankAccount, cost);
+ UpdateOrders(orderDatabase);
+ }
+
+ private void OnRemoveOrderMessage(EntityUid uid, CargoOrderConsoleComponent component, CargoConsoleRemoveOrderMessage args)
+ {
+ var orderDatabase = GetOrderDatabase(component);
+ if (orderDatabase == null) return;
+ RemoveOrder(orderDatabase, args.OrderNumber);
+ }
+
+ private void OnAddOrderMessage(EntityUid uid, CargoOrderConsoleComponent component, CargoConsoleAddOrderMessage args)
+ {
+ if (args.Amount <= 0)
+ return;
+
+ var bank = GetBankAccount(component);
+ if (bank == null) return;
+ var orderDatabase = GetOrderDatabase(component);
+ if (orderDatabase == null) return;
+
+ var data = GetOrderData(args, GetNextIndex(orderDatabase));
+
+ if (!TryAddOrder(orderDatabase, data))
+ {
+ PlayDenySound(uid, component);
+ return;
+ }
+ }
+
+ private void OnOrderUIOpened(EntityUid uid, CargoOrderConsoleComponent component, BoundUIOpenedEvent args)
+ {
+ var station = _station.GetOwningStation(uid);
+ UpdateOrderState(component, station);
+ }
+
+ #endregion
+
+ private void UpdateOrderState(CargoOrderConsoleComponent component, EntityUid? station)
+ {
+ if (station == null ||
+ !TryComp(station, out var orderDatabase) ||
+ !TryComp(station, out var bankAccount)) return;
+
+ var state = new CargoConsoleInterfaceState(
+ MetaData(station.Value).EntityName,
+ GetOrderCount(orderDatabase),
+ orderDatabase.Capacity,
+ bankAccount.Balance,
+ orderDatabase.Orders.Values.ToList());
+
+ _uiSystem.GetUiOrNull(component.Owner, CargoConsoleUiKey.Orders)?.SetState(state);
+ }
+
+ private void ConsolePopup(ICommonSession session, string text)
+ {
+ _popup.PopupCursor(text, Filter.SinglePlayer(session));
+ }
+
+ private void PlayDenySound(EntityUid uid, CargoOrderConsoleComponent component)
+ {
+ SoundSystem.Play(component.ErrorSound.GetSound(), Filter.Pvs(uid, entityManager: EntityManager), uid);
+ }
+
+ private CargoOrderData GetOrderData(CargoConsoleAddOrderMessage args, int index)
+ {
+ return new CargoOrderData(index, args.Requester, args.Reason, args.ProductId, args.Amount);
+ }
+
+ private int GetOrderCount(StationCargoOrderDatabaseComponent component)
+ {
+ var amount = 0;
+
+ foreach (var (_, order) in component.Orders)
+ {
+ if (!order.Approved) continue;
+ amount += order.Amount;
+ }
+
+ return amount;
+ }
+
+ ///
+ /// Updates all of the cargo-related consoles for a particular station.
+ /// This should be called whenever orders change.
+ ///
+ private void UpdateOrders(StationCargoOrderDatabaseComponent component)
+ {
+ // Order added so all consoles need updating.
+ foreach (var comp in EntityQuery(true))
+ {
+ var station = _station.GetOwningStation(component.Owner);
+ if (station != component.Owner) continue;
+
+ UpdateOrderState(comp, station);
+ }
+
+ foreach (var comp in EntityQuery(true))
+ {
+ var station = _station.GetOwningStation(component.Owner);
+ if (station != component.Owner) continue;
+
+ UpdateShuttleState(comp, station);
+ }
+ }
+
+ public bool TryAddOrder(StationCargoOrderDatabaseComponent component, CargoOrderData data)
+ {
+ component.Orders.Add(data.OrderNumber, data);
+ UpdateOrders(component);
+ return true;
+ }
+
+ private int GetNextIndex(StationCargoOrderDatabaseComponent component)
+ {
+ var index = component.Index;
+ component.Index++;
+ return index;
+ }
+
+ public void RemoveOrder(StationCargoOrderDatabaseComponent component, int index)
+ {
+ if (!component.Orders.Remove(index)) return;
+ UpdateOrders(component);
+ }
+
+ public void ClearOrders(StationCargoOrderDatabaseComponent component)
+ {
+ if (component.Orders.Count == 0) return;
+
+ component.Orders.Clear();
+ Dirty(component);
+ }
+
+ private void DeductFunds(StationBankAccountComponent component, int amount)
+ {
+ component.Balance = Math.Max(0, component.Balance - amount);
+ Dirty(component);
+ }
+
+ #region Station
+
+ private StationBankAccountComponent? GetBankAccount(CargoOrderConsoleComponent component)
+ {
+ var station = _station.GetOwningStation(component.Owner);
+
+ TryComp(station, out var bankComponent);
+ return bankComponent;
+ }
+
+ private StationCargoOrderDatabaseComponent? GetOrderDatabase(CargoOrderConsoleComponent component)
+ {
+ var station = _station.GetOwningStation(component.Owner);
+
+ TryComp(station, out var orderComponent);
+ return orderComponent;
+ }
+
+ #endregion
+ }
+}
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
new file mode 100644
index 0000000000..3f1bc47d1e
--- /dev/null
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -0,0 +1,528 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using Content.Server.Cargo.Components;
+using Content.Server.GameTicking.Events;
+using Content.Server.Shuttles.Components;
+using Content.Server.Shuttles.Events;
+using Content.Server.UserInterface;
+using Content.Shared.Cargo;
+using Content.Shared.Cargo.BUI;
+using Content.Shared.Cargo.Components;
+using Content.Shared.Cargo.Events;
+using Content.Shared.Cargo.Prototypes;
+using Content.Shared.Dataset;
+using Content.Shared.GameTicking;
+using Content.Shared.MobState.Components;
+using Robust.Server.GameObjects;
+using Robust.Server.Maps;
+using Robust.Shared.Audio;
+using Robust.Shared.Map;
+using Robust.Shared.Player;
+using Robust.Shared.Random;
+using Robust.Shared.Timing;
+using Robust.Shared.Utility;
+
+namespace Content.Server.Cargo.Systems;
+
+public sealed partial class CargoSystem
+{
+ /*
+ * Handles cargo shuttle mechanics, including cargo shuttle consoles.
+ */
+
+ [Dependency] private readonly IGameTiming _timing = default!;
+ [Dependency] private readonly IMapLoader _loader = default!;
+ [Dependency] private readonly IMapManager _mapManager = default!;
+ [Dependency] private readonly IRobustRandom _random = default!;
+ [Dependency] private readonly EntityLookupSystem _lookup = default!;
+ [Dependency] private readonly PricingSystem _pricing = default!;
+
+ public MapId? CargoMap { get; private set; }
+
+ private const float ShuttleRecallRange = 100f;
+
+ ///
+ /// Minimum mass a grid needs to be to block a shuttle recall.
+ ///
+ private const float ShuttleCallMassThreshold = 300f;
+
+ private const float CallOffset = 50f;
+
+ private int _index;
+
+ private void InitializeShuttle()
+ {
+ SubscribeLocalEvent(OnCargoShuttleMove);
+ SubscribeLocalEvent(OnCargoShuttleConsoleStartup);
+ SubscribeLocalEvent(OnCargoShuttleCall);
+ SubscribeLocalEvent(RecallCargoShuttle);
+
+ SubscribeLocalEvent(OnCargoGetConsole);
+ SubscribeLocalEvent(OnCargoPilotConsoleOpen);
+ SubscribeLocalEvent(OnCargoPilotConsoleClose);
+
+ SubscribeLocalEvent(OnCargoOrderStartup);
+
+ SubscribeLocalEvent(OnRoundRestart);
+ }
+
+ #region Cargo Pilot Console
+
+ private void OnCargoPilotConsoleOpen(EntityUid uid, CargoPilotConsoleComponent component, AfterActivatableUIOpenEvent args)
+ {
+ component.Entity = GetShuttleConsole(component);
+ }
+
+ private void OnCargoPilotConsoleClose(EntityUid uid, CargoPilotConsoleComponent component, BoundUIClosedEvent args)
+ {
+ component.Entity = null;
+ }
+
+ private void OnCargoGetConsole(EntityUid uid, CargoPilotConsoleComponent component, ref ConsoleShuttleEvent args)
+ {
+ args.Console = GetShuttleConsole(component);
+ }
+
+ private EntityUid? GetShuttleConsole(CargoPilotConsoleComponent component)
+ {
+ var stationUid = _station.GetOwningStation(component.Owner);
+
+ if (!TryComp(stationUid, out var orderDatabase) ||
+ !TryComp(orderDatabase.Shuttle, out var shuttle)) return null;
+
+ return GetShuttleConsole(shuttle);
+ }
+
+ #endregion
+
+ #region Console
+
+ private void UpdateShuttleCargoConsoles(CargoShuttleComponent component)
+ {
+ foreach (var console in EntityQuery(true))
+ {
+ var stationUid = _station.GetOwningStation(console.Owner);
+ if (stationUid != component.Station) continue;
+ UpdateShuttleState(console, stationUid);
+ }
+ }
+
+ private void OnCargoShuttleConsoleStartup(EntityUid uid, CargoShuttleConsoleComponent component, ComponentStartup args)
+ {
+ var station = _station.GetOwningStation(uid);
+ UpdateShuttleState(component, station);
+ }
+
+ private void UpdateShuttleState(CargoShuttleConsoleComponent component, EntityUid? station = null)
+ {
+ TryComp(station, out var orderDatabase);
+ TryComp(orderDatabase?.Shuttle, out var shuttle);
+
+ var orders = GetProjectedOrders(orderDatabase, shuttle);
+ var shuttleName = orderDatabase?.Shuttle != null ? MetaData(orderDatabase.Shuttle.Value).EntityName : string.Empty;
+
+ // TODO: Loc
+ _uiSystem.GetUiOrNull(component.Owner, CargoConsoleUiKey.Shuttle)?.SetState(
+ new CargoShuttleConsoleBoundUserInterfaceState(
+ station != null ? MetaData(station.Value).EntityName : Loc.GetString("cargo-shuttle-console-station-unknown"),
+ string.IsNullOrEmpty(shuttleName) ? Loc.GetString("cargo-shuttle-console-shuttle-not-found") : shuttleName,
+ CanRecallShuttle(shuttle?.Owner, out _),
+ shuttle?.NextCall,
+ orders));
+ }
+
+ #endregion
+
+ #region Shuttle
+
+ public EntityUid? GetShuttleConsole(CargoShuttleComponent component)
+ {
+ foreach (var (comp, xform) in EntityQuery(true))
+ {
+ if (xform.ParentUid != component.Owner) continue;
+ return comp.Owner;
+ }
+
+ return null;
+ }
+
+ private void OnCargoShuttleMove(EntityUid uid, CargoShuttleComponent component, ref MoveEvent args)
+ {
+ if (component.Station == null) return;
+
+ var oldCanRecall = component.CanRecall;
+
+ // Check if we can update the recall status.
+ var canRecall = CanRecallShuttle(uid, out _, args.Component);
+ if (oldCanRecall == canRecall) return;
+
+ component.CanRecall = canRecall;
+ _sawmill.Debug($"Updated CanRecall for {ToPrettyString(uid)}");
+ UpdateShuttleCargoConsoles(component);
+ }
+
+ ///
+ /// Returns the orders that can fit on the cargo shuttle.
+ ///
+ private List GetProjectedOrders(
+ StationCargoOrderDatabaseComponent? component = null,
+ CargoShuttleComponent? shuttle = null)
+ {
+ var orders = new List();
+
+ if (component == null || shuttle == null || component.Orders.Count == 0)
+ return orders;
+
+ var space = GetCargoSpace(shuttle);
+
+ if (space == 0) return orders;
+
+ var indices = component.Orders.Keys.ToList();
+ indices.Sort();
+ var amount = 0;
+
+ foreach (var index in indices)
+ {
+ var order = component.Orders[index];
+ if (!order.Approved) continue;
+
+ var cappedAmount = Math.Min(space - amount, order.Amount);
+ amount += cappedAmount;
+ DebugTools.Assert(amount <= space);
+
+ if (cappedAmount < order.Amount)
+ {
+ var reducedOrder = new CargoOrderData(order.OrderNumber, order.Requester, order.Reason, order.ProductId,
+ cappedAmount);
+
+ orders.Add(reducedOrder);
+ break;
+ }
+
+ orders.Add(order);
+
+ if (amount == space) break;
+ }
+
+ return orders;
+ }
+
+ ///
+ /// Get the amount of space the cargo shuttle can fit for orders.
+ ///
+ private int GetCargoSpace(CargoShuttleComponent component)
+ {
+ var space = GetCargoPallets(component).Count;
+ return space;
+ }
+
+ private List GetCargoPallets(CargoShuttleComponent component)
+ {
+ var pads = new List();
+
+ foreach (var (comp, compXform) in EntityQuery(true))
+ {
+ if (compXform.ParentUid != component.Owner ||
+ !compXform.Anchored) continue;
+
+ pads.Add(comp);
+ }
+
+ return pads;
+ }
+
+ #endregion
+
+ #region Station
+
+ private void OnCargoOrderStartup(EntityUid uid, StationCargoOrderDatabaseComponent component, ComponentStartup args)
+ {
+ // Stations get created first but if any are added at runtime then do this.
+ AddShuttle(component);
+ }
+
+ private void AddShuttle(StationCargoOrderDatabaseComponent component)
+ {
+ Setup();
+
+ if (CargoMap == null || component.Shuttle != null) return;
+
+ if (component.CargoShuttleProto != null)
+ {
+ var prototype = _protoMan.Index(component.CargoShuttleProto);
+ var possibleNames = _protoMan.Index(prototype.NameDataset).Values;
+ var name = _random.Pick(possibleNames);
+
+ var (_, gridId) = _loader.LoadBlueprint(CargoMap.Value, prototype.Path.ToString());
+ var shuttleUid = _mapManager.GetGridEuid(gridId!.Value);
+ var xform = Transform(shuttleUid);
+ MetaData(shuttleUid).EntityName = name;
+
+ // TODO: Something better like a bounds check.
+ xform.LocalPosition += 100 * _index;
+ var comp = EnsureComp(shuttleUid);
+ comp.Station = component.Owner;
+ comp.Coordinates = xform.Coordinates;
+
+ component.Shuttle = shuttleUid;
+ comp.NextCall = _timing.CurTime + TimeSpan.FromSeconds(comp.Cooldown);
+ UpdateShuttleCargoConsoles(comp);
+ _index++;
+ _sawmill.Info($"Added cargo shuttle to {ToPrettyString(shuttleUid)}");
+ }
+ }
+
+ private void SellPallets(CargoShuttleComponent component, StationBankAccountComponent bank)
+ {
+ double amount = 0;
+ var toSell = new HashSet();
+ var xformQuery = GetEntityQuery();
+
+ foreach (var pallet in GetCargoPallets(component))
+ {
+ // Containers should already get the sell price of their children so can skip those.
+ foreach (var ent in _lookup.GetEntitiesIntersecting(pallet.Owner, LookupFlags.Anchored))
+ {
+ // Don't re-sell anything, sell anything anchored (e.g. light fixtures), or anything blacklisted
+ // (e.g. players).
+ if (toSell.Contains(ent) ||
+ (xformQuery.TryGetComponent(ent, out var xform) && xform.Anchored)) continue;
+
+ var price = _pricing.GetPrice(ent);
+ if (price == 0) continue;
+ toSell.Add(ent);
+ amount += price;
+ }
+ }
+
+ bank.Balance += (int) amount;
+ _sawmill.Debug($"Cargo sold {toSell.Count} entities for {amount}");
+
+ foreach (var ent in toSell)
+ {
+ Del(ent);
+ }
+ }
+
+ private void SendToCargoMap(EntityUid uid, CargoShuttleComponent? component = null)
+ {
+ if (!Resolve(uid, ref component))
+ return;
+
+ component.NextCall = _timing.CurTime + TimeSpan.FromSeconds(component.Cooldown);
+ Transform(uid).Coordinates = component.Coordinates;
+ DebugTools.Assert(MetaData(uid).EntityPaused);
+
+ UpdateShuttleCargoConsoles(component);
+ _sawmill.Info($"Stashed cargo shuttle {ToPrettyString(uid)}");
+ }
+
+ ///
+ /// Retrieves a shuttle for delivery.
+ ///
+ public void CallShuttle(StationCargoOrderDatabaseComponent orderDatabase)
+ {
+ if (!TryComp(orderDatabase.Shuttle, out var shuttle) ||
+ !TryComp(orderDatabase.Owner, out var xform)) return;
+
+ // Already called / not available
+ if (shuttle.NextCall == null || _timing.CurTime < shuttle.NextCall)
+ return;
+
+ shuttle.NextCall = null;
+
+ // Find a valid free area nearby to spawn in on
+ var center = new Vector2();
+ var minRadius = 0f;
+ Box2? aabb = null;
+
+ foreach (var grid in _mapManager.GetAllMapGrids(xform.MapID))
+ {
+ aabb = aabb?.Union(grid.WorldAABB) ?? grid.WorldAABB;
+ }
+
+ if (aabb != null)
+ {
+ center = aabb.Value.Center;
+ minRadius = MathF.Max(aabb.Value.Width, aabb.Value.Height);
+ }
+
+ var offset = 0f;
+ if (TryComp(orderDatabase.Shuttle, out var shuttleGrid))
+ {
+ var bounds = shuttleGrid.Grid.LocalAABB;
+ offset = MathF.Max(bounds.Width, bounds.Height) / 2f;
+ }
+
+ Transform(shuttle.Owner).Coordinates = new EntityCoordinates(xform.ParentUid,
+ center + _random.NextVector2(minRadius + offset, minRadius + CallOffset + offset));
+ DebugTools.Assert(!MetaData(shuttle.Owner).EntityPaused);
+
+ AddCargoContents(shuttle, orderDatabase);
+ UpdateOrders(orderDatabase);
+ UpdateShuttleCargoConsoles(shuttle);
+
+ _sawmill.Info($"Retrieved cargo shuttle {ToPrettyString(shuttle.Owner)} from {ToPrettyString(orderDatabase.Owner)}");
+ }
+
+ private void AddCargoContents(CargoShuttleComponent component, StationCargoOrderDatabaseComponent orderDatabase)
+ {
+ var xformQuery = GetEntityQuery();
+ var orders = GetProjectedOrders(orderDatabase, component);
+
+ var pads = GetCargoPallets(component);
+ DebugTools.Assert(orders.Sum(o => o.Amount) <= pads.Count);
+
+ for (var i = 0; i < orders.Count; i++)
+ {
+ var order = orders[i];
+
+ Spawn(_protoMan.Index(order.ProductId).Product,
+ new EntityCoordinates(component.Owner, xformQuery.GetComponent(_random.PickAndTake(pads).Owner).LocalPosition));
+ order.Amount--;
+
+ if (order.Amount == 0)
+ {
+ orders.RemoveSwap(i);
+ orderDatabase.Orders.Remove(order.OrderNumber);
+ i--;
+ }
+ else
+ {
+ orderDatabase.Orders[order.OrderNumber] = order;
+ }
+ }
+ }
+
+ public bool CanRecallShuttle(EntityUid? uid, [NotNullWhen(false)] out string? reason, TransformComponent? xform = null)
+ {
+ reason = null;
+
+ if (!TryComp(uid, out var grid) ||
+ !Resolve(uid.Value, ref xform)) return true;
+
+ var bounds = grid.Grid.WorldAABB.Enlarged(ShuttleRecallRange);
+ var bodyQuery = GetEntityQuery();
+
+ foreach (var other in _mapManager.FindGridsIntersecting(xform.MapID, bounds))
+ {
+ if (grid.GridIndex == other.Index ||
+ !bodyQuery.TryGetComponent(other.GridEntityId, out var body) ||
+ body.Mass < ShuttleCallMassThreshold) continue;
+
+ reason = Loc.GetString("cargo-shuttle-console-proximity");
+ return false;
+ }
+
+ return true;
+ }
+
+ private void RecallCargoShuttle(EntityUid uid, CargoShuttleConsoleComponent component, CargoRecallShuttleMessage args)
+ {
+ var player = args.Session.AttachedEntity;
+
+ if (player == null) return;
+
+ var stationUid = _station.GetOwningStation(component.Owner);
+
+ if (!TryComp(stationUid, out var orderDatabase) ||
+ !TryComp(stationUid, out var bank)) return;
+
+ if (!TryComp(orderDatabase.Shuttle, out var shuttle))
+ {
+ _popup.PopupEntity($"No cargo shuttle found!", args.Entity, Filter.Entities(args.Entity));
+ return;
+ }
+
+ if (!CanRecallShuttle(shuttle.Owner, out var reason))
+ {
+ _popup.PopupEntity(reason, args.Entity, Filter.Entities(args.Entity));
+ return;
+ }
+
+ if (IsBlocked(shuttle))
+ {
+ _popup.PopupEntity(Loc.GetString("cargo-shuttle-console-organics"), player.Value, Filter.Entities(player.Value));
+ SoundSystem.Play(component.DenySound.GetSound(), Filter.Pvs(uid, entityManager: EntityManager), uid);
+ return;
+ };
+
+ SellPallets(shuttle, bank);
+
+ SendToCargoMap(orderDatabase.Shuttle.Value);
+ }
+
+ ///
+ ///
+ ///
+ ///
+ private bool IsBlocked(CargoShuttleComponent component)
+ {
+ // TODO: Would be good to rate-limit this on the console.
+ var mobQuery = GetEntityQuery();
+ var xformQuery = GetEntityQuery();
+
+ return FoundOrganics(component.Owner, mobQuery, xformQuery);
+ }
+
+ private bool FoundOrganics(EntityUid uid, EntityQuery mobQuery, EntityQuery xformQuery)
+ {
+ var xform = xformQuery.GetComponent(uid);
+ var childEnumerator = xform.ChildEnumerator;
+
+ while (childEnumerator.MoveNext(out var child))
+ {
+ if (mobQuery.HasComponent(child.Value) ||
+ FoundOrganics(child.Value, mobQuery, xformQuery)) return true;
+ }
+
+ return false;
+ }
+
+ private void OnCargoShuttleCall(EntityUid uid, CargoShuttleConsoleComponent component, CargoCallShuttleMessage args)
+ {
+ var stationUid = _station.GetOwningStation(args.Entity);
+ if (!TryComp(stationUid, out var orderDatabase)) return;
+ CallShuttle(orderDatabase);
+ }
+
+ #endregion
+
+ private void OnRoundRestart(RoundRestartCleanupEvent ev)
+ {
+ Cleanup();
+ }
+
+ private void Cleanup()
+ {
+ if (CargoMap == null || !_mapManager.MapExists(CargoMap.Value))
+ {
+ CargoMap = null;
+ DebugTools.Assert(!EntityQuery().Any());
+ return;
+ }
+
+ _mapManager.DeleteMap(CargoMap.Value);
+ CargoMap = null;
+
+ // Shuttle may not have been in the cargo dimension (e.g. on the station map) so need to delete.
+ foreach (var comp in EntityQuery())
+ {
+ QueueDel(comp.Owner);
+ }
+ }
+
+ private void Setup()
+ {
+ if (CargoMap != null && _mapManager.MapExists(CargoMap.Value)) return;
+
+ // It gets mapinit which is okay... buuutt we still want it paused to avoid power draining.
+ CargoMap = _mapManager.CreateMap();
+ _mapManager.SetMapPaused(CargoMap!.Value, true);
+
+ foreach (var comp in EntityQuery(true))
+ {
+ AddShuttle(comp);
+ }
+ }
+}
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
index a773f05394..1316ec4531 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs
@@ -1,9 +1,12 @@
+using System.Linq;
using Content.Server.Cargo.Components;
using Content.Server.Labels.Components;
using Content.Server.Paper;
using Content.Server.Power.Components;
using Content.Shared.Cargo;
+using Content.Shared.Cargo.Prototypes;
using Robust.Shared.Audio;
+using Robust.Shared.Collections;
using Robust.Shared.Player;
namespace Content.Server.Cargo.Systems;
@@ -27,7 +30,7 @@ public sealed partial class CargoSystem
// Don't EntityQuery for it as it's not required.
TryComp(comp.Owner, out var appearance);
- if (comp.CurrentState == CargoTelepadState.Unpowered || comp.TeleportQueue.Count <= 0)
+ if (comp.CurrentState == CargoTelepadState.Unpowered)
{
comp.CurrentState = CargoTelepadState.Idle;
appearance?.SetData(CargoTelepadVisuals.State, CargoTelepadState.Idle);
@@ -45,14 +48,44 @@ public sealed partial class CargoSystem
continue;
}
- var product = comp.TeleportQueue.Pop();
+ var station = _station.GetOwningStation(comp.Owner);
+
+ if (!TryComp(station, out var orderDatabase) ||
+ orderDatabase.Orders.Count == 0)
+ {
+ comp.Accumulator += comp.Delay;
+ continue;
+ }
+
+ var orderIndices = new ValueList();
+
+ foreach (var (oIndex, oOrder) in orderDatabase.Orders)
+ {
+ if (!oOrder.Approved) continue;
+ orderIndices.Add(oIndex);
+ }
+
+ if (orderIndices.Count == 0)
+ {
+ comp.Accumulator += comp.Delay;
+ continue;
+ }
+
+ orderIndices.Sort();
+ var index = orderIndices[0];
+ var order = orderDatabase.Orders[index];
+ order.Amount--;
+
+ if (order.Amount <= 0)
+ orderDatabase.Orders.Remove(index);
SoundSystem.Play(comp.TeleportSound.GetSound(), Filter.Pvs(comp.Owner), comp.Owner, AudioParams.Default.WithVolume(-8f));
- SpawnProduct(comp, product);
+ SpawnProduct(comp, order);
+ UpdateOrders(orderDatabase);
comp.CurrentState = CargoTelepadState.Teleporting;
appearance?.SetData(CargoTelepadVisuals.State, CargoTelepadState.Teleporting);
- comp.Accumulator = comp.Delay;
+ comp.Accumulator += comp.Delay;
}
}
@@ -87,14 +120,6 @@ public sealed partial class CargoSystem
SetEnabled(component);
}
- public void QueueTeleport(CargoTelepadComponent component, CargoOrderData order)
- {
- for (var i = 0; i < order.Amount; i++)
- {
- component.TeleportQueue.Push(order);
- }
- }
-
///
/// Spawn the product and a piece of paper. Attempt to attach the paper to the product.
///
diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs
index fa5427e887..f675d05f25 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.cs
@@ -1,4 +1,7 @@
+using Content.Server.Cargo.Components;
+using Content.Server.Station.Systems;
using Content.Shared.Cargo;
+using Content.Shared.Cargo.Components;
using Content.Shared.Containers.ItemSlots;
using Robust.Shared.Prototypes;
@@ -9,11 +12,28 @@ public sealed partial class CargoSystem : SharedCargoSystem
[Dependency] private readonly IPrototypeManager _protoMan = default!;
[Dependency] private readonly ItemSlotsSystem _slots = default!;
+ private ISawmill _sawmill = default!;
+
public override void Initialize()
{
base.Initialize();
+ _sawmill = Logger.GetSawmill("cargo");
InitializeConsole();
+ InitializeShuttle();
InitializeTelepad();
+ SubscribeLocalEvent(OnStationInit);
+ }
+
+ public override void Shutdown()
+ {
+ base.Shutdown();
+ Cleanup();
+ }
+
+ private void OnStationInit(StationInitializedEvent ev)
+ {
+ EnsureComp(ev.Station);
+ EnsureComp(ev.Station);
}
public override void Update(float frameTime)
diff --git a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
index c3d5810925..dacf5aeb0b 100644
--- a/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
+++ b/Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
@@ -187,17 +187,26 @@ public sealed class NukeopsRuleSystem : GameRuleSystem
// TODO: Make this a prototype
var map = "/Maps/infiltrator.yml";
- var aabbs = _stationSystem.Stations.SelectMany(x =>
- Comp(x).Grids.Select(x => _mapManager.GetGridComp(x).Grid.WorldAABB)).ToArray();
- var aabb = aabbs[0];
- for (int i = 1; i < aabbs.Length; i++)
+ var center = new Vector2();
+ var minRadius = 0f;
+ Box2? aabb = null;
+
+ foreach (var uid in _stationSystem.Stations)
{
- aabb.Union(aabbs[i]);
+ var grid = Comp(uid).Grid;
+
+ aabb = aabb?.Union(grid.WorldAABB) ?? grid.WorldAABB;
+ }
+
+ if (aabb != null)
+ {
+ center = aabb.Value.Center;
+ minRadius = MathF.Max(aabb.Value.Width, aabb.Value.Height);
}
var (_, gridId) = _mapLoader.LoadBlueprint(GameTicker.DefaultMap, map, new MapLoadOptions
{
- Offset = aabb.Center + MathF.Max(aabb.Height / 2f, aabb.Width / 2f) * 2.5f
+ Offset = center + MathF.Max(minRadius, minRadius) + 1000f,
});
if (!gridId.HasValue)
diff --git a/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
index cf86734ad0..14d1c7c952 100644
--- a/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
+++ b/Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
@@ -42,6 +42,9 @@ namespace Content.Server.Gravity.EntitySystems
if (_mapManager.TryGetGrid(xform.GridUid, out var grid))
{
+ var alerts = _alerts.GetOrNew(xform.GridUid.Value);
+ alerts.Add(status);
+
if (EntityManager.GetComponent(grid.GridEntityId).Enabled)
{
RemoveWeightless(status.Owner);
@@ -51,6 +54,10 @@ namespace Content.Server.Gravity.EntitySystems
AddWeightless(status.Owner);
}
}
+ else
+ {
+ AddWeightless(status.Owner);
+ }
}
public void RemoveAlert(AlertsComponent status)
diff --git a/Content.Server/Physics/Controllers/MoverController.cs b/Content.Server/Physics/Controllers/MoverController.cs
index f29fc79566..a0d99f2c52 100644
--- a/Content.Server/Physics/Controllers/MoverController.cs
+++ b/Content.Server/Physics/Controllers/MoverController.cs
@@ -1,3 +1,4 @@
+using Content.Server.Cargo.Components;
using Content.Server.Shuttles.Components;
using Content.Server.Shuttles.Systems;
using Content.Shared.Vehicle.Components;
@@ -61,9 +62,18 @@ namespace Content.Server.Physics.Controllers
var newPilots = new Dictionary>();
// We just mark off their movement and the shuttle itself does its own movement
- foreach (var (pilot, mover, xform) in EntityManager.EntityQuery())
+ foreach (var (pilot, mover) in EntityManager.EntityQuery())
{
- if (pilot.Console == null) continue;
+ var consoleEnt = pilot.Console?.Owner;
+
+ // TODO: This is terrible. Just make a new mover and also make it remote piloting + device networks
+ if (TryComp(consoleEnt, out var cargoConsole))
+ {
+ consoleEnt = cargoConsole.Entity;
+ }
+
+ if (!TryComp(consoleEnt, out var xform)) continue;
+
_excludedMobs.Add(mover.Owner);
var gridId = xform.GridUid;
diff --git a/Content.Server/Shuttles/Events/ConsoleShuttleEvent.cs b/Content.Server/Shuttles/Events/ConsoleShuttleEvent.cs
new file mode 100644
index 0000000000..bd96387b28
--- /dev/null
+++ b/Content.Server/Shuttles/Events/ConsoleShuttleEvent.cs
@@ -0,0 +1,12 @@
+using Content.Server.Shuttles.Components;
+
+namespace Content.Server.Shuttles.Events;
+
+///
+/// Raised on a when it's trying to get its shuttle console to pilot.
+///
+[ByRefEvent]
+public struct ConsoleShuttleEvent
+{
+ public EntityUid? Console;
+}
diff --git a/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs b/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs
index 3d2e6c0025..eac8d07ff6 100644
--- a/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/RadarConsoleSystem.cs
@@ -23,7 +23,16 @@ public sealed class RadarConsoleSystem : SharedRadarConsoleSystem
protected override void UpdateState(RadarConsoleComponent component)
{
- var radarState = new RadarConsoleBoundInterfaceState(component.MaxRange, component.Owner, new List());
+ var xform = Transform(component.Owner);
+
+ var onGrid = xform.ParentUid == xform.GridUid;
+
+ var radarState = new RadarConsoleBoundInterfaceState(
+ component.MaxRange,
+ onGrid ? xform.Coordinates : null,
+ onGrid ? xform.LocalRotation : null,
+ new List());
+
_uiSystem.GetUiOrNull(component.Owner, RadarConsoleUiKey.Key)?.SetState(radarState);
}
}
diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
index 6eb8649509..3780453ee8 100644
--- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs
@@ -1,3 +1,4 @@
+using Content.Server.Cargo.Components;
using Content.Server.Power.Components;
using Content.Server.Power.EntitySystems;
using Content.Server.Shuttles.Components;
@@ -5,6 +6,7 @@ using Content.Server.Shuttles.Events;
using Content.Server.UserInterface;
using Content.Shared.ActionBlocker;
using Content.Shared.Alert;
+using Content.Shared.Light;
using Content.Shared.Popups;
using Content.Shared.Shuttles.BUIStates;
using Content.Shared.Shuttles.Components;
@@ -136,15 +138,29 @@ namespace Content.Server.Shuttles.Systems
///
private void OnModeRequest(EntityUid uid, ShuttleConsoleComponent component, ShuttleModeRequestMessage args)
{
+ var consoleUid = uid;
+
+ if (TryComp(uid, out var cargoPilot) && cargoPilot.Entity != null)
+ {
+ consoleUid = cargoPilot.Entity.Value;
+ }
+
if (args.Session.AttachedEntity is not { } player ||
!TryComp(player, out var pilot) ||
- !TryComp(player, out var xform) ||
- pilot.Console is not ShuttleConsoleComponent console) return;
+ !TryComp(consoleUid, out var console) ||
+ !TryComp(consoleUid, out var consoleXform)) return;
- if (!console.SubscribedPilots.Contains(pilot) ||
- !TryComp(xform.GridUid, out var shuttle)) return;
+ // Can't check console pilots as it may be remotely piloted!
+ if (!component.SubscribedPilots.Contains(pilot) ||
+ !TryComp(consoleXform.GridUid, out var shuttle)) return;
SetShuttleMode(args.Mode, console, shuttle);
+ UpdateState(component);
+
+ if (uid != consoleUid)
+ {
+ UpdateState(console);
+ }
}
///
@@ -159,7 +175,6 @@ namespace Content.Server.Shuttles.Systems
!consoleXform.Anchored ||
consoleXform.GridID != Transform(shuttleComponent.Owner).GridID)
{
- UpdateState(consoleComponent);
return;
}
@@ -174,8 +189,6 @@ namespace Content.Server.Shuttles.Systems
default:
throw new ArgumentOutOfRangeException();
}
-
- UpdateState(consoleComponent);
}
///
@@ -205,10 +218,21 @@ namespace Content.Server.Shuttles.Systems
private void UpdateState(ShuttleConsoleComponent component, List? docks = null)
{
- TryComp(component.Owner, out var radar);
+ EntityUid? entity = component.Owner;
+
+ var getShuttleEv = new ConsoleShuttleEvent
+ {
+ Console = entity,
+ };
+
+ RaiseLocalEvent(entity.Value, ref getShuttleEv, false);
+ entity = getShuttleEv.Console;
+
+ TryComp(entity, out var consoleXform);
+ TryComp(entity, out var radar);
var range = radar?.MaxRange ?? 0f;
- TryComp(Transform(component.Owner).GridUid, out var shuttle);
+ TryComp(consoleXform?.GridUid, out var shuttle);
var mode = shuttle?.Mode ?? ShuttleMode.Cruise;
docks ??= GetAllDocks();
@@ -217,7 +241,8 @@ namespace Content.Server.Shuttles.Systems
?.SetState(new ShuttleConsoleBoundInterfaceState(
mode,
range,
- component.Owner,
+ consoleXform?.Coordinates,
+ consoleXform?.LocalRotation,
docks));
}
diff --git a/Content.Shared/Cargo/BUI/CargoConsoleInterfaceState.cs b/Content.Shared/Cargo/BUI/CargoConsoleInterfaceState.cs
new file mode 100644
index 0000000000..a1e61772cd
--- /dev/null
+++ b/Content.Shared/Cargo/BUI/CargoConsoleInterfaceState.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Cargo.BUI;
+
+[NetSerializable, Serializable]
+public sealed class CargoConsoleInterfaceState : BoundUserInterfaceState
+{
+ public string Name;
+ public int Count;
+ public int Capacity;
+ public int Balance;
+ public List Orders;
+
+ public CargoConsoleInterfaceState(string name, int count, int capacity, int balance, List orders)
+ {
+ Name = name;
+ Count = count;
+ Capacity = capacity;
+ Balance = balance;
+ Orders = orders;
+ }
+}
\ No newline at end of file
diff --git a/Content.Shared/Cargo/BUI/CargoShuttleConsoleBoundUserInterfaceState.cs b/Content.Shared/Cargo/BUI/CargoShuttleConsoleBoundUserInterfaceState.cs
new file mode 100644
index 0000000000..75e0aee60f
--- /dev/null
+++ b/Content.Shared/Cargo/BUI/CargoShuttleConsoleBoundUserInterfaceState.cs
@@ -0,0 +1,41 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Cargo.BUI;
+
+[Serializable, NetSerializable]
+public sealed class CargoShuttleConsoleBoundUserInterfaceState : BoundUserInterfaceState
+{
+ 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;
+
+ ///
+ /// When the shuttle is expected to be usable.
+ ///
+ public TimeSpan? ShuttleETA;
+
+ ///
+ /// List of orders expected on the delivery.
+ ///
+ public List Orders;
+
+ public CargoShuttleConsoleBoundUserInterfaceState(
+ string accountName,
+ string shuttleName,
+ bool canRecall,
+ TimeSpan? shuttleETA,
+ List orders)
+ {
+ AccountName = accountName;
+ ShuttleName = shuttleName;
+ CanRecall = canRecall;
+ ShuttleETA = shuttleETA;
+ Orders = orders;
+ }
+}
diff --git a/Content.Shared/Cargo/CargoOrderData.cs b/Content.Shared/Cargo/CargoOrderData.cs
index 62e4594127..38ebe195fa 100644
--- a/Content.Shared/Cargo/CargoOrderData.cs
+++ b/Content.Shared/Cargo/CargoOrderData.cs
@@ -12,18 +12,16 @@ namespace Content.Shared.Cargo
public string Reason;
public string ProductId;
public int Amount;
- public int PayingAccountId;
public bool Approved;
public string Approver = string.Empty;
- public CargoOrderData(int orderNumber, string requester, string reason, string productId, int amount, int payingAccountId)
+ public CargoOrderData(int orderNumber, string requester, string reason, string productId, int amount)
{
OrderNumber = orderNumber;
Requester = requester;
Reason = reason;
ProductId = productId;
Amount = amount;
- PayingAccountId = payingAccountId;
}
}
}
diff --git a/Content.Shared/Cargo/Components/CargoShuttleComponent.cs b/Content.Shared/Cargo/Components/CargoShuttleComponent.cs
new file mode 100644
index 0000000000..5a428ce985
--- /dev/null
+++ b/Content.Shared/Cargo/Components/CargoShuttleComponent.cs
@@ -0,0 +1,31 @@
+using Robust.Shared.Map;
+
+namespace Content.Shared.Cargo.Components;
+
+///
+/// Present on cargo shuttles to provide metadata such as preventing spam calling.
+///
+[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 = 45f;
+
+ [ViewVariables]
+ public bool CanRecall;
+
+ ///
+ /// The shuttle's assigned coordinates on the cargo map.
+ ///
+ [ViewVariables]
+ public EntityCoordinates Coordinates;
+
+ ///
+ /// The assigned station for this cargo shuttle.
+ ///
+ [ViewVariables, DataField("station")]
+ public EntityUid? Station;
+}
diff --git a/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs b/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs
deleted file mode 100644
index 19a2114207..0000000000
--- a/Content.Shared/Cargo/Components/SharedCargoConsoleComponent.cs
+++ /dev/null
@@ -1,95 +0,0 @@
-using Robust.Shared.Prototypes;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Cargo.Components
-{
- [Virtual]
- public class SharedCargoConsoleComponent : Component
- {
- [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
-
- ///
- /// Sends away or requests shuttle
- ///
- [Serializable, NetSerializable]
- public sealed class CargoConsoleShuttleMessage : BoundUserInterfaceMessage
- {
- public CargoConsoleShuttleMessage()
- {
- }
- }
-
- ///
- /// Add order to database.
- ///
- [Serializable, NetSerializable]
- public sealed class CargoConsoleAddOrderMessage : BoundUserInterfaceMessage
- {
- public string Requester;
- public string Reason;
- public string ProductId;
- public int Amount;
-
- public CargoConsoleAddOrderMessage(string requester, string reason, string productId, int amount)
- {
- Requester = requester;
- Reason = reason;
- ProductId = productId;
- Amount = amount;
- }
- }
-
- ///
- /// Remove order from database.
- ///
- [Serializable, NetSerializable]
- public sealed class CargoConsoleRemoveOrderMessage : BoundUserInterfaceMessage
- {
- public int OrderNumber;
-
- public CargoConsoleRemoveOrderMessage(int orderNumber)
- {
- OrderNumber = orderNumber;
- }
- }
-
- ///
- /// Set order in database as approved.
- ///
- [Serializable, NetSerializable]
- public sealed class CargoConsoleApproveOrderMessage : BoundUserInterfaceMessage
- {
- public int OrderNumber;
-
- public CargoConsoleApproveOrderMessage(int orderNumber)
- {
- OrderNumber = orderNumber;
- }
- }
-
- [NetSerializable, Serializable]
- public enum CargoConsoleUiKey
- {
- Key
- }
- }
-
- [NetSerializable, Serializable]
- public sealed class CargoConsoleInterfaceState : BoundUserInterfaceState
- {
- public readonly bool RequestOnly;
- public readonly int BankId;
- public readonly string BankName;
- public readonly int BankBalance;
- public readonly (int CurrentCapacity, int MaxCapacity) ShuttleCapacity;
-
- public CargoConsoleInterfaceState(bool requestOnly, int bankId, string bankName, int bankBalance, (int CurrentCapacity, int MaxCapacity) shuttleCapacity)
- {
- RequestOnly = requestOnly;
- BankId = bankId;
- BankName = bankName;
- BankBalance = bankBalance;
- ShuttleCapacity = shuttleCapacity;
- }
- }
-}
diff --git a/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs b/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs
deleted file mode 100644
index c1a7e4b468..0000000000
--- a/Content.Shared/Cargo/Components/SharedCargoOrderDatabaseComponent.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using Robust.Shared.GameStates;
-using Robust.Shared.Serialization;
-
-namespace Content.Shared.Cargo.Components
-{
- [NetworkedComponent()]
- public abstract class SharedCargoOrderDatabaseComponent : Component
- {
- }
-
- [NetSerializable, Serializable]
- public sealed class CargoOrderDatabaseState : ComponentState
- {
- public readonly List? Orders;
-
- public CargoOrderDatabaseState(List? orders)
- {
- Orders = orders;
- }
- }
-}
diff --git a/Content.Shared/Cargo/Events/CargoCallShuttleMessage.cs b/Content.Shared/Cargo/Events/CargoCallShuttleMessage.cs
new file mode 100644
index 0000000000..e06b388596
--- /dev/null
+++ b/Content.Shared/Cargo/Events/CargoCallShuttleMessage.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Cargo.Events;
+
+///
+/// Raised on a cargo console requesting the cargo shuttle.
+///
+[Serializable, NetSerializable]
+public sealed class CargoCallShuttleMessage : BoundUserInterfaceMessage
+{
+
+}
diff --git a/Content.Shared/Cargo/Events/CargoConsoleAddOrderMessage.cs b/Content.Shared/Cargo/Events/CargoConsoleAddOrderMessage.cs
new file mode 100644
index 0000000000..5044ef121c
--- /dev/null
+++ b/Content.Shared/Cargo/Events/CargoConsoleAddOrderMessage.cs
@@ -0,0 +1,23 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Cargo.Events;
+
+///
+/// Add order to database.
+///
+[Serializable, NetSerializable]
+public sealed class CargoConsoleAddOrderMessage : BoundUserInterfaceMessage
+{
+ public string Requester;
+ public string Reason;
+ public string ProductId;
+ public int Amount;
+
+ public CargoConsoleAddOrderMessage(string requester, string reason, string productId, int amount)
+ {
+ Requester = requester;
+ Reason = reason;
+ ProductId = productId;
+ Amount = amount;
+ }
+}
\ No newline at end of file
diff --git a/Content.Shared/Cargo/Events/CargoConsoleApproveOrderMessage.cs b/Content.Shared/Cargo/Events/CargoConsoleApproveOrderMessage.cs
new file mode 100644
index 0000000000..4e580dd8ac
--- /dev/null
+++ b/Content.Shared/Cargo/Events/CargoConsoleApproveOrderMessage.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Cargo.Events;
+
+///
+/// Set order in database as approved.
+///
+[Serializable, NetSerializable]
+public sealed class CargoConsoleApproveOrderMessage : BoundUserInterfaceMessage
+{
+ public int OrderNumber;
+
+ public CargoConsoleApproveOrderMessage(int orderNumber)
+ {
+ OrderNumber = orderNumber;
+ }
+}
\ No newline at end of file
diff --git a/Content.Shared/Cargo/Events/CargoConsoleRemoveOrderMessage.cs b/Content.Shared/Cargo/Events/CargoConsoleRemoveOrderMessage.cs
new file mode 100644
index 0000000000..9a7a842fbe
--- /dev/null
+++ b/Content.Shared/Cargo/Events/CargoConsoleRemoveOrderMessage.cs
@@ -0,0 +1,17 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Cargo.Events;
+
+///
+/// Remove order from database.
+///
+[Serializable, NetSerializable]
+public sealed class CargoConsoleRemoveOrderMessage : BoundUserInterfaceMessage
+{
+ public int OrderNumber;
+
+ public CargoConsoleRemoveOrderMessage(int orderNumber)
+ {
+ OrderNumber = orderNumber;
+ }
+}
\ No newline at end of file
diff --git a/Content.Shared/Cargo/Events/CargoRecallShuttleMessage.cs b/Content.Shared/Cargo/Events/CargoRecallShuttleMessage.cs
new file mode 100644
index 0000000000..041ddebe79
--- /dev/null
+++ b/Content.Shared/Cargo/Events/CargoRecallShuttleMessage.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Cargo.Events;
+
+///
+/// Raised on a client request cargo shuttle recall
+///
+[Serializable, NetSerializable]
+public sealed class CargoRecallShuttleMessage : BoundUserInterfaceMessage
+{
+
+}
diff --git a/Content.Shared/Cargo/CargoProductPrototype.cs b/Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs
similarity index 97%
rename from Content.Shared/Cargo/CargoProductPrototype.cs
rename to Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs
index 7cad752b40..63bb301047 100644
--- a/Content.Shared/Cargo/CargoProductPrototype.cs
+++ b/Content.Shared/Cargo/Prototypes/CargoProductPrototype.cs
@@ -3,7 +3,7 @@ using Robust.Shared.Serialization;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Utility;
-namespace Content.Shared.Cargo
+namespace Content.Shared.Cargo.Prototypes
{
[NetSerializable, Serializable, Prototype("cargoProduct")]
public sealed class CargoProductPrototype : IPrototype
@@ -13,7 +13,7 @@ namespace Content.Shared.Cargo
[DataField("description")] private string _description = string.Empty;
[ViewVariables]
- [IdDataFieldAttribute]
+ [IdDataField]
public string ID { get; } = default!;
///
diff --git a/Content.Shared/Cargo/Prototypes/CargoShuttlePrototype.cs b/Content.Shared/Cargo/Prototypes/CargoShuttlePrototype.cs
new file mode 100644
index 0000000000..8dac2a98b0
--- /dev/null
+++ b/Content.Shared/Cargo/Prototypes/CargoShuttlePrototype.cs
@@ -0,0 +1,20 @@
+using Content.Shared.Dataset;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Utility;
+
+namespace Content.Shared.Cargo.Prototypes;
+
+[Prototype("cargoShuttle")]
+public sealed class CargoShuttlePrototype : IPrototype
+{
+ [ViewVariables]
+ [IdDataField]
+ public string ID { get; } = default!;
+
+ [ViewVariables, DataField("path")]
+ public ResourcePath Path = default!;
+
+ [ViewVariables, DataField("nameDataset", customTypeSerializer:typeof(PrototypeIdSerializer))]
+ public string NameDataset = "CargoShuttleNames";
+}
diff --git a/Content.Shared/Cargo/SharedCargoSystem.cs b/Content.Shared/Cargo/SharedCargoSystem.cs
index 1931c0b95e..2e2546dadb 100644
--- a/Content.Shared/Cargo/SharedCargoSystem.cs
+++ b/Content.Shared/Cargo/SharedCargoSystem.cs
@@ -2,6 +2,14 @@ using Robust.Shared.Serialization;
namespace Content.Shared.Cargo;
+[NetSerializable, Serializable]
+public enum CargoConsoleUiKey : byte
+{
+ Orders,
+ Shuttle,
+ Telepad
+}
+
public abstract class SharedCargoSystem : EntitySystem {}
[Serializable, NetSerializable]
diff --git a/Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs
index 550c6d28f1..bb16f9bdbc 100644
--- a/Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs
+++ b/Content.Shared/Shuttles/BUIStates/RadarConsoleBoundInterfaceState.cs
@@ -8,16 +8,28 @@ namespace Content.Shared.Shuttles.BUIStates;
public class RadarConsoleBoundInterfaceState : BoundUserInterfaceState
{
public readonly float MaxRange;
- public readonly EntityUid? Entity;
+
+ ///
+ /// The relevant coordinates to base the radar around.
+ ///
+ public EntityCoordinates? Coordinates;
+
+ ///
+ /// The relevant rotation to rotate the angle around.
+ ///
+ public Angle? Angle;
+
public readonly List Docks;
public RadarConsoleBoundInterfaceState(
float maxRange,
- EntityUid? entity,
+ EntityCoordinates? coordinates,
+ Angle? angle,
List docks)
{
MaxRange = maxRange;
- Entity = entity;
+ Coordinates = coordinates;
+ Angle = angle;
Docks = docks;
}
}
diff --git a/Content.Shared/Shuttles/BUIStates/ShuttleConsoleBoundInterfaceState.cs b/Content.Shared/Shuttles/BUIStates/ShuttleConsoleBoundInterfaceState.cs
index d210fd5bb6..bad69c5f66 100644
--- a/Content.Shared/Shuttles/BUIStates/ShuttleConsoleBoundInterfaceState.cs
+++ b/Content.Shared/Shuttles/BUIStates/ShuttleConsoleBoundInterfaceState.cs
@@ -12,8 +12,9 @@ public sealed class ShuttleConsoleBoundInterfaceState : RadarConsoleBoundInterfa
public ShuttleConsoleBoundInterfaceState(
ShuttleMode mode,
float maxRange,
- EntityUid? entity,
- List docks) : base(maxRange, entity, docks)
+ EntityCoordinates? coordinates,
+ Angle? angle,
+ List docks) : base(maxRange, coordinates, angle, docks)
{
Mode = mode;
}
diff --git a/Content.Shared/Shuttles/Components/RadarConsoleComponent.cs b/Content.Shared/Shuttles/Components/RadarConsoleComponent.cs
index 92d51ab607..4e20a8b5f8 100644
--- a/Content.Shared/Shuttles/Components/RadarConsoleComponent.cs
+++ b/Content.Shared/Shuttles/Components/RadarConsoleComponent.cs
@@ -17,5 +17,5 @@ public sealed class RadarConsoleComponent : Component
}
[ViewVariables, DataField("maxRange")]
- public float MaxRange = 120f;
+ public float MaxRange = 256f;
}
diff --git a/Resources/Audio/Effects/Cargo/buzz_sigh.ogg b/Resources/Audio/Effects/Cargo/buzz_sigh.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..109c196e2c4fef313bdb2a17c4c7b4a59668eda4
GIT binary patch
literal 8972
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