From 482be9f451b4a970981eb1ce7386f45d2444a0e7 Mon Sep 17 00:00:00 2001 From: DrabWeb Date: Thu, 2 Mar 2017 02:04:26 -0400 Subject: [PATCH] Remove AvailableMods --- osu.Game.Modes.Catch/CatchRuleset.cs | 16 ---------------- osu.Game.Modes.Mania/ManiaRuleset.cs | 27 --------------------------- osu.Game.Modes.Osu/OsuRuleset.cs | 19 ------------------- osu.Game.Modes.Taiko/TaikoRuleset.cs | 16 ---------------- osu.Game/Modes/Ruleset.cs | 2 -- 5 files changed, 80 deletions(-) diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs index 16bf0e6b42..88cd143abf 100644 --- a/osu.Game.Modes.Catch/CatchRuleset.cs +++ b/osu.Game.Modes.Catch/CatchRuleset.cs @@ -8,8 +8,6 @@ using osu.Game.Modes.Objects; using osu.Game.Modes.Osu.UI; using osu.Game.Modes.UI; using osu.Game.Beatmaps; -using osu.Game.Overlays.Mods; -using OpenTK.Input; namespace osu.Game.Modes.Catch { @@ -19,20 +17,6 @@ namespace osu.Game.Modes.Catch public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new CatchHitRenderer { Beatmap = beatmap }; - public override IEnumerable AvailableMods => new Mod[] - { - new CatchModNoFail(), - new CatchModEasy(), - new CatchModHidden(), - new CatchModHardRock(), - new CatchModSuddenDeath(), - new CatchModDoubleTime(), - new CatchModRelax(), - new CatchModHalfTime(), - new CatchModNightcore(), - new CatchModFlashlight(), - }; - public override IEnumerable GetModsFor(ModType type) { switch (type) diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs index 24850e7c25..d896b7f401 100644 --- a/osu.Game.Modes.Mania/ManiaRuleset.cs +++ b/osu.Game.Modes.Mania/ManiaRuleset.cs @@ -8,8 +8,6 @@ using osu.Game.Modes.Objects; using osu.Game.Modes.Osu.UI; using osu.Game.Modes.UI; using osu.Game.Beatmaps; -using osu.Game.Overlays.Mods; -using OpenTK.Input; namespace osu.Game.Modes.Mania { @@ -19,31 +17,6 @@ namespace osu.Game.Modes.Mania public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new ManiaHitRenderer { Beatmap = beatmap }; - public override IEnumerable AvailableMods => new Mod[] - { - new ManiaModNoFail(), - new ManiaModEasy(), - new ManiaModHidden(), - new ManiaModHardRock(), - new ManiaModSuddenDeath(), - new ManiaModDoubleTime(), - new ManiaModHalfTime(), - new ManiaModNightcore(), - new ManiaModFlashlight(), - new ManiaModFadeIn(), - new ManiaModRandom(), - new ManiaModKey1(), - new ManiaModKey2(), - new ManiaModKey3(), - new ManiaModKey4(), - new ManiaModKey5(), - new ManiaModKey6(), - new ManiaModKey7(), - new ManiaModKey8(), - new ManiaModKey9(), - new ManiaModKeyCoop(), - }; - public override IEnumerable GetModsFor(ModType type) { switch (type) diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs index f596fb063d..21554154c1 100644 --- a/osu.Game.Modes.Osu/OsuRuleset.cs +++ b/osu.Game.Modes.Osu/OsuRuleset.cs @@ -3,14 +3,12 @@ using System.Collections.Generic; using System.Linq; -using OpenTK.Input; using osu.Game.Beatmaps; using osu.Game.Graphics; using osu.Game.Modes.Objects; using osu.Game.Modes.Osu.Objects; using osu.Game.Modes.Osu.UI; using osu.Game.Modes.UI; -using osu.Game.Overlays.Mods; namespace osu.Game.Modes.Osu { @@ -36,23 +34,6 @@ namespace osu.Game.Modes.Osu } }; - public override IEnumerable AvailableMods => new Mod[] - { - new OsuModNoFail(), - new OsuModEasy(), - new OsuModHidden(), - new OsuModHardRock(), - new OsuModSuddenDeath(), - new OsuModDoubleTime(), - new OsuModRelax(), - new OsuModHalfTime(), - new OsuModNightcore(), - new OsuModFlashlight(), - new OsuModSpunOut(), - new OsuModAutopilot(), - new OsuModTarget(), - }; - public override IEnumerable GetModsFor(ModType type) { switch (type) diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs index 90a21f96bc..113c272004 100644 --- a/osu.Game.Modes.Taiko/TaikoRuleset.cs +++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs @@ -8,8 +8,6 @@ using osu.Game.Modes.Osu.UI; using osu.Game.Modes.Taiko.UI; using osu.Game.Modes.UI; using osu.Game.Beatmaps; -using osu.Game.Overlays.Mods; -using OpenTK.Input; namespace osu.Game.Modes.Taiko { @@ -19,20 +17,6 @@ namespace osu.Game.Modes.Taiko public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new TaikoHitRenderer { Beatmap = beatmap }; - public override IEnumerable AvailableMods => new Mod[] - { - new TaikoModNoFail(), - new TaikoModEasy(), - new TaikoModHidden(), - new TaikoModHardRock(), - new TaikoModSuddenDeath(), - new TaikoModDoubleTime(), - new TaikoModRelax(), - new TaikoModHalfTime(), - new TaikoModNightcore(), - new TaikoModFlashlight(), - }; - public override IEnumerable GetModsFor(ModType type) { switch (type) diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs index 212449af63..11281a18d0 100644 --- a/osu.Game/Modes/Ruleset.cs +++ b/osu.Game/Modes/Ruleset.cs @@ -27,8 +27,6 @@ namespace osu.Game.Modes public virtual IEnumerable GetBeatmapStatistics(WorkingBeatmap beatmap) => new BeatmapStatistic[] { }; - public abstract IEnumerable AvailableMods { get; } - public abstract IEnumerable GetModsFor(ModType type); public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount);