diff --git a/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs index cf51221cd8..f81109fdc8 100644 --- a/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs +++ b/Content.Client/Cargo/BUI/CargoOrderConsoleBoundUserInterface.cs @@ -158,7 +158,7 @@ namespace Content.Client.Cargo.BUI if (args.Button.Parent?.Parent is not CargoOrderRow row || row.Order == null) return; - SendMessage(new CargoConsoleRemoveOrderMessage(row.Order.OrderNumber)); + SendMessage(new CargoConsoleRemoveOrderMessage(row.Order.OrderIndex)); } private void ApproveOrder(ButtonEventArgs args) @@ -169,7 +169,7 @@ namespace Content.Client.Cargo.BUI if (OrderCount >= OrderCapacity) return; - SendMessage(new CargoConsoleApproveOrderMessage(row.Order.OrderNumber)); + SendMessage(new CargoConsoleApproveOrderMessage(row.Order.OrderIndex)); // Most of the UI isn't predicted anyway so. // _menu?.UpdateCargoCapacity(OrderCount + row.Order.Amount, OrderCapacity); } diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs index 886cbc6889..d5e2568b3f 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs @@ -115,7 +115,7 @@ namespace Content.Server.Cargo.Systems } // No order to approve? - if (!orderDatabase.Orders.TryGetValue(args.OrderNumber, out var order) || + if (!orderDatabase.Orders.TryGetValue(args.OrderIndex, out var order) || order.Approved) return; // Invalid order @@ -163,7 +163,7 @@ namespace Content.Server.Cargo.Systems // Log order approval _adminLogger.Add(LogType.Action, LogImpact.Low, - $"{ToPrettyString(player):user} approved order [orderNum:{order.OrderNumber}, amount:{order.Amount}, product:{order.ProductId}, requester:{order.Requester}, reason:{order.Reason}] with balance at {bankAccount.Balance}"); + $"{ToPrettyString(player):user} approved order [orderIdx:{order.OrderIndex}, amount:{order.Amount}, product:{order.ProductId}, requester:{order.Requester}, reason:{order.Reason}] with balance at {bankAccount.Balance}"); DeductFunds(bankAccount, cost); UpdateOrders(orderDatabase); @@ -173,7 +173,7 @@ namespace Content.Server.Cargo.Systems { var orderDatabase = GetOrderDatabase(component); if (orderDatabase == null) return; - RemoveOrder(orderDatabase, args.OrderNumber); + RemoveOrder(orderDatabase, args.OrderIndex); } private void OnAddOrderMessage(EntityUid uid, CargoOrderConsoleComponent component, CargoConsoleAddOrderMessage args) @@ -199,7 +199,7 @@ namespace Content.Server.Cargo.Systems // Log order addition _adminLogger.Add(LogType.Action, LogImpact.Low, - $"{ToPrettyString(player):user} added order [orderNum:{data.OrderNumber}, amount:{data.Amount}, product:{data.ProductId}, requester:{data.Requester}, reason:{data.Reason}]"); + $"{ToPrettyString(player):user} added order [orderIdx:{data.OrderIndex}, amount:{data.Amount}, product:{data.ProductId}, requester:{data.Requester}, reason:{data.Reason}]"); } @@ -278,7 +278,7 @@ namespace Content.Server.Cargo.Systems public bool TryAddOrder(StationCargoOrderDatabaseComponent component, CargoOrderData data) { - component.Orders.Add(data.OrderNumber, data); + component.Orders.Add(data.OrderIndex, data); UpdateOrders(component); return true; } diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs index 8552b70cce..8e1e6d89b8 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs @@ -228,7 +228,7 @@ public sealed partial class CargoSystem if (cappedAmount < order.Amount) { - var reducedOrder = new CargoOrderData(order.OrderNumber, order.ProductId, cappedAmount, order.Requester, order.Reason); + var reducedOrder = new CargoOrderData(order.OrderIndex, order.ProductId, cappedAmount, order.Requester, order.Reason); orders.Add(reducedOrder); break; @@ -447,11 +447,11 @@ public sealed partial class CargoSystem { // Yes this is functioning as a stack, I was too lazy to re-jig the shuttle state event. orders.RemoveSwap(0); - orderDatabase.Orders.Remove(order.OrderNumber); + orderDatabase.Orders.Remove(order.OrderIndex); } else { - orderDatabase.Orders[order.OrderNumber] = order; + orderDatabase.Orders[order.OrderIndex] = order; } } } @@ -471,13 +471,13 @@ public sealed partial class CargoSystem return; // fill in the order data - var val = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", order.OrderNumber)); + var val = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", order.PrintableOrderNumber)); MetaData(printed).EntityName = val; _paperSystem.SetContent(printed, Loc.GetString( "cargo-console-paper-print-text", - ("orderNumber", order.OrderNumber), + ("orderNumber", order.PrintableOrderNumber), ("itemName", prototype.Name), ("requester", order.Requester), ("reason", order.Reason), diff --git a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs index e44ad80f74..2fd2fe18fb 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Telepad.cs @@ -143,13 +143,13 @@ public sealed partial class CargoSystem return; // fill in the order data - var val = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", data.OrderNumber)); + var val = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", data.PrintableOrderNumber)); MetaData(printed).EntityName = val; _paperSystem.SetContent(printed, Loc.GetString( "cargo-console-paper-print-text", - ("orderNumber", data.OrderNumber), + ("orderNumber", data.PrintableOrderNumber), ("itemName", prototype.Name), ("requester", data.Requester), ("reason", data.Reason), diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs index 26eac88aa3..11213ffc38 100644 --- a/Content.Server/Paper/PaperSystem.cs +++ b/Content.Server/Paper/PaperSystem.cs @@ -60,7 +60,7 @@ namespace Content.Server.Paper return; if (paperComp.Content != "") - args.Message.AddMarkup( + args.PushMarkup( Loc.GetString( "paper-component-examine-detail-has-words", ("paper", uid) ) @@ -68,9 +68,8 @@ namespace Content.Server.Paper if (paperComp.StampedBy.Count > 0) { - args.Message.PushNewline(); string commaSeparated = string.Join(", ", paperComp.StampedBy); - args.Message.AddMarkup( + args.PushMarkup( Loc.GetString( "paper-component-examine-detail-stamped-by", ("paper", uid), ("stamps", commaSeparated)) ); diff --git a/Content.Shared/Cargo/CargoOrderData.cs b/Content.Shared/Cargo/CargoOrderData.cs index 5cf3ab3f1e..0b89212241 100644 --- a/Content.Shared/Cargo/CargoOrderData.cs +++ b/Content.Shared/Cargo/CargoOrderData.cs @@ -6,7 +6,9 @@ namespace Content.Shared.Cargo [NetSerializable, Serializable] public sealed class CargoOrderData { - public int OrderNumber; + public int OrderIndex; + /// The human-readable number, when displaying this order + public int PrintableOrderNumber { get { return OrderIndex + 1; } } public string ProductId; public int Amount; public string Requester; @@ -16,9 +18,9 @@ namespace Content.Shared.Cargo public bool Approved => Approver is not null; public string? Approver; - public CargoOrderData(int orderNumber, string productId, int amount, string requester, string reason) + public CargoOrderData(int orderIndex, string productId, int amount, string requester, string reason) { - OrderNumber = orderNumber; + OrderIndex = orderIndex; ProductId = productId; Amount = amount; Requester = requester; diff --git a/Content.Shared/Cargo/Events/CargoConsoleApproveOrderMessage.cs b/Content.Shared/Cargo/Events/CargoConsoleApproveOrderMessage.cs index 4e580dd8ac..d8776cabda 100644 --- a/Content.Shared/Cargo/Events/CargoConsoleApproveOrderMessage.cs +++ b/Content.Shared/Cargo/Events/CargoConsoleApproveOrderMessage.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Cargo.Events; [Serializable, NetSerializable] public sealed class CargoConsoleApproveOrderMessage : BoundUserInterfaceMessage { - public int OrderNumber; + public int OrderIndex; - public CargoConsoleApproveOrderMessage(int orderNumber) + public CargoConsoleApproveOrderMessage(int orderIndex) { - OrderNumber = orderNumber; + OrderIndex = orderIndex; } -} \ No newline at end of file +} diff --git a/Content.Shared/Cargo/Events/CargoConsoleRemoveOrderMessage.cs b/Content.Shared/Cargo/Events/CargoConsoleRemoveOrderMessage.cs index 9a7a842fbe..bd36ac68e8 100644 --- a/Content.Shared/Cargo/Events/CargoConsoleRemoveOrderMessage.cs +++ b/Content.Shared/Cargo/Events/CargoConsoleRemoveOrderMessage.cs @@ -8,10 +8,10 @@ namespace Content.Shared.Cargo.Events; [Serializable, NetSerializable] public sealed class CargoConsoleRemoveOrderMessage : BoundUserInterfaceMessage { - public int OrderNumber; + public int OrderIndex; - public CargoConsoleRemoveOrderMessage(int orderNumber) + public CargoConsoleRemoveOrderMessage(int orderIndex) { - OrderNumber = orderNumber; + OrderIndex = orderIndex; } -} \ No newline at end of file +}