Skip to content

Commit

Permalink
Merge pull request #443 from taulazer/dependabot/nuget/ppy.osu.Game-2…
Browse files Browse the repository at this point in the history 
…024.130.2

Bump ppy.osu.Game from 2023.1231.0 to 2024.130.2
  • Loading branch information
@LumpBloom7
LumpBloom7 authored Jan 30, 2024
2 parents 420c829 + 51e549b commit 4062d26
Show file tree
Hide file tree
Showing 5 changed files with 57 additions and 54 deletions.
81 changes: 41 additions & 40 deletions osu.Game.Rulesets.Tau.Tests/NonVisual/PolarSliderPathTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using NUnit.Framework;
using NUnit.Framework.Legacy;
using osu.Game.Rulesets.Tau.Objects;
using System.Linq;

Expand All @@ -16,17 +17,17 @@ public void TestNodeAt()
new(400, 50),
});

Assert.AreEqual(50, path.AngleAt(-50));
Assert.AreEqual(50, path.AngleAt(0));
Assert.AreEqual(55, path.AngleAt(50));
Assert.AreEqual(60, path.AngleAt(100));
Assert.AreEqual(65, path.AngleAt(150));
Assert.AreEqual(70, path.AngleAt(200));
Assert.AreEqual(65, path.AngleAt(250));
Assert.AreEqual(60, path.AngleAt(300));
Assert.AreEqual(55, path.AngleAt(350));
Assert.AreEqual(50, path.AngleAt(400));
Assert.AreEqual(50, path.AngleAt(450));
ClassicAssert.AreEqual(50, path.AngleAt(-50));
ClassicAssert.AreEqual(50, path.AngleAt(0));
ClassicAssert.AreEqual(55, path.AngleAt(50));
ClassicAssert.AreEqual(60, path.AngleAt(100));
ClassicAssert.AreEqual(65, path.AngleAt(150));
ClassicAssert.AreEqual(70, path.AngleAt(200));
ClassicAssert.AreEqual(65, path.AngleAt(250));
ClassicAssert.AreEqual(60, path.AngleAt(300));
ClassicAssert.AreEqual(55, path.AngleAt(350));
ClassicAssert.AreEqual(50, path.AngleAt(400));
ClassicAssert.AreEqual(50, path.AngleAt(450));
}

[Test]
Expand All @@ -38,12 +39,12 @@ public void TestNodeAtNegatives()
new(200, 10),
});

Assert.AreEqual(-10, path.AngleAt(-50));
Assert.AreEqual(-10, path.AngleAt(0));
Assert.AreEqual(-5, path.AngleAt(50));
Assert.AreEqual(0, path.AngleAt(100));
Assert.AreEqual(5, path.AngleAt(150));
Assert.AreEqual(10, path.AngleAt(200));
ClassicAssert.AreEqual(-10, path.AngleAt(-50));
ClassicAssert.AreEqual(-10, path.AngleAt(0));
ClassicAssert.AreEqual(-5, path.AngleAt(50));
ClassicAssert.AreEqual(0, path.AngleAt(100));
ClassicAssert.AreEqual(5, path.AngleAt(150));
ClassicAssert.AreEqual(10, path.AngleAt(200));
}

[Test]
Expand All @@ -58,18 +59,18 @@ public void TestNodesBetween()

var nodes = path.NodesBetween(50, 250).ToArray();

Assert.IsNotEmpty(nodes);
Assert.AreEqual(2, nodes.Length);
Assert.AreEqual(60, nodes[0].Angle);
Assert.AreEqual(70, nodes[1].Angle);
ClassicAssert.IsNotEmpty(nodes);
ClassicAssert.AreEqual(2, nodes.Length);
ClassicAssert.AreEqual(60, nodes[0].Angle);
ClassicAssert.AreEqual(70, nodes[1].Angle);

nodes = path.NodesBetween(50, 60).ToArray();
Assert.IsEmpty(nodes);
ClassicAssert.IsEmpty(nodes);

nodes = path.NodesBetween(90, 110).ToArray();
Assert.IsNotEmpty(nodes);
Assert.AreEqual(1, nodes.Length);
Assert.AreEqual(60, nodes[0].Angle);
ClassicAssert.IsNotEmpty(nodes);
ClassicAssert.AreEqual(1, nodes.Length);
ClassicAssert.AreEqual(60, nodes[0].Angle);
}

[Test]
Expand All @@ -82,11 +83,11 @@ public void TestCalculatedDistance()
new(400, 50),
});

