Make hit lighting our own separate setting

Author: naoei

osu.Game.Rulesets.Tau.Tests/TestSceneDrawableJudgement.cs

@@ -3,24 +3,25 @@
 using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Allocation;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions;
+using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Pooling;
 using osu.Framework.Testing;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Tau.Configuration;
 using osu.Game.Rulesets.Tau.Objects.Drawables;
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Tau.Tests
 {
     public class TestSceneDrawableJudgement : TauSkinnableTestScene
     {
-        [Resolved]
-        private OsuConfigManager config { get; set; }
+        private readonly BindableBool hitLighting = new BindableBool();
 
         private readonly List<DrawablePool<TestDrawableTauJudgement>> pools;
 
@@ -34,10 +35,17 @@ public TestSceneDrawableJudgement()
             }
         }
 
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            var config = (TauRulesetConfigManager)RulesetConfigs.GetConfigFor(Ruleset.Value.CreateInstance()).AsNonNull();
+            config.BindWith(TauRulesetSettings.HitLighting, hitLighting);
+        }
+
         [Test]
         public void TestHitLightingDisabled()
         {
-            AddStep("hit Lighting disabled", () => config.SetValue(OsuSetting.HitLighting, false));
+            AddStep("hit Lighting disabled", () => hitLighting.Value = false);
 
             showResult(HitResult.Great);
 
@@ -49,7 +57,7 @@ public void TestHitLightingDisabled()
         [Test]
         public void TestHitLightingEnabled()
         {
-            AddStep("hit Lighting enabled", () => config.SetValue(OsuSetting.HitLighting, true));
+            AddStep("hit Lighting enabled", () => hitLighting.Value = true);
 
             showResult(HitResult.Great);
 

osu.Game.Rulesets.Tau/Configuration/TauRulesetConfigManager.cs

@@ -17,6 +17,7 @@ protected override void InitialiseDefaults()
             SetDefault(TauRulesetSettings.ShowEffects, true);
             SetDefault(TauRulesetSettings.ShowVisualizer, true);
             SetDefault(TauRulesetSettings.ShowSliderEffects, true);
+            SetDefault(TauRulesetSettings.HitLighting, false);
             SetDefault(TauRulesetSettings.KiaiType, KiaiType.Turbulence);
             SetDefault(TauRulesetSettings.PlayfieldDim, 0.7f, 0, 1, 0.01f);
             SetDefault(TauRulesetSettings.NotesSize, 16f, 10, 25, 1f);
@@ -28,6 +29,7 @@ public enum TauRulesetSettings
         ShowEffects,
         ShowVisualizer,
         ShowSliderEffects, // There's no real reason to have a toggle for showing Kiai effects, as that's already handled under KiaiType
+        HitLighting,
         KiaiType,
         PlayfieldDim,
         NotesSize,

osu.Game.Rulesets.Tau/Objects/Drawables/DrawableTauJudgement.cs

@@ -1,8 +1,8 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Configuration;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.Tau.Configuration;
 using osu.Game.Rulesets.Tau.Objects.Drawables.Pieces;
 using osu.Game.Rulesets.Tau.UI;
 using osuTK;
@@ -14,7 +14,7 @@ public class DrawableTauJudgement : DrawableJudgement
         protected SkinnableLighting Lighting { get; private set; }
 
         [Resolved]
-        private OsuConfigManager config { get; set; }
+        private TauRulesetConfigManager config { get; set; }
 
         [Resolved(canBeNull: true)]
         private TauCachedProperties properties { get; set; }
@@ -62,7 +62,7 @@ protected override void PrepareForUse()
 
         protected override void ApplyHitAnimations()
         {
-            var hitLightingEnabled = config.Get<bool>(OsuSetting.HitLighting);
+            var hitLightingEnabled = config.Get<bool>(TauRulesetSettings.HitLighting);
 
             Lighting.Alpha = 0;
 

osu.Game.Rulesets.Tau/UI/TauSettingsSubsection.cs

@@ -45,6 +45,11 @@ private void load()
                     LabelText = "Show Visualizer",
                     Current = config.GetBindable<bool>(TauRulesetSettings.ShowVisualizer)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Hit Lighting",
+                    Current = config.GetBindable<bool>(TauRulesetSettings.HitLighting)
+                },
                 kiaiType = new SettingsEnumDropdown<KiaiType>()
                 {
                     LabelText = "Kiai Type",

osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj

@@ -18,7 +18,7 @@
     <None Remove="Resources\Shaders\sh_DepthMask.vs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2022.628.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2022.731.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Objects\Drawables\DrawableSlider.Calculations.cs">