Skip to content

Update packages #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peppy merged 1 commit into from
Mar 5, 2026
Merged

Update packages #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions PerformanceCalculator/PerformanceCalculator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<ItemGroup>
<PackageReference Include="Alba.CsConsoleFormat" Version="1.0.0" />
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
<PackageReference Include="ppy.osu.Game" Version="2025.1007.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2025.1007.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2025.1007.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2025.1007.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2025.1007.0" />
<PackageReference Include="ppy.osu.Game" Version="2026.303.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2026.303.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2026.303.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2026.303.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2026.303.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions PerformanceCalculatorGUI/Components/ExtendedProfileScore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,20 +398,20 @@ private OsuSpriteText formatCombo()

private static int getStatisticsWidth(Ruleset ruleset)
{
var rulesetHitResults = ruleset.GetHitResults().Where(x => x.result.IsBasic()).ToArray();
var rulesetHitResults = ruleset.GetValidHitResults().Where(x => x.IsBasic()).ToArray();

return Math.Max(80, rulesetHitResults.Length * 15 + 50); // 50px are reserved for the combo
}

private static string formatStatistics(Dictionary<HitResult, int> statistics, Ruleset ruleset)
{
var rulesetHitResults = ruleset.GetHitResults().Where(x => x.result.IsBasic()).ToArray();
var rulesetHitResults = ruleset.GetValidHitResults().Where(x => x.IsBasic()).ToArray();

var statisticsBuilder = new StringBuilder();

for (int i = 0; i < rulesetHitResults.Length; i++)
{
statisticsBuilder.Append(statistics.GetValueOrDefault(rulesetHitResults[i].result));
statisticsBuilder.Append(statistics.GetValueOrDefault(rulesetHitResults[i]));

if (i < rulesetHitResults.Length - 1)
statisticsBuilder.Append(" / ");
Expand Down
10 changes: 5 additions & 5 deletions PerformanceCalculatorGUI/PerformanceCalculatorGUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2025.1007.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2025.1007.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2025.1007.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2025.1007.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2025.1007.0" />
<PackageReference Include="ppy.osu.Game" Version="2026.303.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2026.303.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2026.303.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2026.303.0" />
<PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2026.303.0" />
</ItemGroup>
</Project>
30 changes: 24 additions & 6 deletions PerformanceCalculatorGUI/Screens/SimulateScreen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,10 +191,19 @@ private void load(OsuColour osuColour)
CommitOnFocusLoss = false,
SelectAllOnFocus = true
},
beatmapImportTypeSwitch = new SwitchButton
new Container
{
Width = 80,
Height = file_selection_container_height
Width = 70,
Height = file_selection_container_height,
Children = new Drawable[]
{
new FormControlBackground(),
beatmapImportTypeSwitch = new SwitchButton
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre
}
}
}
}
}
Expand Down Expand Up @@ -312,10 +321,19 @@ private void load(OsuColour osuColour)
PlaceholderText = "0",
MinValue = 0
},
fullScoreDataSwitch = new SwitchButton
new Container
{
Width = 80,
Height = 40
Width = 70,
Height = 40,
Children = new Drawable[]
{
new FormControlBackground(),
fullScoreDataSwitch = new SwitchButton
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre
}
}
}
}
}
Expand Down
Loading