Move hit lighting into ruleset config.

taulazer · Apr 24, 2022 · 9b07a5d · 9b07a5d
1 parent 6a5a0c3
commit 9b07a5d
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/osu.Game.Rulesets.Tau.Tests/TestSceneDrawableJudgement.cs b/osu.Game.Rulesets.Tau.Tests/TestSceneDrawableJudgement.cs
@@ -3,27 +3,28 @@
 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 List<DrawablePool<TestDrawableTauJudgement>> pools;
 
+        private readonly BindableBool hitLighting = new BindableBool();
+
         public TestSceneDrawableJudgement()
         {
             pools = new List<DrawablePool<TestDrawableTauJudgement>>();
@@ -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);
 

diff --git a/osu.Game.Rulesets.Tau/Configuration/TauRulesetConfigManager.cs b/osu.Game.Rulesets.Tau/Configuration/TauRulesetConfigManager.cs
@@ -15,6 +15,7 @@ protected override void InitialiseDefaults()
             base.InitialiseDefaults();
 
             SetDefault(TauRulesetSettings.ShowVisualizer, true);
+            SetDefault(TauRulesetSettings.HitLighting, true);
             SetDefault(TauRulesetSettings.PlayfieldDim, 0.3f, 0, 1, 0.01f);
             SetDefault(TauRulesetSettings.BeatSize, 16f, 10, 25, 1f);
             SetDefault(TauRulesetSettings.KiaiEffect, KiaiType.Turbulent);
@@ -24,6 +25,7 @@ protected override void InitialiseDefaults()
     public enum TauRulesetSettings
     {
         ShowVisualizer,
+        HitLighting,
         PlayfieldDim,
         BeatSize,
         KiaiEffect

diff --git a/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableTauJudgement.cs b/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableTauJudgement.cs
@@ -1,9 +1,9 @@
 using System.Linq;
 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.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 TauPlayfield playfield { get; set; }
@@ -58,7 +58,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;
 

diff --git a/osu.Game.Rulesets.Tau/UI/TauSettingsSubsection.cs b/osu.Game.Rulesets.Tau/UI/TauSettingsSubsection.cs
@@ -30,6 +30,12 @@ private void load()
                     LabelText = "Show Visualizer",
                     Current = config.GetBindable<bool>(TauRulesetSettings.ShowVisualizer)
                 },
+                new SettingsCheckbox
+                {
+                    LabelText = "Hit lighting",
+                    Current = config.GetBindable<bool>(TauRulesetSettings.HitLighting),
+                    WarningText = "This has been moved into the ruleset settings to reduce the chance of Tau breaking."
+                },
                 new SettingsSlider<float>
                 {
                     LabelText = "Playfield dim",