RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

General fixes.

This commit is contained in:
smoogipooo 2017-03-13 21:05:09 +09:00
parent 7d129ebd6d
commit 842f938439
6 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj
View File

@ -76,10 +76,6 @@
<Project>{C92A607B-1FDD-4954-9F92-03FF547D9080}</Project>
<Name>osu.Game.Modes.Osu</Name>
</ProjectReference>
<ProjectReference Include="..\osu.Game.Modes.Taiko\osu.Game.Modes.Taiko.csproj">
<Project>{F167E17A-7DE6-4AF5-B920-A5112296C695}</Project>
<Name>osu.Game.Modes.Taiko</Name>
</ProjectReference>
<ProjectReference Include="..\osu.Game\osu.Game.csproj">
<Project>{0D3FBF8A-7464-4CF7-8C90-3E7886DF2D4D}</Project>
<Name>osu.Game</Name>

1
osu.Game.Modes.Mania/Beatmaps/ManiaBeatmapConverter.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Beatmaps;
using osu.Game.Modes.Mania.Objects;
using System.Collections.Generic;

18
osu.Game.Modes.Osu/Mods/OsuMod.cs
View File

@ -1,10 +1,10 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Modes.Mods;
using osu.Game.Modes.Osu.Objects;
using osu.Game.Modes.UI;
using System;
using System.Linq;
@ -88,22 +88,14 @@ public class OsuModAutopilot : Mod
public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) };
}
public class OsuModAutoplay : ModAutoplay, IApplyableMod<OsuHitObject>
public class OsuModAutoplay : ModAutoplay<OsuHitObject>
{
public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray();
public void Apply(HitRenderer<OsuHitObject> hitRenderer)
protected override Score CreateReplayScore(Beatmap<OsuHitObject> beatmap) => new Score
{
Attach(hitRenderer, new Score
{
Replay = new OsuAutoReplay(hitRenderer.Beatmap)
});
}
public void Revert(HitRenderer<OsuHitObject> hitRenderer)
{
Detach(hitRenderer);
}
Replay = new OsuAutoReplay(beatmap)
};
}
public class OsuModTarget : Mod

6
osu.Game/Modes/Mods/IApplyableMod.cs
View File

@ -19,11 +19,5 @@ public interface IApplyableMod<TObject>
/// </summary>
/// <param name="hitRenderer">The HitRenderer to apply the mod to.</param>
void Apply(HitRenderer<TObject> hitRenderer);
/// <summary>
/// Reverts any changes applied to a HitRenderer through <see cref="Apply(HitRenderer{TObject})"/>.
/// </summary>
/// <param name="hitRenderer">The HitRenderer to revert from.</param>
void Revert(HitRenderer<TObject> hitRenderer);
}
}

24
osu.Game/Modes/Mods/Mod.cs
View File

@ -1,7 +1,9 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Modes.Objects;
using osu.Game.Modes.UI;
using System;
@ -145,24 +147,16 @@ public class ModAutoplay : Mod
public override string Description => "Watch a perfect automated play through the song";
public override double ScoreMultiplier => 0;
public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) };
}
/// <summary>
/// Attaches a replay score to a HitRenderer.
/// </summary>
/// <param name="hitRenderer">The HitRenderer to attach the score to.</param>
/// <param name="score">The score to attach.</param>
protected void Attach(HitRenderer hitRenderer, Score score)
{
hitRenderer.InputManager.ReplayInputHandler = score?.Replay?.GetInputHandler();
}
public abstract class ModAutoplay<T> : ModAutoplay, IApplyableMod<T>
where T : HitObject
{
protected abstract Score CreateReplayScore(Beatmap<T> beatmap);
/// <summary>
/// Detaches the active replay score from a HitRenderer.
/// </summary>
/// <param name="hitRenderer">The HitRenderer to detach the score from.</param>
protected void Detach(HitRenderer hitRenderer)
public void Apply(HitRenderer<T> hitRenderer)
{
hitRenderer.InputManager.ReplayInputHandler = null;
hitRenderer.InputManager.ReplayInputHandler = CreateReplayScore(hitRenderer.Beatmap)?.Replay?.GetInputHandler();
}
}

1
osu.Game/Modes/Mods/ModType.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
namespace osu.Game.Modes.Mods
{
public enum ModType