1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 15:27:30 +08:00

Merge pull request #16505 from peppy/remove-base-difficulty-usage

Remove all usage of `BaseDifficulty` (and access `Difficulty` instead)
This commit is contained in:
Dan Balasescu 2022-01-19 13:53:55 +09:00 committed by GitHub
commit 3e5d29ed00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 45 additions and 44 deletions

View File

@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.Tests
{ {
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty { CircleSize = 6, SliderMultiplier = 3 }, Difficulty = new BeatmapDifficulty { CircleSize = 6, SliderMultiplier = 3 },
Ruleset = ruleset Ruleset = ruleset
} }
}; };

View File

@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.Tests
{ {
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 }, Difficulty = new BeatmapDifficulty { CircleSize = 6 },
Ruleset = ruleset Ruleset = ruleset
} }
}; };

View File

@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Catch.Tests
{ {
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 }, Difficulty = new BeatmapDifficulty { CircleSize = 6 },
Ruleset = ruleset Ruleset = ruleset
} }
}; };

View File

@ -35,7 +35,7 @@ namespace osu.Game.Rulesets.Catch.Tests
HitObjects = new List<HitObject> { new Fruit() }, HitObjects = new List<HitObject> { new Fruit() },
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty(), Difficulty = new BeatmapDifficulty(),
Metadata = new BeatmapMetadata Metadata = new BeatmapMetadata
{ {
Artist = @"Unknown", Artist = @"Unknown",

View File

@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Catch.Tests
BeatmapInfo = BeatmapInfo =
{ {
Ruleset = ruleset, Ruleset = ruleset,
BaseDifficulty = new BeatmapDifficulty { CircleSize = 3.6f } Difficulty = new BeatmapDifficulty { CircleSize = 3.6f }
} }
}; };

View File

@ -24,7 +24,7 @@ namespace osu.Game.Rulesets.Catch.Tests
{ {
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty { CircleSize = 5, SliderMultiplier = 2 }, Difficulty = new BeatmapDifficulty { CircleSize = 5, SliderMultiplier = 2 },
Ruleset = ruleset Ruleset = ruleset
}, },
HitObjects = new List<HitObject> HitObjects = new List<HitObject>

View File

@ -264,7 +264,7 @@ namespace osu.Game.Rulesets.Mania.Tests
}, },
BeatmapInfo = BeatmapInfo =
{ {
BaseDifficulty = new BeatmapDifficulty Difficulty = new BeatmapDifficulty
{ {
SliderTickRate = 4, SliderTickRate = 4,
OverallDifficulty = 10, OverallDifficulty = 10,
@ -306,7 +306,7 @@ namespace osu.Game.Rulesets.Mania.Tests
}, },
BeatmapInfo = BeatmapInfo =
{ {
BaseDifficulty = new BeatmapDifficulty { SliderTickRate = tick_rate }, Difficulty = new BeatmapDifficulty { SliderTickRate = tick_rate },
Ruleset = new ManiaRuleset().RulesetInfo Ruleset = new ManiaRuleset().RulesetInfo
}, },
}; };
@ -383,7 +383,7 @@ namespace osu.Game.Rulesets.Mania.Tests
}, },
BeatmapInfo = BeatmapInfo =
{ {
BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 4 }, Difficulty = new BeatmapDifficulty { SliderTickRate = 4 },
Ruleset = new ManiaRuleset().RulesetInfo Ruleset = new ManiaRuleset().RulesetInfo
}, },
}; };

View File

@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.Beatmaps
public static int GetColumnCountForNonConvert(BeatmapInfo beatmapInfo) public static int GetColumnCountForNonConvert(BeatmapInfo beatmapInfo)
{ {
double roundedCircleSize = Math.Round(beatmapInfo.BaseDifficulty.CircleSize); double roundedCircleSize = Math.Round(beatmapInfo.Difficulty.CircleSize);
return (int)Math.Max(1, roundedCircleSize); return (int)Math.Max(1, roundedCircleSize);
} }

