From 0f553e107987e541520aa35b6c1deec35a9c3d2a Mon Sep 17 00:00:00 2001 From: CaptainSqrBeard Date: Sat, 30 Nov 2024 23:10:58 +0600 Subject: [PATCH 1/3] no viscosity for footprints --- 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..633b526714e 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); 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-Footsteps { + // Corvax-Next-Footsteps-Start + if (!component.ViscosityAffectsMovement) + return; + // Corvax-Next-Footsteps-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..dbbadd59a95 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-Footsteps-Start + [DataField] + public bool ViscosityAffectsMovement = true; + // Corvax-Next-Footsteps-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 From 7adfc503e091e60b1108885875742e45dc025221 Mon Sep 17 00:00:00 2001 From: CaptainSqrBeard Date: Sat, 30 Nov 2024 23:27:17 +0600 Subject: [PATCH 2/3] // Corvax-Next-Footsteps --- Content.Server/Fluids/EntitySystems/PuddleSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index 633b526714e..b8286280d4b 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, entity.Comp); + UpdateSlow(entity, args.Solution, entity.Comp); // Corvax-Next-Footsteps UpdateEvaporation(entity, args.Solution); UpdateAppearance(entity, entity.Comp); } From 69278fc2e6c6c52f343c2d3f9112eb090afeb8d6 Mon Sep 17 00:00:00 2001 From: CaptainSqrBeard Date: Sun, 1 Dec 2024 03:12:32 +0600 Subject: [PATCH 3/3] footprintsteps --- Content.Server/Fluids/EntitySystems/PuddleSystem.cs | 8 ++++---- Content.Shared/Fluids/Components/PuddleComponent.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index b8286280d4b..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, entity.Comp); // Corvax-Next-Footsteps + UpdateSlow(entity, args.Solution, entity.Comp); // Corvax-Next-Footprints UpdateEvaporation(entity, args.Solution); UpdateAppearance(entity, entity.Comp); } @@ -421,12 +421,12 @@ private void UpdateSlip(EntityUid entityUid, PuddleComponent component, Solution } } - private void UpdateSlow(EntityUid uid, Solution solution, PuddleComponent component) // Corvax-Next-Footsteps + private void UpdateSlow(EntityUid uid, Solution solution, PuddleComponent component) // Corvax-Next-Footprints { - // Corvax-Next-Footsteps-Start + // Corvax-Next-Footprints-Start if (!component.ViscosityAffectsMovement) return; - // Corvax-Next-Footsteps-End + // 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 dbbadd59a95..3e08a725841 100644 --- a/Content.Shared/Fluids/Components/PuddleComponent.cs +++ b/Content.Shared/Fluids/Components/PuddleComponent.cs @@ -22,9 +22,9 @@ public sealed partial class PuddleComponent : Component [DataField("solutionRef")] public Entity? Solution; - // Corvax-Next-Footsteps-Start + // Corvax-Next-Footprints-Start [DataField] public bool ViscosityAffectsMovement = true; - // Corvax-Next-Footsteps-End + // Corvax-Next-Footprints-End } }