Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update puddle stickiness (#16597)

Browse Source
This commit is contained in:
Slava0135
2023-06-03 22:34:43 +03:00
committed by GitHub
parent 10932cc384
commit d3f7a9e820
4 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Chemistry/TileReactions/SpillTileReaction.cs
View File

@@ -4,6 +4,7 @@ using Content.Shared.Chemistry.Reaction;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.FixedPoint;
using Content.Shared.Movement.Components;
using Content.Shared.Movement.Systems;
using Content.Shared.Slippery;
using Content.Shared.StepTrigger.Components;
using Content.Shared.StepTrigger.Systems;
@@ -39,9 +40,7 @@ namespace Content.Server.Chemistry.TileReactions
var slow = entityManager.EnsureComponent<SlowContactsComponent>(puddleUid);
var speedModifier = 1 - reagent.Viscosity;
slow.WalkSpeedModifier = speedModifier;
slow.SprintSpeedModifier = speedModifier;
entityManager.Dirty(slow);
entityManager.EntitySysManager.GetEntitySystem<SlowContactsSystem>().ChangeModifiers(puddleUid, speedModifier, slow);
return reactVolume;
}

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

@@ -25,6 +25,8 @@ using Solution = Content.Shared.Chemistry.Components.Solution;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Timing;
using Content.Shared.Movement.Components;
using Content.Shared.Movement.Systems;
namespace Content.Server.Fluids.EntitySystems;
@@ -47,6 +49,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
[Dependency] private readonly StepTriggerSystem _stepTrigger = default!;
[Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!;
[Dependency] private readonly TileFrictionController _tile = default!;
[Dependency] private readonly SlowContactsSystem _slowContacts = default!;
public static float PuddleVolume = 1000;
@@ -242,6 +245,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
_deletionQueue.Remove(uid);
UpdateSlip(uid, component, args.Solution);
UpdateSlow(uid, args.Solution);
UpdateEvaporation(uid, args.Solution);
UpdateAppearance(uid, component);
}
@@ -319,6 +323,26 @@ public sealed partial class PuddleSystem : SharedPuddleSystem
}
}
private void UpdateSlow(EntityUid uid, Solution solution)
{
var maxViscosity = 0f;
foreach (var reagent in solution.Contents)
{
var reagentProto = _prototypeManager.Index<ReagentPrototype>(reagent.ReagentId);
maxViscosity = Math.Max(maxViscosity, reagentProto.Viscosity);
}
if (maxViscosity > 0)
{
var comp = EnsureComp<SlowContactsComponent>(uid);
var speed = 1 - maxViscosity;
_slowContacts.ChangeModifiers(uid, speed, comp);
}
else
{
RemComp<SlowContactsComponent>(uid);
}
}
private void HandlePuddleExamined(EntityUid uid, PuddleComponent component, ExaminedEvent args)
{
if (TryComp<StepTriggerComponent>(uid, out var slippery) && slippery.Active)