Use better running animation (thanks Slipsy)

Beamographic · May 29, 2020 · 217ab63 · 217ab63
1 parent 6954938
commit 217ab63
Show file tree

Hide file tree

Showing 22 changed files with 20 additions and 22 deletions.
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_1.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_1.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_2.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_2.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_3.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_3.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_4.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_4.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_5.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_5.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_6.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_6.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_7.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_7.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_8.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/run_8.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_00.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_00.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_01.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_01.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_02.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_02.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_03.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_03.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_04.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_04.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_05.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_05.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_06.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_06.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_07.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_07.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_08.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_08.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_09.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_09.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_10.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_10.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_11.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_11.png
diff --git a/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_12.png b/osu.Game.Rulesets.Rush/Resources/Textures/Player/skeleton-03_run_12.png
diff --git a/osu.Game.Rulesets.Rush/UI/RushPlayerSprite.cs b/osu.Game.Rulesets.Rush/UI/RushPlayerSprite.cs
@@ -63,26 +63,19 @@ public RushPlayerSprite(float groundY, float airY)
             this.groundY = groundY;
             this.airY = airY;
 
-            // temporarily hide the player until we can get a decent sprite
-            Alpha = 0;
-
             InternalChildren = new Drawable[]
             {
                 runningAnimation = new TextureAnimation
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
-                    // FillMode = FillMode.Fit,
-                    // RelativeSizeAxes = Axes.Both,
-                    DefaultFrameLength = 30,
-                    Scale = new Vector2(0.5f)
+                    DefaultFrameLength = 50,
+                    Scale = new Vector2(1)
                 },
                 fallingAnimation = new TextureAnimation
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
-                    // FillMode = FillMode.Fit,
-                    // RelativeSizeAxes = Axes.Both,
                     DefaultFrameLength = 50,
                     Alpha = 0f,
                     Scale = new Vector2(0.5f)
@@ -91,8 +84,6 @@ public RushPlayerSprite(float groundY, float airY)
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
-                    // FillMode = FillMode.Fit,
-                    // RelativeSizeAxes = Axes.Both,
                     DefaultFrameLength = 50,
                     Alpha = 0f,
                     Scale = new Vector2(0.5f)
@@ -101,8 +92,6 @@ public RushPlayerSprite(float groundY, float airY)
                 {
                     Origin = Anchor.Centre,
                     Anchor = Anchor.Centre,
-                    // FillMode = FillMode.Fit,
-                    // RelativeSizeAxes = Axes.Both,
                     DefaultFrameLength = 50,
                     Alpha = 0f,
                     Scale = new Vector2(0.5f)
@@ -113,17 +102,17 @@ public RushPlayerSprite(float groundY, float airY)
         [BackgroundDependencyLoader]
         private void load(TextureStore store)
         {
-            runningAnimation.AddFrames(Enumerable.Range(0, 13).Select(i => store.Get($"Player/skeleton-03_run_{i:D2}")));
-            fallingAnimation.AddFrames(Enumerable.Range(0, 11).Select(i => store.Get($"Player/skeleton-05_fall_{i:D2}")));
-            attackAnimations[0].AddFrames(Enumerable.Range(0, 16).Select(i => store.Get($"Player/skeleton-09_attack_{i:D2}")));
-            attackAnimations[1].AddFrames(Enumerable.Range(0, 16).Select(i => store.Get($"Player/skeleton-10_attack_2_{i:D2}")));
+            runningAnimation.AddFrames(Enumerable.Range(1, 8).Select(i => store.Get($"Player/run_{i}")));
+            // fallingAnimation.AddFrames(Enumerable.Range(0, 11).Select(i => store.Get($"Player/skeleton-05_fall_{i:D2}")));
+            // attackAnimations[0].AddFrames(Enumerable.Range(0, 16).Select(i => store.Get($"Player/skeleton-09_attack_{i:D2}")));
+            // attackAnimations[1].AddFrames(Enumerable.Range(0, 16).Select(i => store.Get($"Player/skeleton-10_attack_2_{i:D2}")));
 
             runningAnimation.IsPlaying = true;
-            fallingAnimation.IsPlaying = false;
-            attackAnimations[0].IsPlaying = false;
-            attackAnimations[1].IsPlaying = false;
-            attackAnimations[0].Loop = false;
-            attackAnimations[1].Loop = false;
+            // fallingAnimation.IsPlaying = false;
+            // attackAnimations[0].IsPlaying = false;
+            // attackAnimations[1].IsPlaying = false;
+            // attackAnimations[0].Loop = false;
+            // attackAnimations[1].Loop = false;
         }
 
         public void StopAll() => InternalChildren.OfType<TextureAnimation>().ForEach(a =>
@@ -141,13 +130,19 @@ public void PlayRunning()
 
         public void PlayFalling()
         {
+            if (fallingAnimation.FrameCount == 0)
+                return;
+
             StopAll();
             fallingAnimation.Show();
             fallingAnimation.Play();
         }
 
         public void PlayAttackOnLane(LanedHitLane lane)
         {
+            if (attackAnimations[attackIndex].FrameCount == 0)
+                return;
+
             if (holdingAir && lane == LanedHitLane.Ground)
                 ; // TODO: ghost punch the ground
             else if (holdingGround && lane == LanedHitLane.Air)
@@ -167,6 +162,9 @@ public void PlayAttackOnLane(LanedHitLane lane)
 
         private void updateHold()
         {
+            if (runningAnimation.IsPlaying)
+                return;
+
             if (holdingAir && holdingGround)
                 this.MoveToY(0, travel_time, Easing.OutBack);
             else if (holdingAir)