Bump dependencies

EVAST9919 · Oct 18, 2021 · cc55403 · cc55403
1 parent 41bf730
commit cc55403
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/osu.Game.Rulesets.Touhosu/Beatmaps/TouhosuBeatmapConverter.cs b/osu.Game.Rulesets.Touhosu/Beatmaps/TouhosuBeatmapConverter.cs
@@ -78,8 +78,8 @@ protected override IEnumerable<TouhosuHitObject> ConvertHitObject(HitObject obj,
 
                 if (h is ConstantMovingProjectile m)
                 {
-                    var sv = beatmap.ControlPointInfo.DifficultyPointAt(obj.StartTime).SpeedMultiplier;
-                    m.SpeedMultiplier *= Interpolation.ValueAt(sv, 0.8f, 1.3f, 0.5, 4.5);
+                    var bpm = beatmap.ControlPointInfo.TimingPointAt(h.StartTime).BPM;
+                    m.SpeedMultiplier *= Interpolation.ValueAt(bpm, 0.8f, 1.3f, 60, 300);
                 }
 
                 if (first)

diff --git a/osu.Game.Rulesets.Touhosu/Extensions/ConversionExtensions.cs b/osu.Game.Rulesets.Touhosu/Extensions/ConversionExtensions.cs
@@ -49,9 +49,8 @@ public static IEnumerable<TouhosuHitObject> ConvertDefaultSlider(HitObject obj,
 
             var controlPointInfo = beatmap.ControlPointInfo;
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(obj.StartTime);
-            DifficultyControlPoint difficultyPoint = controlPointInfo.DifficultyPointAt(obj.StartTime);
 
-            double scoringDistance = 100 * difficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier;
+            double scoringDistance = 100 * difficulty.SliderMultiplier;
 
             var velocity = scoringDistance / timingPoint.BeatLength;
             var tickDistance = scoringDistance / difficulty.SliderTickRate;
@@ -86,9 +85,8 @@ public static IEnumerable<TouhosuHitObject> ConvertBuzzSlider(HitObject obj, Vec
 
             var controlPointInfo = beatmap.ControlPointInfo;
             TimingControlPoint timingPoint = controlPointInfo.TimingPointAt(obj.StartTime);
-            DifficultyControlPoint difficultyPoint = controlPointInfo.DifficultyPointAt(obj.StartTime);
 
-            double scoringDistance = 100 * difficulty.SliderMultiplier * difficultyPoint.SpeedMultiplier;
+            double scoringDistance = 100 * difficulty.SliderMultiplier;
 
             var velocity = scoringDistance / timingPoint.BeatLength;
             var tickDistance = scoringDistance / difficulty.SliderTickRate;

diff --git a/osu.Game.Rulesets.Touhosu/Objects/InstantProjectile.cs b/osu.Game.Rulesets.Touhosu/Objects/InstantProjectile.cs
@@ -8,10 +8,9 @@ public class InstantProjectile : Projectile
     {
         public override Judgement CreateJudgement() => new IgnoreJudgement();
 
-        protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
+        protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
         {
             base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
-
             TimePreempt = 800;
         }
     }

diff --git a/osu.Game.Rulesets.Touhosu/osu.Game.Rulesets.Touhosu.csproj b/osu.Game.Rulesets.Touhosu/osu.Game.Rulesets.Touhosu.csproj
@@ -11,6 +11,6 @@
     <EmbeddedResource Include="Resources\**\*" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2021.916.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2021.1016.0" />
   </ItemGroup>
 </Project>