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

Fix conflicts

Browse Source
This commit is contained in:
o-dasher 2024-07-14 21:55:48 -03:00
parent c56cc97e38
commit 5fc6f1f4a5
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModFlashlight.cs
View File

@ -30,9 +30,6 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
[TestCase(2f)] [TestCase(2f)]
public void TestSizeMultiplier(float sizeMultiplier) => CreateModTest(new ModTestData { Mod = new OsuModFlashlight { StartingFlashlightSize = { Value = sizeMultiplier } }, PassCondition = () => true }); public void TestSizeMultiplier(float sizeMultiplier) => CreateModTest(new ModTestData { Mod = new OsuModFlashlight { StartingFlashlightSize = { Value = sizeMultiplier } }, PassCondition = () => true });
[Test]
public void TestComboBasedSize([Values] bool comboBasedSize) => CreateModTest(new ModTestData { Mod = new OsuModFlashlight { ComboBasedSize = { Value = comboBasedSize } }, PassCondition = () => true });
[Test] [Test]
public void TestPlayfieldBasedSize() public void TestPlayfieldBasedSize()
{ {

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

@ -149,7 +149,6 @@ namespace osu.Game.Rulesets.Mods
internal Func<Vector2>? GetPlayfieldScale; internal Func<Vector2>? GetPlayfieldScale;
protected Flashlight(ModFlashlight modFlashlight) protected Flashlight(ModFlashlight modFlashlight)
{ {
changeSizeCombo = modFlashlight.ChangeSizeComboDivisor.Value; changeSizeCombo = modFlashlight.ChangeSizeComboDivisor.Value;
@ -197,7 +196,7 @@ namespace osu.Game.Rulesets.Mods
Debug.Assert(Precision.AlmostEquals(Math.Abs(playfieldScale.X), Math.Abs(playfieldScale.Y)), Debug.Assert(Precision.AlmostEquals(Math.Abs(playfieldScale.X), Math.Abs(playfieldScale.Y)),
@"Playfield has non-proportional scaling. Flashlight implementations should be revisited with regard to balance."); @"Playfield has non-proportional scaling. Flashlight implementations should be revisited with regard to balance.");
size *= Math.Abs(playfieldScale.X); scale *= Math.Abs(playfieldScale.X);
} }
if (isBreakTime.Value) if (isBreakTime.Value)