Merge pull request #66 from Syriiin/update-to-lazer-2024.1009.1

Update to lazer 2024.1009.1
Syriiin · Oct 18, 2024 · c366dfa · c366dfa
2 parents 6d7aa23 + 11ee6b8
commit c366dfa
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 16 deletions.
diff --git a/Difficalcy.Catch/Difficalcy.Catch.csproj b/Difficalcy.Catch/Difficalcy.Catch.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2024.523.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.523.0" /> <!-- required for convert support -->
+    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2024.1009.1" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.1009.1" /> <!-- required for convert support -->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Difficalcy.Mania/Difficalcy.Mania.csproj b/Difficalcy.Mania/Difficalcy.Mania.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2024.523.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.523.0" /> <!-- required for convert support -->
+    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2024.1009.1" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.1009.1" /> <!-- required for convert support -->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Difficalcy.Osu.Tests/OsuCalculatorServiceTest.cs b/Difficalcy.Osu.Tests/OsuCalculatorServiceTest.cs
@@ -10,8 +10,8 @@ public class OsuCalculatorServiceTest : CalculatorServiceTest<OsuScore, OsuDiffi
     protected override CalculatorService<OsuScore, OsuDifficulty, OsuPerformance, OsuCalculation> CalculatorService { get; } = new OsuCalculatorService(new InMemoryCache(), new TestBeatmapProvider(typeof(OsuCalculatorService).Assembly.GetName().Name));
 
     [Theory]
-    [InlineData(6.710442985146793d, 288.27290484349686d, "diffcalc-test", 0)]
-    [InlineData(8.9742952703071666d, 710.7304138915342d, "diffcalc-test", 64)]
+    [InlineData(6.7171144000821119d, 291.6916492167043d, "diffcalc-test", 0)]
+    [InlineData(8.9825709931204205d, 718.5552449511403d, "diffcalc-test", 64)]
     public void Test(double expectedDifficultyTotal, double expectedPerformanceTotal, string beatmapId, int mods)
         => TestGetCalculationReturnsCorrectValues(expectedDifficultyTotal, expectedPerformanceTotal, new OsuScore { BeatmapId = beatmapId, Mods = mods });
 
@@ -27,6 +27,6 @@ public void TestAllParameters()
             Mehs = 4,
             Oks = 3,
         };
-        TestGetCalculationReturnsCorrectValues(10.07270907570737d, 553.1423675531603d, score);
+        TestGetCalculationReturnsCorrectValues(10.095171949076231d, 685.8314990408466d, score);
     }
 }
diff --git a/Difficalcy.Osu/Difficalcy.Osu.csproj b/Difficalcy.Osu/Difficalcy.Osu.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.523.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.1009.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Difficalcy.Osu/Services/OsuCalculatorService.cs b/Difficalcy.Osu/Services/OsuCalculatorService.cs
@@ -59,6 +59,8 @@ protected override (object, string) CalculateDifficultyAttributes(string beatmap
                 difficultyAttributes.SpeedNoteCount,
                 difficultyAttributes.FlashlightDifficulty,
                 difficultyAttributes.SliderFactor,
+                difficultyAttributes.AimDifficultStrainCount,
+                difficultyAttributes.SpeedDifficultStrainCount,
                 difficultyAttributes.ApproachRate,
                 difficultyAttributes.OverallDifficulty,
                 difficultyAttributes.DrainRate,

diff --git a/Difficalcy.Taiko.Tests/TaikoCalculatorServiceTest.cs b/Difficalcy.Taiko.Tests/TaikoCalculatorServiceTest.cs
@@ -10,8 +10,8 @@ public class TaikoCalculatorServiceTest : CalculatorServiceTest<TaikoScore, Taik
     protected override CalculatorService<TaikoScore, TaikoDifficulty, TaikoPerformance, TaikoCalculation> CalculatorService { get; } = new TaikoCalculatorService(new InMemoryCache(), new TestBeatmapProvider(typeof(TaikoCalculatorService).Assembly.GetName().Name));
 
     [Theory]
-    [InlineData(3.0920212594351191d, 108.45361131093136d, "diffcalc-test", 0)]
-    [InlineData(4.0789820318081444d, 197.40372508926697d, "diffcalc-test", 64)]
+    [InlineData(3.092021259435121d, 137.80325540434842d, "diffcalc-test", 0)]
+    [InlineData(4.0789820318081444d, 248.8310568362074d, "diffcalc-test", 64)]
     public void Test(double expectedDifficultyTotal, double expectedPerformanceTotal, string beatmapId, int mods)
         => TestGetCalculationReturnsCorrectValues(expectedDifficultyTotal, expectedPerformanceTotal, new TaikoScore { BeatmapId = beatmapId, Mods = mods });
 
@@ -26,6 +26,6 @@ public void TestAllParameters()
             Misses = 5,
             Oks = 3,
         };
-        TestGetCalculationReturnsCorrectValues(4.0789820318081444d, 176.94088597258678d, score);
+        TestGetCalculationReturnsCorrectValues(4.0789820318081444d, 240.24516772998618d, score);
     }
 }
diff --git a/Difficalcy.Taiko/Difficalcy.Taiko.csproj b/Difficalcy.Taiko/Difficalcy.Taiko.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2024.523.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.523.0" /> <!-- required for convert support -->
+    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2024.1009.1" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.1009.1" /> <!-- required for convert support -->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Difficalcy.Taiko/Services/TaikoCalculatorService.cs b/Difficalcy.Taiko/Services/TaikoCalculatorService.cs
@@ -60,7 +60,8 @@ protected override (object, string) CalculateDifficultyAttributes(string beatmap
                 difficultyAttributes.RhythmDifficulty,
                 difficultyAttributes.ColourDifficulty,
                 difficultyAttributes.PeakDifficulty,
-                difficultyAttributes.GreatHitWindow
+                difficultyAttributes.GreatHitWindow,
+                difficultyAttributes.OkHitWindow
             }));
         }
 

diff --git a/Difficalcy.Tests/CalculatorServiceTest.cs b/Difficalcy.Tests/CalculatorServiceTest.cs
@@ -20,7 +20,7 @@ public async void TestGetCalculationReturnsCorrectValues(double expectedDifficul
 
         var calculationFromCache = await CalculatorService.GetCalculation(score);
 
-        Assert.Equal(calculationFromCache.Difficulty.Total, calculation.Difficulty.Total);
-        Assert.Equal(calculationFromCache.Performance.Total, calculation.Performance.Total);
+        Assert.Equal(calculation.Difficulty.Total, calculationFromCache.Difficulty.Total);
+        Assert.Equal(calculation.Performance.Total, calculationFromCache.Performance.Total);
     }
 }