Separation Of Cash Payment From VendingMachineComponent

Content.Client/VendingMachines/VendingMachineBoundUserInterface.cs

@@ -4,6 +4,7 @@
 using Robust.Client.UserInterface;
 using Robust.Shared.Input;
 using System.Linq;
+using Content.Shared._Mono.Economy.Component; // Mono
 using Robust.Client.GameObjects;
 using Content.Shared._NF.Bank.Components; // Frontier
 using Content.Shared.Containers.ItemSlots; // Frontier
@@ -57,10 +58,10 @@ protected override void Open()
                 _menu.Title = Loc.GetString("vending-machine-nf-fallback-title");
             // End Frontier: no exceptions
             _menu.OnItemSelected += OnItemSelected;
-            Refresh();
+            Update();
         }
 
-        public void Refresh()
+        public override void Update()
         {
             var system = EntMan.System<VendingMachineSystem>();
             _cachedInventory = system.GetAllInventory(Owner);
@@ -73,11 +74,12 @@ public void Refresh()
                     _balance = bank.Balance;
             }
             int? cashSlotValue = null;
-            if (EntMan.TryGetComponent<VendingMachineComponent>(Owner, out var vendingMachine))
+            if (EntMan.TryGetComponent<VendingMachineComponent>(Owner, out var vendingMachine) // Mono start - Seperation of Cash from VendingMachineComp
+                && EntMan.TryGetComponent<CreditReceiverComponent>(Owner, out var creditReceiver))
             {
-                _cashSlotBalance = vendingMachine.CashSlotBalance;
+                _cashSlotBalance = creditReceiver.CashSlotBalance;
                 _requiresCash = vendingMachine.RequiresCash; // mono
-                if (vendingMachine.CashSlotName != null)
+                if (creditReceiver.CashSlotName != null) // Mono end
                     cashSlotValue = _cashSlotBalance;
             }
             else

Content.Client/VendingMachines/VendingMachineSystem.cs

@@ -1,3 +1,4 @@
+using Content.Shared._Mono.Economy.Component;
 using Content.Shared.VendingMachines;
 using Robust.Client.Animations;
 using Robust.Client.GameObjects;
