sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix bug causing the star rating to change when Random is enabled"

Browse Source 
This reverts commit 1dfe028c02.
This commit is contained in:
Pasi4K5
2021-04-27 19:39:58 +02:00
parent 1dfe028c02
commit 4b05568d2d
4 changed files with 1 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Osu/Mods/OsuModRandom.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Rulesets.Osu.Mods
/// <summary> /// <summary>
/// Mod that randomises the positions of the <see cref="HitObject"/>s /// Mod that randomises the positions of the <see cref="HitObject"/>s
/// </summary> /// </summary>
public class OsuModRandom : ModRandom, IApplicableToBeatmapKeepStarRating public class OsuModRandom : ModRandom, IApplicableToBeatmap
{ {
public override string Description => "It never gets boring!"; public override string Description => "It never gets boring!";
public override bool Ranked => false; public override bool Ranked => false;

10
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -32,11 +32,6 @@ namespace osu.Game.Beatmaps
public readonly BeatmapMetadata Metadata; public readonly BeatmapMetadata Metadata;
/// <summary>
/// Only if this is set to true, changes made by mods that implement <see cref="IApplicableToBeatmapKeepStarRating"/> will be applied.
/// </summary>
public bool ApplyChangesToBeatmap;
protected AudioManager AudioManager { get; } protected AudioManager AudioManager { get; }
protected WorkingBeatmap(BeatmapInfo beatmapInfo, AudioManager audioManager) protected WorkingBeatmap(BeatmapInfo beatmapInfo, AudioManager audioManager)
@ -171,15 +166,10 @@ namespace osu.Game.Beatmaps
foreach (var mod in mods.OfType<IApplicableToBeatmap>()) foreach (var mod in mods.OfType<IApplicableToBeatmap>())
{ {
if (mod is IApplicableToBeatmapKeepStarRating && !ApplyChangesToBeatmap)
continue;
cancellationSource.Token.ThrowIfCancellationRequested(); cancellationSource.Token.ThrowIfCancellationRequested();
mod.ApplyToBeatmap(converted); mod.ApplyToBeatmap(converted);
} }
ApplyChangesToBeatmap = false;
return converted; return converted;
} }
} }

14
osu.Game/Rulesets/Mods/IApplicableToBeatmapKeepStarRating.cs
View File

@ -1,14 +0,0 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Game.Beatmaps;
namespace osu.Game.Rulesets.Mods
{
/// <summary>
/// Interface for a <see cref="Mod"/> that applies changes to a <see cref="Beatmap"/> after conversion and post-processing has completed without changing its difficulty
/// </summary>
public interface IApplicableToBeatmapKeepStarRating : IApplicableToBeatmap
{
}
}

2
osu.Game/Screens/Play/Player.cs
View File

@ -455,8 +455,6 @@ namespace osu.Game.Screens.Play
rulesetInfo = Ruleset.Value ?? Beatmap.Value.BeatmapInfo.Ruleset; rulesetInfo = Ruleset.Value ?? Beatmap.Value.BeatmapInfo.Ruleset;
ruleset = rulesetInfo.CreateInstance(); ruleset = rulesetInfo.CreateInstance();
Beatmap.Value.ApplyChangesToBeatmap = true;
try try
{ {
playable = Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, Mods.Value); playable = Beatmap.Value.GetPlayableBeatmap(ruleset.RulesetInfo, Mods.Value);