h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 18:07:23 +08:00
Code Issues Releases Wiki Activity

ModeMultiplier rename

Browse Source
This commit is contained in:
mk-56 2022-01-24 11:38:52 +01:00
parent 161a2a321e
commit 948867898c
5 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
View File

@ -33,9 +33,9 @@ namespace osu.Game.Rulesets.Catch.Mods
Precision = 0.1f
};
protected override float ModeMultiplier => 350;
protected virtual float DefaultFlashlightSize => 350;
public override Flashlight CreateFlashlight() => new CatchFlashlight(playfield, ChangeRadius.Value, InitialRadius.Value, ModeMultiplier);
public override Flashlight CreateFlashlight() => new CatchFlashlight(playfield, ChangeRadius.Value, InitialRadius.Value, DefaultFlashlightSize);
private CatchPlayfield playfield;
@ -49,8 +49,8 @@ namespace osu.Game.Rulesets.Catch.Mods
{
private readonly CatchPlayfield playfield;
public CatchFlashlight(CatchPlayfield playfield, bool isRadiusBasedOnCombo, float initialRadius, float modeMultiplier)
: base(isRadiusBasedOnCombo, initialRadius, modeMultiplier)
public CatchFlashlight(CatchPlayfield playfield, bool isRadiusBasedOnCombo, float initialRadius, float defaultFlashlightSize)
: base(isRadiusBasedOnCombo, initialRadius, defaultFlashlightSize)
{
this.playfield = playfield;
FlashlightSize = new Vector2(0, GetRadiusFor(0));

8
osu.Game.Rulesets.Mania/Mods/ManiaModFlashlight.cs
View File

@ -34,16 +34,16 @@ namespace osu.Game.Rulesets.Mania.Mods
Precision = 0.1f
};
protected override float ModeMultiplier => 50;
protected virtual float DefaultFlashlightSize => 50;
public override Flashlight CreateFlashlight() => new ManiaFlashlight(ChangeRadius.Value, InitialRadius.Value, ModeMultiplier);
public override Flashlight CreateFlashlight() => new ManiaFlashlight(ChangeRadius.Value, InitialRadius.Value, DefaultFlashlightSize);
private class ManiaFlashlight : Flashlight
{
private readonly LayoutValue flashlightProperties = new LayoutValue(Invalidation.DrawSize);
public ManiaFlashlight(bool isRadiusBasedOnCombo, float initialRadius, float modeMultiplier)
: base(isRadiusBasedOnCombo, initialRadius, modeMultiplier)
public ManiaFlashlight(bool isRadiusBasedOnCombo, float initialRadius, float defaultFlashlightSize)
: base(isRadiusBasedOnCombo, initialRadius, defaultFlashlightSize)
{
FlashlightSize = new Vector2(DrawWidth, GetRadiusFor(0));

8
osu.Game.Rulesets.Osu/Mods/OsuModFlashlight.cs
View File

@ -47,11 +47,11 @@ namespace osu.Game.Rulesets.Osu.Mods
Precision = 0.1f
};
protected override float ModeMultiplier => 180;
protected virtual float DefaultFlashlightSize => 180;
private OsuFlashlight flashlight;
public override Flashlight CreateFlashlight() => flashlight = new OsuFlashlight(ChangeRadius.Value, InitialRadius.Value, FollowDelay.Value, ModeMultiplier);
public override Flashlight CreateFlashlight() => flashlight = new OsuFlashlight(ChangeRadius.Value, InitialRadius.Value, FollowDelay.Value, DefaultFlashlightSize);
public void ApplyToDrawableHitObject(DrawableHitObject drawable)
{
@ -66,8 +66,8 @@ namespace osu.Game.Rulesets.Osu.Mods
//public float InitialRadius { private get; set; }
public bool ChangeRadius { private get; set; }
public OsuFlashlight(bool isRadiusBasedOnCombo, float initialRadius, double followDelay, float modeMultiplier)
: base(isRadiusBasedOnCombo, initialRadius, modeMultiplier)
public OsuFlashlight(bool isRadiusBasedOnCombo, float initialRadius, double followDelay, float defaultFlashlightSize)
: base(isRadiusBasedOnCombo, initialRadius, defaultFlashlightSize)
{
FollowDelay = followDelay;

8
osu.Game.Rulesets.Taiko/Mods/TaikoModFlashlight.cs
View File

@ -34,9 +34,9 @@ namespace osu.Game.Rulesets.Taiko.Mods
Precision = 0.1f
};
protected override float ModeMultiplier => 250;
protected virtual float DefaultFlashlightSize => 250;
public override Flashlight CreateFlashlight() => new TaikoFlashlight(playfield, ChangeRadius.Value, InitialRadius.Value, ModeMultiplier);
public override Flashlight CreateFlashlight() => new TaikoFlashlight(playfield, ChangeRadius.Value, InitialRadius.Value, DefaultFlashlightSize);
private TaikoPlayfield playfield;
@ -51,8 +51,8 @@ namespace osu.Game.Rulesets.Taiko.Mods
private readonly LayoutValue flashlightProperties = new LayoutValue(Invalidation.DrawSize);
private readonly TaikoPlayfield taikoPlayfield;
public TaikoFlashlight(TaikoPlayfield taikoPlayfield, bool isRadiusBasedOnCombo, float initialRadius, float modeMultiplier)
: base(isRadiusBasedOnCombo, initialRadius, modeMultiplier)
public TaikoFlashlight(TaikoPlayfield taikoPlayfield, bool isRadiusBasedOnCombo, float initialRadius, float defaultFlashlightSize)
: base(isRadiusBasedOnCombo, initialRadius, defaultFlashlightSize)
{
this.taikoPlayfield = taikoPlayfield;
FlashlightSize = getSizeFor(0);

14
osu.Game/Rulesets/Mods/ModFlashlight.cs
View File

@ -38,8 +38,6 @@ namespace osu.Game.Rulesets.Mods
[SettingSource("Initial radius", "Initial radius of the flashlight area.")]
public abstract BindableNumber<float> InitialRadius { get; }
protected abstract float ModeMultiplier { get; }
}
public abstract class ModFlashlight<T> : ModFlashlight, IApplicableToDrawableRuleset<T>, IApplicableToScoreProcessor
@ -102,13 +100,13 @@ namespace osu.Game.Rulesets.Mods
public readonly float InitialRadius;
public readonly float ModeMultiplier;
public readonly float DefaultFlashlightSize;
protected Flashlight(bool isRadiusBasedOnCombo, float initialRadius, float modeMultiplier)
protected Flashlight(bool isRadiusBasedOnCombo, float initialRadius, float defaultFlashlightSize)
{
IsRadiusBasedOnCombo = isRadiusBasedOnCombo;
InitialRadius = initialRadius;
ModeMultiplier = modeMultiplier;
DefaultFlashlightSize = defaultFlashlightSize;
}
[BackgroundDependencyLoader]
@ -147,12 +145,12 @@ namespace osu.Game.Rulesets.Mods
if (IsRadiusBasedOnCombo)
{
if (combo > 200)
return InitialRadius * 0.8f * ModeMultiplier;
return InitialRadius * 0.8f * DefaultFlashlightSize;
else if (combo > 100)
return InitialRadius * 0.9f * ModeMultiplier;
return InitialRadius * 0.9f * DefaultFlashlightSize;
}
return InitialRadius * ModeMultiplier;
return InitialRadius * DefaultFlashlightSize;
}
private Vector2 flashlightPosition;