juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vending visualizer update (#9962)

Browse Source
This commit is contained in:
Leon Friedrich
2022-07-26 12:35:36 +12:00
committed by GitHub
parent a21bcb4363
commit 5449e7875e
9 changed files with 113 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
Content.Server/VendingMachines/VendingMachineSystem.cs
View File

@@ -20,7 +20,7 @@ using static Content.Shared.VendingMachines.SharedVendingMachineComponent;
namespace Content.Server.VendingMachines
{
public sealed class VendingMachineSystem : EntitySystem
public sealed class VendingMachineSystem : SharedVendingMachineSystem
{
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
@@ -32,7 +32,7 @@ namespace Content.Server.VendingMachines
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<VendingMachineComponent, ComponentInit>(OnComponentInit);
SubscribeLocalEvent<VendingMachineComponent, PowerChangedEvent>(OnPowerChanged);
SubscribeLocalEvent<VendingMachineComponent, InventorySyncRequestMessage>(OnInventoryRequestMessage);
SubscribeLocalEvent<VendingMachineComponent, VendingMachineEjectMessage>(OnInventoryEjectMessage);
@@ -43,9 +43,11 @@ namespace Content.Server.VendingMachines
SubscribeLocalEvent<VendingMachineComponent, VendingMachineSelfDispenseEvent>(OnSelfDispense);
}
private void OnComponentInit(EntityUid uid, VendingMachineComponent component, ComponentInit args)
protected override void OnComponentInit(EntityUid uid, SharedVendingMachineComponent sharedComponent, ComponentInit args)
{
base.Initialize();
base.OnComponentInit(uid, sharedComponent, args);
var component = (VendingMachineComponent) sharedComponent;
if (TryComp<ApcPowerReceiverComponent>(component.Owner, out var receiver))
{
@@ -57,8 +59,6 @@ namespace Content.Server.VendingMachines
var action = new InstantAction(_prototypeManager.Index<InstantActionPrototype>(component.Action));
_action.AddAction(uid, action, uid);
}
InitializeFromPrototype(uid, component);
}
private void OnInventoryRequestMessage(EntityUid uid, VendingMachineComponent component, InventorySyncRequestMessage args)
@@ -123,67 +123,6 @@ namespace Content.Server.VendingMachines
EjectRandom(uid, true, component);
}
public void InitializeFromPrototype(EntityUid uid, VendingMachineComponent? vendComponent = null)
{
if (!Resolve(uid, ref vendComponent))
return;
if (string.IsNullOrEmpty(vendComponent.PackPrototypeId)) { return; }
if (!_prototypeManager.TryIndex(vendComponent.PackPrototypeId, out VendingMachineInventoryPrototype? packPrototype))
{
return;
}
MetaData(uid).EntityName = packPrototype.Name;
vendComponent.AnimationDuration = TimeSpan.FromSeconds(packPrototype.AnimationDuration);
vendComponent.SpriteName = packPrototype.SpriteName;
if (!string.IsNullOrEmpty(vendComponent.SpriteName))
{
if (TryComp<SpriteComponent>(vendComponent.Owner, out var spriteComp)) {
const string vendingMachineRSIPath = "Structures/Machines/VendingMachines/{0}.rsi";
spriteComp.BaseRSIPath = string.Format(vendingMachineRSIPath, vendComponent.SpriteName);
}
}
AddInventoryFromPrototype(uid, packPrototype.StartingInventory, InventoryType.Regular, vendComponent);
AddInventoryFromPrototype(uid, packPrototype.EmaggedInventory, InventoryType.Emagged, vendComponent);
AddInventoryFromPrototype(uid, packPrototype.ContrabandInventory, InventoryType.Contraband, vendComponent);
}
private void AddInventoryFromPrototype(EntityUid uid, Dictionary<string, uint>? entries,
InventoryType type,
VendingMachineComponent? component = null)
{
if (!Resolve(uid, ref component) || entries == null)
{
return;
}
var inventory = new List<VendingMachineInventoryEntry>();
foreach (var (id, amount) in entries)
{
if (_prototypeManager.HasIndex<EntityPrototype>(id))
{
inventory.Add(new VendingMachineInventoryEntry(type, id, amount));
}
}
switch (type)
{
case InventoryType.Regular:
component.Inventory.AddRange(inventory);
break;
case InventoryType.Emagged:
component.EmaggedInventory.AddRange(inventory);
break;
case InventoryType.Contraband:
component.ContrabandInventory.AddRange(inventory);
break;
}
}
public void Deny(EntityUid uid, VendingMachineComponent? vendComponent = null)
{
if (!Resolve(uid, ref vendComponent))