mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-18 14:07:53 +03:00
## Mirror of PR #26230: [Fix borg charger error](https://github.com/space-wizards/space-station-14/pull/26230) from <img src="https://avatars.githubusercontent.com/u/10567778?v=4" alt="space-wizards" width="22"/> [space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14) ###### `29887636e5614f4f91b968107875722293f0c8b4` PR opened by <img src="https://avatars.githubusercontent.com/u/85356?v=4" width="16"/><a href="https://github.com/Tayrtahn"> Tayrtahn</a> at 2024-03-18 12:52:09 UTC --- PR changed 1 files with 7 additions and 7 deletions. The PR had the following labels: --- <details open="true"><summary><h1>Original Body</h1></summary> > <!-- Please read these guidelines before opening your PR: https://docs.spacestation14.io/en/getting-started/pr-guideline --> > <!-- The text between the arrows are comments - they will not be visible on your PR. --> > > ## About the PR > <!-- What did you change in this PR? --> > Borg chargers can now charge borgs again. > > ## Why / Balance > <!-- Why was it changed? Link any discussions or issues here. Please discuss how this would affect game balance. --> > Bug fix. > > ## Technical details > <!-- If this is a code change, summarize at high level how your new code works. This makes it easier to review. --> > An oversight in #25871 caused ChargerSystem to call BatterySystem's SetCharge with the wrong EntityUid. > > SearchForBattery has been given another out argument which gives the found battery's uid so it can be passed to SetCharge. > > To the author of #25871: get better at testing your code! > > ## Media > <!-- > PRs which make ingame changes (adding clothing, items, new features, etc) are required to have media attached that showcase the changes. > Small fixes/refactors are exempt. > Any media may be used in SS14 progress reports, with clear credit given. > > If you're unsure whether your PR will require media, ask a maintainer. > > Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): > --> > > - [X] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase > > ## Breaking changes > <!-- > List any breaking changes, including namespace, public class/method/field changes, prototype renames; and provide instructions for fixing them. This will be pasted in #codebase-changes. > --> > > **Changelog** > <!-- > Make players aware of new features and changes that could affect how they play the game by adding a Changelog entry. Please read the Changelog guidelines located at: https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog > --> > > <!-- > Make sure to take this Changelog template out of the comment block in order for it to show up. > 🆑 > - add: Added fun! > - remove: Removed fun! > - tweak: Changed fun! > - fix: Fixed fun! > --> > 🆑 > - fix: Cyborg recharging stations are able to charge cyborgs again. </details> Co-authored-by: SimpleStation14 <Unknown>
226 lines
8.1 KiB
C#
226 lines
8.1 KiB
C#
using Content.Server.Power.Components;
|
|
using Content.Server.PowerCell;
|
|
using Content.Shared.Examine;
|
|
using Content.Shared.Power;
|
|
using Content.Shared.PowerCell.Components;
|
|
using JetBrains.Annotations;
|
|
using Robust.Shared.Containers;
|
|
using System.Diagnostics.CodeAnalysis;
|
|
using Content.Shared.Storage.Components;
|
|
using Robust.Server.Containers;
|
|
|
|
namespace Content.Server.Power.EntitySystems;
|
|
|
|
[UsedImplicitly]
|
|
internal sealed class ChargerSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly ContainerSystem _container = default!;
|
|
[Dependency] private readonly PowerCellSystem _powerCell = default!;
|
|
[Dependency] private readonly BatterySystem _battery = default!;
|
|
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
SubscribeLocalEvent<ChargerComponent, ComponentStartup>(OnStartup);
|
|
SubscribeLocalEvent<ChargerComponent, PowerChangedEvent>(OnPowerChanged);
|
|
SubscribeLocalEvent<ChargerComponent, EntInsertedIntoContainerMessage>(OnInserted);
|
|
SubscribeLocalEvent<ChargerComponent, EntRemovedFromContainerMessage>(OnRemoved);
|
|
SubscribeLocalEvent<ChargerComponent, ContainerIsInsertingAttemptEvent>(OnInsertAttempt);
|
|
SubscribeLocalEvent<ChargerComponent, InsertIntoEntityStorageAttemptEvent>(OnEntityStorageInsertAttempt);
|
|
SubscribeLocalEvent<ChargerComponent, ExaminedEvent>(OnChargerExamine);
|
|
}
|
|
|
|
private void OnStartup(EntityUid uid, ChargerComponent component, ComponentStartup args)
|
|
{
|
|
UpdateStatus(uid, component);
|
|
}
|
|
|
|
private void OnChargerExamine(EntityUid uid, ChargerComponent component, ExaminedEvent args)
|
|
{
|
|
args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int) component.ChargeRate)));
|
|
}
|
|
|
|
public override void Update(float frameTime)
|
|
{
|
|
var query = EntityQueryEnumerator<ActiveChargerComponent, ChargerComponent, ContainerManagerComponent>();
|
|
while (query.MoveNext(out var uid, out _, out var charger, out var containerComp))
|
|
{
|
|
if (!_container.TryGetContainer(uid, charger.SlotId, out var container, containerComp))
|
|
continue;
|
|
|
|
if (charger.Status == CellChargerStatus.Empty || charger.Status == CellChargerStatus.Charged || container.ContainedEntities.Count == 0)
|
|
continue;
|
|
|
|
foreach (var contained in container.ContainedEntities)
|
|
{
|
|
TransferPower(uid, contained, charger, frameTime);
|
|
}
|
|
}
|
|
}
|
|
|
|
private void OnPowerChanged(EntityUid uid, ChargerComponent component, ref PowerChangedEvent args)
|
|
{
|
|
UpdateStatus(uid, component);
|
|
}
|
|
|
|
private void OnInserted(EntityUid uid, ChargerComponent component, EntInsertedIntoContainerMessage args)
|
|
{
|
|
if (!component.Initialized)
|
|
return;
|
|
|
|
if (args.Container.ID != component.SlotId)
|
|
return;
|
|
|
|
UpdateStatus(uid, component);
|
|
}
|
|
|
|
private void OnRemoved(EntityUid uid, ChargerComponent component, EntRemovedFromContainerMessage args)
|
|
{
|
|
if (args.Container.ID != component.SlotId)
|
|
return;
|
|
|
|
UpdateStatus(uid, component);
|
|
}
|
|
|
|
/// <summary>
|
|
/// Verify that the entity being inserted is actually rechargeable.
|
|
/// </summary>
|
|
private void OnInsertAttempt(EntityUid uid, ChargerComponent component, ContainerIsInsertingAttemptEvent args)
|
|
{
|
|
if (!component.Initialized)
|
|
return;
|
|
|
|
if (args.Container.ID != component.SlotId)
|
|
return;
|
|
|
|
if (!TryComp<PowerCellSlotComponent>(args.EntityUid, out var cellSlot))
|
|
return;
|
|
|
|
if (!cellSlot.FitsInCharger)
|
|
args.Cancel();
|
|
}
|
|
|
|
private void OnEntityStorageInsertAttempt(EntityUid uid, ChargerComponent component, ref InsertIntoEntityStorageAttemptEvent args)
|
|
{
|
|
if (!component.Initialized || args.Cancelled)
|
|
return;
|
|
|
|
if (!TryComp<PowerCellSlotComponent>(uid, out var cellSlot))
|
|
return;
|
|
|
|
if (!cellSlot.FitsInCharger)
|
|
args.Cancelled = true;
|
|
}
|
|
|
|
private void UpdateStatus(EntityUid uid, ChargerComponent component)
|
|
{
|
|
var status = GetStatus(uid, component);
|
|
TryComp(uid, out AppearanceComponent? appearance);
|
|
|
|
if (!_container.TryGetContainer(uid, component.SlotId, out var container))
|
|
return;
|
|
|
|
_appearance.SetData(uid, CellVisual.Occupied, container.ContainedEntities.Count != 0, appearance);
|
|
if (component.Status == status || !TryComp(uid, out ApcPowerReceiverComponent? receiver))
|
|
return;
|
|
|
|
component.Status = status;
|
|
|
|
if (component.Status == CellChargerStatus.Charging)
|
|
{
|
|
AddComp<ActiveChargerComponent>(uid);
|
|
}
|
|
else
|
|
{
|
|
RemComp<ActiveChargerComponent>(uid);
|
|
}
|
|
|
|
switch (component.Status)
|
|
{
|
|
case CellChargerStatus.Off:
|
|
receiver.Load = 0;
|
|
_appearance.SetData(uid, CellVisual.Light, CellChargerStatus.Off, appearance);
|
|
break;
|
|
case CellChargerStatus.Empty:
|
|
receiver.Load = 0;
|
|
_appearance.SetData(uid, CellVisual.Light, CellChargerStatus.Empty, appearance);
|
|
break;
|
|
case CellChargerStatus.Charging:
|
|
receiver.Load = component.ChargeRate;
|
|
_appearance.SetData(uid, CellVisual.Light, CellChargerStatus.Charging, appearance);
|
|
break;
|
|
case CellChargerStatus.Charged:
|
|
receiver.Load = 0;
|
|
_appearance.SetData(uid, CellVisual.Light, CellChargerStatus.Charged, appearance);
|
|
break;
|
|
default:
|
|
throw new ArgumentOutOfRangeException();
|
|
}
|
|
}
|
|
|
|
private CellChargerStatus GetStatus(EntityUid uid, ChargerComponent component)
|
|
{
|
|
if (!TryComp(uid, out TransformComponent? transformComponent))
|
|
return CellChargerStatus.Off;
|
|
|
|
if (!transformComponent.Anchored)
|
|
return CellChargerStatus.Off;
|
|
|
|
if (!TryComp(uid, out ApcPowerReceiverComponent? apcPowerReceiverComponent))
|
|
return CellChargerStatus.Off;
|
|
|
|
if (!apcPowerReceiverComponent.Powered)
|
|
return CellChargerStatus.Off;
|
|
|
|
if (!_container.TryGetContainer(uid, component.SlotId, out var container))
|
|
return CellChargerStatus.Off;
|
|
|
|
if (container.ContainedEntities.Count == 0)
|
|
return CellChargerStatus.Empty;
|
|
|
|
if (!SearchForBattery(container.ContainedEntities[0], out _, out var heldBattery))
|
|
return CellChargerStatus.Off;
|
|
|
|
if (Math.Abs(heldBattery.MaxCharge - heldBattery.CurrentCharge) < 0.01)
|
|
return CellChargerStatus.Charged;
|
|
|
|
return CellChargerStatus.Charging;
|
|
}
|
|
|
|
private void TransferPower(EntityUid uid, EntityUid targetEntity, ChargerComponent component, float frameTime)
|
|
{
|
|
if (!TryComp(uid, out ApcPowerReceiverComponent? receiverComponent))
|
|
return;
|
|
|
|
if (!receiverComponent.Powered)
|
|
return;
|
|
|
|
if (component.Whitelist?.IsValid(targetEntity, EntityManager) == false)
|
|
return;
|
|
|
|
if (!SearchForBattery(targetEntity, out var batteryUid, out var heldBattery))
|
|
return;
|
|
|
|
_battery.SetCharge(batteryUid.Value, heldBattery.CurrentCharge + component.ChargeRate * frameTime, heldBattery);
|
|
// Just so the sprite won't be set to 99.99999% visibility
|
|
if (heldBattery.MaxCharge - heldBattery.CurrentCharge < 0.01)
|
|
{
|
|
_battery.SetCharge(batteryUid.Value, heldBattery.MaxCharge, heldBattery);
|
|
}
|
|
|
|
UpdateStatus(uid, component);
|
|
}
|
|
|
|
private bool SearchForBattery(EntityUid uid, [NotNullWhen(true)] out EntityUid? batteryUid, [NotNullWhen(true)] out BatteryComponent? component)
|
|
{
|
|
// try get a battery directly on the inserted entity
|
|
if (!TryComp(uid, out component))
|
|
{
|
|
// or by checking for a power cell slot on the inserted entity
|
|
return _powerCell.TryGetBatteryFromSlot(uid, out batteryUid, out component);
|
|
}
|
|
batteryUid = uid;
|
|
return true;
|
|
}
|
|
}
|