h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-18 13:20:32 +08:00
Code Issues Releases Wiki Activity

Adjust property name

Browse Source
This commit is contained in:
Dan Balasescu
2025-04-14 18:16:27 +09:00
Unverified
parent b4c7d7f498
commit 35ee4b6f24
18 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Rulesets.Mania/Mods/ManiaModCover.cs
+1 -1
View File
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Mania.Mods
public override bool Ranked => false;
// Ideally we'd allow this, but it's not easy to handle due to the change in acronym from the base class.
public override bool ValidForFreestyle => false;
public override bool ValidForFreestyleAsRequiredMod => false;
[SettingSource("Coverage", "The proportion of playfield height that notes will be hidden for.")]
public override BindableNumber<float> Coverage { get; } = new BindableFloat(0.5f)
osu.Game.Rulesets.Mania/Mods/ManiaModFadeIn.cs
+1 -1
View File
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Mania.Mods
public override double ScoreMultiplier => 1;
// Ideally we'd allow this, but it's not easy to handle due to the change in acronym from the base class.
public override bool ValidForFreestyle => false;
public override bool ValidForFreestyleAsRequiredMod => false;
public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[]
{
osu.Game.Tests/Mods/ModUtilsTest.cs
+5 -5
View File
@@ -464,10 +464,10 @@ namespace osu.Game.Tests.Mods
{
foreach (var mod in ruleset.CreateAllMods())
{
if (mod.ValidForFreestyle && mod.UserPlayable && !commonAcronyms.Contains(mod.Acronym))
Assert.Fail($"{mod.GetType().ReadableName()} declares {nameof(Mod.ValidForFreestyle)} but does not exist in all four basic rulesets!");
if (!mod.ValidForFreestyle && mod.UserPlayable && commonAcronyms.Contains(mod.Acronym))
Assert.Fail($"{mod.GetType().ReadableName()} does not declare {nameof(Mod.ValidForFreestyle)} but exists in all four basic rulesets!");
if (mod.ValidForFreestyleAsRequiredMod && mod.UserPlayable && !commonAcronyms.Contains(mod.Acronym))
Assert.Fail($"{mod.GetType().ReadableName()} declares {nameof(Mod.ValidForFreestyleAsRequiredMod)} but does not exist in all four basic rulesets!");
if (!mod.ValidForFreestyleAsRequiredMod && mod.UserPlayable && commonAcronyms.Contains(mod.Acronym))
Assert.Fail($"{mod.GetType().ReadableName()} does not declare {nameof(Mod.ValidForFreestyleAsRequiredMod)} but exists in all four basic rulesets!");
}
}
});
@@ -509,7 +509,7 @@ namespace osu.Game.Tests.Mods
public override double ScoreMultiplier => 1;
public override string Acronym => string.Empty;
public override bool HasImplementation => true;
public override bool ValidForFreestyle => false;
public override bool ValidForFreestyleAsRequiredMod => false;
}
public interface IModCompatibilitySpecification
osu.Game/Rulesets/Mods/Mod.cs
+1 -1
View File
@@ -131,7 +131,7 @@ namespace osu.Game.Rulesets.Mods
/// </item>
/// </list>
/// </example>
public virtual bool ValidForFreestyle => false;
public virtual bool ValidForFreestyleAsRequiredMod => false;
/// <summary>
/// Whether this mod can be specified as a "free" or "allowed" mod in a multiplayer context.
osu.Game/Rulesets/Mods/ModAccuracyChallenge.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Mods
public override bool Ranked => true;
public override bool ValidForFreestyle => true;
public override bool ValidForFreestyleAsRequiredMod => true;
public override IEnumerable<(LocalisableString setting, LocalisableString value)> SettingDescription
{
osu.Game/Rulesets/Mods/ModClassic.cs
+1 -1
View File
@@ -31,6 +31,6 @@ namespace osu.Game.Rulesets.Mods
/// </summary>
public sealed override bool Ranked => false;
public sealed override bool ValidForFreestyle => true;
public sealed override bool ValidForFreestyleAsRequiredMod => true;
}
}
osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+1 -1
View File
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mods
public override bool RequiresConfiguration => true;
public override bool ValidForFreestyle => true;
public override bool ValidForFreestyleAsRequiredMod => true;
public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModHardRock) };
osu.Game/Rulesets/Mods/ModEasy.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Mods
public override double ScoreMultiplier => 0.5;
public override Type[] IncompatibleMods => new[] { typeof(ModHardRock), typeof(ModDifficultyAdjust) };
public override bool Ranked => UsesDefaultConfiguration;
public override bool ValidForFreestyle => true;
public override bool ValidForFreestyleAsRequiredMod => true;
public virtual void ReadFromDifficulty(BeatmapDifficulty difficulty)
{
osu.Game/Rulesets/Mods/ModFlashlight.cs
+1 -1
View File
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mods
public override ModType Type => ModType.DifficultyIncrease;
public override LocalisableString Description => "Restricted view area.";
public override bool Ranked => UsesDefaultConfiguration;
public override bool ValidForFreestyle => true;
public override bool ValidForFreestyleAsRequiredMod => true;
[SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
public abstract BindableFloat SizeMultiplier { get; }
osu.Game/Rulesets/Mods/ModHardRock.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace osu.Game.Rulesets.Mods
public override LocalisableString Description => "Everything just got a bit harder...";
public override Type[] IncompatibleMods => new[] { typeof(ModEasy), typeof(ModDifficultyAdjust) };
public override bool Ranked => UsesDefaultConfiguration;
public override bool ValidForFreestyle => true;
public override bool ValidForFreestyleAsRequiredMod => true;
protected const float ADJUST_RATIO = 1.4f;
osu.Game/Rulesets/Mods/ModHidden.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace osu.Game.Rulesets.Mods
public override IconUsage? Icon => OsuIcon.ModHidden;
public override ModType Type => ModType.DifficultyIncrease;
public override bool Ranked => UsesDefaultConfiguration;
public override bool ValidForFreestyle => true;
public override bool ValidForFreestyleAsRequiredMod => true;
public virtual void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
{
osu.Game/Rulesets/Mods/ModMuted.cs
+1 -1
View File
@@ -26,7 +26,7 @@ namespace osu.Game.Rulesets.Mods
public override ModType Type => ModType.Fun;
public override double ScoreMultiplier => 1;
public override bool Ranked => true;
public override bool ValidForFreestyle => true;
public override bool ValidForFreestyleAsRequiredMod => true;
}
public abstract class ModMuted<TObject> : ModMuted, IApplicableToDrawableRuleset<TObject>, IApplicableToTrack, IApplicableToScoreProcessor
osu.Game/Rulesets/Mods/ModNoFail.cs
+1 -1
View File
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Mods
public override double ScoreMultiplier => 0.5;
public override Type[] IncompatibleMods => new[] { typeof(ModFailCondition), typeof(ModCinema) };
public override bool Ranked => UsesDefaultConfiguration;
public override bool ValidForFreestyle => true;
public override bool ValidForFreestyleAsRequiredMod => true;
private readonly Bindable<bool> showHealthBar = new Bindable<bool>();
osu.Game/Rulesets/Mods/ModPerfect.cs
+1 -1
View File
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mods
public override double ScoreMultiplier => 1;
public override LocalisableString Description => "SS or quit.";
public override bool Ranked => true;
public override bool ValidForFreestyle => true;
public override bool ValidForFreestyleAsRequiredMod => true;
public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(ModSuddenDeath), typeof(ModAccuracyChallenge) }).ToArray();
osu.Game/Rulesets/Mods/ModRateAdjust.cs
+1 -1
View File
@@ -11,7 +11,7 @@ namespace osu.Game.Rulesets.Mods
{
public abstract class ModRateAdjust : Mod, IApplicableToRate
{
public sealed override bool ValidForFreestyle => true;
public sealed override bool ValidForFreestyleAsRequiredMod => true;
public sealed override bool ValidForMultiplayerAsFreeMod => false;
public abstract BindableNumber<double> SpeedChange { get; }
osu.Game/Rulesets/Mods/ModSuddenDeath.cs
+1 -1
View File
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mods
public override LocalisableString Description => "Miss and fail.";
public override double ScoreMultiplier => 1;
public override bool Ranked => true;
public override bool ValidForFreestyle => true;
public override bool ValidForFreestyleAsRequiredMod => true;
public override Type[] IncompatibleMods => base.IncompatibleMods.Append(typeof(ModPerfect)).ToArray();
osu.Game/Rulesets/Mods/ModTimeRamp.cs
+1 -1
View File
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Mods
[SettingSource("Adjust pitch", "Should pitch be adjusted with speed")]
public abstract BindableBool AdjustPitch { get; }
public sealed override bool ValidForFreestyle => true;
public sealed override bool ValidForFreestyleAsRequiredMod => true;
public sealed override bool ValidForMultiplayerAsFreeMod => false;
public override Type[] IncompatibleMods => new[] { typeof(ModRateAdjust), typeof(ModAdaptiveSpeed) };
osu.Game/Utils/ModUtils.cs
+2 -2
View File
@@ -146,7 +146,7 @@ namespace osu.Game.Utils
if (!CheckCompatibleSet(mods, out invalidMods))
return false;
return checkValid(mods, m => m.Type != ModType.System && m.HasImplementation && m.ValidForMultiplayer && (!freestyle || m.ValidForFreestyle), out invalidMods);
return checkValid(mods, m => m.Type != ModType.System && m.HasImplementation && m.ValidForMultiplayer && (!freestyle || m.ValidForFreestyleAsRequiredMod), out invalidMods);
}
/// <summary>
@@ -308,7 +308,7 @@ namespace osu.Game.Utils
if (mod.Type == ModType.System || !mod.UserPlayable || !mod.HasImplementation)
return false;
if (isFreestyle && isRequired && !mod.ValidForFreestyle)
if (isFreestyle && isRequired && !mod.ValidForFreestyleAsRequiredMod)
return false;
switch (matchType)