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

Hotplate overhaul (#17586)

Browse Source 
* Hotplate overhaul

- Beakers are now placed on top of the hotplate instead of itemslot.
- Hotplate LED now only lights up if it's heating something.
- More comments/xmldoc.
- Some other minor tweaks.

* Actually remove the beaker slot
This commit is contained in:
0x6273
2023-06-24 20:09:24 +02:00
committed by GitHub
parent 084cb7b750
commit fcb6516cee
5 changed files with 141 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs
View File

@@ -1,14 +1,22 @@
using Content.Server.Chemistry.Components;
using System.Linq;
using Content.Server.Chemistry.Components;
using Content.Server.Chemistry.Components.SolutionManager;
using Content.Server.Construction;
using Content.Server.Power.Components;
using Content.Shared.Containers.ItemSlots;
using Content.Server.Power.EntitySystems;
using Content.Shared.Chemistry;
using Content.Shared.Placeable;
using Robust.Shared.Physics.Events;
using Robust.Shared.Physics.Systems;
namespace Content.Server.Chemistry.EntitySystems;
public sealed class SolutionHeaterSystem : EntitySystem
{
[Dependency] private readonly ItemSlotsSystem _itemSlots = default!;
[Dependency] private readonly SharedAppearanceSystem _appearance = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly PlaceableSurfaceSystem _placeableSurface = default!;
[Dependency] private readonly PowerReceiverSystem _powerReceiver = default!;
[Dependency] private readonly SolutionContainerSystem _solution = default!;
/// <inheritdoc/>
@@ -17,48 +25,101 @@ public sealed class SolutionHeaterSystem : EntitySystem
SubscribeLocalEvent<SolutionHeaterComponent, PowerChangedEvent>(OnPowerChanged);
SubscribeLocalEvent<SolutionHeaterComponent, RefreshPartsEvent>(OnRefreshParts);
SubscribeLocalEvent<SolutionHeaterComponent, UpgradeExamineEvent>(OnUpgradeExamine);
SubscribeLocalEvent<SolutionHeaterComponent, StartCollideEvent>(OnStartCollide);
SubscribeLocalEvent<SolutionHeaterComponent, EndCollideEvent>(OnEndCollide);
}
private void TurnOn(EntityUid uid)
{
_appearance.SetData(uid, SolutionHeaterVisuals.IsOn, true);
EnsureComp<ActiveSolutionHeaterComponent>(uid);
}
public bool TryTurnOn(EntityUid uid, SolutionHeaterComponent component)
{
if (component.PlacedEntities.Count <= 0 || !_powerReceiver.IsPowered(uid))
return false;
TurnOn(uid);
return true;
}
public void TurnOff(EntityUid uid)
{
_appearance.SetData(uid, SolutionHeaterVisuals.IsOn, false);
RemComp<ActiveSolutionHeaterComponent>(uid);
}
private void OnPowerChanged(EntityUid uid, SolutionHeaterComponent component, ref PowerChangedEvent args)
{
if (args.Powered)
if (args.Powered && component.PlacedEntities.Count > 0)
{
EnsureComp<ActiveSolutionHeaterComponent>(uid);
TurnOn(uid);
}
else
{
RemComp<ActiveSolutionHeaterComponent>(uid);
TurnOff(uid);
}
}
private void OnRefreshParts(EntityUid uid, SolutionHeaterComponent component, RefreshPartsEvent args)
{
var heatRating = args.PartRatings[component.MachinePartHeatPerSecond] - 1;
var heatRating = args.PartRatings[component.MachinePartHeatMultiplier] - 1;
component.HeatMultiplier = MathF.Pow(component.PartRatingHeatMultiplier, heatRating);
component.HeatPerSecond = component.BaseHeatPerSecond * MathF.Pow(component.PartRatingHeatMultiplier, heatRating);
}
private void OnUpgradeExamine(EntityUid uid, SolutionHeaterComponent component, UpgradeExamineEvent args)
{
args.AddPercentageUpgrade("solution-heater-upgrade-heat", component.HeatMultiplier);
args.AddPercentageUpgrade("solution-heater-upgrade-heat", component.HeatPerSecond / component.BaseHeatPerSecond);
}
private void OnStartCollide(EntityUid uid, SolutionHeaterComponent component, ref StartCollideEvent args)
{
if (component.Whitelist is not null && !component.Whitelist.IsValid(args.OtherEntity))
return;
// Disallow sleeping so we can detect when entity is removed from the heater.
_physics.SetSleepingAllowed(args.OtherEntity, args.OtherBody, false);
component.PlacedEntities.Add(args.OtherEntity);
TryTurnOn(uid, component);
if (component.PlacedEntities.Count >= component.MaxEntities)
_placeableSurface.SetPlaceable(uid, false);
}
private void OnEndCollide(EntityUid uid, SolutionHeaterComponent component, ref EndCollideEvent args)
{
// Re-allow sleeping.
_physics.SetSleepingAllowed(args.OtherEntity, args.OtherBody, true);
component.PlacedEntities.Remove(args.OtherEntity);
if (component.PlacedEntities.Count == 0) // Last entity was removed
TurnOff(uid);
_placeableSurface.SetPlaceable(uid, true);
}
public override void Update(float frameTime)
{
base.Update(frameTime);
foreach (var (_, heater) in EntityQuery<ActiveSolutionHeaterComponent, SolutionHeaterComponent>())
var query = EntityQueryEnumerator<ActiveSolutionHeaterComponent, SolutionHeaterComponent>();
while (query.MoveNext(out _, out _, out var heater))
{
if (_itemSlots.GetItemOrNull(heater.Owner, heater.BeakerSlotId) is not { } item)
continue;
if (!TryComp<SolutionContainerManagerComponent>(item, out var solution))
continue;
var energy = heater.HeatPerSecond * heater.HeatMultiplier * frameTime;
foreach (var s in solution.Solutions.Values)
foreach (var heatingEntity in heater.PlacedEntities.Take((int) heater.MaxEntities))
{
_solution.AddThermalEnergy(solution.Owner, s, energy);
if (!TryComp<SolutionContainerManagerComponent>(heatingEntity, out var solution))
continue;
var energy = heater.HeatPerSecond * frameTime;
foreach (var s in solution.Solutions.Values)
{
_solution.AddThermalEnergy(heatingEntity, s, energy);
}
}
}
}