View File

@ -107,7 +107,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
var beatmap = new Beatmap<HitObject> var beatmap = new Beatmap<HitObject>
{ {
HitObjects = hitObjects, HitObjects = hitObjects,
BeatmapInfo = new BeatmapInfo { BaseDifficulty = new BeatmapDifficulty(beatmapDifficulty) } BeatmapInfo = new BeatmapInfo { Difficulty = new BeatmapDifficulty(beatmapDifficulty) }
}; };
return new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap)); return new BeatmapVerifierContext(beatmap, new TestWorkingBeatmap(beatmap));

View File

@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
{ {
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty Difficulty = new BeatmapDifficulty
{ {
CircleSize = 8 CircleSize = 8
} }

View File

@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Tests
{ {
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty { CircleSize = 6 }, Difficulty = new BeatmapDifficulty { CircleSize = 6 },
Ruleset = ruleset Ruleset = ruleset
} }
}; };

View File

@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Tests
{ {
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty { OverallDifficulty = 10 }, Difficulty = new BeatmapDifficulty { OverallDifficulty = 10 },
Ruleset = ruleset Ruleset = ruleset
} }
}; };

View File

@ -358,7 +358,7 @@ namespace osu.Game.Rulesets.Osu.Tests
}, },
BeatmapInfo = BeatmapInfo =
{ {
BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 3 }, Difficulty = new BeatmapDifficulty { SliderTickRate = 3 },
Ruleset = new OsuRuleset().RulesetInfo Ruleset = new OsuRuleset().RulesetInfo
}, },
}); });

View File

@ -364,7 +364,7 @@ namespace osu.Game.Rulesets.Osu.Tests
HitObjects = hitObjects, HitObjects = hitObjects,
BeatmapInfo = BeatmapInfo =
{ {
BaseDifficulty = new BeatmapDifficulty { SliderTickRate = 3 }, Difficulty = new BeatmapDifficulty { SliderTickRate = 3 },
Ruleset = new OsuRuleset().RulesetInfo Ruleset = new OsuRuleset().RulesetInfo
}, },
}); });

View File

@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
HitObjects = new List<HitObject> { new Hit { Type = HitType.Centre } }, HitObjects = new List<HitObject> { new Hit { Type = HitType.Centre } },
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty(), Difficulty = new BeatmapDifficulty(),
Metadata = new BeatmapMetadata Metadata = new BeatmapMetadata
{ {
Artist = @"Unknown", Artist = @"Unknown",

View File

@ -158,7 +158,7 @@ namespace osu.Game.Rulesets.Taiko.Tests.Skinning
HitObjects = new List<HitObject> { new Hit { Type = HitType.Centre } }, HitObjects = new List<HitObject> { new Hit { Type = HitType.Centre } },
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty(), Difficulty = new BeatmapDifficulty(),
Metadata = new BeatmapMetadata Metadata = new BeatmapMetadata
{ {
Artist = "Unknown", Artist = "Unknown",

View File

@ -128,7 +128,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
{ {
MD5Hash = md5Hash, MD5Hash = md5Hash,
Ruleset = new OsuRuleset().RulesetInfo, Ruleset = new OsuRuleset().RulesetInfo,
BaseDifficulty = new BeatmapDifficulty() Difficulty = new BeatmapDifficulty()
} }
}); });
} }

View File

