Revert TestCaseCatcherArea

This commit is contained in:
ekrctb 2018-06-03 15:31:51 +09:00
parent 9f27dd848a
commit 25d3f0ead1
2 changed files with 7 additions and 3 deletions

View File

@ -16,6 +16,7 @@ namespace osu.Game.Rulesets.Catch.Tests
public class TestCaseCatcherArea : OsuTestCase
{
private RulesetInfo catchRuleset;
private TestCatcherArea catcherArea;
public override IReadOnlyList<Type> RequiredTypes => new[]
{
@ -25,6 +26,7 @@ public class TestCaseCatcherArea : OsuTestCase
public TestCaseCatcherArea()
{
AddSliderStep<float>("CircleSize", 0, 8, 5, createCatcher);
AddToggleStep("Hyperdash", t => catcherArea.ToggleHyperDash(t));
}
private void createCatcher(float size)
@ -32,10 +34,10 @@ private void createCatcher(float size)
Child = new CatchInputManager(catchRuleset)
{
RelativeSizeAxes = Axes.Both,
Child = new TestCatcherArea(new BeatmapDifficulty { CircleSize = size })
Child = catcherArea = new TestCatcherArea(new BeatmapDifficulty { CircleSize = size })
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.TopLeft
Origin = Anchor.BottomLeft
},
};
}
@ -52,6 +54,8 @@ public TestCatcherArea(BeatmapDifficulty beatmapDifficulty)
: base(beatmapDifficulty)
{
}
public void ToggleHyperDash(bool status) => MovableCatcher.HyperDashModifier = status ? 2 : 1;
}
}
}

View File

@ -277,7 +277,7 @@ public bool AttemptCatch(CatchHitObject fruit)
/// The modifier multiplied to the catcher speed.
/// It is always not less than 1 and it is greater than 1 if and only if the catcher is hyper-dashing.
/// </summary>
protected double HyperDashModifier
public double HyperDashModifier
{
get => hyperDashModifier;
set