CleanTileReaction, sounds, localization, and sprite

space-syndicate · Dec 28, 2024 · 881f8a8 · 881f8a8
1 parent f36751f
commit 881f8a8
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 6 deletions.
diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs
@@ -16,7 +16,6 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Spawners;
 using System.Numerics;
-using Content.Server._CorvaxNext.Footprints;
 
 namespace Content.Server.Chemistry.EntitySystems
 {
@@ -50,8 +49,6 @@ private void HandleCollide(Entity<VaporComponent> entity, ref StartCollideEvent
                 _reactive.DoEntityReaction(args.OtherEntity, solution, ReactionMethod.Touch);
             }
 
-            RaiseLocalEvent(args.OtherEntity, new FootprintCleanEvent()); // Corvax-Next-Footprints
-
             // Check for collision with a impassable object (e.g. wall) and stop
             if ((args.OtherFixture.CollisionLayer & (int) CollisionGroup.Impassable) != 0 && args.OtherFixture.Hard)
             {

diff --git a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
@@ -7,6 +7,8 @@
 using Robust.Shared.Map;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using System.Linq;
+using Content.Shared._CorvaxNext.Footprints;
+using Content.Server._CorvaxNext.Footprints;
 
 namespace Content.Server.Chemistry.TileReactions;
 
@@ -57,6 +59,11 @@ IEntityManager entityManager
 
             solutionContainerSystem.TryAddSolution(puddleSolution.Value, new Solution(ReplacementReagent, purgeable.Volume));
 
+            // Corvax-Next-Footprints-Start
+            if (entityManager.HasComponent<FootprintComponent>(entity))
+                entityManager.EventBus.RaiseLocalEvent(entity, new FootprintCleanEvent());
+            // Corvax-Next-Footprints-End
+
             if (purgeable.Volume <= FixedPoint2.Zero)
                 break;
         }

diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs
@@ -425,7 +425,7 @@ private void UpdateSlip(EntityUid entityUid, PuddleComponent component, Solution
     private void UpdateSlow(EntityUid uid, Solution solution, PuddleComponent component) // Corvax-Next-Footprints
     {
         // Corvax-Next-Footprints-Start
-        if (!component.ViscosityAffectsMovement)
+        if (!component.AffectsMovement)
             return;
         // Corvax-Next-Footprints-End
 

diff --git a/Content.Shared/Fluids/Components/PuddleComponent.cs b/Content.Shared/Fluids/Components/PuddleComponent.cs
@@ -24,7 +24,10 @@ public sealed partial class PuddleComponent : Component
 
         // Corvax-Next-Footprints-Start
         [DataField]
-        public bool ViscosityAffectsMovement = true;
+        public bool AffectsMovement = true;
+
+        [DataField]
+        public bool AffectsSound = true;
         // Corvax-Next-Footprints-End
     }
 }
diff --git a/Content.Shared/Fluids/SharedPuddleSystem.cs b/Content.Shared/Fluids/SharedPuddleSystem.cs
@@ -73,6 +73,11 @@ private void OnRefillableCanDropDragged(Entity<RefillableSolutionComponent> enti
 
     private void OnGetFootstepSound(Entity<PuddleComponent> entity, ref GetFootstepSoundEvent args)
     {
+        // Corvax-Next-Footprints
+        if (!entity.Comp.AffectsSound)
+            return;
+        // Corvax-Next-Footprints
+
         if (!_solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.SolutionName, ref entity.Comp.Solution,
                 out var solution))
             return;

diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/effects/footprint.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/effects/footprint.ftl
@@ -0,0 +1,2 @@
+ent-Footprint = след
+    .desc = Дорожка из жидкости.
diff --git a/Resources/Prototypes/_CorvaxNext/Entities/Effects/footprint.yml b/Resources/Prototypes/_CorvaxNext/Entities/Effects/footprint.yml
@@ -29,7 +29,8 @@
   - type: Footprint
   - type: Puddle
     solution: print
-    viscosityAffectsMovement: false
+    affectsMovement: false
+    affectsSound: false
   - type: ExaminableSolution
     solution: print
   - type: MixableSolution

diff --git a/Resources/Textures/_CorvaxNext/Effects/footprint.rsi/body.png b/Resources/Textures/_CorvaxNext/Effects/footprint.rsi/body.png
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		ent-Footprint = след
		.desc = Дорожка из жидкости.