2020-03-13 11:59:30 +08:00
|
|
|
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
|
|
|
|
using System;
|
|
|
|
using System.Linq;
|
2020-04-22 10:04:07 +08:00
|
|
|
using JetBrains.Annotations;
|
2020-03-13 11:59:30 +08:00
|
|
|
using osu.Framework.Allocation;
|
2020-07-14 11:52:34 +08:00
|
|
|
using osu.Framework.Bindables;
|
2020-03-13 11:59:30 +08:00
|
|
|
using osu.Framework.Graphics;
|
|
|
|
using osu.Framework.Graphics.Animations;
|
|
|
|
using osu.Framework.Graphics.Containers;
|
2020-12-01 10:32:20 +08:00
|
|
|
using osu.Framework.Graphics.Pooling;
|
2020-03-13 11:59:30 +08:00
|
|
|
using osu.Framework.Input.Bindings;
|
|
|
|
using osu.Framework.Utils;
|
|
|
|
using osu.Game.Beatmaps;
|
2020-07-14 11:35:01 +08:00
|
|
|
using osu.Game.Configuration;
|
2020-03-13 11:59:30 +08:00
|
|
|
using osu.Game.Rulesets.Catch.Objects;
|
|
|
|
using osu.Game.Rulesets.Catch.Objects.Drawables;
|
2020-03-26 14:11:59 +08:00
|
|
|
using osu.Game.Rulesets.Catch.Skinning;
|
2020-12-08 13:28:30 +08:00
|
|
|
using osu.Game.Rulesets.Judgements;
|
2020-03-26 14:11:59 +08:00
|
|
|
using osu.Game.Skinning;
|
2020-03-13 11:59:30 +08:00
|
|
|
using osuTK;
|
|
|
|
using osuTK.Graphics;
|
|
|
|
|
|
|
|
namespace osu.Game.Rulesets.Catch.UI
|
|
|
|
{
|
2020-03-26 14:11:59 +08:00
|
|
|
public class Catcher : SkinReloadableDrawable, IKeyBindingHandler<CatchAction>
|
2020-03-13 11:59:30 +08:00
|
|
|
{
|
2020-04-21 16:36:09 +08:00
|
|
|
/// <summary>
|
2020-05-07 05:27:01 +08:00
|
|
|
/// The default colour used to tint hyper-dash fruit, along with the moving catcher, its trail
|
|
|
|
/// and end glow/after-image during a hyper-dash.
|
2020-04-21 16:36:09 +08:00
|
|
|
/// </summary>
|
2020-04-08 19:23:29 +08:00
|
|
|
public static readonly Color4 DEFAULT_HYPER_DASH_COLOUR = Color4.Red;
|
2020-03-26 10:37:26 +08:00
|
|
|
|
2020-04-22 10:12:29 +08:00
|
|
|
/// <summary>
|
|
|
|
/// The duration between transitioning to hyper-dash state.
|
|
|
|
/// </summary>
|
|
|
|
public const double HYPER_DASH_TRANSITION_DURATION = 180;
|
|
|
|
|
2020-03-13 11:59:30 +08:00
|
|
|
/// <summary>
|
|
|
|
/// Whether we are hyper-dashing or not.
|
|
|
|
/// </summary>
|
|
|
|
public bool HyperDashing => hyperDashModifier != 1;
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// The relative space to cover in 1 millisecond. based on 1 game pixel per millisecond as in osu-stable.
|
|
|
|
/// </summary>
|
2020-07-01 23:21:45 +08:00
|
|
|
public const double BASE_SPEED = 1.0;
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-04-22 10:12:29 +08:00
|
|
|
[NotNull]
|
|
|
|
private readonly Container trailsTarget;
|
|
|
|
|
|
|
|
private CatcherTrailDisplay trails;
|
2020-03-26 14:11:31 +08:00
|
|
|
|
2020-12-02 20:23:34 +08:00
|
|
|
private readonly Container droppedObjectTarget;
|
|
|
|
|
|
|
|
private readonly Container<DrawablePalpableCatchHitObject> caughtFruitContainer;
|
|
|
|
|
2020-03-13 11:59:30 +08:00
|
|
|
public CatcherAnimationState CurrentState { get; private set; }
|
|
|
|
|
2020-03-31 17:33:00 +08:00
|
|
|
/// <summary>
|
|
|
|
/// The width of the catcher which can receive fruit. Equivalent to "catchMargin" in osu-stable.
|
|
|
|
/// </summary>
|
2020-08-21 01:21:16 +08:00
|
|
|
public const float ALLOWED_CATCH_RANGE = 0.8f;
|
2020-03-31 17:33:00 +08:00
|
|
|
|
2020-04-22 10:12:29 +08:00
|
|
|
/// <summary>
|
|
|
|
/// The drawable catcher for <see cref="CurrentState"/>.
|
|
|
|
/// </summary>
|
|
|
|
internal Drawable CurrentDrawableCatcher => currentCatcher.Drawable;
|
|
|
|
|
|
|
|
private bool dashing;
|
|
|
|
|
|
|
|
public bool Dashing
|
2020-03-13 11:59:30 +08:00
|
|
|
{
|
|
|
|
get => dashing;
|
2020-04-22 10:12:29 +08:00
|
|
|
protected set
|
2020-03-13 11:59:30 +08:00
|
|
|
{
|
|
|
|
if (value == dashing) return;
|
|
|
|
|
|
|
|
dashing = value;
|
|
|
|
|
2020-05-10 23:05:30 +08:00
|
|
|
updateTrailVisibility();
|
2020-03-13 11:59:30 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-22 12:27:15 +08:00
|
|
|
/// <summary>
|
|
|
|
/// Width of the area that can be used to attempt catches during gameplay.
|
|
|
|
/// </summary>
|
|
|
|
private readonly float catchWidth;
|
|
|
|
|
2020-12-02 18:28:47 +08:00
|
|
|
private readonly CatcherSprite catcherIdle;
|
|
|
|
private readonly CatcherSprite catcherKiai;
|
|
|
|
private readonly CatcherSprite catcherFail;
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-03-14 16:06:23 +08:00
|
|
|
private CatcherSprite currentCatcher;
|
|
|
|
|
2020-04-21 10:58:56 +08:00
|
|
|
private Color4 hyperDashColour = DEFAULT_HYPER_DASH_COLOUR;
|
|
|
|
private Color4 hyperDashEndGlowColour = DEFAULT_HYPER_DASH_COLOUR;
|
2020-03-26 14:11:31 +08:00
|
|
|
|
2020-03-13 11:59:30 +08:00
|
|
|
private int currentDirection;
|
|
|
|
|
|
|
|
private double hyperDashModifier = 1;
|
|
|
|
private int hyperDashDirection;
|
|
|
|
private float hyperDashTargetPosition;
|
2020-07-14 11:52:34 +08:00
|
|
|
private Bindable<bool> hitLighting;
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-02 18:28:47 +08:00
|
|
|
private readonly DrawablePool<HitExplosion> hitExplosionPool;
|
|
|
|
private readonly Container<HitExplosion> hitExplosionContainer;
|
2020-12-01 10:32:20 +08:00
|
|
|
|
2020-12-02 20:23:34 +08:00
|
|
|
public Catcher([NotNull] Container trailsTarget, [NotNull] Container droppedObjectTarget, BeatmapDifficulty difficulty = null)
|
2020-03-13 11:59:30 +08:00
|
|
|
{
|
2020-04-22 10:12:29 +08:00
|
|
|
this.trailsTarget = trailsTarget;
|
2020-12-02 20:23:34 +08:00
|
|
|
this.droppedObjectTarget = droppedObjectTarget;
|
2020-04-21 16:41:53 +08:00
|
|
|
|
2020-03-13 11:59:30 +08:00
|
|
|
Origin = Anchor.TopCentre;
|
|
|
|
|
|
|
|
Size = new Vector2(CatcherArea.CATCHER_SIZE);
|
|
|
|
if (difficulty != null)
|
2020-04-22 12:37:49 +08:00
|
|
|
Scale = calculateScale(difficulty);
|
2020-04-22 12:27:15 +08:00
|
|
|
|
|
|
|
catchWidth = CalculateCatchWidth(Scale);
|
2020-07-14 11:35:01 +08:00
|
|
|
|
2020-03-26 14:11:59 +08:00
|
|
|
InternalChildren = new Drawable[]
|
2020-03-13 11:59:30 +08:00
|
|
|
{
|
2020-12-01 10:32:20 +08:00
|
|
|
hitExplosionPool = new DrawablePool<HitExplosion>(10),
|
2020-12-02 19:03:13 +08:00
|
|
|
caughtFruitContainer = new Container<DrawablePalpableCatchHitObject>
|
2020-12-02 18:28:47 +08:00
|
|
|
{
|
|
|
|
Anchor = Anchor.TopCentre,
|
|
|
|
Origin = Anchor.BottomCentre,
|
|
|
|
},
|
2020-03-13 11:59:30 +08:00
|
|
|
catcherIdle = new CatcherSprite(CatcherAnimationState.Idle)
|
|
|
|
{
|
|
|
|
Anchor = Anchor.TopCentre,
|
|
|
|
Alpha = 0,
|
|
|
|
},
|
|
|
|
catcherKiai = new CatcherSprite(CatcherAnimationState.Kiai)
|
|
|
|
{
|
|
|
|
Anchor = Anchor.TopCentre,
|
|
|
|
Alpha = 0,
|
|
|
|
},
|
|
|
|
catcherFail = new CatcherSprite(CatcherAnimationState.Fail)
|
|
|
|
{
|
|
|
|
Anchor = Anchor.TopCentre,
|
|
|
|
Alpha = 0,
|
2020-12-01 10:32:20 +08:00
|
|
|
},
|
|
|
|
hitExplosionContainer = new Container<HitExplosion>
|
|
|
|
{
|
|
|
|
Anchor = Anchor.TopCentre,
|
|
|
|
Origin = Anchor.BottomCentre,
|
|
|
|
},
|
2020-03-13 11:59:30 +08:00
|
|
|
};
|
2020-12-02 18:28:47 +08:00
|
|
|
}
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-02 18:28:47 +08:00
|
|
|
[BackgroundDependencyLoader]
|
|
|
|
private void load(OsuConfigManager config)
|
|
|
|
{
|
|
|
|
hitLighting = config.GetBindable<bool>(OsuSetting.HitLighting);
|
2020-10-19 16:41:21 +08:00
|
|
|
trails = new CatcherTrailDisplay(this);
|
2020-04-21 16:41:53 +08:00
|
|
|
|
|
|
|
updateCatcher();
|
2020-04-05 00:33:52 +08:00
|
|
|
}
|
|
|
|
|
2020-10-19 16:41:21 +08:00
|
|
|
protected override void LoadComplete()
|
|
|
|
{
|
|
|
|
base.LoadComplete();
|
|
|
|
|
|
|
|
// don't add in above load as we may potentially modify a parent in an unsafe manner.
|
|
|
|
trailsTarget.Add(trails);
|
|
|
|
}
|
|
|
|
|
2020-07-16 14:35:19 +08:00
|
|
|
/// <summary>
|
|
|
|
/// Creates proxied content to be displayed beneath hitobjects.
|
|
|
|
/// </summary>
|
|
|
|
public Drawable CreateProxiedContent() => caughtFruitContainer.CreateProxy();
|
|
|
|
|
2020-04-22 12:27:15 +08:00
|
|
|
/// <summary>
|
|
|
|
/// Calculates the scale of the catcher based off the provided beatmap difficulty.
|
|
|
|
/// </summary>
|
2020-12-04 13:35:56 +08:00
|
|
|
private static Vector2 calculateScale(BeatmapDifficulty difficulty) => new Vector2(1.0f - 0.7f * (difficulty.CircleSize - 5) / 5);
|
2020-04-22 12:27:15 +08:00
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Calculates the width of the area used for attempting catches in gameplay.
|
|
|
|
/// </summary>
|
2020-04-22 12:36:59 +08:00
|
|
|
/// <param name="scale">The scale of the catcher.</param>
|
2020-12-04 13:35:56 +08:00
|
|
|
internal static float CalculateCatchWidth(Vector2 scale) => CatcherArea.CATCHER_SIZE * Math.Abs(scale.X) * ALLOWED_CATCH_RANGE;
|
2020-04-22 12:27:15 +08:00
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Calculates the width of the area used for attempting catches in gameplay.
|
|
|
|
/// </summary>
|
2020-04-22 12:36:59 +08:00
|
|
|
/// <param name="difficulty">The beatmap difficulty.</param>
|
2020-12-04 13:35:56 +08:00
|
|
|
internal static float CalculateCatchWidth(BeatmapDifficulty difficulty) => CalculateCatchWidth(calculateScale(difficulty));
|
2020-03-13 11:59:30 +08:00
|
|
|
|
|
|
|
/// <summary>
|
2020-12-08 13:28:30 +08:00
|
|
|
/// Determine if this catcher can catch a <see cref="CatchHitObject"/> in the current position.
|
2020-03-13 11:59:30 +08:00
|
|
|
/// </summary>
|
2020-12-08 13:28:30 +08:00
|
|
|
public bool CanCatch(CatchHitObject hitObject)
|
2020-03-13 11:59:30 +08:00
|
|
|
{
|
2020-11-24 18:57:37 +08:00
|
|
|
if (!(hitObject is PalpableCatchHitObject fruit))
|
2020-08-21 00:58:07 +08:00
|
|
|
return false;
|
|
|
|
|
2020-04-22 12:27:15 +08:00
|
|
|
var halfCatchWidth = catchWidth * 0.5f;
|
2020-03-13 11:59:30 +08:00
|
|
|
|
|
|
|
// this stuff wil disappear once we move fruit to non-relative coordinate space in the future.
|
2020-07-01 23:21:45 +08:00
|
|
|
var catchObjectPosition = fruit.X;
|
|
|
|
var catcherPosition = Position.X;
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-08 13:28:30 +08:00
|
|
|
return catchObjectPosition >= catcherPosition - halfCatchWidth &&
|
|
|
|
catchObjectPosition <= catcherPosition + halfCatchWidth;
|
|
|
|
}
|
|
|
|
|
|
|
|
public void OnNewResult(DrawableCatchHitObject drawableObject, JudgementResult result)
|
|
|
|
{
|
|
|
|
if (!(drawableObject.HitObject is PalpableCatchHitObject hitObject)) return;
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-08 13:28:30 +08:00
|
|
|
if (result.IsHit)
|
|
|
|
placeCaughtObject(hitObject);
|
2020-12-04 09:24:25 +08:00
|
|
|
|
2020-12-03 13:44:35 +08:00
|
|
|
// droplet doesn't affect the catcher state
|
2020-12-08 13:28:30 +08:00
|
|
|
if (hitObject is TinyDroplet) return;
|
2020-12-04 09:24:25 +08:00
|
|
|
|
2020-12-08 13:28:30 +08:00
|
|
|
if (result.IsHit && hitObject.HyperDash)
|
2020-03-13 11:59:30 +08:00
|
|
|
{
|
2020-12-08 13:28:30 +08:00
|
|
|
var target = hitObject.HyperDashTarget;
|
|
|
|
var timeDifference = target.StartTime - hitObject.StartTime;
|
|
|
|
double positionDifference = target.X - X;
|
2020-12-04 09:24:25 +08:00
|
|
|
var velocity = positionDifference / Math.Max(1.0, timeDifference - 1000.0 / 60.0);
|
|
|
|
|
|
|
|
SetHyperDashState(Math.Abs(velocity), target.X);
|
2020-03-13 11:59:30 +08:00
|
|
|
}
|
2020-12-04 09:24:25 +08:00
|
|
|
else
|
|
|
|
SetHyperDashState();
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-08 13:28:30 +08:00
|
|
|
if (result.IsHit)
|
|
|
|
updateState(hitObject.Kiai ? CatcherAnimationState.Kiai : CatcherAnimationState.Idle);
|
|
|
|
else if (!(hitObject is Banana))
|
2020-12-04 09:24:25 +08:00
|
|
|
updateState(CatcherAnimationState.Fail);
|
2020-12-08 13:28:30 +08:00
|
|
|
}
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-08 13:28:30 +08:00
|
|
|
public void OnRevertResult(DrawableCatchHitObject fruit, JudgementResult result)
|
|
|
|
{
|
2020-03-13 11:59:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Set hyper-dash state.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="modifier">The speed multiplier. If this is less or equals to 1, this catcher will be non-hyper-dashing state.</param>
|
|
|
|
/// <param name="targetPosition">When this catcher crosses this position, this catcher ends hyper-dashing.</param>
|
|
|
|
public void SetHyperDashState(double modifier = 1, float targetPosition = -1)
|
|
|
|
{
|
|
|
|
var wasHyperDashing = HyperDashing;
|
|
|
|
|
|
|
|
if (modifier <= 1 || X == targetPosition)
|
|
|
|
{
|
|
|
|
hyperDashModifier = 1;
|
|
|
|
hyperDashDirection = 0;
|
|
|
|
|
|
|
|
if (wasHyperDashing)
|
2020-05-10 23:05:30 +08:00
|
|
|
runHyperDashStateTransition(false);
|
2020-03-13 11:59:30 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
hyperDashModifier = modifier;
|
|
|
|
hyperDashDirection = Math.Sign(targetPosition - X);
|
|
|
|
hyperDashTargetPosition = targetPosition;
|
|
|
|
|
|
|
|
if (!wasHyperDashing)
|
|
|
|
{
|
2020-04-22 10:12:29 +08:00
|
|
|
trails.DisplayEndGlow();
|
2020-05-10 23:05:30 +08:00
|
|
|
runHyperDashStateTransition(true);
|
2020-03-13 11:59:30 +08:00
|
|
|
}
|
|
|
|
}
|
2020-03-26 14:11:31 +08:00
|
|
|
}
|
|
|
|
|
2020-12-04 13:36:40 +08:00
|
|
|
public void UpdatePosition(float position)
|
2020-03-26 14:11:31 +08:00
|
|
|
{
|
2020-12-04 13:36:40 +08:00
|
|
|
position = Math.Clamp(position, 0, CatchPlayfield.WIDTH);
|
2020-05-10 23:05:30 +08:00
|
|
|
|
2020-12-04 13:36:40 +08:00
|
|
|
if (position == X)
|
|
|
|
return;
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-04 13:36:40 +08:00
|
|
|
Scale = new Vector2(Math.Abs(Scale.X) * (position > X ? 1 : -1), Scale.Y);
|
|
|
|
X = position;
|
|
|
|
}
|
2020-05-10 23:05:30 +08:00
|
|
|
|
2020-03-13 11:59:30 +08:00
|
|
|
public bool OnPressed(CatchAction action)
|
|
|
|
{
|
|
|
|
switch (action)
|
|
|
|
{
|
|
|
|
case CatchAction.MoveLeft:
|
|
|
|
currentDirection--;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
case CatchAction.MoveRight:
|
|
|
|
currentDirection++;
|
|
|
|
return true;
|
|
|
|
|
|
|
|
case CatchAction.Dash:
|
|
|
|
Dashing = true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
public void OnReleased(CatchAction action)
|
|
|
|
{
|
|
|
|
switch (action)
|
|
|
|
{
|
|
|
|
case CatchAction.MoveLeft:
|
|
|
|
currentDirection++;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CatchAction.MoveRight:
|
|
|
|
currentDirection--;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CatchAction.Dash:
|
|
|
|
Dashing = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Drop any fruit off the plate.
|
|
|
|
/// </summary>
|
2020-12-02 20:23:34 +08:00
|
|
|
public void Drop() => clearPlate(DroppedObjectAnimation.Drop);
|
2020-03-13 11:59:30 +08:00
|
|
|
|
|
|
|
/// <summary>
|
2020-12-04 13:35:56 +08:00
|
|
|
/// Explode all fruit off the plate.
|
2020-03-13 11:59:30 +08:00
|
|
|
/// </summary>
|
2020-12-02 20:23:34 +08:00
|
|
|
public void Explode() => clearPlate(DroppedObjectAnimation.Explode);
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-04 13:36:40 +08:00
|
|
|
private void runHyperDashStateTransition(bool hyperDashing)
|
|
|
|
{
|
|
|
|
updateTrailVisibility();
|
|
|
|
|
|
|
|
if (hyperDashing)
|
|
|
|
{
|
|
|
|
this.FadeColour(hyperDashColour, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
|
|
|
|
this.FadeTo(0.2f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
this.FadeColour(Color4.White, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
|
|
|
|
this.FadeTo(1f, HYPER_DASH_TRANSITION_DURATION, Easing.OutQuint);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private void updateTrailVisibility() => trails.DisplayTrail = Dashing || HyperDashing;
|
|
|
|
|
2020-03-26 14:11:59 +08:00
|
|
|
protected override void SkinChanged(ISkinSource skin, bool allowFallback)
|
|
|
|
{
|
|
|
|
base.SkinChanged(skin, allowFallback);
|
|
|
|
|
2020-04-21 10:58:56 +08:00
|
|
|
hyperDashColour =
|
|
|
|
skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDash)?.Value ??
|
|
|
|
DEFAULT_HYPER_DASH_COLOUR;
|
|
|
|
|
|
|
|
hyperDashEndGlowColour =
|
|
|
|
skin.GetConfig<CatchSkinColour, Color4>(CatchSkinColour.HyperDashAfterImage)?.Value ??
|
|
|
|
hyperDashColour;
|
|
|
|
|
2020-08-24 21:57:41 +08:00
|
|
|
trails.HyperDashTrailsColour = hyperDashColour;
|
|
|
|
trails.EndGlowSpritesColour = hyperDashEndGlowColour;
|
|
|
|
|
2020-05-10 23:05:30 +08:00
|
|
|
runHyperDashStateTransition(HyperDashing);
|
2020-03-26 14:11:59 +08:00
|
|
|
}
|
|
|
|
|
2020-03-13 11:59:30 +08:00
|
|
|
protected override void Update()
|
|
|
|
{
|
|
|
|
base.Update();
|
|
|
|
|
|
|
|
if (currentDirection == 0) return;
|
|
|
|
|
|
|
|
var direction = Math.Sign(currentDirection);
|
|
|
|
|
|
|
|
var dashModifier = Dashing ? 1 : 0.5;
|
|
|
|
var speed = BASE_SPEED * dashModifier * hyperDashModifier;
|
|
|
|
|
|
|
|
UpdatePosition((float)(X + direction * Clock.ElapsedFrameTime * speed));
|
|
|
|
|
|
|
|
// Correct overshooting.
|
2020-03-14 14:35:59 +08:00
|
|
|
if ((hyperDashDirection > 0 && hyperDashTargetPosition < X) ||
|
|
|
|
(hyperDashDirection < 0 && hyperDashTargetPosition > X))
|
2020-03-13 11:59:30 +08:00
|
|
|
{
|
|
|
|
X = hyperDashTargetPosition;
|
|
|
|
SetHyperDashState();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private void updateCatcher()
|
|
|
|
{
|
2020-03-14 16:06:23 +08:00
|
|
|
currentCatcher?.Hide();
|
2020-03-13 11:59:30 +08:00
|
|
|
|
|
|
|
switch (CurrentState)
|
|
|
|
{
|
|
|
|
default:
|
2020-03-14 16:06:23 +08:00
|
|
|
currentCatcher = catcherIdle;
|
2020-03-13 11:59:30 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CatcherAnimationState.Fail:
|
2020-03-14 16:06:23 +08:00
|
|
|
currentCatcher = catcherFail;
|
2020-03-13 11:59:30 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CatcherAnimationState.Kiai:
|
2020-03-14 16:06:23 +08:00
|
|
|
currentCatcher = catcherKiai;
|
2020-03-13 11:59:30 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2020-03-14 16:06:23 +08:00
|
|
|
currentCatcher.Show();
|
2020-04-03 14:59:56 +08:00
|
|
|
(currentCatcher.Drawable as IFramedAnimation)?.GotoFrame(0);
|
2020-03-13 11:59:30 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
private void updateState(CatcherAnimationState state)
|
|
|
|
{
|
|
|
|
if (CurrentState == state)
|
|
|
|
return;
|
|
|
|
|
|
|
|
CurrentState = state;
|
|
|
|
updateCatcher();
|
|
|
|
}
|
|
|
|
|
2020-12-03 13:44:35 +08:00
|
|
|
private void placeCaughtObject(PalpableCatchHitObject source)
|
|
|
|
{
|
|
|
|
var caughtObject = createCaughtObject(source);
|
2020-12-04 13:35:56 +08:00
|
|
|
|
2020-12-03 13:44:35 +08:00
|
|
|
if (caughtObject == null) return;
|
|
|
|
|
|
|
|
caughtObject.RelativePositionAxes = Axes.None;
|
|
|
|
caughtObject.X = source.X - X;
|
|
|
|
caughtObject.IsOnPlate = true;
|
|
|
|
|
|
|
|
caughtObject.Anchor = Anchor.TopCentre;
|
|
|
|
caughtObject.Origin = Anchor.Centre;
|
|
|
|
caughtObject.Scale *= 0.5f;
|
|
|
|
caughtObject.LifetimeStart = source.StartTime;
|
|
|
|
caughtObject.LifetimeEnd = double.MaxValue;
|
|
|
|
|
2020-12-04 13:35:56 +08:00
|
|
|
adjustPositionInStack(caughtObject);
|
|
|
|
|
|
|
|
caughtFruitContainer.Add(caughtObject);
|
|
|
|
|
|
|
|
addLighting(caughtObject);
|
2020-12-03 13:44:35 +08:00
|
|
|
|
|
|
|
if (!caughtObject.StaysOnPlate)
|
2020-12-04 13:35:56 +08:00
|
|
|
removeFromPlate(caughtObject, DroppedObjectAnimation.Explode);
|
|
|
|
}
|
|
|
|
|
|
|
|
private void adjustPositionInStack(DrawablePalpableCatchHitObject caughtObject)
|
|
|
|
{
|
|
|
|
const float radius_div_2 = CatchHitObject.OBJECT_RADIUS / 2;
|
|
|
|
const float allowance = 10;
|
|
|
|
|
|
|
|
float caughtObjectRadius = caughtObject.DisplayRadius;
|
|
|
|
|
|
|
|
while (caughtFruitContainer.Any(f => Vector2Extensions.Distance(f.Position, caughtObject.Position) < (caughtObjectRadius + radius_div_2) / (allowance / 2)))
|
|
|
|
{
|
|
|
|
float diff = (caughtObjectRadius + radius_div_2) / allowance;
|
|
|
|
|
|
|
|
caughtObject.X += (RNG.NextSingle() - 0.5f) * diff * 2;
|
|
|
|
caughtObject.Y -= RNG.NextSingle() * diff;
|
|
|
|
}
|
|
|
|
|
|
|
|
caughtObject.X = Math.Clamp(caughtObject.X, -CatcherArea.CATCHER_SIZE / 2, CatcherArea.CATCHER_SIZE / 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
private void addLighting(DrawablePalpableCatchHitObject caughtObject)
|
|
|
|
{
|
|
|
|
if (!hitLighting.Value) return;
|
|
|
|
|
|
|
|
HitExplosion hitExplosion = hitExplosionPool.Get();
|
|
|
|
hitExplosion.X = caughtObject.X;
|
|
|
|
hitExplosion.Scale = new Vector2(caughtObject.HitObject.Scale);
|
|
|
|
hitExplosion.ObjectColour = caughtObject.AccentColour.Value;
|
|
|
|
hitExplosionContainer.Add(hitExplosion);
|
2020-12-03 13:44:35 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
private DrawablePalpableCatchHitObject createCaughtObject(PalpableCatchHitObject source)
|
|
|
|
{
|
|
|
|
switch (source)
|
|
|
|
{
|
|
|
|
case Banana banana:
|
|
|
|
return new DrawableBanana(banana);
|
|
|
|
|
|
|
|
case Fruit fruit:
|
|
|
|
return new DrawableFruit(fruit);
|
|
|
|
|
|
|
|
case TinyDroplet tiny:
|
|
|
|
return new DrawableTinyDroplet(tiny);
|
|
|
|
|
|
|
|
case Droplet droplet:
|
|
|
|
return new DrawableDroplet(droplet);
|
|
|
|
|
|
|
|
default:
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-02 20:23:34 +08:00
|
|
|
private void clearPlate(DroppedObjectAnimation animation)
|
2020-03-13 11:59:30 +08:00
|
|
|
{
|
2020-12-02 20:23:34 +08:00
|
|
|
var caughtObjects = caughtFruitContainer.Children.ToArray();
|
|
|
|
caughtFruitContainer.Clear(false);
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-02 20:23:34 +08:00
|
|
|
droppedObjectTarget.AddRange(caughtObjects);
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-02 20:23:34 +08:00
|
|
|
foreach (var caughtObject in caughtObjects)
|
|
|
|
drop(caughtObject, animation);
|
|
|
|
}
|
|
|
|
|
|
|
|
private void removeFromPlate(DrawablePalpableCatchHitObject caughtObject, DroppedObjectAnimation animation)
|
|
|
|
{
|
|
|
|
if (!caughtFruitContainer.Remove(caughtObject))
|
|
|
|
throw new InvalidOperationException("Can only drop a caught object on the plate");
|
|
|
|
|
|
|
|
droppedObjectTarget.Add(caughtObject);
|
|
|
|
|
|
|
|
drop(caughtObject, animation);
|
|
|
|
}
|
|
|
|
|
2020-12-03 17:45:10 +08:00
|
|
|
private void drop(DrawablePalpableCatchHitObject d, DroppedObjectAnimation animation)
|
2020-12-02 20:23:34 +08:00
|
|
|
{
|
|
|
|
var originalX = d.X * Scale.X;
|
2020-12-03 17:45:10 +08:00
|
|
|
var startTime = Clock.CurrentTime;
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-02 20:23:34 +08:00
|
|
|
d.Anchor = Anchor.TopLeft;
|
|
|
|
d.Position = caughtFruitContainer.ToSpaceOfOtherDrawable(d.DrawPosition, droppedObjectTarget);
|
|
|
|
|
2020-12-03 17:45:10 +08:00
|
|
|
// we cannot just apply the transforms because DHO clears transforms when state is updated
|
|
|
|
d.ApplyCustomUpdateState += (o, state) => animate(o, animation, originalX, startTime);
|
|
|
|
if (d.IsLoaded)
|
|
|
|
animate(d, animation, originalX, startTime);
|
2020-12-02 20:23:34 +08:00
|
|
|
}
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-03 17:45:10 +08:00
|
|
|
private void animate(Drawable d, DroppedObjectAnimation animation, float originalX, double startTime)
|
2020-12-02 20:23:34 +08:00
|
|
|
{
|
2020-12-03 17:45:10 +08:00
|
|
|
using (d.BeginAbsoluteSequence(startTime))
|
2020-12-02 20:23:34 +08:00
|
|
|
{
|
2020-12-03 17:45:10 +08:00
|
|
|
switch (animation)
|
|
|
|
{
|
|
|
|
case DroppedObjectAnimation.Drop:
|
|
|
|
d.MoveToY(d.Y + 75, 750, Easing.InSine);
|
|
|
|
d.FadeOut(750);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case DroppedObjectAnimation.Explode:
|
|
|
|
d.MoveToY(d.Y - 50, 250, Easing.OutSine).Then().MoveToY(d.Y + 50, 500, Easing.InSine);
|
|
|
|
d.MoveToX(d.X + originalX * 6, 1000);
|
|
|
|
d.FadeOut(750);
|
|
|
|
break;
|
|
|
|
}
|
2020-03-13 11:59:30 +08:00
|
|
|
|
2020-12-03 17:45:10 +08:00
|
|
|
d.Expire();
|
2020-03-13 11:59:30 +08:00
|
|
|
}
|
|
|
|
}
|
2020-12-02 20:23:34 +08:00
|
|
|
|
2020-12-03 17:45:38 +08:00
|
|
|
private enum DroppedObjectAnimation
|
|
|
|
{
|
|
|
|
Drop,
|
|
|
|
Explode
|
|
|
|
}
|
2020-12-02 20:23:34 +08:00
|
|
|
}
|
2020-03-13 11:59:30 +08:00
|
|
|
}
|