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

Puddle fixes (#15820)

Browse Source
This commit is contained in:
metalgearsloth
2023-04-26 21:29:31 +10:00
committed by GitHub
parent d1d7c1107e
commit f12f277c35
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/Fluids/EntitySystems/PuddleSystem.cs
View File

@@ -105,7 +105,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
continue;
}
var remaining = neighborSolution.Volume - puddle.OverflowVolume;
var remaining = puddle.OverflowVolume - neighborSolution.Volume;
if (remaining <= FixedPoint2.Zero)
continue;
@@ -129,20 +129,13 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
}
}
// Then we go to free tiles -> only overflow if we can go up to capacity at least.
// Then we go to free tiles.
// Need to go even if we have a little remainder to avoid solution sploshing around internally
// for ages.
if (args.NeighborFreeTiles.Count > 0 && args.Updates > 0)
{
// We'll only spill if we have the minimum threshold per tile.
var spillCount = (int) Math.Floor(overflow.Volume.Float() / component.OverflowVolume.Float());
if (spillCount == 0)
{
return;
}
_random.Shuffle(args.NeighborFreeTiles);
spillCount = Math.Min(args.NeighborFreeTiles.Count, spillCount);
var spillAmount = overflow.Volume / spillCount;
var spillAmount = overflow.Volume / args.NeighborFreeTiles.Count;
foreach (var neighbor in args.NeighborFreeTiles)
{
@@ -165,12 +158,10 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
foreach (var neighbor in args.Neighbors)
{
// Overflow to neighbours but not if they're already at the cap
// This is to avoid diluting solutions too much.
// Overflow to neighbours (unless it's pure water)
if (!puddleQuery.TryGetComponent(neighbor, out var puddle) ||
!_solutionContainerSystem.TryGetSolution(neighbor, puddle.SolutionName, out var neighborSolution) ||
CanFullyEvaporate(neighborSolution) ||
neighborSolution.Volume >= puddle.OverflowVolume)
CanFullyEvaporate(neighborSolution))
{
continue;
}