@ -18,7 +18,7 @@ namespace osu.Game.Tests.NonVisual.Filtering
{ {
Ruleset = new RulesetInfo { OnlineID = 0 }, Ruleset = new RulesetInfo { OnlineID = 0 },
StarRating = 4.0d, StarRating = 4.0d,
BaseDifficulty = new BeatmapDifficulty Difficulty = new BeatmapDifficulty
{ {
ApproachRate = 5.0f, ApproachRate = 5.0f,
DrainRate = 3.0f, DrainRate = 3.0f,

View File

@ -133,7 +133,7 @@ namespace osu.Game.Tests.Resources
Hash = Guid.NewGuid().ToString().ComputeMD5Hash(), Hash = Guid.NewGuid().ToString().ComputeMD5Hash(),
Ruleset = rulesetInfo, Ruleset = rulesetInfo,
Metadata = metadata, Metadata = metadata,
BaseDifficulty = new BeatmapDifficulty Difficulty = new BeatmapDifficulty
{ {
OverallDifficulty = diff, OverallDifficulty = diff,
} }

View File

@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual.Gameplay
{ {
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty { CircleSize = 6, SliderMultiplier = 3 }, Difficulty = new BeatmapDifficulty { CircleSize = 6, SliderMultiplier = 3 },
Ruleset = ruleset Ruleset = ruleset
} }
}; };

View File

@ -76,7 +76,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
Length = length, Length = length,
BPM = bpm, BPM = bpm,
Metadata = metadata, Metadata = metadata,
BaseDifficulty = new BeatmapDifficulty() Difficulty = new BeatmapDifficulty()
}; };
beatmaps.Add(beatmap); beatmaps.Add(beatmap);

View File

@ -114,14 +114,14 @@ namespace osu.Game.Tests.Visual.Navigation
{ {
OnlineID = i * 1024, OnlineID = i * 1024,
Metadata = metadata, Metadata = metadata,
BaseDifficulty = new BeatmapDifficulty(), Difficulty = new BeatmapDifficulty(),
Ruleset = ruleset ?? new OsuRuleset().RulesetInfo Ruleset = ruleset ?? new OsuRuleset().RulesetInfo
}, },
new BeatmapInfo new BeatmapInfo
{ {
OnlineID = i * 2048, OnlineID = i * 2048,
Metadata = metadata, Metadata = metadata,
BaseDifficulty = new BeatmapDifficulty(), Difficulty = new BeatmapDifficulty(),
Ruleset = ruleset ?? new OsuRuleset().RulesetInfo Ruleset = ruleset ?? new OsuRuleset().RulesetInfo
}, },
} }

View File

@ -44,7 +44,7 @@ namespace osu.Game.Tests.Visual.Navigation
Author = { Username = "SomeAuthor" }, Author = { Username = "SomeAuthor" },
Title = "import" Title = "import"
}, },
BaseDifficulty = new BeatmapDifficulty(), Difficulty = new BeatmapDifficulty(),
Ruleset = new OsuRuleset().RulesetInfo Ruleset = new OsuRuleset().RulesetInfo
}, },
new BeatmapInfo new BeatmapInfo
@ -56,7 +56,7 @@ namespace osu.Game.Tests.Visual.Navigation
Author = { Username = "SomeAuthor" }, Author = { Username = "SomeAuthor" },
Title = "import" Title = "import"
}, },
BaseDifficulty = new BeatmapDifficulty(), Difficulty = new BeatmapDifficulty(),
Ruleset = new OsuRuleset().RulesetInfo Ruleset = new OsuRuleset().RulesetInfo
}, },
} }

View File

