From b3b813c0ae3ce33c541c647fbef90abaf59eba0d Mon Sep 17 00:00:00 2001 From: Huo Yaoyuan Date: Tue, 7 Mar 2017 20:05:50 +0800 Subject: [PATCH] Follow current mod layout. --- osu.Game.Modes.Catch/CatchRuleset.cs | 2 ++ osu.Game.Modes.Mania/ManiaRuleset.cs | 11 +++++++++-- osu.Game.Modes.Osu/OsuRuleset.cs | 2 +- osu.Game.Modes.Taiko/TaikoRuleset.cs | 2 ++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs index 16c9114c66..4c4137f7b0 100644 --- a/osu.Game.Modes.Catch/CatchRuleset.cs +++ b/osu.Game.Modes.Catch/CatchRuleset.cs @@ -62,6 +62,8 @@ public override IEnumerable GetModsFor(ModType type) return new Mod[] { new CatchModRelax(), + null, + null, new MultiMod { Mods = new Mod[] diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs index d4b5ecad22..667d7b2c54 100644 --- a/osu.Game.Modes.Mania/ManiaRuleset.cs +++ b/osu.Game.Modes.Mania/ManiaRuleset.cs @@ -54,7 +54,14 @@ public override IEnumerable GetModsFor(ModType type) new ManiaModNightcore(), }, }, - new ManiaModHidden(), + new MultiMod + { + Mods = new Mod[] + { + new ManiaModFadeIn(), + new ManiaModHidden(), + } + }, new ManiaModFlashlight(), }; @@ -76,8 +83,8 @@ public override IEnumerable GetModsFor(ModType type) new ManiaModKey3(), }, }, - new ManiaModKeyCoop(), new ManiaModRandom(), + new ManiaModKeyCoop(), new MultiMod { Mods = new Mod[] diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs index b58dc70b16..b85e2fc294 100644 --- a/osu.Game.Modes.Osu/OsuRuleset.cs +++ b/osu.Game.Modes.Osu/OsuRuleset.cs @@ -80,7 +80,6 @@ public override IEnumerable GetModsFor(ModType type) { new OsuModRelax(), new OsuModAutopilot(), - new OsuModTarget(), new OsuModSpunOut(), new MultiMod { @@ -90,6 +89,7 @@ public override IEnumerable GetModsFor(ModType type) new ModCinema(), }, }, + new OsuModTarget(), }; default: diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs index 73e65a2734..dcd61a3df2 100644 --- a/osu.Game.Modes.Taiko/TaikoRuleset.cs +++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs @@ -62,6 +62,8 @@ public override IEnumerable GetModsFor(ModType type) return new Mod[] { new TaikoModRelax(), + null, + null, new MultiMod { Mods = new Mod[]