1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 08:07:24 +08:00

Merge pull request #16111 from smoogipoo/test-hyper-generation

Test hyperdash generation in catch conversion tests
This commit is contained in:
Bartłomiej Dach 2021-12-17 10:35:55 +01:00 committed by GitHub
commit 869e30995b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 967 additions and 424 deletions

View File

@ -27,6 +27,7 @@ namespace osu.Game.Rulesets.Catch.Tests
[TestCase("hardrock-repeat-slider", new[] { typeof(CatchModHardRock) })]
[TestCase("hardrock-spinner", new[] { typeof(CatchModHardRock) })]
[TestCase("right-bound-hr-offset", new[] { typeof(CatchModHardRock) })]
[TestCase("basic-hyperdash")]
public new void Test(string name, params Type[] mods) => base.Test(name, mods);
protected override IEnumerable<ConvertValue> CreateConvertValue(HitObject hitObject)
@ -70,6 +71,7 @@ namespace osu.Game.Rulesets.Catch.Tests
HitObject = hitObject;
startTime = 0;
position = 0;
hyperDash = false;
}
private double startTime;
@ -88,8 +90,17 @@ namespace osu.Game.Rulesets.Catch.Tests
set => position = value;
}
private bool hyperDash;
public bool HyperDash
{
get => (HitObject as PalpableCatchHitObject)?.HyperDash ?? hyperDash;
set => hyperDash = value;
}
public bool Equals(ConvertValue other)
=> Precision.AlmostEquals(StartTime, other.StartTime, conversion_lenience)
&& Precision.AlmostEquals(Position, other.Position, conversion_lenience);
&& Precision.AlmostEquals(Position, other.Position, conversion_lenience)
&& HyperDash == other.HyperDash;
}
}

View File

@ -0,0 +1,19 @@
{
"Mappings": [{
"StartTime": 369,
"Objects": [{
"StartTime": 369,
"Position": 0,
"HyperDash": true
}]
},
{
"StartTime": 450,
"Objects": [{
"StartTime": 450,
"Position": 512,
"HyperDash": false
}]
}
]
}

View File

@ -0,0 +1,21 @@
osu file format v14
[General]
StackLeniency: 0.7
Mode: 2
[Difficulty]
HPDrainRate:6
CircleSize:4
OverallDifficulty:9.6
ApproachRate:9.6
SliderMultiplier:1.9
SliderTickRate:1
[TimingPoints]
2169,266.666666666667,4,2,1,70,1,0
[HitObjects]
0,192,369,1,0,0:0:0:0:
512,192,450,1,0,0:0:0:0:

View File