@@ -26,7 +27,7 @@ private void OnVendingAfterState(EntityUid uid, VendingMachineComponent componen
     {
         if (_uiSystem.TryGetOpenUi<VendingMachineBoundUserInterface>(uid, VendingMachineUiKey.Key, out var bui))
         {
-            bui.Refresh();
+            bui.Update();
         }
     }
 
@@ -35,15 +36,15 @@ private void OnEntityInserted(Entity<VendingMachineComponent> ent, ref EntInsert
     {
         if (_uiSystem.TryGetOpenUi<VendingMachineBoundUserInterface>(ent.Owner, VendingMachineUiKey.Key, out var bui))
         {
-            bui.Refresh();
+            bui.Update();
         }
     }
 
     private void OnEntityRemoved(Entity<VendingMachineComponent> ent, ref EntRemovedFromContainerMessage args)
     {
         if (_uiSystem.TryGetOpenUi<VendingMachineBoundUserInterface>(ent.Owner, VendingMachineUiKey.Key, out var bui))
         {
-            bui.Refresh();
+            bui.Update();
         }
     }
     // End Frontier

Content.Client/_Mono/Economy/CreditReceiverSystem.cs

@@ -0,0 +1,25 @@
+using Content.Shared._Mono.Economy;
+using Content.Shared._Mono.Economy.Component;
+using Content.Shared.VendingMachines;
+
+namespace Content.Client._Mono.Economy;
+
+public sealed partial class CreditReceiverSystem : SharedCreditReceiverSystem
+{
+    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<CreditReceiverComponent, AfterAutoHandleStateEvent>(OnVendingCashMoneyAfterState);
+    }
+
+    private void OnVendingCashMoneyAfterState(EntityUid uid, CreditReceiverComponent component, ref AfterAutoHandleStateEvent args)
+    {
+        if (_uiSystem.TryGetOpenUi(uid, VendingMachineUiKey.Key, out var bui))
+        {
+            bui.Update();
+        }
+    }
+}

Content.Server/VendingMachines/VendingMachineSystem.cs

@@ -32,34 +32,33 @@
 using Content.Server.Administration.Logs; // Frontier
 using Content.Shared.Database; // Frontier
 using Content.Shared._NF.Bank.BUI; // Frontier
-using Content.Server._NF.Contraband.Systems; // Frontier
-using Content.Shared.Stacks; // Frontier
 using Content.Server.Stack;
 using Content.Server._Mono.VendingMachine;
 using Content.Shared._Mono.Traits.Physical;
-using Robust.Shared.Containers; // Frontier
+using Content.Shared._Mono.Economy; // Mono - Seperation of cash payment from VendingMachineComp
+using Content.Shared._Mono.Economy.Component;
 
 namespace Content.Server.VendingMachines
 {
     public sealed partial class VendingMachineSystem : SharedVendingMachineSystem
     {
-        [Dependency] private IRobustRandom _random = default!;
-        [Dependency] private AccessReaderSystem _accessReader = default!;
-        [Dependency] private AppearanceSystem _appearanceSystem = default!;
-        [Dependency] private PricingSystem _pricing = default!;
-        [Dependency] private ThrowingSystem _throwingSystem = default!;
-        [Dependency] private IGameTiming _timing = default!;
-        [Dependency] private SpeakOnUIClosedSystem _speakOnUIClosed = default!;
-        [Dependency] private SharedPointLightSystem _light = default!;
-        [Dependency] private EmagSystem _emag = default!;
-
-        [Dependency] private IPrototypeManager _prototypeManager = default!; // Frontier
-        [Dependency] private SharedAudioSystem _audioSystem = default!; // Frontier
-        [Dependency] private BankSystem _bankSystem = default!; // Frontier
-        [Dependency] private PopupSystem _popupSystem = default!; // Frontier
-        [Dependency] private IAdminLogManager _adminLogger = default!; // Frontier
-        [Dependency] private StackSystem _stack = default!; // Frontier
-        [Dependency] private VendingMachinePurchaseSystem _vendingPurchase = default!; // Mono
+        [Dependency] private readonly IRobustRandom _random = default!;
+        [Dependency] private readonly AccessReaderSystem _accessReader = default!;
+        [Dependency] private readonly AppearanceSystem _appearanceSystem = default!;
+        [Dependency] private readonly PricingSystem _pricing = default!;
+        [Dependency] private readonly ThrowingSystem _throwingSystem = default!;
+        [Dependency] private readonly IGameTiming _timing = default!;
+        [Dependency] private readonly SpeakOnUIClosedSystem _speakOnUIClosed = default!;
+        [Dependency] private readonly SharedPointLightSystem _light = default!;
+        [Dependency] private readonly EmagSystem _emag = default!;
+
+        [Dependency] private readonly IPrototypeManager _prototypeManager = default!; // Frontier
+        [Dependency] private readonly SharedAudioSystem _audioSystem = default!; // Frontier
+        [Dependency] private readonly BankSystem _bankSystem = default!; // Frontier
+        [Dependency] private readonly PopupSystem _popupSystem = default!; // Frontier
+        [Dependency] private readonly IAdminLogManager _adminLogger = default!; // Frontier
+        [Dependency] private readonly VendingMachinePurchaseSystem _vendingPurchase = default!; // Mono
+        [Dependency] private readonly SharedCreditReceiverSystem _cash = default!; // Mono - Pwease chwose two pway wiw cawsh ow cwedit
 
         private const float WallVendEjectDistanceFromWall = 1f;
 
@@ -71,8 +70,9 @@ public override void Initialize()
             SubscribeLocalEvent<VendingMachineComponent, BreakageEventArgs>(OnBreak);
             SubscribeLocalEvent<VendingMachineComponent, DamageChangedEvent>(OnDamageChanged);
             SubscribeLocalEvent<VendingMachineComponent, PriceCalculationEvent>(OnVendingPrice);
-            SubscribeLocalEvent<VendingMachineComponent, EntInsertedIntoContainerMessage>(OnEntityInserted); // Frontier
-            SubscribeLocalEvent<VendingMachineComponent, EntRemovedFromContainerMessage>(OnEntityRemoved); // Frontier
+            //SubscribeLocalEvent<VendingMachineComponent, EmpPulseEvent>(OnEmpPulse); // Frontier: Upstream - #28984
+            //SubscribeLocalEvent<VendingMachineComponent, EntInsertedIntoContainerMessage>(OnEntityInserted); // Frontier //Mono: Moved this logic to CreditReceiverSystem
+            //SubscribeLocalEvent<VendingMachineComponent, EntRemovedFromContainerMessage>(OnEntityRemoved); // Frontier //Mono: Moved this logic to CreditReceiverSystem
 
             SubscribeLocalEvent<VendingMachineComponent, ActivatableUIOpenAttemptEvent>(OnActivatableUIOpenAttempt);
 
@@ -360,17 +360,7 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type,
                 if (!HasComp<IronmanComponent>(sender) && TryComp<BankAccountComponent>(sender, out var bank))
                     bankBalance = bank.Balance;
 
-                int cashSlotBalance = 0;
-                Entity<StackComponent>? cashEntity = null;
-                if (component.CashSlotName != null
-                    && component.CurrencyStackType != null
-                    && ItemSlots.TryGetSlot(uid, component.CashSlotName, out var cashSlot)
-                    && TryComp<StackComponent>(cashSlot?.ContainerSlot?.ContainedEntity, out var stackComp)
-                    && stackComp!.StackTypeId == component.CurrencyStackType)
-                {
-                    cashSlotBalance = stackComp!.Count;
-                    cashEntity = (cashSlot!.ContainerSlot!.ContainedEntity.Value, stackComp!);
-                }
+                _cash.TryGetCash(uid, out _, out var cashSlotBalance); //Mono: Moved this logic to CreditReceiverSystem
 
                 if (totalPrice > bankBalance + cashSlotBalance)
                 {
@@ -385,15 +375,10 @@ public void AuthorizedVend(EntityUid uid, EntityUid sender, InventoryType type,
 
                 if (TryEjectVendorItem(uid, type, itemId, component.CanShoot, component))
                 {
-                    if (cashEntity != null)
-                    {
-                        var newCashSlotBalance = Math.Max(cashSlotBalance - totalPrice, 0);
-                        _stack.SetCount(cashEntity.Value.Owner, newCashSlotBalance, cashEntity.Value.Comp);
-                        component.CashSlotBalance = newCashSlotBalance;
-                        paidFully = true; // Either we paid fully with cash, or we need to withdraw the remainder
-                    }
+                    paidFully = _cash.TryCashPayment(uid, totalPrice, out var _, true); // Mono - Attempt to pay with cash before credit
+
                     if (totalPrice > cashSlotBalance && !HasComp<Content.Shared._Mono.Traits.Physical.IronmanComponent>(sender))
-                        paidFully = _bankSystem.TryBankWithdraw(sender, totalPrice - cashSlotBalance);
+                        paidFully = _bankSystem.TryBankWithdraw(sender, totalPrice - cashSlotBalance); // Mono - if cash was not enough, pay the difference with credit
 
                     // If we paid completely, pay our station taxes
                     if (paidFully)
@@ -673,29 +658,14 @@ private void OnPriceCalculation(EntityUid uid, VendingMachineRestockComponent co
             args.Price += priceSets.Max();
         }
 
-        // Frontier: cash slot logic
-        private void OnEntityInserted(Entity<VendingMachineComponent> ent, ref EntInsertedIntoContainerMessage args)
-        {
-            if (ent.Comp.CashSlotName != null
-            && ent.Comp.CurrencyStackType != null
-            && ItemSlots.TryGetSlot(ent, ent.Comp.CashSlotName, out var slot)
-            && TryComp<StackComponent>(slot?.ContainerSlot?.ContainedEntity, out var stack)
-            && stack.StackTypeId == ent.Comp.CurrencyStackType)
-            {
-                ent.Comp.CashSlotBalance = stack.Count;
-            }
-            else
-            {
-                ent.Comp.CashSlotBalance = 0;
-            }
-            Dirty(ent, ent.Comp);
-        }
-
-        private void OnEntityRemoved(Entity<VendingMachineComponent> ent, ref EntRemovedFromContainerMessage args)
-        {
-            ent.Comp.CashSlotBalance = 0;
-            Dirty(ent, ent.Comp);
-        }
-        // End Frontier: cash slot logic
+        //private void OnEmpPulse(EntityUid uid, VendingMachineComponent component, ref EmpPulseEvent args) // Frontier: Upstream - #28984
+        //{
+        //    if (!component.Broken && this.IsPowered(uid, EntityManager))
+        //    {
+        //        args.Affected = true;
+        //        args.Disabled = true;
+        //        component.NextEmpEject = _timing.CurTime;
+        //    }
+        //}
     }
 }

Content.Server/_Mono/Economy/CreditReceiverSystem.cs

@@ -0,0 +1,8 @@
+using Content.Shared._Mono.Economy;
+
+namespace Content.Server._Mono.Economy;
+
+public sealed partial class CreditReceiverSystem : SharedCreditReceiverSystem
+{
+
+}

Content.Shared/VendingMachines/SharedVendingMachineSystem.cs

@@ -1,4 +1,5 @@
 using System.Linq;
+using Content.Shared._Mono.Economy.Component; // Mono
 using Content.Shared.DoAfter;
 using Content.Shared.Emag.Components;
 using Content.Shared.Emag.Systems;
@@ -38,12 +39,8 @@ public override void Initialize()
 
     protected virtual void OnMapInit(EntityUid uid, VendingMachineComponent component, MapInitEvent args)
     {
-        RestockInventoryFromPrototype(uid, component, component.InitialStockQuality);
-
-        // Frontier: create the cash slot if this entity has one
-        if (component.CashSlot != null && component.CashSlotName != null)
-            ItemSlots.AddItemSlot(uid, component.CashSlotName, component.CashSlot);
-        // End Frontier
+        if (TryComp<VendingMachineComponent>(uid, out var vendingMachine)) // Mono
+            RestockInventoryFromPrototype(uid, vendingMachine, vendingMachine.InitialStockQuality); // Mono
     }
 
     public void RestockInventoryFromPrototype(EntityUid uid,

Content.Shared/VendingMachines/VendingMachineComponent.cs

@@ -6,10 +6,13 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Content.Shared._NF.Bank.Components; // Frontier
-using Content.Shared.Containers.ItemSlots; // Frontier
+//using Content.Shared.Containers.ItemSlots; // Frontier // Mono
+using Content.Shared._Mono.Economy.Component; // Mono
 
 namespace Content.Shared.VendingMachines
 {
+    /// Mono Change: Anything related to actually accepting physical cash or other currencies has been
+    /// moved over to <see cref="CreditReceiverComponent"/>. <seealso cref="CreditReceiverComponent.CashSlot"/>
     [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
     public sealed partial class VendingMachineComponent : Component
     {
@@ -218,29 +221,6 @@ public sealed partial class VendingMachineComponent : Component
         [DataField(serverOnly: true), ViewVariables(VVAccess.ReadWrite)]
         public Dictionary<SectorBankAccount, float> TaxAccounts = new();
 
-        // Optional item slot for cash
-        [DataField]
-        public ItemSlot? CashSlot = null;
-
-        /// <summary>
-        /// Name of the cash slot, if there is one.  Null if there isn't.
-        /// </summary>
-        [DataField]
-        public string? CashSlotName;
-
-        /// <summary>
-        /// The type of currency to accept in the item slot.
-        /// </summary>
-        [DataField]
-        public string? CurrencyStackType;
-
-        /// <summary>
-        /// The current balance in the cash slot.
-        /// Kept for
-        /// </summary>
-        [DataField, AutoNetworkedField]
-        public int CashSlotBalance;
-
         /// <summary>
         /// Mono: Tracks the last purchase price for vending machine purchase tracking.
         /// Used to mark spawned entities with purchase information.

Content.Shared/_Mono/Economy/Component/CreditReceiverComponent.cs

@@ -0,0 +1,37 @@
+using Robust.Shared.GameStates;
+using Content.Shared.Containers.ItemSlots;
+
+namespace Content.Shared._Mono.Economy.Component;
+
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
+[Access(typeof(SharedCreditReceiverSystem))]
+public sealed partial class CreditReceiverComponent : Robust.Shared.GameObjects.Component
+{
+    /// <summary>
+    /// Item slot for cash.</summary>
+    /// <remarks>
+    /// Set this to Null if you want to disable this component
+    /// in case you can't get rid of it, i.e. YAML inherited.
+    /// </remarks>
+    [DataField]
+    public ItemSlot? CashSlot;
+
+    /// <summary>
+    /// Name of the cash slot, if there is one.  Null if there isn't.
+    /// </summary>
+    [DataField]
+    public string? CashSlotName;
+
+    /// <summary>
+    /// The type of currency to accept in the item slot.
+    /// </summary>
+    [DataField]
+    public string? CurrencyStackType;
+
+    /// <summary>
+    /// The current balance in the cash slot.
+    /// Kept for
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public int CashSlotBalance;
+}