@ -38,7 +38,7 @@ namespace osu.Game.Tests.Visual.SongSelect
private BeatmapInfo exampleBeatmapInfo => new BeatmapInfo private BeatmapInfo exampleBeatmapInfo => new BeatmapInfo
{ {
Ruleset = rulesets.AvailableRulesets.First(), Ruleset = rulesets.AvailableRulesets.First(),
BaseDifficulty = new BeatmapDifficulty Difficulty = new BeatmapDifficulty
{ {
CircleSize = 7.2f, CircleSize = 7.2f,
DrainRate = 3, DrainRate = 3,
@ -68,7 +68,7 @@ namespace osu.Game.Tests.Visual.SongSelect
AddStep("set beatmap", () => advancedStats.BeatmapInfo = new BeatmapInfo AddStep("set beatmap", () => advancedStats.BeatmapInfo = new BeatmapInfo
{ {
Ruleset = rulesets.GetRuleset(3) ?? throw new InvalidOperationException(), Ruleset = rulesets.GetRuleset(3) ?? throw new InvalidOperationException(),
BaseDifficulty = new BeatmapDifficulty Difficulty = new BeatmapDifficulty
{ {
CircleSize = 5, CircleSize = 5,
DrainRate = 4.3f, DrainRate = 4.3f,

View File

@ -216,7 +216,7 @@ namespace osu.Game.Tests.Visual.SongSelect
Ruleset = ruleset, Ruleset = ruleset,
StarRating = 6, StarRating = 6,
DifficultyName = $"{ruleset.ShortName}Version", DifficultyName = $"{ruleset.ShortName}Version",
BaseDifficulty = new BeatmapDifficulty() Difficulty = new BeatmapDifficulty()
}, },
HitObjects = objects HitObjects = objects
}; };

View File

@ -267,7 +267,7 @@ namespace osu.Game.Tests.Visual.UserInterface
{ {
BeatmapInfo = new BeatmapInfo BeatmapInfo = new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty Difficulty = new BeatmapDifficulty
{ {
OverallDifficulty = value, OverallDifficulty = value,
CircleSize = value, CircleSize = value,

View File

@ -28,7 +28,7 @@ namespace osu.Game.Beatmaps
difficulty = value; difficulty = value;
if (beatmapInfo != null) if (beatmapInfo != null)
beatmapInfo.BaseDifficulty = difficulty.Clone(); beatmapInfo.Difficulty = difficulty.Clone();
} }
} }
@ -41,8 +41,8 @@ namespace osu.Game.Beatmaps
{ {
beatmapInfo = value; beatmapInfo = value;
if (beatmapInfo?.BaseDifficulty != null) if (beatmapInfo?.Difficulty != null)
Difficulty = beatmapInfo.BaseDifficulty.Clone(); Difficulty = beatmapInfo.Difficulty.Clone();
} }
} }
@ -57,7 +57,7 @@ namespace osu.Game.Beatmaps
Author = { Username = @"Unknown Creator" }, Author = { Username = @"Unknown Creator" },
}, },
DifficultyName = @"Normal", DifficultyName = @"Normal",
BaseDifficulty = Difficulty, Difficulty = Difficulty,
}; };
} }

View File

