RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename flashlight settings to be more accurate

This commit is contained in:
Bartłomiej Dach 2022-01-24 20:44:25 +01:00
parent 948867898c
commit a7c0d507ce
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
5 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,15 +16,8 @@ public class CatchModFlashlight : ModFlashlight<CatchHitObject>
{
public override double ScoreMultiplier => 1.12;
[SettingSource("Change radius based on combo", "Decrease the flashlight radius as combo increases.")]
public override BindableBool ChangeRadius { get; } = new BindableBool
{
Default = true,
Value = true
};
[SettingSource("Initial radius", "Initial radius of the flashlight area.")]
public override BindableNumber<float> InitialRadius { get; } = new BindableNumber<float>
[SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
public override BindableNumber<float> SizeMultiplier { get; } = new BindableNumber<float>
{
MinValue = 0.4f,
MaxValue = 1.7f,
@ -33,9 +26,16 @@ public class CatchModFlashlight : ModFlashlight<CatchHitObject>
Precision = 0.1f
};
[SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
public override BindableBool ComboBasedSize { get; } = new BindableBool
{
Default = true,
Value = true
};
protected virtual float DefaultFlashlightSize => 350;
public override Flashlight CreateFlashlight() => new CatchFlashlight(playfield, ChangeRadius.Value, InitialRadius.Value, DefaultFlashlightSize);
public override Flashlight CreateFlashlight() => new CatchFlashlight(playfield, ComboBasedSize.Value, SizeMultiplier.Value, DefaultFlashlightSize);
private CatchPlayfield playfield;

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

@ -17,15 +17,8 @@ public class ManiaModFlashlight : ModFlashlight<ManiaHitObject>
public override double ScoreMultiplier => 1;
public override Type[] IncompatibleMods => new[] { typeof(ModHidden) };
[SettingSource("Change radius based on combo", "Decrease the flashlight radius as combo increases.")]
public override BindableBool ChangeRadius { get; } = new BindableBool
{
Default = false,
Value = false
};
[SettingSource("Initial radius", "Initial radius of the flashlight area.")]
public override BindableNumber<float> InitialRadius { get; } = new BindableNumber<float>
[SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
public override BindableNumber<float> SizeMultiplier { get; } = new BindableNumber<float>
{
MinValue = 0f,
MaxValue = 4.5f,
@ -34,9 +27,16 @@ public class ManiaModFlashlight : ModFlashlight<ManiaHitObject>
Precision = 0.1f
};
[SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
public override BindableBool ComboBasedSize { get; } = new BindableBool
{
Default = false,
Value = false
};
protected virtual float DefaultFlashlightSize => 50;
public override Flashlight CreateFlashlight() => new ManiaFlashlight(ChangeRadius.Value, InitialRadius.Value, DefaultFlashlightSize);
public override Flashlight CreateFlashlight() => new ManiaFlashlight(ComboBasedSize.Value, SizeMultiplier.Value, DefaultFlashlightSize);
private class ManiaFlashlight : Flashlight
{

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

@ -30,15 +30,8 @@ public class OsuModFlashlight : ModFlashlight<OsuHitObject>, IApplicableToDrawab
Precision = default_follow_delay,
};
[SettingSource("Change radius based on combo", "Decrease the flashlight radius as combo increases.")]
public override BindableBool ChangeRadius { get; } = new BindableBool
{
Default = true,
Value = true
};
[SettingSource("Initial radius", "Initial radius of the flashlight area.")]
public override BindableNumber<float> InitialRadius { get; } = new BindableNumber<float>
[SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
public override BindableNumber<float> SizeMultiplier { get; } = new BindableNumber<float>
{
MinValue = 0.5f,
MaxValue = 2f,
@ -47,11 +40,18 @@ public class OsuModFlashlight : ModFlashlight<OsuHitObject>, IApplicableToDrawab
Precision = 0.1f
};
[SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
public override BindableBool ComboBasedSize { get; } = new BindableBool
{
Default = true,
Value = true
};
protected virtual float DefaultFlashlightSize => 180;
private OsuFlashlight flashlight;
public override Flashlight CreateFlashlight() => flashlight = new OsuFlashlight(ChangeRadius.Value, InitialRadius.Value, FollowDelay.Value, DefaultFlashlightSize);
public override Flashlight CreateFlashlight() => flashlight = new OsuFlashlight(ComboBasedSize.Value, SizeMultiplier.Value, FollowDelay.Value, DefaultFlashlightSize);
public void ApplyToDrawableHitObject(DrawableHitObject drawable)
{

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

@ -17,15 +17,8 @@ public class TaikoModFlashlight : ModFlashlight<TaikoHitObject>
{
public override double ScoreMultiplier => 1.12;
[SettingSource("Change radius based on combo", "Decrease the flashlight radius as combo increases.")]
public override BindableBool ChangeRadius { get; } = new BindableBool
{
Default = true,
Value = true
};
[SettingSource("Initial radius", "Initial radius of the flashlight area.")]
public override BindableNumber<float> InitialRadius { get; } = new BindableNumber<float>
[SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
public override BindableNumber<float> SizeMultiplier { get; } = new BindableNumber<float>
{
MinValue = 0,
MaxValue = 1.66f,
@ -34,9 +27,16 @@ public class TaikoModFlashlight : ModFlashlight<TaikoHitObject>
Precision = 0.1f
};
[SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
public override BindableBool ComboBasedSize { get; } = new BindableBool
{
Default = true,
Value = true
};
protected virtual float DefaultFlashlightSize => 250;
public override Flashlight CreateFlashlight() => new TaikoFlashlight(playfield, ChangeRadius.Value, InitialRadius.Value, DefaultFlashlightSize);
public override Flashlight CreateFlashlight() => new TaikoFlashlight(playfield, ComboBasedSize.Value, SizeMultiplier.Value, DefaultFlashlightSize);
private TaikoPlayfield playfield;

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

@ -33,11 +33,11 @@ public abstract class ModFlashlight : Mod
public override ModType Type => ModType.DifficultyIncrease;
public override string Description => "Restricted view area.";
[SettingSource("Change radius based on combo", "Decrease the flashlight radius as combo increases.")]
public abstract BindableBool ChangeRadius { get; }
[SettingSource("Flashlight size", "Multiplier applied to the default flashlight size.")]
public abstract BindableNumber<float> SizeMultiplier { get; }
[SettingSource("Initial radius", "Initial radius of the flashlight area.")]
public abstract BindableNumber<float> InitialRadius { get; }
[SettingSource("Change size based on combo", "Decrease the flashlight size as combo increases.")]
public abstract BindableBool ComboBasedSize { get; }
}
public abstract class ModFlashlight<T> : ModFlashlight, IApplicableToDrawableRuleset<T>, IApplicableToScoreProcessor