@ -3,147 +3,183 @@
"StartTime": 369,
"Objects": [{
"StartTime": 369,
"Position": 177
"Position": 177,
"HyperDash": false
},
{
"StartTime": 450,
"Position": 216.539276
"Position": 216.539276,
"HyperDash": false
},
{
"StartTime": 532,
"Position": 256.5667
"Position": 256.5667,
"HyperDash": false
},
{
"StartTime": 614,
"Position": 296.594116
"Position": 296.594116,
"HyperDash": false
},
{
"StartTime": 696,
"Position": 336.621521
"Position": 336.621521,
"HyperDash": false
},
{
"StartTime": 778,
"Position": 376.99762
"Position": 376.99762,
"HyperDash": false
},
{
"StartTime": 860,
"Position": 337.318878
"Position": 337.318878,
"HyperDash": false
},
{
"StartTime": 942,
"Position": 297.291443
"Position": 297.291443,
"HyperDash": false
},
{
"StartTime": 1024,
"Position": 257.264038
"Position": 257.264038,
"HyperDash": false
},
{
"StartTime": 1106,
"Position": 217.2366
"Position": 217.2366,
"HyperDash": false
},
{
"StartTime": 1188,
"Position": 177
"Position": 177,
"HyperDash": false
},
{
"StartTime": 1270,
"Position": 216.818192
"Position": 216.818192,
"HyperDash": false
},
{
"StartTime": 1352,
"Position": 256.8456
"Position": 256.8456,
"HyperDash": false
},
{
"StartTime": 1434,
"Position": 296.873047
"Position": 296.873047,
"HyperDash": false
},
{
"StartTime": 1516,
"Position": 336.900452
"Position": 336.900452,
"HyperDash": false
},
{
"StartTime": 1598,
"Position": 376.99762
"Position": 376.99762,
"HyperDash": false
},
{
"StartTime": 1680,
"Position": 337.039948
"Position": 337.039948,
"HyperDash": false
},
{
"StartTime": 1762,
"Position": 297.0125
"Position": 297.0125,
"HyperDash": false
},
{
"StartTime": 1844,
"Position": 256.9851
"Position": 256.9851,
"HyperDash": false
},
{
"StartTime": 1926,
"Position": 216.957672
"Position": 216.957672,
"HyperDash": false
},
{
"StartTime": 2008,
"Position": 177
"Position": 177,
"HyperDash": false
},
{
"StartTime": 2090,
"Position": 217.097137
"Position": 217.097137,
"HyperDash": false
},
{
"StartTime": 2172,
"Position": 257.124573
"Position": 257.124573,
"HyperDash": false
},
{
"StartTime": 2254,
"Position": 297.152
"Position": 297.152,
"HyperDash": false
},
{
"StartTime": 2336,
"Position": 337.179443
"Position": 337.179443,
"HyperDash": false
},
{
"StartTime": 2418,
"Position": 376.99762
"Position": 376.99762,
"HyperDash": false
},
{
"StartTime": 2500,
"Position": 336.760956
"Position": 336.760956,
"HyperDash": false
},
{
"StartTime": 2582,
"Position": 296.733643
"Position": 296.733643,
"HyperDash": false
},
{
"StartTime": 2664,
"Position": 256.7062
"Position": 256.7062,
"HyperDash": false
},
{
"StartTime": 2746,
"Position": 216.678772
"Position": 216.678772,
"HyperDash": false
},
{
"StartTime": 2828,
"Position": 177
"Position": 177,
"HyperDash": false
},
{
"StartTime": 2909,
"Position": 216.887909
"Position": 216.887909,
"HyperDash": false
},
{
"StartTime": 2991,
"Position": 256.915344
"Position": 256.915344,
"HyperDash": false
},
{
"StartTime": 3073,
"Position": 296.942749
"Position": 296.942749,
"HyperDash": false
},
{
"StartTime": 3155,
"Position": 336.970184
"Position": 336.970184,
"HyperDash": false
},
{
"StartTime": 3237,
"Position": 376.99762
"Position": 376.99762,
"HyperDash": false
}
]
}]

View File

@ -3,71 +3,88 @@
"StartTime": 369,
"Objects": [{
"StartTime": 369,
"Position": 65
"Position": 65,
"HyperDash": false
},
{
"StartTime": 450,
"Position": 482
"Position": 482,
"HyperDash": false
},
{
"StartTime": 532,
"Position": 164
"Position": 164,
"HyperDash": false
},
{
"StartTime": 614,
"Position": 315
"Position": 315,
"HyperDash": false
},
{
"StartTime": 696,
"Position": 145
"Position": 145,
"HyperDash": false
},
{
"StartTime": 778,
"Position": 159
"Position": 159,
"HyperDash": false
},
{
"StartTime": 860,
"Position": 310
"Position": 310,
"HyperDash": false
},
{
"StartTime": 942,
"Position": 441
"Position": 441,
"HyperDash": false
},
{
"StartTime": 1024,
"Position": 428
"Position": 428,
"HyperDash": false
},
{
"StartTime": 1106,
"Position": 243
"Position": 243,
"HyperDash": false
},
{
"StartTime": 1188,
"Position": 422
"Position": 422,
"HyperDash": false
},
{
"StartTime": 1270,
"Position": 481
"Position": 481,
"HyperDash": false
},
{
"StartTime": 1352,
"Position": 104
"Position": 104,
"HyperDash": false
},
{
"StartTime": 1434,
"Position": 473
"Position": 473,
"HyperDash": false
},
{
"StartTime": 1516,
"Position": 135
"Position": 135,
"HyperDash": false
},
{
"StartTime": 1598,
"Position": 360
"Position": 360,
"HyperDash": false
},
{
"StartTime": 1680,
"Position": 123
"Position": 123,
"HyperDash": false
}
]
}]

View File

