* Fix Mixed puddles not updating slips when evap * Remove Comment that isn't needed Co-authored-by: Centronias <charlie.t.santos@gmail.com> * CR - use SolutionContainerSystem.UpdateChemicals * CR - cleanup unused imports --------- Co-authored-by: Centronias <charlie.t.santos@gmail.com>
63 lines
2.1 KiB
C#
63 lines
2.1 KiB
C#
using Content.Shared.Chemistry.Components;
|
|
using Content.Shared.FixedPoint;
|
|
using Content.Shared.Fluids.Components;
|
|
|
|
namespace Content.Server.Fluids.EntitySystems;
|
|
|
|
public sealed partial class PuddleSystem
|
|
{
|
|
private static readonly TimeSpan EvaporationCooldown = TimeSpan.FromSeconds(1);
|
|
|
|
private void OnEvaporationMapInit(Entity<EvaporationComponent> entity, ref MapInitEvent args)
|
|
{
|
|
entity.Comp.NextTick = _timing.CurTime + EvaporationCooldown;
|
|
}
|
|
|
|
private void UpdateEvaporation(EntityUid uid, Solution solution)
|
|
{
|
|
if (HasComp<EvaporationComponent>(uid))
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (solution.GetTotalPrototypeQuantity(EvaporationReagents) > FixedPoint2.Zero)
|
|
{
|
|
var evaporation = AddComp<EvaporationComponent>(uid);
|
|
evaporation.NextTick = _timing.CurTime + EvaporationCooldown;
|
|
return;
|
|
}
|
|
|
|
RemComp<EvaporationComponent>(uid);
|
|
}
|
|
|
|
private void TickEvaporation()
|
|
{
|
|
var query = EntityQueryEnumerator<EvaporationComponent, PuddleComponent>();
|
|
var xformQuery = GetEntityQuery<TransformComponent>();
|
|
var curTime = _timing.CurTime;
|
|
while (query.MoveNext(out var uid, out var evaporation, out var puddle))
|
|
{
|
|
if (evaporation.NextTick > curTime)
|
|
continue;
|
|
|
|
evaporation.NextTick += EvaporationCooldown;
|
|
|
|
if (!_solutionContainerSystem.ResolveSolution(uid, puddle.SolutionName, ref puddle.Solution, out var puddleSolution))
|
|
continue;
|
|
|
|
var reagentTick = evaporation.EvaporationAmount * EvaporationCooldown.TotalSeconds;
|
|
puddleSolution.SplitSolutionWithOnly(reagentTick, EvaporationReagents);
|
|
|
|
// Despawn if we're done
|
|
if (puddleSolution.Volume == FixedPoint2.Zero)
|
|
{
|
|
// Spawn a *sparkle*
|
|
Spawn("PuddleSparkle", xformQuery.GetComponent(uid).Coordinates);
|
|
QueueDel(uid);
|
|
}
|
|
|
|
_solutionContainerSystem.UpdateChemicals(puddle.Solution.Value);
|
|
}
|
|
}
|
|
}
|