Merge pull request #611 from EVAST9919/key_retry

Retry on Tilde key

osu.Game/Screens/Play/HotkeyRetryOverlay.cs

@@ -0,0 +1,82 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Input;
+using OpenTK.Input;
+using osu.Framework.Allocation;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Audio;
+using System;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Sprites;
+using OpenTK.Graphics;
+
+namespace osu.Game.Screens.Play
+{
+    public class HotkeyRetryOverlay : Container
+    {
+        public Action Action;
+
+        private SampleChannel retrySample;
+        private Box overlay;
+
+        private const int activate_delay = 400;
+        private const int fadeout_delay = 200;
+
+        private bool fired;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            retrySample = audio.Sample.Get(@"Menu/menuback");
+            RelativeSizeAxes = Axes.Both;
+            AlwaysPresent = true;
+
+            Children = new Drawable[]
+            {
+                overlay = new Box
+                {
+                    Alpha = 0,
+                    Colour = Color4.Black,
+                    RelativeSizeAxes = Axes.Both,
+                }
+            };
+        }
+
+        protected override bool OnKeyDown(InputState state, KeyDownEventArgs args)
+        {
+            if (args.Repeat) return false;
+
+            if (args.Key == Key.Tilde)
+            {
+                overlay.FadeIn(activate_delay, EasingTypes.Out);
+                return true;
+            }
+
+            return base.OnKeyDown(state, args);
+        }
+
+        protected override bool OnKeyUp(InputState state, KeyUpEventArgs args)
+        {
+            if (args.Key == Key.Tilde && !fired)
+            {
+                overlay.FadeOut(fadeout_delay, EasingTypes.Out);
+                return true;
+            }
+
+            return base.OnKeyUp(state, args);
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+            if (!fired && overlay.Alpha == 1)
+            {
+                fired = true;
+                retrySample.Play();
+                Action?.Invoke();
+            }
+        }
+    }
+}

osu.Game/Screens/Play/Player.cs

@@ -157,6 +157,10 @@ namespace osu.Game.Screens.Play
                 {
                     OnRetry = Restart,
                     OnQuit = Exit,
+                },
+                new HotkeyRetryOverlay
+                {
+                    Action = Restart,
                 }
             };
         }

osu.Game/osu.Game.csproj

@@ -180,6 +180,7 @@
     <Compile Include="Screens\Backgrounds\BackgroundScreenEmpty.cs" />
     <Compile Include="Screens\Charts\ChartInfo.cs" />
     <Compile Include="Screens\Edit\Editor.cs" />
+    <Compile Include="Screens\Play\HotkeyRetryOverlay.cs" />
     <Compile Include="Screens\ScreenWhiteBox.cs" />
     <Compile Include="Screens\Loader.cs" />
     <Compile Include="Screens\Menu\Button.cs" />