@ -3,231 +3,264 @@
"StartTime": 369,
"Objects": [{
"StartTime": 369,
"Position": 258
"Position": 258,
"HyperDash": false
}]
},
{
"StartTime": 450,
"Objects": [{
"StartTime": 450,
"Position": 254
"Position": 254,
"HyperDash": false
}]
},
{
"StartTime": 532,
"Objects": [{
"StartTime": 532,
"Position": 241
"Position": 241,
"HyperDash": false
}]
},
{
"StartTime": 614,
"Objects": [{
"StartTime": 614,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 696,
"Objects": [{
"StartTime": 696,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 778,
"Objects": [{
"StartTime": 778,
"Position": 278
"Position": 278,
"HyperDash": false
}]
},
{
"StartTime": 860,
"Objects": [{
"StartTime": 860,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 942,
"Objects": [{
"StartTime": 942,
"Position": 278
"Position": 278,
"HyperDash": false
}]
},
{
"StartTime": 1024,
"Objects": [{
"StartTime": 1024,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 1106,
"Objects": [{
"StartTime": 1106,
"Position": 278
"Position": 278,
"HyperDash": false
}]
},
{
"StartTime": 1188,
"Objects": [{
"StartTime": 1188,
"Position": 278
"Position": 278,
"HyperDash": false
}]
},
{
"StartTime": 1270,
"Objects": [{
"StartTime": 1270,
"Position": 278
"Position": 278,
"HyperDash": false
}]
},
{
"StartTime": 1352,
"Objects": [{
"StartTime": 1352,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 1434,
"Objects": [{
"StartTime": 1434,
"Position": 258
"Position": 258,
"HyperDash": false
}]
},
{
"StartTime": 1516,
"Objects": [{
"StartTime": 1516,
"Position": 253
"Position": 253,
"HyperDash": false
}]
},
{
"StartTime": 1598,
"Objects": [{
"StartTime": 1598,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 1680,
"Objects": [{
"StartTime": 1680,
"Position": 260
"Position": 260,
"HyperDash": false
}]
},
{
"StartTime": 1762,
"Objects": [{
"StartTime": 1762,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 1844,
"Objects": [{
"StartTime": 1844,
"Position": 278
"Position": 278,
"HyperDash": false
}]
},
{
"StartTime": 1926,
"Objects": [{
"StartTime": 1926,
"Position": 278
"Position": 278,
"HyperDash": false
}]
},
{
"StartTime": 2008,
"Objects": [{
"StartTime": 2008,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 2090,
"Objects": [{
"StartTime": 2090,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 2172,
"Objects": [{
"StartTime": 2172,
"Position": 243
"Position": 243,
"HyperDash": false
}]
},
{
"StartTime": 2254,
"Objects": [{
"StartTime": 2254,
"Position": 278
"Position": 278,
"HyperDash": false
}]
},
{
"StartTime": 2336,
"Objects": [{
"StartTime": 2336,
"Position": 278
"Position": 278,
"HyperDash": false
}]
},
{
"StartTime": 2418,
"Objects": [{
"StartTime": 2418,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 2500,
"Objects": [{
"StartTime": 2500,
"Position": 258
"Position": 258,
"HyperDash": false
}]
},
{
"StartTime": 2582,
"Objects": [{
"StartTime": 2582,
"Position": 256
"Position": 256,
"HyperDash": false
}]
},
{
"StartTime": 2664,
"Objects": [{
"StartTime": 2664,
"Position": 242
"Position": 242,
"HyperDash": false
}]
},
{
"StartTime": 2746,
"Objects": [{
"StartTime": 2746,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 2828,
"Objects": [{
"StartTime": 2828,
"Position": 238
"Position": 238,
"HyperDash": false
}]
},
{
"StartTime": 2909,
"Objects": [{
"StartTime": 2909,
"Position": 271
"Position": 271,
"HyperDash": false
}]
},
{
"StartTime": 2991,
"Objects": [{
"StartTime": 2991,
"Position": 254
"Position": 254,
"HyperDash": false
}]
}
]

View File

@ -3,14 +3,16 @@
"StartTime": 3368,
"Objects": [{
"StartTime": 3368,
"Position": 374
"Position": 374,
"HyperDash": false
}]
},
{
"StartTime": 3501,
"Objects": [{
"StartTime": 3501,
"Position": 446
"Position": 446,
"HyperDash": false
}]
}
]

View File

@ -1 +1,71 @@
{"Mappings":[{"StartTime":19184.0,"Objects":[{"StartTime":19184.0,"Position":320.0},{"StartTime":19263.0,"Position":311.730255},{"StartTime":19343.0,"Position":324.6205},{"StartTime":19423.0,"Position":343.0907},{"StartTime":19503.0,"Position":372.2917},{"StartTime":19582.0,"Position":385.194733},{"StartTime":19662.0,"Position":379.0426},{"StartTime":19742.0,"Position":385.1066},{"StartTime":19822.0,"Position":391.624664},{"StartTime":19919.0,"Position":386.27832},{"StartTime":20016.0,"Position":380.117035},{"StartTime":20113.0,"Position":381.664154},{"StartTime":20247.0,"Position":370.872864}]}]}
{
"Mappings": [{
"StartTime": 19184,
"Objects": [{
"StartTime": 19184,
"Position": 320,
"HyperDash": false
},
{
"StartTime": 19263,
"Position": 311.730255,
"HyperDash": false
},
{
"StartTime": 19343,
"Position": 324.6205,
"HyperDash": false
},
{
"StartTime": 19423,
"Position": 343.0907,
"HyperDash": false
},
{
"StartTime": 19503,
"Position": 372.2917,
"HyperDash": false
},
{
"StartTime": 19582,
"Position": 385.194733,
"HyperDash": false
},
{
"StartTime": 19662,
"Position": 379.0426,
"HyperDash": false
},
{
"StartTime": 19742,
"Position": 385.1066,
"HyperDash": false
},
{
"StartTime": 19822,
"Position": 391.624664,
"HyperDash": false
},
{
"StartTime": 19919,
"Position": 386.27832,
"HyperDash": false
},
{
"StartTime": 20016,
"Position": 380.117035,
"HyperDash": false
},
{
"StartTime": 20113,
"Position": 381.664154,
"HyperDash": false
},
{
"StartTime": 20247,
"Position": 370.872864,
"HyperDash": false
}
]
}]
}

View File

@ -3,18 +3,21 @@
"StartTime": 2589,
"Objects": [{
"StartTime": 2589,
"Position": 256
"Position": 256,
"HyperDash": false
}]
},
{
"StartTime": 2915,
"Objects": [{
"StartTime": 2915,
"Position": 65
"Position": 65,
"HyperDash": false
},
{
"StartTime": 2916,
"Position": 482
"Position": 482,
"HyperDash": false
}
]
},
@ -22,11 +25,13 @@
"StartTime": 3078,
"Objects": [{
"StartTime": 3078,
"Position": 164
"Position": 164,
"HyperDash": false
},
{
"StartTime": 3079,
"Position": 315
"Position": 315,
"HyperDash": false
}
]
},
@ -34,11 +39,13 @@
"StartTime": 3241,
"Objects": [{
"StartTime": 3241,
"Position": 145
"Position": 145,
"HyperDash": false
},
{
"StartTime": 3242,
"Position": 159
"Position": 159,
"HyperDash": false
}
]
},
@ -46,11 +53,13 @@
"StartTime": 3404,
"Objects": [{
"StartTime": 3404,
"Position": 310
"Position": 310,
"HyperDash": false
},
{
"StartTime": 3405,
"Position": 441
"Position": 441,
"HyperDash": false
}
]
},
@ -58,7 +67,8 @@
"StartTime": 5197,
"Objects": [{
"StartTime": 5197,
"Position": 256
"Position": 256,
"HyperDash": false
}]
}
]

View File

@ -3,71 +3,88 @@
"StartTime": 18500,
"Objects": [{
"StartTime": 18500,
"Position": 65
"Position": 65,
"HyperDash": false
},
{
"StartTime": 18559,
"Position": 482
"Position": 482,
"HyperDash": false
},
{
"StartTime": 18618,
"Position": 164
"Position": 164,
"HyperDash": false
},
{
"StartTime": 18678,
"Position": 315
"Position": 315,
"HyperDash": false
},
{
"StartTime": 18737,
"Position": 145
"Position": 145,
"HyperDash": false
},
{
"StartTime": 18796,
"Position": 159
"Position": 159,
"HyperDash": false
},
{
"StartTime": 18856,
"Position": 310
"Position": 310,
"HyperDash": false
},
{
"StartTime": 18915,
"Position": 441
"Position": 441,
"HyperDash": false
},
{
"StartTime": 18975,
"Position": 428
"Position": 428,
"HyperDash": false
},
{
"StartTime": 19034,
"Position": 243
"Position": 243,
"HyperDash": false
},
{
"StartTime": 19093,
"Position": 422
"Position": 422,
"HyperDash": false
},
{
"StartTime": 19153,
"Position": 481
"Position": 481,
"HyperDash": false
},
{
"StartTime": 19212,
"Position": 104
"Position": 104,
"HyperDash": false
},
{
"StartTime": 19271,
"Position": 473
"Position": 473,
"HyperDash": false
},
{
"StartTime": 19331,
"Position": 135
"Position": 135,
"HyperDash": false
},
{
"StartTime": 19390,
"Position": 360
"Position": 360,
"HyperDash": false
},
{
"StartTime": 19450,
"Position": 123
"Position": 123,
"HyperDash": false
}
]
}]