Merge pull request #171 from goodtrailer/manual-bump-2024.412.1

Manually update ppy.osu.Game to 2024.412.1
goodtrailer · Apr 20, 2024 · 84e5165 · 84e5165
2 parents f4d2f39 + ab902cf
commit 84e5165
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/osu.Game.Rulesets.Soyokaze/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Soyokaze/Objects/Drawables/DrawableHitCircle.cs
@@ -115,7 +115,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             if (!userTriggered)
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
-                    ApplyResult(r => r.Type = r.Judgement.MinResult);
+                    ApplyResult(static (r, _) => r.Type = r.Judgement.MinResult, 0);
                 return;
             }
 
@@ -128,7 +128,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 return;
             }
 
-            ApplyResult(r => r.Type = result);
+            ApplyResult(result);
         }
 
         public override bool Hit(SoyokazeAction action)

diff --git a/osu.Game.Rulesets.Soyokaze/Objects/Drawables/DrawableHold.cs b/osu.Game.Rulesets.Soyokaze/Objects/Drawables/DrawableHold.cs
@@ -60,7 +60,7 @@ private void load()
                 HoldProgress = new SkinnableHoldProgress
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Current = { Value = 0 },
+                    Progress = 0.0,
                 },
                 holdSamples = new PausableSkinnableSound { Looping = true },
             };
@@ -144,7 +144,7 @@ protected override void UpdateInitialTransforms()
             HoldProgress.FadeInFromZero(Math.Min(HitObject.FadeIn * 2, HitObject.Preempt / 2));
             using (BeginDelayedSequence(HitObject.Preempt))
             {
-                HoldProgress.FillTo(1.0, HitObject.Duration);
+                HoldProgress.ProgressTo(1.0, HitObject.Duration);
             }
         }
 
@@ -214,14 +214,16 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             else
                 result = HitResult.Miss;
 
-            ApplyResult(r =>
+            var payload = new { result, HoldCircle.TrueTimeOffset };
+
+            ApplyResult(static (r, p) =>
             {
                 if (!(r is SoyokazeHoldJudgementResult hr))
                     throw new InvalidOperationException($"Expected result of type {nameof(SoyokazeHoldJudgementResult)}");
 
-                hr.Type = result;
-                hr.TrueTimeOffset = HoldCircle.TrueTimeOffset;
-            });
+                hr.Type = p.result;
+                hr.TrueTimeOffset = p.TrueTimeOffset;
+            }, payload);
         }
 
         public override bool Hit(SoyokazeAction action)

diff --git a/osu.Game.Rulesets.Soyokaze/Objects/Drawables/DrawableHoldCircle.cs b/osu.Game.Rulesets.Soyokaze/Objects/Drawables/DrawableHoldCircle.cs
@@ -45,7 +45,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 {
                     TrueResult = new JudgementResult(HitObject, new SoyokazeJudgement()) { Type = HitResult.Miss };
                     TrueTimeOffset = timeOffset;
-                    ApplyResult(r => r.Type = HitResult.IgnoreMiss);
+                    ApplyResult(HitResult.IgnoreMiss);
                 }
                 return;
             }
@@ -61,7 +61,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
 
             TrueResult = new JudgementResult(HitObject, new SoyokazeJudgement()) { Type = result };
             TrueTimeOffset = timeOffset;
-            ApplyResult(r => r.Type = HitResult.IgnoreHit);
+            ApplyResult(HitResult.IgnoreHit);
         }
 
         protected override void UpdatePosition()

diff --git a/osu.Game.Rulesets.Soyokaze/Skinning/SkinnableHoldProgress.cs b/osu.Game.Rulesets.Soyokaze/Skinning/SkinnableHoldProgress.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Soyokaze.Skinning
     public partial class SkinnableHoldProgress : Container
     {
         public override bool RemoveWhenNotAlive => false;
-        public Bindable<double> Current { get => circularProgress.Current; set => circularProgress.Current = value; }
+        public double Progress { get => circularProgress.Progress; set => circularProgress.Progress = value; }
 
         [Resolved]
         private DrawableHitObject drawableObject { get; set; }
@@ -44,7 +44,7 @@ public SkinnableHoldProgress()
                 Origin = Anchor.Centre,
                 Scale = new Vector2(0.5f),
                 InnerRadius = 1f,
-                Current = { Value = 0 },
+                Progress = 0.0,
             };
 
             background = new SkinnableDrawable(new SoyokazeSkinComponentLookup(SoyokazeSkinComponents.HoldOverlay), _ => new DefaultHoldOverlay());
@@ -88,6 +88,6 @@ private void load(ISkinSource skin, SoyokazeConfigManager cm)
             }, true);
         }
 
-        public TransformSequence<CircularProgress> FillTo(double newValue, double duration = 0, Easing easing = Easing.None) => circularProgress.FillTo(newValue, duration, easing);
+        public TransformSequence<CircularProgress> ProgressTo(double newValue, double duration = 0, Easing easing = Easing.None) => circularProgress.ProgressTo(newValue, duration, easing);
     }
 }
diff --git a/osu.Game.Rulesets.Soyokaze/osu.Game.Rulesets.Soyokaze.csproj b/osu.Game.Rulesets.Soyokaze/osu.Game.Rulesets.Soyokaze.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>10.0</LangVersion>
     <AssemblyTitle>osu.Game.Rulesets.Soyokaze</AssemblyTitle>
     <OutputType>Library</OutputType>
@@ -11,7 +11,7 @@
     <EmbeddedResource Include="Resources\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2024.131.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2024.412.1" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\Samples\Gameplay" />