From d5334da8c5b9e8127b97b8bfdcb6f3db23aaeef0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:57:35 +0000 Subject: [PATCH 1/3] Bump the osu-rulesets group across 8 directories with 4 updates Bumps the osu-rulesets group with 2 updates in the /Difficalcy.Catch directory: [ppy.osu.Game.Rulesets.Catch](https://github.com/ppy/osu) and [ppy.osu.Game.Rulesets.Osu](https://github.com/ppy/osu). Bumps the osu-rulesets group with 2 updates in the /Difficalcy.Catch.Tests directory: [ppy.osu.Game.Rulesets.Catch](https://github.com/ppy/osu) and [ppy.osu.Game.Rulesets.Osu](https://github.com/ppy/osu). Bumps the osu-rulesets group with 2 updates in the /Difficalcy.Mania directory: [ppy.osu.Game.Rulesets.Osu](https://github.com/ppy/osu) and [ppy.osu.Game.Rulesets.Mania](https://github.com/ppy/osu). Bumps the osu-rulesets group with 2 updates in the /Difficalcy.Mania.Tests directory: [ppy.osu.Game.Rulesets.Osu](https://github.com/ppy/osu) and [ppy.osu.Game.Rulesets.Mania](https://github.com/ppy/osu). Bumps the osu-rulesets group with 1 update in the /Difficalcy.Osu directory: [ppy.osu.Game.Rulesets.Osu](https://github.com/ppy/osu). Bumps the osu-rulesets group with 1 update in the /Difficalcy.Osu.Tests directory: [ppy.osu.Game.Rulesets.Osu](https://github.com/ppy/osu). Bumps the osu-rulesets group with 2 updates in the /Difficalcy.Taiko directory: [ppy.osu.Game.Rulesets.Osu](https://github.com/ppy/osu) and [ppy.osu.Game.Rulesets.Taiko](https://github.com/ppy/osu). Bumps the osu-rulesets group with 2 updates in the /Difficalcy.Taiko.Tests directory: [ppy.osu.Game.Rulesets.Osu](https://github.com/ppy/osu) and [ppy.osu.Game.Rulesets.Taiko](https://github.com/ppy/osu). Updates `ppy.osu.Game.Rulesets.Catch` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Osu` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Catch` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Osu` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Osu` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Mania` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Osu` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Mania` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Osu` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Osu` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Osu` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Taiko` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Osu` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) Updates `ppy.osu.Game.Rulesets.Taiko` from 2024.1023.0 to 2024.1104.0 - [Release notes](https://github.com/ppy/osu/releases) - [Commits](https://github.com/ppy/osu/compare/2024.1023.0...2024.1104.0) --- updated-dependencies: - dependency-name: ppy.osu.Game.Rulesets.Catch dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Osu dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Catch dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Osu dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Osu dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Mania dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Osu dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Mania dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Osu dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Osu dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Osu dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Taiko dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Osu dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets - dependency-name: ppy.osu.Game.Rulesets.Taiko dependency-type: direct:production update-type: version-update:semver-minor dependency-group: osu-rulesets ... Signed-off-by: dependabot[bot] --- Difficalcy.Catch/Difficalcy.Catch.csproj | 4 ++-- Difficalcy.Mania/Difficalcy.Mania.csproj | 4 ++-- Difficalcy.Osu/Difficalcy.Osu.csproj | 2 +- Difficalcy.Taiko/Difficalcy.Taiko.csproj | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Difficalcy.Catch/Difficalcy.Catch.csproj b/Difficalcy.Catch/Difficalcy.Catch.csproj index 7f33f06..a72feb3 100644 --- a/Difficalcy.Catch/Difficalcy.Catch.csproj +++ b/Difficalcy.Catch/Difficalcy.Catch.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/Difficalcy.Mania/Difficalcy.Mania.csproj b/Difficalcy.Mania/Difficalcy.Mania.csproj index 97b96f4..3723974 100644 --- a/Difficalcy.Mania/Difficalcy.Mania.csproj +++ b/Difficalcy.Mania/Difficalcy.Mania.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/Difficalcy.Osu/Difficalcy.Osu.csproj b/Difficalcy.Osu/Difficalcy.Osu.csproj index fc21381..7e7cf5a 100644 --- a/Difficalcy.Osu/Difficalcy.Osu.csproj +++ b/Difficalcy.Osu/Difficalcy.Osu.csproj @@ -5,7 +5,7 @@ - + diff --git a/Difficalcy.Taiko/Difficalcy.Taiko.csproj b/Difficalcy.Taiko/Difficalcy.Taiko.csproj index 4a1333c..a639f35 100644 --- a/Difficalcy.Taiko/Difficalcy.Taiko.csproj +++ b/Difficalcy.Taiko/Difficalcy.Taiko.csproj @@ -5,8 +5,8 @@ - - + + From de8b128cfa259375a25dcb4137a062bbe63159c0 Mon Sep 17 00:00:00 2001 From: Samuel Cattini-Schultz Date: Tue, 12 Nov 2024 22:23:19 +1100 Subject: [PATCH 2/3] Add MonoStaminaFactor to taiko diff attributes --- Difficalcy.Taiko/Services/TaikoCalculatorService.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Difficalcy.Taiko/Services/TaikoCalculatorService.cs b/Difficalcy.Taiko/Services/TaikoCalculatorService.cs index 63644e1..dd9959e 100644 --- a/Difficalcy.Taiko/Services/TaikoCalculatorService.cs +++ b/Difficalcy.Taiko/Services/TaikoCalculatorService.cs @@ -71,6 +71,7 @@ Mod[] mods difficultyAttributes.StarRating, difficultyAttributes.MaxCombo, difficultyAttributes.StaminaDifficulty, + difficultyAttributes.MonoStaminaFactor, difficultyAttributes.RhythmDifficulty, difficultyAttributes.ColourDifficulty, difficultyAttributes.PeakDifficulty, From cfc33b37da9a2d285de64053679327ad2a159105 Mon Sep 17 00:00:00 2001 From: Samuel Cattini-Schultz Date: Tue, 12 Nov 2024 22:23:38 +1100 Subject: [PATCH 3/3] Update taiko tests --- Difficalcy.Taiko.Tests/TaikoCalculatorServiceTest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Difficalcy.Taiko.Tests/TaikoCalculatorServiceTest.cs b/Difficalcy.Taiko.Tests/TaikoCalculatorServiceTest.cs index 03e7cfa..9de89d0 100644 --- a/Difficalcy.Taiko.Tests/TaikoCalculatorServiceTest.cs +++ b/Difficalcy.Taiko.Tests/TaikoCalculatorServiceTest.cs @@ -21,8 +21,8 @@ protected override CalculatorService< ); [Theory] - [InlineData(3.092021259435121d, 137.80325540434842d, "diffcalc-test", new string[] { })] - [InlineData(4.0789820318081444d, 248.8310568362074d, "diffcalc-test", new string[] { "DT" })] + [InlineData(3.092021259435121d, 135.79672372953866, "diffcalc-test", new string[] { })] + [InlineData(4.0789820318081444d, 248.7184459889834, "diffcalc-test", new string[] { "DT" })] public void Test( double expectedDifficultyTotal, double expectedPerformanceTotal, @@ -58,6 +58,6 @@ public void TestAllParameters() Misses = 5, Oks = 3, }; - TestGetCalculationReturnsCorrectValues(4.922364692298034, 359.95282202016443, score); + TestGetCalculationReturnsCorrectValues(4.922364692298034, 359.9526882598762d, score); } }