From 63cc8d4f90b29a165f43eb704cc9c0a057766a5f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Sep 2019 02:16:57 +0900
Subject: [PATCH 1/2] Add hit lighting setting

---
 osu.Game/Configuration/OsuConfigManager.cs                   | 5 ++++-
 .../Overlays/Settings/Sections/Graphics/DetailSettings.cs    | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index e26021d930..4cbf2b4d94 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -81,6 +81,8 @@ namespace osu.Game.Configuration
             Set(OsuSetting.DimLevel, 0.3, 0, 1, 0.01);
             Set(OsuSetting.BlurLevel, 0, 0, 1, 0.01);
 
+            Set(OsuSetting.HitLighting, true);
+
             Set(OsuSetting.ShowInterface, true);
             Set(OsuSetting.ShowHealthDisplayWhenCantFail, true);
             Set(OsuSetting.KeyOverlay, false);
@@ -180,6 +182,7 @@ namespace osu.Game.Configuration
         ScalingSizeX,
         ScalingSizeY,
         UIScale,
-        IntroSequence
+        IntroSequence,
+        HitLighting
     }
 }
diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
index 56e56f6ca8..5189d573cc 100644
--- a/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
@@ -27,6 +27,11 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
                     Bindable = config.GetBindable<bool>(OsuSetting.ShowVideoBackground)
                 },
                 new SettingsCheckbox
+                {
+                    LabelText = "Hit Lighting",
+                    Bindable = config.GetBindable<bool>(OsuSetting.HitLighting)
+                },
+                new SettingsCheckbox
                 {
                     LabelText = "Rotate cursor when dragging",
                     Bindable = config.GetBindable<bool>(OsuSetting.CursorRotation)

From ba76f09c99df0c59c37c85c32ccbdc24875a9d30 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 18 Sep 2019 02:49:54 +0900
Subject: [PATCH 2/2] Add initial implementation of hit lighting

Requires a supporting skin, like osu!classic for now.
---
 .../Objects/Drawables/DrawableOsuJudgement.cs | 44 +++++++++++++++++++
 .../Rulesets/Judgements/DrawableJudgement.cs  |  8 +++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
index 938a2293ba..022e9ea12b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuJudgement.cs
@@ -1,22 +1,66 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Game.Configuration;
 using osuTK;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Skinning;
+using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Osu.Objects.Drawables
 {
     public class DrawableOsuJudgement : DrawableJudgement
     {
+        private SkinnableSprite lighting;
+        private Bindable<Color4> lightingColour;
+
         public DrawableOsuJudgement(JudgementResult result, DrawableHitObject judgedObject)
             : base(result, judgedObject)
         {
         }
 
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            if (config.Get<bool>(OsuSetting.HitLighting) && Result.Type != HitResult.Miss)
+            {
+                AddInternal(lighting = new SkinnableSprite("lighting")
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    Blending = BlendingParameters.Additive,
+                    Depth = float.MaxValue
+                });
+
+                if (JudgedObject != null)
+                {
+                    lightingColour = JudgedObject.AccentColour.GetBoundCopy();
+                    lightingColour.BindValueChanged(colour => lighting.Colour = colour.NewValue, true);
+                }
+                else
+                {
+                    lighting.Colour = Color4.White;
+                }
+            }
+        }
+
+        protected override double FadeOutDelay => lighting == null ? base.FadeOutDelay : 1400;
+
         protected override void ApplyHitAnimations()
         {
+            if (lighting != null)
+            {
+                JudgementBody.Delay(FadeInDuration).FadeOut(400);
+
+                lighting.ScaleTo(0.8f).ScaleTo(1.2f, 600, Easing.Out);
+                lighting.FadeIn(200).Then().Delay(200).FadeOut(1000);
+            }
+
             JudgementText?.TransformSpacingTo(new Vector2(14, 0), 1800, Easing.OutQuint);
             base.ApplyHitAnimations();
         }
diff --git a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
index 4f8cb7660b..4c503ea59c 100644
--- a/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
+++ b/osu.Game/Rulesets/Judgements/DrawableJudgement.cs
@@ -34,10 +34,14 @@ namespace osu.Game.Rulesets.Judgements
 
         /// <summary>
         /// Duration of initial fade in.
-        /// Default fade out will start immediately after this duration.
         /// </summary>
         protected virtual double FadeInDuration => 100;
 
+        /// <summary>
+        /// Duration to wait until fade out begins. Defaults to <see cref="FadeInDuration"/>.
+        /// </summary>
+        protected virtual double FadeOutDelay => FadeInDuration;
+
         /// <summary>
         /// Creates a drawable which visualises a <see cref="Judgements.Judgement"/>.
         /// </summary>
@@ -76,7 +80,7 @@ namespace osu.Game.Rulesets.Judgements
             JudgementBody.ScaleTo(0.9f);
             JudgementBody.ScaleTo(1, 500, Easing.OutElastic);
 
-            this.Delay(FadeInDuration).FadeOut(400);
+            this.Delay(FadeOutDelay).FadeOut(400);
         }
 
         protected override void LoadComplete()