h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 20:32:55 +08:00
Code Issues Releases Wiki Activity

Add logic to gain bonus score from spinner ticks

Browse Source
This commit is contained in:
iiSaLMaN 2019-08-20 21:50:49 +03:00
parent bb4178fa03
commit 07795c9922
1 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -12,7 +12,9 @@ using osu.Game.Graphics;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics.Sprites;
using osu.Game.Screens.Ranking; using osu.Game.Screens.Ranking;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
@ -22,6 +24,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{ {
protected readonly Spinner Spinner; protected readonly Spinner Spinner;
private readonly Container<DrawableSpinnerTick> ticks;
private readonly OsuSpriteText bonusCounter;
public readonly SpinnerDisc Disc; public readonly SpinnerDisc Disc;
public readonly SpinnerTicks Ticks; public readonly SpinnerTicks Ticks;
private readonly SpinnerSpmCounter spmCounter; private readonly SpinnerSpmCounter spmCounter;
@ -58,6 +63,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
ticks = new Container<DrawableSpinnerTick>(),
circleContainer = new Container circleContainer = new Container
{ {
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
@ -115,8 +121,24 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Origin = Anchor.Centre, Origin = Anchor.Centre,
Y = 120, Y = 120,
Alpha = 0 Alpha = 0
},
bonusCounter = new OsuSpriteText
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Y = -120,
Font = OsuFont.Numeric.With(size: 24),
Alpha = 0,
} }
}; };
foreach (var tick in Spinner.NestedHitObjects.OfType<SpinnerTick>())
{
var drawableTick = new DrawableSpinnerTick(tick);
ticks.Add(drawableTick);
AddNested(drawableTick);
}
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -182,6 +204,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
base.Update(); base.Update();
} }
private int currentSpins;
protected override void UpdateAfterChildren() protected override void UpdateAfterChildren()
{ {
base.UpdateAfterChildren(); base.UpdateAfterChildren();
@ -190,6 +214,22 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
Ticks.Rotation = Disc.Rotation; Ticks.Rotation = Disc.Rotation;
spmCounter.SetRotation(Disc.RotationAbsolute); spmCounter.SetRotation(Disc.RotationAbsolute);
var newSpins = (int)(Disc.RotationAbsolute / 360) - currentSpins;
for (int i = currentSpins; i < currentSpins + newSpins; i++)
{
if (i < 0 || i >= ticks.Count)
break;
var tick = ticks[i];
tick.HasBonusPoints = Progress >= 1 && i > Spinner.SpinsRequired;
tick.TriggerResult(HitResult.Great);
}
currentSpins += newSpins;
float relativeCircleScale = Spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight; float relativeCircleScale = Spinner.Scale * circle.DrawHeight / mainContainer.DrawHeight;
Disc.ScaleTo(relativeCircleScale + (1 - relativeCircleScale) * Progress, 200, Easing.OutQuint); Disc.ScaleTo(relativeCircleScale + (1 - relativeCircleScale) * Progress, 200, Easing.OutQuint);
@ -232,6 +272,9 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
break; break;
} }
if (state != ArmedState.Idle)
Schedule(() => NestedHitObjects.Where(t => !t.IsHit).OfType<DrawableSpinnerTick>().ForEach(t => t.TriggerResult(HitResult.Miss)));
Expire(); Expire();
} }
} }