Merge remote-tracking branch 'origin/master' into timingchange-rework

# Conflicts:
#	osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs
This commit is contained in:
smoogipooo
2017-06-05 10:19:53 +09:00
23 changed files with 208 additions and 292 deletions

View File

@ -27,7 +27,14 @@ namespace osu.Game.Rulesets.Mania
{
new ManiaModEasy(),
new ManiaModNoFail(),
new ManiaModHalfTime(),
new MultiMod
{
Mods = new Mod[]
{
new ManiaModHalfTime(),
new ManiaModDaycore(),
},
},
};
case ModType.DifficultyIncrease:

View File

@ -34,6 +34,11 @@ namespace osu.Game.Rulesets.Mania.Mods
}
public class ManiaModDaycore : ModDaycore
{
public override double ScoreMultiplier => 0.3;
}
public class ManiaModDoubleTime : ModDoubleTime
{
public override double ScoreMultiplier => 1.0;