mirror of
https://github.com/ppy/osu.git
synced 2024-11-14 14:27:25 +08:00
Don't convert TaikoModRandom to/from legacy mods
This commit is contained in:
parent
2f28a92f0a
commit
f84c181573
@ -25,7 +25,6 @@ namespace osu.Game.Rulesets.Taiko.Tests
|
|||||||
new object[] { LegacyMods.HalfTime, new[] { typeof(TaikoModHalfTime) } },
|
new object[] { LegacyMods.HalfTime, new[] { typeof(TaikoModHalfTime) } },
|
||||||
new object[] { LegacyMods.Flashlight, new[] { typeof(TaikoModFlashlight) } },
|
new object[] { LegacyMods.Flashlight, new[] { typeof(TaikoModFlashlight) } },
|
||||||
new object[] { LegacyMods.Autoplay, new[] { typeof(TaikoModAutoplay) } },
|
new object[] { LegacyMods.Autoplay, new[] { typeof(TaikoModAutoplay) } },
|
||||||
new object[] { LegacyMods.Random, new[] { typeof(TaikoModRandom) } },
|
|
||||||
new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(TaikoModHardRock), typeof(TaikoModDoubleTime) } },
|
new object[] { LegacyMods.HardRock | LegacyMods.DoubleTime, new[] { typeof(TaikoModHardRock), typeof(TaikoModDoubleTime) } },
|
||||||
new object[] { LegacyMods.ScoreV2, new[] { typeof(ModScoreV2) } },
|
new object[] { LegacyMods.ScoreV2, new[] { typeof(ModScoreV2) } },
|
||||||
};
|
};
|
||||||
|
@ -115,23 +115,10 @@ namespace osu.Game.Rulesets.Taiko
|
|||||||
if (mods.HasFlagFast(LegacyMods.Relax))
|
if (mods.HasFlagFast(LegacyMods.Relax))
|
||||||
yield return new TaikoModRelax();
|
yield return new TaikoModRelax();
|
||||||
|
|
||||||
if (mods.HasFlagFast(LegacyMods.Random))
|
|
||||||
yield return new TaikoModRandom();
|
|
||||||
|
|
||||||
if (mods.HasFlagFast(LegacyMods.ScoreV2))
|
if (mods.HasFlagFast(LegacyMods.ScoreV2))
|
||||||
yield return new ModScoreV2();
|
yield return new ModScoreV2();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override LegacyMods ConvertToLegacyMods(Mod[] mods)
|
|
||||||
{
|
|
||||||
var value = base.ConvertToLegacyMods(mods);
|
|
||||||
|
|
||||||
if (mods.OfType<TaikoModRandom>().Any())
|
|
||||||
value |= LegacyMods.Random;
|
|
||||||
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public override IEnumerable<Mod> GetModsFor(ModType type)
|
public override IEnumerable<Mod> GetModsFor(ModType type)
|
||||||
{
|
{
|
||||||
switch (type)
|
switch (type)
|
||||||
|
Loading…
Reference in New Issue
Block a user