RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-21 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add (incorrectly) exploding fruit

Browse Source
This commit is contained in:
Dean Herbert 2017-09-15 21:26:36 +09:00
parent fe221905fa
commit cfcb0c1c6e
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,7 @@ namespace osu.Game.Rulesets.Catch.UI
public class CatcherArea : Container public class CatcherArea : Container
{ {
private Catcher catcher; private Catcher catcher;
private Container explodingFruitContainer;
public void Add(DrawableHitObject fruit, Vector2 screenPosition) => catcher.AddToStack(fruit, screenPosition); public void Add(DrawableHitObject fruit, Vector2 screenPosition) => catcher.AddToStack(fruit, screenPosition);
@ -30,9 +31,14 @@ namespace osu.Game.Rulesets.Catch.UI
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
explodingFruitContainer = new Container
{
RelativeSizeAxes = Axes.Both,
},
catcher = new Catcher catcher = new Catcher
{ {
RelativePositionAxes = Axes.Both, RelativePositionAxes = Axes.Both,
ExplodingFruitTarget = explodingFruitContainer,
Anchor = Anchor.TopLeft, Anchor = Anchor.TopLeft,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
X = 0.5f, X = 0.5f,
@ -63,6 +69,8 @@ namespace osu.Game.Rulesets.Catch.UI
private bool dashing; private bool dashing;
public Container ExplodingFruitTarget;
protected bool Dashing protected bool Dashing
{ {
get { return dashing; } get { return dashing; }
@ -168,13 +176,44 @@ namespace osu.Game.Rulesets.Catch.UI
float distance = fruit.DrawSize.X / 2 * fruit.Scale.X; float distance = fruit.DrawSize.X / 2 * fruit.Scale.X;
while (Children.OfType<DrawableFruit>().Any(f => Vector2Extensions.DistanceSquared(f.Position, fruit.Position) < distance * distance)) while (Children.OfType<DrawableFruit>().Any(f => f.LifetimeEnd == double.PositiveInfinity && Vector2Extensions.DistanceSquared(f.Position, fruit.Position) < distance * distance))
{ {
fruit.X += RNG.Next(-5, 5); fruit.X += RNG.Next(-5, 5);
fruit.Y -= RNG.Next(0, 5); fruit.Y -= RNG.Next(0, 5);
} }
Add(fruit); Add(fruit);
if (((CatchBaseHit)fruit.HitObject).LastInCombo)
explode();
}
private void explode()
{
foreach (var existingFruit in Children.OfType<DrawableFruit>().ToArray())
{
var originalX = existingFruit.X * Scale.X;
if (ExplodingFruitTarget != null)
{
existingFruit.Anchor = Anchor.TopLeft;
existingFruit.Position = ToSpaceOfOtherDrawable(existingFruit.DrawPosition, ExplodingFruitTarget);
Remove(existingFruit);
ExplodingFruitTarget.Add(existingFruit);
}
existingFruit
.MoveToY(existingFruit.Y - 50, 250, Easing.OutSine)
.Then()
.MoveToY(existingFruit.Y + 50, 500, Easing.InSine);
existingFruit.MoveToX(existingFruit.X + originalX * 6, 1000);
existingFruit.FadeOut(750);
existingFruit.Expire();
}
} }
} }
} }