]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Update ``DoorComponent`` to use TimeSpans and fix comments (#40420)
authorWinkarst-cpu <74284083+Winkarst-cpu@users.noreply.github.com>
Wed, 17 Sep 2025 13:28:11 +0000 (16:28 +0300)
committerGitHub <noreply@github.com>
Wed, 17 Sep 2025 13:28:11 +0000 (15:28 +0200)
Cleanup

Content.Client/Doors/DoorSystem.cs
Content.Shared/Doors/Components/DoorComponent.cs

index f1697b820d5a3dd856ef1941674876238d8c82c0..ae9c7eda78f2d176bb04c63d62f3d49f7d2f413c 100644 (file)
@@ -31,7 +31,7 @@ public sealed class DoorSystem : SharedDoorSystem
 
         comp.OpeningAnimation = new Animation
         {
-            Length = TimeSpan.FromSeconds(comp.OpeningAnimationTime),
+            Length = comp.OpeningAnimationTime,
             AnimationTracks =
             {
                 new AnimationTrackSpriteFlick
@@ -47,7 +47,7 @@ public sealed class DoorSystem : SharedDoorSystem
 
         comp.ClosingAnimation = new Animation
         {
-            Length = TimeSpan.FromSeconds(comp.ClosingAnimationTime),
+            Length = comp.ClosingAnimationTime,
             AnimationTracks =
             {
                 new AnimationTrackSpriteFlick
@@ -63,7 +63,7 @@ public sealed class DoorSystem : SharedDoorSystem
 
         comp.EmaggingAnimation = new Animation
         {
-            Length = TimeSpan.FromSeconds(comp.EmaggingAnimationTime),
+            Length = comp.EmaggingAnimationTime,
             AnimationTracks =
             {
                 new AnimationTrackSpriteFlick
@@ -116,14 +116,14 @@ public sealed class DoorSystem : SharedDoorSystem
 
                 return;
             case DoorState.Opening:
-                if (entity.Comp.OpeningAnimationTime == 0.0)
+                if (entity.Comp.OpeningAnimationTime == TimeSpan.Zero)
                     return;
 
                 _animationSystem.Play(entity, (Animation)entity.Comp.OpeningAnimation, DoorComponent.AnimationKey);
 
                 return;
             case DoorState.Closing:
-                if (entity.Comp.ClosingAnimationTime == 0.0 || entity.Comp.CurrentlyCrushing.Count != 0)
+                if (entity.Comp.ClosingAnimationTime == TimeSpan.Zero || entity.Comp.CurrentlyCrushing.Count != 0)
                     return;
 
                 _animationSystem.Play(entity, (Animation)entity.Comp.ClosingAnimation, DoorComponent.AnimationKey);
index e413f472e0098560bd730d4a1445fdd9b792c549..020a7a4c9be5fe1695e76adda9fda927f8cc8034 100644 (file)
@@ -187,22 +187,22 @@ public sealed partial class DoorComponent : Component
     public string EmaggingSpriteState = "sparks";
 
     /// <summary>
-    /// The sprite state used for the door when it's open.
+    /// The length of the door's opening animation.
     /// </summary>
     [DataField]
-    public float OpeningAnimationTime = 0.8f;
+    public TimeSpan OpeningAnimationTime = TimeSpan.FromSeconds(0.8);
 
     /// <summary>
-    /// The sprite state used for the door when it's open.
+    /// The length of the door's closing animation.
     /// </summary>
     [DataField]
-    public float ClosingAnimationTime = 0.8f;
+    public TimeSpan ClosingAnimationTime = TimeSpan.FromSeconds(0.8);
 
     /// <summary>
-    /// The sprite state used for the door when it's open.
+    /// The length of the door's emagging animation.
     /// </summary>
     [DataField]
-    public float EmaggingAnimationTime = 1.5f;
+    public TimeSpan EmaggingAnimationTime = TimeSpan.FromSeconds(1.5);
 
     /// <summary>
     /// The animation used when the door opens.