tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make vending machine restocks predicted (and its sound not spammable) (#38609)

Browse Source 
* feat: make vending machine restocks predicted

* refactor: VendingMachineRestockComponent cleanup

* refactor: minor simplification

* revert: refactor: minor simplification; load bearing IsFirstTimePredicted

lol second guessed myself

* chore: unneeded VendingMachineSystem dep

* Update Content.Shared/VendingMachines/VendingMachineComponent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
Perry Fraser
2025-09-11 14:27:54 -04:00
committed by GitHub
parent 77eca4a570
commit fbf65b7f74
5 changed files with 77 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs
View File

@@ -3,7 +3,6 @@ using Content.Shared.IdentityManagement;
using Content.Shared.Interaction;
using Content.Shared.Popups;
using Content.Shared.Wires;
using Robust.Shared.Audio;
namespace Content.Shared.VendingMachines;
@@ -46,6 +45,17 @@ public abstract partial class SharedVendingMachineSystem
return true;
}
public void TryRestockInventory(EntityUid uid, VendingMachineComponent? vendComponent = null)
{
if (!Resolve(uid, ref vendComponent))
return;
RestockInventoryFromPrototype(uid, vendComponent);
Dirty(uid, vendComponent);
TryUpdateVisualState((uid, vendComponent));
}
private void OnAfterInteract(EntityUid uid, VendingMachineRestockComponent component, AfterInteractEvent args)
{
if (args.Target is not { } target || !args.CanReach || args.Handled)
@@ -62,8 +72,13 @@ public abstract partial class SharedVendingMachineSystem
args.Handled = true;
var doAfterArgs = new DoAfterArgs(EntityManager, args.User, (float)component.RestockDelay.TotalSeconds, new RestockDoAfterEvent(), target,
target: target, used: uid)
var doAfterArgs = new DoAfterArgs(EntityManager,
args.User,
component.RestockDelay,
new RestockDoAfterEvent(),
target,
target: target,
used: uid)
{
BreakOnMove = true,
BreakOnDamage = true,
@@ -74,13 +89,48 @@ public abstract partial class SharedVendingMachineSystem
return;
var selfMessage = Loc.GetString("vending-machine-restock-start-self", ("target", target));
var othersMessage = Loc.GetString("vending-machine-restock-start-others", ("user", Identity.Entity(args.User, EntityManager)), ("target", target));
Popup.PopupPredicted(selfMessage,
othersMessage,
uid,
args.User,
PopupType.Medium);
var othersMessage = Loc.GetString("vending-machine-restock-start-others",
("user", Identity.Entity(args.User, EntityManager)),
("target", target));
Popup.PopupPredicted(selfMessage, othersMessage, target, args.User, PopupType.Medium);
Audio.PlayPredicted(component.SoundRestockStart, uid, args.User);
if (!Timing.IsFirstTimePredicted)
return;
Audio.Stop(machineComponent.RestockStream);
machineComponent.RestockStream = Audio.PlayPredicted(component.SoundRestockStart, target, args.User)?.Entity;
}
private void OnRestockDoAfter(Entity<VendingMachineComponent> ent, ref RestockDoAfterEvent args)
{
if (args.Cancelled)
{
// Future predicted ticks can clobber the RestockStream with null while not stopping anything
if (Timing.IsFirstTimePredicted)
ent.Comp.RestockStream = Audio.Stop(ent.Comp.RestockStream);
return;
}
if (args.Handled || args.Used == null)
return;
if (!TryComp<VendingMachineRestockComponent>(args.Used, out var restockComponent))
{
Log.Error($"{ToPrettyString(args.User)} tried to restock {ToPrettyString(ent)} with {ToPrettyString(args.Used.Value)} which did not have a VendingMachineRestockComponent.");
return;
}
TryRestockInventory(ent, ent.Comp);
var userMessage = Loc.GetString("vending-machine-restock-done-self", ("target", ent));
var othersMessage = Loc.GetString("vending-machine-restock-done-others",
("user", Identity.Entity(args.User, EntityManager)),
("target", ent));
Popup.PopupPredicted(userMessage, othersMessage, ent, args.User, PopupType.Medium);
Audio.PlayPredicted(restockComponent.SoundRestockDone, ent, args.User);
PredictedQueueDel(args.Used.Value);
}
}