@ -167,6 +167,7 @@ namespace osu.Game.Beatmaps
} }
[Ignored] [Ignored]
[Obsolete("Use BeatmapInfo.Difficulty instead.")] // can be removed 20220719
public BeatmapDifficulty BaseDifficulty public BeatmapDifficulty BaseDifficulty
{ {
get => Difficulty; get => Difficulty;

View File

@ -93,7 +93,7 @@ namespace osu.Game.Beatmaps
{ {
new BeatmapInfo new BeatmapInfo
{ {
BaseDifficulty = new BeatmapDifficulty(), Difficulty = new BeatmapDifficulty(),
Ruleset = ruleset, Ruleset = ruleset,
Metadata = metadata, Metadata = metadata,
WidescreenStoryboard = true, WidescreenStoryboard = true,

View File

@ -58,7 +58,7 @@ namespace osu.Game.Beatmaps
// Warning: The directionality here is important. Changes have to be copied *from* beatmapContent (which comes from editor and is being saved) // Warning: The directionality here is important. Changes have to be copied *from* beatmapContent (which comes from editor and is being saved)
// *to* the beatmapInfo (which is a database model and needs to receive values without the taiko slider velocity multiplier for correct operation). // *to* the beatmapInfo (which is a database model and needs to receive values without the taiko slider velocity multiplier for correct operation).
// CopyTo() will undo such adjustments, while CopyFrom() will not. // CopyTo() will undo such adjustments, while CopyFrom() will not.
beatmapContent.Difficulty.CopyTo(beatmapInfo.BaseDifficulty); beatmapContent.Difficulty.CopyTo(beatmapInfo.Difficulty);
// All changes to metadata are made in the provided beatmapInfo, so this should be copied to the `IBeatmap` before encoding. // All changes to metadata are made in the provided beatmapInfo, so this should be copied to the `IBeatmap` before encoding.
beatmapContent.BeatmapInfo = beatmapInfo; beatmapContent.BeatmapInfo = beatmapInfo;

View File

@ -32,7 +32,7 @@ namespace osu.Game.Beatmaps
Title = "no beatmaps available!" Title = "no beatmaps available!"
}, },
BeatmapSet = new BeatmapSetInfo(), BeatmapSet = new BeatmapSetInfo(),
BaseDifficulty = new BeatmapDifficulty Difficulty = new BeatmapDifficulty
{ {
DrainRate = 0, DrainRate = 0,
CircleSize = 0, CircleSize = 0,

View File

@ -74,7 +74,7 @@ namespace osu.Game.Rulesets.Mods
return; return;
} }
var difficulty = beatmap.Value.BeatmapInfo.BaseDifficulty; var difficulty = beatmap.Value.BeatmapInfo.Difficulty;
// generally should always be implemented, else the slider will have a zero default. // generally should always be implemented, else the slider will have a zero default.
if (difficultyBindable.ReadCurrentFromDifficulty == null) if (difficultyBindable.ReadCurrentFromDifficulty == null)

View File

@ -39,10 +39,10 @@ namespace osu.Game.Screens.Select.Carousel
} }
match &= !criteria.StarDifficulty.HasFilter || criteria.StarDifficulty.IsInRange(BeatmapInfo.StarRating); match &= !criteria.StarDifficulty.HasFilter || criteria.StarDifficulty.IsInRange(BeatmapInfo.StarRating);
match &= !criteria.ApproachRate.HasFilter || criteria.ApproachRate.IsInRange(BeatmapInfo.BaseDifficulty.ApproachRate); match &= !criteria.ApproachRate.HasFilter || criteria.ApproachRate.IsInRange(BeatmapInfo.Difficulty.ApproachRate);
match &= !criteria.DrainRate.HasFilter || criteria.DrainRate.IsInRange(BeatmapInfo.BaseDifficulty.DrainRate); match &= !criteria.DrainRate.HasFilter || criteria.DrainRate.IsInRange(BeatmapInfo.Difficulty.DrainRate);
match &= !criteria.CircleSize.HasFilter || criteria.CircleSize.IsInRange(BeatmapInfo.BaseDifficulty.CircleSize); match &= !criteria.CircleSize.HasFilter || criteria.CircleSize.IsInRange(BeatmapInfo.Difficulty.CircleSize);
match &= !criteria.OverallDifficulty.HasFilter || criteria.OverallDifficulty.IsInRange(BeatmapInfo.BaseDifficulty.OverallDifficulty); match &= !criteria.OverallDifficulty.HasFilter || criteria.OverallDifficulty.IsInRange(BeatmapInfo.Difficulty.OverallDifficulty);
match &= !criteria.Length.HasFilter || criteria.Length.IsInRange(BeatmapInfo.Length); match &= !criteria.Length.HasFilter || criteria.Length.IsInRange(BeatmapInfo.Length);
match &= !criteria.BPM.HasFilter || criteria.BPM.IsInRange(BeatmapInfo.BPM); match &= !criteria.BPM.HasFilter || criteria.BPM.IsInRange(BeatmapInfo.BPM);

View File

@ -218,7 +218,7 @@ namespace osu.Game.Stores
} }
var decodedInfo = decoded.BeatmapInfo; var decodedInfo = decoded.BeatmapInfo;
var decodedDifficulty = decodedInfo.BaseDifficulty; var decodedDifficulty = decodedInfo.Difficulty;
var ruleset = realm.All<RulesetInfo>().FirstOrDefault(r => r.OnlineID == decodedInfo.RulesetID); var ruleset = realm.All<RulesetInfo>().FirstOrDefault(r => r.OnlineID == decodedInfo.RulesetID);