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

Power cell QOL fix (#15673)

Browse Source
This commit is contained in:
metalgearsloth
2023-04-23 13:46:47 +10:00
committed by GitHub
parent 1485c0aa6a
commit 3dddb8aba5
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Server/PowerCell/PowerCellSystem.cs
View File

@@ -10,21 +10,21 @@ using Content.Shared.Rounding;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using Content.Server.Kitchen.Components; using Content.Server.Kitchen.Components;
using Content.Server.Power.EntitySystems;
using Content.Server.UserInterface; using Content.Server.UserInterface;
using Content.Shared.Containers.ItemSlots; using Content.Shared.Containers.ItemSlots;
using Content.Shared.Popups; using Content.Shared.Popups;
using Content.Shared.Rejuvenate; using Content.Shared.Rejuvenate;
using Content.Shared.UserInterface;
using Robust.Server.GameObjects;
namespace Content.Server.PowerCell; namespace Content.Server.PowerCell;
public sealed class PowerCellSystem : SharedPowerCellSystem public sealed class PowerCellSystem : SharedPowerCellSystem
{ {
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly ActivatableUISystem _activatable = default!; [Dependency] private readonly ActivatableUISystem _activatable = default!;
[Dependency] private readonly BatterySystem _battery = default!;
[Dependency] private readonly SolutionContainerSystem _solutionsSystem = default!; [Dependency] private readonly SolutionContainerSystem _solutionsSystem = default!;
[Dependency] private readonly ExplosionSystem _explosionSystem = default!; [Dependency] private readonly ExplosionSystem _explosionSystem = default!;
[Dependency] private readonly IAdminLogManager _adminLogger = default!;
[Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
[Dependency] private readonly SharedAppearanceSystem _sharedAppearanceSystem = default!; [Dependency] private readonly SharedAppearanceSystem _sharedAppearanceSystem = default!;
@@ -58,7 +58,7 @@ public sealed class PowerCellSystem : SharedPowerCellSystem
if (!TryGetBatteryFromSlot(uid, out var battery, slot)) if (!TryGetBatteryFromSlot(uid, out var battery, slot))
continue; continue;
if (battery.TryUseCharge(comp.DrawRate * frameTime)) if (_battery.TryUseCharge(uid, comp.DrawRate * frameTime, battery))
continue; continue;
comp.Enabled = false; comp.Enabled = false;
@@ -79,7 +79,7 @@ public sealed class PowerCellSystem : SharedPowerCellSystem
if (slot.Item == null) if (slot.Item == null)
return; return;
RaiseLocalEvent(slot.Item.Value, args, false); RaiseLocalEvent(slot.Item.Value, args);
} }
} }
@@ -115,7 +115,7 @@ public sealed class PowerCellSystem : SharedPowerCellSystem
&& _itemSlotsSystem.TryGetSlot(container.Owner, slot.CellSlotId, out ItemSlot? itemSlot)) && _itemSlotsSystem.TryGetSlot(container.Owner, slot.CellSlotId, out ItemSlot? itemSlot))
{ {
if (itemSlot.Item == uid) if (itemSlot.Item == uid)
RaiseLocalEvent(container.Owner, new PowerCellChangedEvent(false), false); RaiseLocalEvent(container.Owner, new PowerCellChangedEvent(false));
} }
} }
@@ -138,8 +138,9 @@ public sealed class PowerCellSystem : SharedPowerCellSystem
/// <param name="user">Popup to this user with the relevant detail if specified.</param> /// <param name="user">Popup to this user with the relevant detail if specified.</param>
public bool HasActivatableCharge(EntityUid uid, PowerCellDrawComponent? battery = null, PowerCellSlotComponent? cell = null, EntityUid? user = null) public bool HasActivatableCharge(EntityUid uid, PowerCellDrawComponent? battery = null, PowerCellSlotComponent? cell = null, EntityUid? user = null)
{ {
// Default to true if we don't have the components.
if (!Resolve(uid, ref battery, ref cell, false)) if (!Resolve(uid, ref battery, ref cell, false))
return false; return true;
return HasCharge(uid, battery.UseRate, cell, user); return HasCharge(uid, battery.UseRate, cell, user);
} }
@@ -150,8 +151,9 @@ public sealed class PowerCellSystem : SharedPowerCellSystem
/// <param name="user">Popup to this user with the relevant detail if specified.</param> /// <param name="user">Popup to this user with the relevant detail if specified.</param>
public bool TryUseActivatableCharge(EntityUid uid, PowerCellDrawComponent? battery = null, PowerCellSlotComponent? cell = null, EntityUid? user = null) public bool TryUseActivatableCharge(EntityUid uid, PowerCellDrawComponent? battery = null, PowerCellSlotComponent? cell = null, EntityUid? user = null)
{ {
// Default to true if we don't have the components.
if (!Resolve(uid, ref battery, ref cell, false)) if (!Resolve(uid, ref battery, ref cell, false))
return false; return true;
if (TryUseCharge(uid, battery.UseRate, cell, user)) if (TryUseCharge(uid, battery.UseRate, cell, user))
{ {
@@ -202,7 +204,7 @@ public sealed class PowerCellSystem : SharedPowerCellSystem
return false; return false;
} }
if (!battery.TryUseCharge(charge)) if (!_battery.TryUseCharge(uid, charge, battery))
{ {
if (user != null) if (user != null)
_popup.PopupEntity(Loc.GetString("power-cell-insufficient"), uid, user.Value); _popup.PopupEntity(Loc.GetString("power-cell-insufficient"), uid, user.Value);