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

Rename variable

Browse Source
This commit is contained in:
Dean Herbert 2023-09-12 20:51:22 +09:00
parent 39d69903ab
commit e810abf1e6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,7 +312,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
tick.TriggerResult(true); tick.TriggerResult(true);
if (tick is DrawableSpinnerBonusTick) if (tick is DrawableSpinnerBonusTick)
gainedBonus.Value = score_per_tick * (spins - HitObject.FirstBonusSpin); gainedBonus.Value = score_per_tick * (spins - HitObject.SpinsRequiredForBonus);
} }
completedFullSpins++; completedFullSpins++;

12
osu.Game.Rulesets.Osu/Objects/Spinner.cs
View File

@ -31,6 +31,11 @@ namespace osu.Game.Rulesets.Osu.Objects
/// </summary> /// </summary>
public int SpinsRequired { get; protected set; } = 1; public int SpinsRequired { get; protected set; } = 1;
/// <summary>
/// The number of spins required to start receiving bonus score. The first bonus is awarded on this spin count.
/// </summary>
public int SpinsRequiredForBonus => SpinsRequired + bonus_spins_gap;
/// <summary> /// <summary>
/// The gap between spinner completion and the first bonus-awarding spin. /// The gap between spinner completion and the first bonus-awarding spin.
/// </summary> /// </summary>
@ -41,11 +46,6 @@ namespace osu.Game.Rulesets.Osu.Objects
/// </summary> /// </summary>
public int MaximumBonusSpins { get; protected set; } = 1; public int MaximumBonusSpins { get; protected set; } = 1;
/// <summary>
/// The first spin awarding bonus score.
/// </summary>
public int FirstBonusSpin => SpinsRequired + bonus_spins_gap;
public override Vector2 StackOffset => Vector2.Zero; public override Vector2 StackOffset => Vector2.Zero;
protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty) protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty)
@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Objects
double startTime = StartTime + (float)(i + 1) / totalSpins * Duration; double startTime = StartTime + (float)(i + 1) / totalSpins * Duration;
AddNested(i < FirstBonusSpin AddNested(i < SpinsRequiredForBonus
? new SpinnerTick { StartTime = startTime, SpinnerDuration = Duration } ? new SpinnerTick { StartTime = startTime, SpinnerDuration = Duration }
: new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration, Samples = new[] { CreateHitSampleInfo("spinnerbonus") } }); : new SpinnerBonusTick { StartTime = startTime, SpinnerDuration = Duration, Samples = new[] { CreateHitSampleInfo("spinnerbonus") } });
} }