h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-21 18:42:56 +08:00
Code Issues Releases Wiki Activity

Add directionality

Browse Source
This commit is contained in:
Dean Herbert 2017-12-01 20:07:28 +09:00
parent 445bb70ef5
commit 25207c51b5
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Rulesets.Catch/UI/CatcherArea.cs
View File

@ -201,7 +201,10 @@ namespace osu.Game.Rulesets.Catch.UI
catchObjectPosition <= catcherPosition + relative_catcher_width / 2; catchObjectPosition <= catcherPosition + relative_catcher_width / 2;
if (validCatch && fruit.HyperDash) if (validCatch && fruit.HyperDash)
{
HyperDashModifier = Math.Abs(fruit.HyperDashTarget.X - fruit.X) / Math.Abs(fruit.HyperDashTarget.StartTime - fruit.StartTime) / BASE_SPEED; HyperDashModifier = Math.Abs(fruit.HyperDashTarget.X - fruit.X) / Math.Abs(fruit.HyperDashTarget.StartTime - fruit.StartTime) / BASE_SPEED;
HyperDashDirection = fruit.HyperDashTarget.X - fruit.X;
}
else else
HyperDashModifier = 1; HyperDashModifier = 1;
@ -215,6 +218,8 @@ namespace osu.Game.Rulesets.Catch.UI
private double hyperDashModifier = 1; private double hyperDashModifier = 1;
public double HyperDashDirection;
public double HyperDashModifier public double HyperDashModifier
{ {
get { return hyperDashModifier; } get { return hyperDashModifier; }
@ -233,6 +238,7 @@ namespace osu.Game.Rulesets.Catch.UI
} }
else else
{ {
HyperDashDirection = 0;
this.FadeColour(Color4.White, transition_length, Easing.OutQuint); this.FadeColour(Color4.White, transition_length, Easing.OutQuint);
this.FadeTo(1, transition_length, Easing.OutQuint); this.FadeTo(1, transition_length, Easing.OutQuint);
} }
@ -286,13 +292,15 @@ namespace osu.Game.Rulesets.Catch.UI
if (currentDirection == 0) return; if (currentDirection == 0) return;
var direction = Math.Sign(currentDirection);
double dashModifier = Dashing ? 1 : 0.5; double dashModifier = Dashing ? 1 : 0.5;
if (hyperDashModifier != 1) if (hyperDashModifier != 1 && (HyperDashDirection == 0 || direction == Math.Sign(HyperDashDirection)))
dashModifier = hyperDashModifier; dashModifier = hyperDashModifier;
Scale = new Vector2(Math.Abs(Scale.X) * Math.Sign(currentDirection), Scale.Y); Scale = new Vector2(Math.Abs(Scale.X) * direction, Scale.Y);
X = (float)MathHelper.Clamp(X + Math.Sign(currentDirection) * Clock.ElapsedFrameTime * BASE_SPEED * dashModifier, 0, 1); X = (float)MathHelper.Clamp(X + direction * Clock.ElapsedFrameTime * BASE_SPEED * dashModifier, 0, 1);
} }
private void explode() private void explode()