Assert.AreEqual(0, path.Version.Value);
Assert.AreEqual(40, path.CalculatedDistance);
Assert.AreEqual(0, path.Version.Value);
Assert.AreEqual(20, path.CalculateLazyDistance(10));
Assert.AreEqual(0, path.CalculateLazyDistance(20));
ClassicAssert.AreEqual(0, path.Version.Value);
ClassicAssert.AreEqual(40, path.CalculatedDistance);
ClassicAssert.AreEqual(0, path.Version.Value);
ClassicAssert.AreEqual(20, path.CalculateLazyDistance(10));
ClassicAssert.AreEqual(0, path.CalculateLazyDistance(20));
}

[Test]
Expand All @@ -100,20 +101,20 @@ public void TestSegments()
});

var segments = path.SegmentsBetween(100, 300).ToArray();
Assert.AreEqual(2, segments.Length);
Assert.AreEqual(60, segments[0].From.Angle);
Assert.AreEqual(60, segments[1].To.Angle);
ClassicAssert.AreEqual(2, segments.Length);
ClassicAssert.AreEqual(60, segments[0].From.Angle);
ClassicAssert.AreEqual(60, segments[1].To.Angle);

segments = path.SegmentsBetween(50, 100).ToArray();
Assert.AreEqual(1, segments.Length);
Assert.AreEqual(55, segments[0].From.Angle);
Assert.AreEqual(60, segments[0].To.Angle);
ClassicAssert.AreEqual(1, segments.Length);
ClassicAssert.AreEqual(55, segments[0].From.Angle);
ClassicAssert.AreEqual(60, segments[0].To.Angle);

segments = path.SegmentsBetween(0, 400).ToArray();
Assert.AreEqual(2, segments.Length);
Assert.AreEqual(50, segments[0].From.Angle);
Assert.AreEqual(70, segments[0].To.Angle);
Assert.AreEqual(50, segments[1].To.Angle);
ClassicAssert.AreEqual(2, segments.Length);
ClassicAssert.AreEqual(50, segments[0].From.Angle);
ClassicAssert.AreEqual(70, segments[0].To.Angle);
ClassicAssert.AreEqual(50, segments[1].To.Angle);
}
}
}
23 changes: 14 additions & 9 deletions osu.Game.Rulesets.Tau.Tests/TestSceneDrawableJudgement.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ public TestSceneDrawableJudgement()
{
pools = new List<DrawablePool<TestDrawableTauJudgement>>();

for (int i = 0; i < 4; ++i)
{
var pool = new DrawablePool<TestDrawableTauJudgement>(1);
pools.Add(pool);

Add(new Container
{
Child = pool
});
}

foreach (var result in Enum.GetValues(typeof(HitResult)).OfType<HitResult>().Skip(1))
{
showResult(result);
Expand Down Expand Up @@ -73,16 +84,10 @@ private void showResult(HitResult result)

SetContents(_ =>
{
DrawablePool<TestDrawableTauJudgement> pool;
var pool = pools[poolIndex];

if (poolIndex >= pools.Count)
pools.Add(pool = new DrawablePool<TestDrawableTauJudgement>(1));
else
{
pool = pools[poolIndex];
((Container)pool.Parent).Clear(false);

((Container)pool.Parent).Clear(false);
}

var container = new Container
{
Expand All @@ -106,7 +111,7 @@ private void showResult(HitResult result)
}
};

poolIndex++;
poolIndex = (poolIndex + 1) % 4;

return container;
});
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Tau.Tests/VisualTestRunner.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public static class VisualTestRunner
[STAThread]
public static int Main(string[] args)
{
using DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu", new HostOptions { BindIPC = true });
using DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu");
host.Run(new OsuTestBrowser());

return 0;
Expand Down
3 changes: 0 additions & 3 deletions osu.Game.Rulesets.Tau/Mods/TauModFlashlight.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ public abstract partial class TauModFlashlight<T> : ModFlashlight, IApplicableTo
public void ApplyToScoreProcessor(ScoreProcessor scoreProcessor)
{
Combo.BindTo(scoreProcessor.Combo);

// Default value of ScoreProcessor's Rank in Flashlight Mod should be SS+
scoreProcessor.Rank.Value = ScoreRank.XH;
}

public ScoreRank AdjustRank(ScoreRank rank, double accuracy)
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game" Version="2023.1231.0" />
<PackageReference Include="ppy.osu.Game" Version="2024.130.2" />
</ItemGroup>
<ItemGroup>
<Compile Update="Objects\Drawables\DrawableSlider.Calculations.cs">
Expand Down

0 comments on commit 4062d26

Please sign in to comment.