Merge pull request #435 from LumpBloom7/dependabot/nuget/ppy.osu.Game…

…-2023.207.0 Bump ppy.osu.Game from 2022.1227.0 to 2023.207.0
LumpBloom7 · Feb 8, 2023 · d8047c8 · d8047c8
2 parents 36bfd52 + c18c601
commit d8047c8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModAccuracyChallenge.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModAccuracyChallenge.cs
@@ -0,0 +1,8 @@
+using osu.Game.Rulesets.Mods;
+
+namespace osu.Game.Rulesets.Sentakki.Mods
+{
+    public class SentakkiModAccuracyChallenge : ModAccuracyChallenge
+    {
+    }
+}
diff --git a/osu.Game.Rulesets.Sentakki/Mods/SentakkiModChallenge.cs b/osu.Game.Rulesets.Sentakki/Mods/SentakkiModChallenge.cs
@@ -17,7 +17,7 @@
 
 namespace osu.Game.Rulesets.Sentakki.Mods
 {
-    public class SentakkiModChallenge : Mod, IApplicableToDrawableRuleset<SentakkiHitObject>, IApplicableToHealthProcessor
+    public class SentakkiModChallenge : ModFailCondition, IApplicableToDrawableRuleset<SentakkiHitObject>, IApplicableToHealthProcessor
     {
         public override string Name => "Challenge";
         public override LocalisableString Description => SentakkiModChallengeStrings.ModDescription;
@@ -33,8 +33,7 @@ public class SentakkiModChallenge : Mod, IApplicableToDrawableRuleset<SentakkiHi
         public override Type[] IncompatibleMods => new[]
         {
             typeof(ModRelax),
-            typeof(ModSuddenDeath),
-            typeof(ModPerfect),
+            typeof(ModFailCondition),
             typeof(ModAutoplay),
             typeof(ModNoFail),
         };
@@ -85,12 +84,7 @@ public void ApplyToDrawableRuleset(DrawableRuleset<SentakkiHitObject> drawableRu
             ((SentakkiPlayfield)drawableRuleset.Playfield).AccentContainer.Add(new LiveCounter(LivesLeft));
         }
 
-        public void ApplyToHealthProcessor(HealthProcessor healthProcessor)
-        {
-            healthProcessor.FailConditions += FailCondition;
-        }
-
-        protected bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
+        protected override bool FailCondition(HealthProcessor healthProcessor, JudgementResult result)
         {
             if (result.Judgement is not SentakkiJudgement || result.HitObject is ScorePaddingObject)
                 return false;

diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiLanedHitObject.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSentakkiLanedHitObject.cs
@@ -100,7 +100,7 @@ protected override void ClearNestedHitObjects()
         protected override void OnFree()
         {
             base.OnFree();
-            breakSample.Samples = null;
+            breakSample.Samples = null!;
         }
 
         protected override void ApplyResult(Action<JudgementResult> application)

diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouchHold.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableTouchHold.cs
@@ -99,7 +99,7 @@ protected override void OnFree()
         {
             base.OnFree();
 
-            holdSample.Samples = null;
+            holdSample.Samples = null!;
             holdStartTime = null;
             totalHoldTime = 0;
         }

diff --git a/osu.Game.Rulesets.Sentakki/SentakkiRuleset.cs b/osu.Game.Rulesets.Sentakki/SentakkiRuleset.cs
@@ -85,7 +85,7 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
                     {
                         new SentakkiModHardRock(),
                         new MultiMod(new SentakkiModSuddenDeath(), new SentakkiModPerfect()),
-                        new SentakkiModChallenge(),
+                        new MultiMod(new SentakkiModChallenge(), new SentakkiModAccuracyChallenge()),
                         new MultiMod(new SentakkiModDoubleTime(), new SentakkiModNightcore()),
                         new SentakkiModHidden(),
                     };

diff --git a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj
@@ -9,7 +9,7 @@
         <AssemblyName>osu.Game.Rulesets.Sentakki</AssemblyName>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="ppy.osu.Game" Version="2022.1227.0"/>
+        <PackageReference Include="ppy.osu.Game" Version="2023.207.0"/>
     </ItemGroup>
 
     <!--Since we aren't changing the assembly name, we use the assembly title to indicate whether it is a dev build-->