1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 11:47:24 +08:00
Commit Graph

598 Commits

Author SHA1 Message Date
Dan Balasescu
b20ff22af0 Ensure travel distance is calculated for all sliders 2021-11-24 16:50:33 +09:00
Dan Balasescu
274444ed67 Add additional information to diagram 2021-11-24 13:22:52 +09:00
Dan Balasescu
b5747f351d Reword xmldocs 2021-11-24 13:11:44 +09:00
Dan Balasescu
a081038076 Normalized -> Normalised 2021-11-24 13:01:53 +09:00
Dan Balasescu
e07c44d79a Reword comment with a more diagrammatical explanation 2021-11-24 13:01:15 +09:00
Dan Balasescu
402de754f7 Make TravelDistance/TravelTime apply to the current object 2021-11-24 12:37:22 +09:00
Dan Balasescu
e67d9b1c21 Reorder members a bit 2021-11-24 12:14:52 +09:00
GoldenMine0502
9157b91e5f fix adding wrong values 2021-11-23 16:41:20 +09:00
MBmasher
7560d3de04 Remove decay factor in Flashlight skill 2021-11-22 10:52:04 +11:00
MBmasher
65ef030341 Further balancing 2021-11-22 08:59:41 +11:00
MBmasher
7833fab02d Balancing bonuses to adjust for corrected opacity formula 2021-11-22 08:41:56 +11:00
MBmasher
e9745a3ac4 Fix wrong opacity formula 2021-11-22 08:32:35 +11:00
MBmasher
e9a4ee6800 Cleaning up code 2021-11-21 23:53:40 +11:00
MBmasher
a57c277a58 Move preempt back to CreateDifficultyAttributes 2021-11-21 23:43:09 +11:00
MBmasher
afbec94124 Move opacity function to OsuDifficultyHitObject 2021-11-21 23:40:15 +11:00
Dean Herbert
9f688f6291 Stop persisting Skills in DifficultyAttributes 2021-11-21 12:15:32 +09:00
MBmasher
fe83b8fc77 Add line break 2021-11-18 10:50:32 +11:00
MBmasher
f4b23f0960 Remove setting preempt in CreateDifficultyAttributes 2021-11-18 10:37:07 +11:00
MBmasher
30e18f16d9 Change mods and preemptTime to readonly 2021-11-18 10:33:44 +11:00
MBmasher
92cf447180 Remove unnecessary braces 2021-11-18 10:32:41 +11:00
MBmasher
e42f28990b Add blank line 2021-11-18 10:30:17 +11:00
MBmasher
a77a9a2309 Balancing slider bonus 2021-11-18 10:13:25 +11:00
MBmasher
05b44f5df4 Add slider bonus to Flashlight skill 2021-11-18 09:55:04 +11:00
MBmasher
8e8571543d Removing unnecessary file 2021-11-18 09:48:18 +11:00
MBmasher
6a444b9edb Further balancing opacity/hidden bonus 2021-11-18 09:47:41 +11:00
Dean Herbert
fd0cae2bfb
Merge branch 'master' into difficulty-attribute-helpers 2021-11-17 20:49:31 +09:00
Dan Balasescu
815179f713 Use consts for attribute IDs 2021-11-17 20:31:18 +09:00
Dan Balasescu
43cbb23b15 Use ShouldSerializeFlashlightRating() to serialise database attribute 2021-11-17 20:23:08 +09:00
Dan Balasescu
2ae46f901e Add comment for implicitly-used method 2021-11-17 20:22:43 +09:00
MBmasher
63c5f7d9d7 Balancing opacity and hidden bonus 2021-11-17 11:39:12 +11:00
MBmasher
f2d05ea899 Remove strain being multiplied by max opacity bonus 2021-11-17 11:27:48 +11:00
Dan Balasescu
2c45a327bb Remove JsonIgnores, require opt-in properties 2021-11-15 19:54:35 +09:00
Dean Herbert
369b4ba789 Update DifficultyCalculator to take an IRulesetInfo 2021-11-15 19:16:48 +09:00
Dean Herbert
62d670a3ca Update DifficultyCalculator to take an IWorkingBeatmap 2021-11-15 19:16:48 +09:00
Dan Balasescu
c8a01c35f7 Remove extra members from FromDatabaseAttributes 2021-11-15 18:11:07 +09:00
Dan Balasescu
21c0882b74 Don't serialize FL rating without FL mod 2021-11-15 17:24:53 +09:00
Dan Balasescu
45382a8127 Ignore some properties 2021-11-15 16:32:25 +09:00
Dan Balasescu
0cfd6fdf04 Add to/from database mapping functions to difficulty attributes 2021-11-15 16:06:50 +09:00
Dan Balasescu
907499f73a Add json properties to difficulty attributes 2021-11-15 16:06:29 +09:00
MBmasher
efac11e886 Add extra bonus for hidden+flashlight 2021-11-12 21:42:27 +11:00
MBmasher
5a3be778a1 Resolve conflicts with recent slider hotfix 2021-11-12 21:41:01 +11:00
MBmasher
131e64e56c Add bonus based on opacity of hit objects 2021-11-12 21:29:51 +11:00
Dan Balasescu
9fb2402781 Remove unnecessary parens 2021-11-12 17:31:25 +09:00
apollo-dw
cdfe022805 Fix potential NaN values 2021-11-12 00:56:08 +00:00
apollo-dw
c330093476 Add clamp back in 2021-11-11 14:42:54 +00:00
apollo-dw
1ba01a7e9a Fix circle-only map NaN values 2021-11-11 14:37:50 +00:00
apollo-dw
95bfb2c69b Clamp slider end estimate to 0 2021-11-11 12:46:22 +00:00
apollo-dw
7075108062 Clean up clamp logic relating to slider end estimate 2021-11-11 02:57:34 +00:00
apollo-dw
86c6837e5d Make slider nerf factor more lenient 2021-11-11 02:49:24 +00:00
apollo-dw
5df694e912 Estimate number of difficult sliders, and increase assumed slider radius 2021-11-11 00:42:06 +00:00
apollo-dw
2d2a6d8a18 Swap to a harsher formula for slider dropped nerf 2021-11-10 04:00:54 +00:00
apollo-dw
fe2f143e8a Nerf slider aim for plays with dropped slider ends 2021-11-10 00:59:28 +00:00
Sebastian Krajewski
b84b288c23 Merge branch 'master' of github.com:ppy/osu into fix-initial-strain 2021-11-08 02:07:08 +01:00
Sebastian Krajewski
bd35a3b7ba Change currentStrain to 0 for standard mode skills 2021-11-08 01:53:51 +01:00
Dan Balasescu
547feaa392
Merge branch 'master' into aim-refactor-ppcalc 2021-11-08 01:38:18 +09:00
Dan Balasescu
fd9e86d399
Merge pull request #14847 from emu1337/aim-refactor-velocity
osu! Difficulty Aim Overhaul: velocity change
2021-11-08 01:38:07 +09:00
smoogipoo
480a1604fa Rename constant 2021-11-08 00:47:22 +09:00
smoogipoo
84f3168a6c More comment refactorings 2021-11-08 00:46:35 +09:00
Bartłomiej Dach
cc73db09d3
Merge branch 'master' into relax-nan-fix 2021-11-07 16:31:59 +01:00
Xexxar
fed733202e removed unneeded comment 2021-11-07 14:59:25 +00:00
Xexxar
4493ca4dda Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-07 14:56:50 +00:00
Xexxar
86b635cdd3 refactor comments to be on previous line for readability 2021-11-07 14:56:23 +00:00
Dean Herbert
ca933c53ab
Fix weird english in old comment 2021-11-07 23:52:32 +09:00
Xexxar
80248f436d Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-07 14:51:19 +00:00
Xexxar
e23b93bc4c Merge branch 'aim-refactor-slider' of https://github.com/emu1337/osu into aim-refactor-slider 2021-11-07 14:50:29 +00:00
Xexxar
03476e018e fixed comment 2021-11-07 14:49:26 +00:00
smoogipoo
6aecd682af Refactor a bit 2021-11-07 23:26:13 +09:00
Xexxar
771620cef1 refactored duplicate code for simplicity 2021-11-07 14:21:18 +00:00
Sebastian Krajewski
91e261e256 Start comments with upper case 2021-11-07 14:51:17 +01:00
Sebastian Krajewski
fedbbc0210 Add a comment why Math.Min is used 2021-11-07 14:50:00 +01:00
Sebastian Krajewski
b1f3fee239 Add sanity check in Relax effectiveMissCount calculation 2021-11-07 05:54:17 +01:00
Xexxar
291ef1fe9c Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-07 01:50:59 +00:00
Xexxar
24ba515f09 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-07 01:50:47 +00:00
Xexxar
22b9d2e879 adjustment to decrease slider leniency 2021-11-07 01:50:17 +00:00
Xexxar
866c731b74 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-07 01:09:09 +00:00
Xexxar
26ff292337 revert velchangetest change 2021-11-07 01:08:51 +00:00
Xexxar
fc25f9501f Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-07 00:13:37 +00:00
Xexxar
adeebd954a update to fix velocity change oversight 2021-11-07 00:13:13 +00:00
Xexxar
e0632c4b1f Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-06 22:28:13 +00:00
Xexxar
f135a98d69 updated for review, adding wide angle buff for velchanges 2021-11-06 22:27:58 +00:00
Xexxar
860f9f0860 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-06 21:56:02 +00:00
Xexxar
bd58d2873e revert velocity multiplier to 0.75 2021-11-06 21:55:47 +00:00
Xexxar
0fdfa77185 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-06 21:12:03 +00:00
Xexxar
7af1a0bf12 buffed velocity constant 2021-11-06 21:11:37 +00:00
Xexxar
454e51a4c5 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-06 21:11:14 +00:00
Xexxar
14a3e3bb06 nerfed approx slider window 2021-11-06 21:10:21 +00:00
Xexxar
fc33c96c38 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-06 19:44:39 +00:00
Xexxar
e50c7fff2f Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-06 19:44:21 +00:00
Xexxar
7d2c31f4df cleaned up code uglies 2021-11-06 19:42:54 +00:00
Xexxar
9b8b6846e9 restore original global multiplier so people dont mald 2021-11-06 19:22:30 +00:00
Xexxar
6f5cfe3268 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-06 19:22:08 +00:00
Xexxar
beea8e8ba6 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-06 19:18:50 +00:00
Xexxar
7e47432f93 merged latest 2021-11-06 19:18:25 +00:00
Xexxar
3e08772660 updated slider to use lazytraveldistance code location 2021-11-06 19:16:58 +00:00
smoogipoo
d76158cbad Resolve inspection 2021-11-04 09:20:46 +09:00
smoogipoo
23dbf04764 Fix incorrect type 2021-11-04 09:17:51 +09:00
Xexxar
6c6a440f1b applied constants to numbers 2021-11-03 18:09:44 +00:00
Xexxar
7eb0edf046 added stanrs requested changes 2021-11-03 17:59:09 +00:00
Xexxar
8e0d845f21 added small length component to ARbuffs 2021-11-03 16:39:05 +00:00
Xexxar
a92e588389 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-03 16:37:19 +00:00
Xexxar
45e0897530 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-03 16:37:02 +00:00
Xexxar
a32c97427d set angleBonus to take max of acute and wide multipliers 2021-11-03 16:36:39 +00:00
Xexxar
93ed97d11e increased global multiplier due to adjustment to sliders 2021-11-03 16:16:09 +00:00
Xexxar
a8d4d7ca2d Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-03 16:15:40 +00:00
Xexxar
d1ec245685 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-03 16:15:17 +00:00
Xexxar
7fc60a840e added radial leniency to movementdistance 2021-11-03 16:14:45 +00:00
Xexxar
8fdffbf08f adjusted global multiplier to better balance values against inflation 2021-11-03 16:02:23 +00:00
Xexxar
2d48301223 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-03 15:55:01 +00:00
Xexxar
d74e181531 renamed prev to last 2021-11-03 15:54:49 +00:00
Xexxar
b9fc355f74 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-03 15:53:41 +00:00
Xexxar
b3b44c0795 merged in aim-base 2021-11-03 15:52:48 +00:00
Xexxar
9afca5c5b6 rewrote slider algorithm to be based on leniency and stored current cursor positions 2021-11-03 15:38:23 +00:00
smoogipoo
133218ecbb Document special MovementDistance for sliders, ensure always has a value 2021-11-03 01:04:07 +09:00
smoogipoo
b0d9c0eca3 Refactor variables for readability in angle calculations 2021-11-03 00:16:33 +09:00
smoogipoo
93c03b9d37 Refactor documentation around velocity calculations 2021-11-03 00:04:19 +09:00
smoogipoo
7e0629774b Rename variables for readability
In particular, "last" vs "prev" can get confusing because they mean the
same thing.
2021-11-02 23:51:10 +09:00
smoogipoo
5454de7ae8 Refactor xmldocs 2021-11-02 23:47:20 +09:00
smoogipoo
be8a1f60c0 Apply styling changes 2021-11-02 23:33:51 +09:00
Xexxar
9f5a7526ed merge in ppy/master 2021-10-28 14:47:28 +00:00
Xexxar
219880d719 add in stanrs review 2021-10-28 14:45:45 +00:00
Xexxar
bc98e8c97c Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-27 18:10:11 +00:00
Xexxar
09d4ed149c merged latest slider 2021-10-27 18:09:50 +00:00
Xexxar
7eb7d12589 updated sliders to handle increased tick rates better 2021-10-27 18:08:30 +00:00
Xexxar
626db1f274 updated sliders to handle increased tick rates better 2021-10-27 18:08:06 +00:00
Xexxar
ddf87316df updated to add nerf for repeated acute angles 2021-10-27 16:30:17 +00:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Xexxar
ceb2bdece9 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-22 17:22:00 +00:00
Xexxar
b6e7d898f1 constant didnt update during last merge 2021-10-22 17:21:34 +00:00
Xexxar
19fb848ed2 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-22 17:19:04 +00:00
Xexxar
b9748399c4 added velocity adjustment for sliders 2021-10-22 17:18:34 +00:00
Xexxar
06e7c3cd04 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-10-22 17:17:36 +00:00
Xexxar
62197fec3a updated sliders for rebalance again 2021-10-22 17:17:19 +00:00
Xexxar
ce8899e7c8 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-21 21:38:37 +00:00
Xexxar
5ee2272d8a added slider changes 2021-10-21 21:37:38 +00:00
Xexxar
85f28a843a adjusted sliders further 2021-10-21 21:30:00 +00:00
Xexxar
ac22d31b34 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-21 19:58:55 +00:00
Xexxar
534d1e72ce merged sliders 2021-10-21 19:58:41 +00:00
Xexxar
ec06e53212 further rebalancing of sliders 2021-10-21 19:58:02 +00:00
Xexxar
b51a8dead5 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-21 19:29:30 +00:00
Xexxar
be2f9603c9 merged slider updates 2021-10-21 19:29:06 +00:00
Xexxar
e3a0e4749e removed excess acute anglebuff and buffed sliders to comp 2021-10-21 19:28:06 +00:00
Xexxar
55809c43ee Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-21 18:38:59 +00:00
Xexxar
692c7b4be1 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-10-21 18:38:32 +00:00
Xexxar
b1c18d1f36 Merge branch 'aim-refactor-base' into aim-refactor-slider 2021-10-21 18:37:22 +00:00
Xexxar
2f8972b529 reverted overwritten file 2021-10-21 18:37:06 +00:00
Xexxar
ca3259d4e9 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-21 17:22:33 +00:00
Xexxar
fd991296fa Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-10-21 17:22:09 +00:00
Xexxar
613a548583 Merge branch 'aim-refactor-base' into aim-refactor-slider 2021-10-21 17:21:52 +00:00
Xexxar
d6aa2fe6e4 identified case with spinner where / 0 could theoretically be possible 2021-10-21 17:21:34 +00:00
Xexxar
a23330c49b removed comment 2021-10-21 17:21:03 +00:00
Xexxar
dba0ee0b1d added ppcalc changes to build 2021-10-21 17:18:24 +00:00
Xexxar
81e817f881 updated to latest version of velchange 2021-10-21 17:07:56 +00:00
Xexxar
276b4afdb0 removed unnecessary test code 2021-10-21 16:14:31 +00:00
Xexxar
4fe007aa2e new slider travel dist algorithm 2021-10-21 16:08:35 +00:00
Xexxar
bef6e100fa Merge branch 'aim-refactor-base' into aim-refactor-slider 2021-10-21 16:01:38 +00:00
Xexxar
cb605f9156 removed ppCalc changes and sliderabuseChecks 2021-10-21 16:00:57 +00:00
Xexxar
750c5a0181 Merge remote-tracking branch 'ppy/master' into aim-refactor-base 2021-10-21 15:45:31 +00:00
Xexxar
c074304ec3 updated to latest version of base 2021-10-17 04:48:57 +00:00
Xexxar
14d405786e resolved nans and added stacked slider fix 2021-10-17 03:56:53 +00:00
smoogipoo
30eb08d394 Merge branch 'master' into aim-refactor-base 2021-10-17 12:00:39 +09:00
smoogipoo
80827b741f Merge branch 'master' into effective-miss-count 2021-10-16 21:43:34 +09:00
StanR
ccaac97794 Clamp comboBasedMissCount 2021-10-16 14:50:15 +03:00
StanR
c8d99e68a5 Remove calculation for scores with combo above threshold, avoid division by zero 2021-10-15 16:51:05 +03:00
smoogipoo
1a18d3598a Merge branch 'master' into fix-invisible-sinners 2021-10-15 20:45:40 +09:00
StanR
205d95e8c6 Approximate amount of effective misses using combo 2021-10-13 20:04:34 +03:00
Xexxar
4edf559408 adjusted constant to 1.5 from 2.0 for acute 2021-10-13 16:45:58 +00:00
Xexxar
cde4b0b17c forgot to add double delcaration, remember to test 2021-10-13 16:25:16 +00:00
Xexxar
0b794728ea updated to latest version with slider calc 2021-10-13 16:17:49 +00:00
Xexxar
0292fe1c83 removed residual code leftover 2021-10-13 16:04:39 +00:00
Xexxar
200149c9d7 updated to newly refactored aim 2021-10-13 15:41:24 +00:00
emu1337
d7483a6c5d changed pow to exp function 2021-10-11 19:58:03 +02:00
emu1337
aab3277024 changed speed acc scaling to be closer to worst case scenario 2021-10-11 03:12:57 +02:00
Xexxar
56daac73f2 merged ppy/master 2021-10-10 17:12:49 +00:00
Dean Herbert
b8fe744d2b
Merge pull request #15008 from stanriders/remove-int-casts
Remove int casts in difficulty calculation
2021-10-10 16:48:37 +09:00
smoogipoo
e7a3467655 Merge branch 'master' into skillsrework 2021-10-10 16:16:54 +09:00
StanR
abd32e30f1
Update osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
Co-authored-by: Liam DeVoe <orionldevoe@gmail.com>
2021-10-09 21:11:24 +03:00
StanR
3b0b8707fe Reduce nesting, check all objects for spinners 2021-10-09 20:28:42 +03:00
StanR
b72b071c25 Fix instant spinners giving insane amounts of strain 2021-10-09 12:35:17 +03:00
StanR
37632fe4dc Remove int casts in difficulty calculation, fixup some comments 2021-10-09 12:08:57 +03:00
smoogipoo
f0affa9f5a Don't refer to BeatmapInfo 2021-10-08 19:50:31 +09:00
smoogipoo
3a4807a032 Merge branch 'master' into blinds-pp 2021-10-08 19:45:59 +09:00
smoogipoo
cefef81cdf Merge branch 'master' into skillsrework 2021-10-08 18:21:51 +09:00
Dan Balasescu
5b89293fa3
Merge pull request #14942 from apollo-dw/relax-osu-pp
Implement Relax difficulty calculation in osu!
2021-10-08 16:47:43 +09:00
apollo-dw
57c069e0e1 Remove unused strings 2021-10-06 23:50:23 +01:00
apollo-dw
d6eab02d92 Return 0 for speed with relax 2021-10-06 16:53:33 +01:00
apollo-dw
34269d48e5 Use global multipliers instead of multiplying skill values 2021-10-06 12:25:19 +01:00
Dean Herbert
b339c149d8 Copy BaseDifficulty to Beatmap<T> and move all write operations across 2021-10-06 15:10:45 +09:00
emu1337
d17beb9bbe improved overall balance 2021-10-06 01:39:01 +02:00
emu1337
3cb816b6cd fixed some nerfs not carrying to the next iteration 2021-10-05 21:19:00 +02:00
Xexxar
94f8692b00 removed acc changes to put in seperate PR 2021-10-03 17:42:49 +00:00
Xexxar
bc3ae4c4f8 changed function names to be consistent 2021-10-03 17:36:34 +00:00
Xexxar
6d134b2a83 resolved code cleanliness issues 2021-10-03 17:32:03 +00:00
Xexxar
ba2c44a2f4 reworked strain to fix issue with overlapping hitwindo 2021-10-03 17:31:56 +00:00
apollo-dw
03f0a36589 additional balancing 2021-10-03 11:53:14 +01:00
apollo-dw
bc1ff019da Implement relax checks 2021-10-03 11:27:17 +01:00
apollo-dw
a5025dc8b8 Buff base multiplier 2021-10-01 22:23:16 +01:00
apollo-dw
310bf3e580 more code quality (oops) 2021-10-01 15:29:20 +01:00
apollo-dw
57b9a91cba trim whitespace cuz code quality 2021-10-01 15:26:59 +01:00
apollo-dw
7884dbbd11 adjust formulae 2021-10-01 15:04:44 +01:00
Dean Herbert
05996cc2e9 Add changes that got forgotted in branch surgery 2021-10-01 17:04:53 +09:00