make cargo balance ui updating its own component (#28295)
* add BankClientComponent and event * query BankClient instead of hardcoded CargoOrderConsole for updating * add BankClient to all ordering consoles * :trollface: * add Balance field to BankClient * forgor Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> * m --------- Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
This commit is contained in:
@@ -40,6 +40,7 @@ namespace Content.Server.Cargo.Systems
|
||||
SubscribeLocalEvent<CargoOrderConsoleComponent, BoundUIOpenedEvent>(OnOrderUIOpened);
|
||||
SubscribeLocalEvent<CargoOrderConsoleComponent, ComponentInit>(OnInit);
|
||||
SubscribeLocalEvent<CargoOrderConsoleComponent, InteractUsingEvent>(OnInteractUsing);
|
||||
SubscribeLocalEvent<CargoOrderConsoleComponent, BankBalanceUpdatedEvent>(OnOrderBalanceUpdated);
|
||||
Reset();
|
||||
}
|
||||
|
||||
@@ -315,6 +316,15 @@ namespace Content.Server.Cargo.Systems
|
||||
|
||||
#endregion
|
||||
|
||||
|
||||
private void OnOrderBalanceUpdated(Entity<CargoOrderConsoleComponent> ent, ref BankBalanceUpdatedEvent args)
|
||||
{
|
||||
if (!_uiSystem.IsUiOpen(ent.Owner, CargoConsoleUiKey.Orders))
|
||||
return;
|
||||
|
||||
UpdateOrderState(ent, args.Station);
|
||||
}
|
||||
|
||||
private void UpdateOrderState(EntityUid consoleUid, EntityUid? station)
|
||||
{
|
||||
if (station == null ||
|
||||
|
||||
@@ -81,18 +81,18 @@ public sealed partial class CargoSystem : SharedCargoSystem
|
||||
public void UpdateBankAccount(EntityUid uid, StationBankAccountComponent component, int balanceAdded)
|
||||
{
|
||||
component.Balance += balanceAdded;
|
||||
var query = EntityQueryEnumerator<CargoOrderConsoleComponent>();
|
||||
var query = EntityQueryEnumerator<BankClientComponent, TransformComponent>();
|
||||
|
||||
while (query.MoveNext(out var oUid, out var _))
|
||||
var ev = new BankBalanceUpdatedEvent(uid, component.Balance);
|
||||
while (query.MoveNext(out var client, out var comp, out var xform))
|
||||
{
|
||||
if (!_uiSystem.IsUiOpen(oUid, CargoConsoleUiKey.Orders))
|
||||
continue;
|
||||
|
||||
var station = _station.GetOwningStation(oUid);
|
||||
var station = _station.GetOwningStation(client, xform);
|
||||
if (station != uid)
|
||||
continue;
|
||||
|
||||
UpdateOrderState(oUid, station);
|
||||
comp.Balance = component.Balance;
|
||||
Dirty(client, comp);
|
||||
RaiseLocalEvent(client, ref ev);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
26
Content.Shared/Cargo/Components/BankClientComponent.cs
Normal file
26
Content.Shared/Cargo/Components/BankClientComponent.cs
Normal file
@@ -0,0 +1,26 @@
|
||||
using Content.Shared.Cargo;
|
||||
using Robust.Shared.GameStates;
|
||||
|
||||
namespace Content.Shared.Cargo.Components;
|
||||
|
||||
/// <summary>
|
||||
/// Makes an entity a client of the station's bank account.
|
||||
/// When its balance changes it will have <see cref="BankBalanceUpdatedEvent"/> raised on it.
|
||||
/// Other systems can then use this for logic or to update ui states.
|
||||
/// </summary>
|
||||
[RegisterComponent, NetworkedComponent, Access(typeof(SharedCargoSystem))]
|
||||
[AutoGenerateComponentState]
|
||||
public sealed partial class BankClientComponent : Component
|
||||
{
|
||||
/// <summary>
|
||||
/// The balance updated for the last station this entity was a part of.
|
||||
/// </summary>
|
||||
[DataField, AutoNetworkedField]
|
||||
public int Balance;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Raised on an entity with <see cref="BankClientComponent"/> when the bank's balance is updated.
|
||||
/// </summary>
|
||||
[ByRefEvent]
|
||||
public record struct BankBalanceUpdatedEvent(EntityUid Station, int Balance);
|
||||
@@ -69,6 +69,7 @@
|
||||
- type: RadarConsole
|
||||
followEntity: true
|
||||
- type: CargoOrderConsole
|
||||
- type: BankClient
|
||||
- type: CrewMonitoringConsole
|
||||
- type: GeneralStationRecordConsole
|
||||
canDeleteEntries: true
|
||||
|
||||
@@ -548,6 +548,7 @@
|
||||
tags:
|
||||
- Write
|
||||
- type: CargoOrderConsole
|
||||
- type: BankClient
|
||||
- type: ActivatableUI
|
||||
verbText: qm-clipboard-computer-verb-text
|
||||
key: enum.CargoConsoleUiKey.Orders
|
||||
|
||||
@@ -735,6 +735,7 @@
|
||||
- map: ["computerLayerKeys"]
|
||||
state: tech_key
|
||||
- type: CargoOrderConsole
|
||||
- type: BankClient
|
||||
- type: ActiveRadio
|
||||
channels:
|
||||
- Supply
|
||||
|
||||
Reference in New Issue
Block a user