From e7ec45450eced12b042241ee46e1a134df0a4505 Mon Sep 17 00:00:00 2001 From: csqrb <56765288+CaptainSqrBeard@users.noreply.github.com> Date: Sun, 1 Dec 2024 05:40:02 +0600 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8F=D0=B7=D0=BA=D0=BE=D1=81=D1=82?= =?UTF-8?q?=D1=8C=20=D1=80=D0=B5=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=20=D1=81=D0=BB=D0=B5=D0=B4=D0=BE=D0=B2=20=D1=82=D0=B5=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=BD=D0=B5=20=D0=B2=D0=BB=D0=B8=D1=8F?= =?UTF-8?q?=D0=B5=D1=82=20=D0=BD=D0=B0=20=D1=81=D0=BA=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=B4=D0=B2=D0=B8=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20(#99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * no viscosity for footprints * // Corvax-Next-Footsteps * footprintsteps --- Content.Server/Fluids/EntitySystems/PuddleSystem.cs | 9 +++++++-- Content.Shared/Fluids/Components/PuddleComponent.cs | 5 +++++ .../Prototypes/_CorvaxNext/Entities/Effects/footstep.yml | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index 3889be11743..ef06b9f2d99 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -340,7 +340,7 @@ private void OnSolutionUpdate(Entity entity, ref SolutionContai _deletionQueue.Remove(entity); UpdateSlip(entity, entity.Comp, args.Solution); - UpdateSlow(entity, args.Solution); + UpdateSlow(entity, args.Solution, entity.Comp); // Corvax-Next-Footprints UpdateEvaporation(entity, args.Solution); UpdateAppearance(entity, entity.Comp); } @@ -421,8 +421,13 @@ private void UpdateSlip(EntityUid entityUid, PuddleComponent component, Solution } } - private void UpdateSlow(EntityUid uid, Solution solution) + private void UpdateSlow(EntityUid uid, Solution solution, PuddleComponent component) // Corvax-Next-Footprints { + // Corvax-Next-Footprints-Start + if (!component.ViscosityAffectsMovement) + return; + // Corvax-Next-Footprints-End + var maxViscosity = 0f; foreach (var (reagent, _) in solution.Contents) { diff --git a/Content.Shared/Fluids/Components/PuddleComponent.cs b/Content.Shared/Fluids/Components/PuddleComponent.cs index b8a6fe0cb88..3e08a725841 100644 --- a/Content.Shared/Fluids/Components/PuddleComponent.cs +++ b/Content.Shared/Fluids/Components/PuddleComponent.cs @@ -21,5 +21,10 @@ public sealed partial class PuddleComponent : Component [DataField("solutionRef")] public Entity? Solution; + + // Corvax-Next-Footprints-Start + [DataField] + public bool ViscosityAffectsMovement = true; + // Corvax-Next-Footprints-End } } diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Effects/footstep.yml b/Resources/Prototypes/_CorvaxNext/Entities/Effects/footstep.yml index 5753d2cb057..8369a040070 100644 --- a/Resources/Prototypes/_CorvaxNext/Entities/Effects/footstep.yml +++ b/Resources/Prototypes/_CorvaxNext/Entities/Effects/footstep.yml @@ -34,6 +34,7 @@ - type: Footprint - type: Puddle solution: step + viscosityAffectsMovement: false - type: Appearance - type: ExaminableSolution solution: step