1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 02:32:55 +08:00
This commit is contained in:
mk-56 2022-01-17 15:15:25 +01:00
parent 57cc2f7893
commit bd308ca38c
3 changed files with 2 additions and 16 deletions

View File

@ -55,5 +55,3 @@ namespace osu.Game.Rulesets.Mania.Mods
} }
} }
} }

View File

@ -27,6 +27,8 @@ namespace osu.Game.Rulesets.Osu.Mods
private const double default_follow_delay = 120; private const double default_follow_delay = 120;
private OsuFlashlight flashlight; private OsuFlashlight flashlight;
public override Flashlight CreateFlashlight() => flashlight = new OsuFlashlight(ChangeRadius.Value, InitialRadius.Value, FollowDelay.Value); public override Flashlight CreateFlashlight() => flashlight = new OsuFlashlight(ChangeRadius.Value, InitialRadius.Value, FollowDelay.Value);
@ -77,19 +79,6 @@ namespace osu.Game.Rulesets.Osu.Mods
return base.OnMouseMove(e); return base.OnMouseMove(e);
} }
private float getSizeFor(int combo)
{
if (ChangeRadius)
{
if (combo > 200)
return InitialRadius * 0.8f;
else if (combo > 100)
return InitialRadius * 0.9f;
}
return InitialRadius;
}
protected override void OnComboChange(ValueChangedEvent<int> e) protected override void OnComboChange(ValueChangedEvent<int> e)
{ {
this.TransformTo(nameof(FlashlightSize), new Vector2(0, GetRadiusFor(e.NewValue)), FLASHLIGHT_FADE_DURATION); this.TransformTo(nameof(FlashlightSize), new Vector2(0, GetRadiusFor(e.NewValue)), FLASHLIGHT_FADE_DURATION);

View File

@ -48,7 +48,6 @@ namespace osu.Game.Rulesets.Taiko.Mods
private Vector2 getSizeFor(int combo) private Vector2 getSizeFor(int combo)
{ {
// Preserve flashlight size through the playfield's aspect adjustment. // Preserve flashlight size through the playfield's aspect adjustment.
// return new Vector2(0, size * taikoPlayfield.DrawHeight / TaikoPlayfield.DEFAULT_HEIGHT);
return new Vector2(0, GetRadiusFor(combo) * taikoPlayfield.DrawHeight / TaikoPlayfield.DEFAULT_HEIGHT); return new Vector2(0, GetRadiusFor(combo) * taikoPlayfield.DrawHeight / TaikoPlayfield.DEFAULT_HEIGHT);
} }