Merge pull request #191 from bdach/update-game

Update game packages & fix compilation failures
ppy · Dec 28, 2023 · 7e97004 · 7e97004
2 parents 668dfa7 + 23314db
commit 7e97004
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/PerformanceCalculator/Performance/ReplayPerformanceCommand.cs b/PerformanceCalculator/Performance/ReplayPerformanceCommand.cs
@@ -44,7 +44,7 @@ public override void Execute()
             {
                 difficultyMods = LegacyHelper.ConvertToLegacyDifficultyAdjustmentMods(workingBeatmap.BeatmapInfo, ruleset, difficultyMods);
                 score.ScoreInfo.LegacyTotalScore = (int)score.ScoreInfo.TotalScore;
-                score.ScoreInfo.TotalScore = StandardisedScoreMigrationTools.ConvertFromLegacyTotalScore(
+                StandardisedScoreMigrationTools.UpdateFromLegacy(
                     score.ScoreInfo,
                     LegacyBeatmapConversionDifficultyInfo.FromBeatmap(playableBeatmap),
                     ((ILegacyRuleset)ruleset).CreateLegacyScoreSimulator().Simulate(workingBeatmap, playableBeatmap));

diff --git a/PerformanceCalculator/Performance/ScorePerformanceCommand.cs b/PerformanceCalculator/Performance/ScorePerformanceCommand.cs
@@ -46,7 +46,7 @@ public override void Execute()
                 score.Mods = score.Mods.Append(ruleset.CreateMod<ModClassic>()).ToArray();
                 score.IsLegacyScore = true;
                 score.LegacyTotalScore = (int)score.TotalScore;
-                score.TotalScore = StandardisedScoreMigrationTools.ConvertFromLegacyTotalScore(
+                StandardisedScoreMigrationTools.UpdateFromLegacy(
                     score,
                     LegacyBeatmapConversionDifficultyInfo.FromAPIBeatmap(apiBeatmap),
                     ((ILegacyRuleset)ruleset).CreateLegacyScoreSimulator().Simulate(workingBeatmap, workingBeatmap.GetPlayableBeatmap(ruleset.RulesetInfo, score.Mods)));

diff --git a/PerformanceCalculator/PerformanceCalculator.csproj b/PerformanceCalculator/PerformanceCalculator.csproj
@@ -7,10 +7,10 @@
   <ItemGroup>
     <PackageReference Include="Alba.CsConsoleFormat" Version="1.0.0" />
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
-    <PackageReference Include="ppy.osu.Game" Version="2023.1114.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2023.1114.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2023.1114.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2023.1114.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2023.1114.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2023.1224.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2023.1224.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2023.1224.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2023.1224.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2023.1224.0" />
   </ItemGroup>
 </Project>
diff --git a/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj b/PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2023.1114.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2023.1114.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2023.1114.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2023.1114.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2023.1114.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2023.1224.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2023.1224.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2023.1224.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2023.1224.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2023.1224.0" />
   </ItemGroup>
 </Project>