h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-21 15:07:23 +08:00
Code Issues Releases Wiki Activity

Merge branch 'beatmap_conversion' into mod_application

Browse Source 
Conflicts:
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Taiko/TaikoRuleset.cs
This commit is contained in:
smoogipooo 2017-03-12 22:20:52 +09:00
commit 447cc17de8
5 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Modes.Catch/CatchRuleset.cs
View File

@ -4,7 +4,6 @@
using OpenTK.Input;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Modes.Catch.Beatmaps;
using osu.Game.Modes.Catch.Mods;
using osu.Game.Modes.Catch.UI;
using osu.Game.Modes.Mods;
@ -94,10 +93,5 @@ namespace osu.Game.Modes.Catch
public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new CatchDifficultyCalculator(beatmap);
public override IBeatmapConverter<CatchBaseHit> CreateBeatmapConverter<CatchBaseHit>()
{
return (IBeatmapConverter<CatchBaseHit>)new CatchBeatmapConverter();
}
}
}

6
osu.Game.Modes.Mania/ManiaRuleset.cs
View File

@ -3,7 +3,6 @@
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Modes.Mania.Beatmaps;
using osu.Game.Modes.Mania.Mods;
using osu.Game.Modes.Mania.UI;
using osu.Game.Modes.Mods;
@ -109,10 +108,5 @@ namespace osu.Game.Modes.Mania
public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new ManiaDifficultyCalculator(beatmap);
public override IBeatmapConverter<T> CreateBeatmapConverter<T>()
{
return (IBeatmapConverter<T>)new ManiaBeatmapConverter();
}
}
}

6
osu.Game.Modes.Osu/OsuRuleset.cs
View File

@ -6,7 +6,6 @@ using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Modes.Mods;
using osu.Game.Modes.Objects;
using osu.Game.Modes.Osu.Beatmaps;
using osu.Game.Modes.Osu.Mods;
using osu.Game.Modes.Osu.Objects;
using osu.Game.Modes.Osu.UI;
@ -114,10 +113,5 @@ namespace osu.Game.Modes.Osu
new KeyCounterMouse(MouseButton.Left),
new KeyCounterMouse(MouseButton.Right)
};
public override IBeatmapConverter<T> CreateBeatmapConverter<T>()
{
return (IBeatmapConverter<T>)new OsuBeatmapConverter();
}
}
}

6
osu.Game.Modes.Taiko/TaikoRuleset.cs
View File

@ -6,7 +6,6 @@ using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Modes.Mods;
using osu.Game.Modes.Objects;
using osu.Game.Modes.Taiko.Beatmaps;
using osu.Game.Modes.Taiko.Mods;
using osu.Game.Modes.Taiko.UI;
using osu.Game.Modes.UI;
@ -95,10 +94,5 @@ namespace osu.Game.Modes.Taiko
public override HitObjectParser CreateHitObjectParser() => new NullHitObjectParser();
public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new TaikoDifficultyCalculator(beatmap);
public override IBeatmapConverter<T> CreateBeatmapConverter<T>()
{
return (IBeatmapConverter<T>)new TaikoBeatmapConverter();
}
}
}

2
osu.Game/Modes/Ruleset.cs
View File

@ -38,8 +38,6 @@ namespace osu.Game.Modes
public abstract DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap);
public abstract IBeatmapConverter<T> CreateBeatmapConverter<T>() where T : HitObject;
public static void Register(Ruleset ruleset) => availableRulesets.TryAdd(ruleset.PlayMode, ruleset.GetType());
protected abstract PlayMode PlayMode { get; }