osu/osu-tools
1
0
Fork 0
mirror of https://github.com/ppy/osu-tools.git synced 2025-06-10 01:50:46 +09:00
Code Activity

Merge pull request #222 from minisbett/fix-duplicate-calculations

Browse source 
fix duplicate difficulty & performance calculation when changing mods
This commit is contained in:
Dan Balasescu 2024-10-23 15:27:21 +09:00 • committed by GitHub
commit 156867cba3
Signed by: github
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

42
PerformanceCalculatorGUI/Screens/SimulateScreen.cs
View file

@ -524,23 +524,10 @@ namespace PerformanceCalculatorGUI.Screens
private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods) private void modsChanged(ValueChangedEvent<IReadOnlyList<Mod>> mods)
{ {
void updateMissesTextboxes() // Hotfix for preventing a difficulty and performance calculation from being trigger twice,
{ // as the mod overlay for some reason triggers a ValueChanged twice per mod change.
if (ruleset.Value.ShortName == "osu") if (mods.OldValue.SequenceEqual(mods.NewValue))
{ return;
// Large tick misses and slider tail misses are only relevant in PP if slider head accuracy exists
if (mods.NewValue.OfType<OsuModClassic>().Any(m => m.NoSliderHeadAccuracy.Value))
{
missesContainer.Content = new[] { new[] { missesTextBox } };
missesContainer.ColumnDimensions = [new Dimension()];
}
else
{
missesContainer.Content = new[] { new[] { missesTextBox, largeTickMissesTextBox, sliderTailMissesTextBox } };
missesContainer.ColumnDimensions = [new Dimension(), new Dimension(), new Dimension()];
}
}
}
modSettingChangeTracker?.Dispose(); modSettingChangeTracker?.Dispose();
@ -564,6 +551,24 @@ namespace PerformanceCalculatorGUI.Screens
calculateDifficulty(); calculateDifficulty();
updateCombo(false); updateCombo(false);
calculatePerformance(); calculatePerformance();
void updateMissesTextboxes()
{
if (ruleset.Value.ShortName == "osu")
{
// Large tick misses and slider tail misses are only relevant in PP if slider head accuracy exists
if (mods.NewValue.OfType<OsuModClassic>().Any(m => m.NoSliderHeadAccuracy.Value))
{
missesContainer.Content = new[] { new[] { missesTextBox } };
missesContainer.ColumnDimensions = [new Dimension()];
}
else
{
missesContainer.Content = new[] { new[] { missesTextBox, largeTickMissesTextBox, sliderTailMissesTextBox } };
missesContainer.ColumnDimensions = [new Dimension(), new Dimension(), new Dimension()];
}
}
}
} }
private void resetBeatmap() private void resetBeatmap()
@ -697,7 +702,8 @@ namespace PerformanceCalculatorGUI.Screens
if (ruleset.Value.OnlineID != -1) if (ruleset.Value.OnlineID != -1)
{ {
// official rulesets can generate more precise hits from accuracy // official rulesets can generate more precise hits from accuracy
statistics = RulesetHelper.GenerateHitResultsForRuleset(ruleset.Value, accuracyTextBox.Value.Value / 100.0, beatmap, missesTextBox.Value.Value, countMeh, countGood, largeTickMissesTextBox.Value.Value, sliderTailMissesTextBox.Value.Value); statistics = RulesetHelper.GenerateHitResultsForRuleset(ruleset.Value, accuracyTextBox.Value.Value / 100.0, beatmap, missesTextBox.Value.Value, countMeh, countGood,
largeTickMissesTextBox.Value.Value, sliderTailMissesTextBox.Value.Value);
accuracy = RulesetHelper.GetAccuracyForRuleset(ruleset.Value, statistics); accuracy = RulesetHelper.GetAccuracyForRuleset(ruleset.Value, statistics);
} }