1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-18 01:23:05 +08:00
Commit Graph

620 Commits

Author SHA1 Message Date
Dan Balasescu
6d2a2ba7d6 Rename Position -> Index 2022-06-09 18:49:11 +09:00
apollo-dw
774ac13900 Add xmldocs 2022-05-28 14:09:08 +01:00
apollo-dw
b631cefc55 Move object difficulty calculation to evaluator methods 2022-05-28 13:29:09 +01:00
apollo-dw
777d9af0f5 Move object difficulty calculation to evaluator methods 2022-05-28 13:28:04 +01:00
apollo-dw
66a6467403 Pass object position to the object 2022-05-26 19:26:14 +01:00
Dan Balasescu
8a4f52287c Re-invert distances, cleanup, use actual normalised distance 2022-05-25 13:38:36 +09:00
Dan Balasescu
cde06ecf17 Apply code reviews 2022-05-25 13:03:08 +09:00
Dan Balasescu
7b2a5d4f76 Adjust xmldoc for correctness 2022-05-25 13:01:27 +09:00
apollo-dw
1ef711de41 Return null for out of range objects 2022-05-24 16:40:24 +01:00
apollo-dw
30b9e0e7ab Use object list size for object position 2022-05-24 16:30:25 +01:00
apollo-dw
5dbec92d9e Update comments 2022-05-23 22:17:29 +01:00
Jamieson Berida
c9b00a2302
Merge branch 'master' into fl-slider 2022-05-23 17:42:12 +10:00
apollo-dw
26985ca8af Store hitobject history in the hitobject 2022-05-22 16:26:22 +01:00
Dan Balasescu
b71274265f
Merge pull request #15665 from MBmasher/fl-opacity
Consider opacity of hit objects in Flashlight skill
2022-05-12 19:00:21 +09:00
Dan Balasescu
4463a26f4e Refactor opacity computation algorithm 2022-05-12 18:31:10 +09:00
Dan Balasescu
637f817696 Ignore zero-sections on a per-case basis 2022-05-03 16:06:20 +09:00
Dan Balasescu
ce095d6af6 Merge branch 'master' into fl-opacity 2022-04-26 18:34:53 +09:00
Dan Balasescu
32e55e7d78 Merge branch 'master' into osu-diff-calc-max-combo 2022-03-31 15:08:08 +09:00
Dan Balasescu
523f668c8c Remove unnecessary ctor argument 2022-03-15 12:37:39 +09:00
Dan Balasescu
4a3e3aba65 Restructure PerformanceCalculator to not require ScoreInfo argument 2022-03-14 14:25:28 +09:00
Dan Balasescu
567da9214e Merge branch 'master' into osu-diff-calc-max-combo 2022-02-18 18:35:24 +09:00
Dan Balasescu
84e82ef5e4 Add XMLDocs to difficulty attribute properties 2022-02-16 14:09:19 +09:00
Dan Balasescu
215da7e933 Reimplement as extension method on IBeatmap
Implementation has changed slightly to support arbitrary levels of
nested hitobjects.
2022-02-16 12:06:49 +09:00
Henry Lin
74a55ead77 Simplify combo counting logic 2022-01-23 13:00:54 +08:00
Henry Lin
f53ce5aedf Fix max combo calculation in osu diffcalc 2022-01-23 11:11:12 +08:00
Bartłomiej Dach
1ce0b18003
Merge branch 'master' into display-performance-attributes 2022-01-22 14:12:57 +01:00
Dan Balasescu
36d1cdb95a Merge branch 'master' into fl-opacity 2022-01-20 14:48:20 +09:00
StanR
b77e6f92b7 Fix touch device difficulty reduction not affecting star rating 2022-01-19 22:31:11 +03:00
Dan Balasescu
58bae9bda3
Merge pull request #16331 from stanriders/continuous-effective-misscount
Don't floor `effectiveMissCount`
2022-01-19 14:13:12 +09:00
Henry Lin
b81fc675e8 Include PropertyName in PerformanceDisplayAttribute 2022-01-17 20:45:25 +08:00
Henry Lin
d014fef179 Hide confusing attributes 2022-01-17 20:36:36 +08:00
Henry Lin
511a607599 Display performance breakdown in a tooltip 2022-01-17 18:28:17 +08:00
Dan Balasescu
b88a65166e Fix pp counter underflow with SpunOut mod 2022-01-11 10:22:16 +09:00
StanR
dc755f4a7f Remove redundant casts 2022-01-05 15:07:02 +03:00
StanR
b317a95fe1 Don't floor effectiveMissCount 2022-01-05 14:36:07 +03:00
Bartłomiej Dach
63e0492725
Mark ShouldSerialize() methods as implicitly used 2021-12-28 09:02:03 +01:00
MBmasher
bb4e8add4d
Merge branch 'master' into fl-slider 2021-12-23 15:31:30 +11:00
Dan Balasescu
98f044881e
Merge branch 'master' into refactor-diffcalc 2021-12-22 12:31:28 +09:00
Dan Balasescu
e50609c546 Rename method 2021-12-22 12:28:07 +09:00
StanR
40b3ce0ade Clean up comments 2021-12-21 14:03:24 +03:00
StanR
cca02a8016 Create PerformanceAttributes 2021-12-21 13:08:31 +03:00
MBmasher
2aafcd3628 Refactor code regarding hidden boolean 2021-12-21 20:58:05 +11:00
MBmasher
c5de203aa5 Multiply opacityBonus to base strain 2021-12-21 20:10:19 +11:00
MBmasher
5d8968498c Adjust skillMultiplier after merging #15728, #15867 2021-12-21 20:08:57 +11:00
MBmasher
3d3de00581 Move hidden initialisation to Flashlight constructor 2021-12-21 20:06:53 +11:00
MBmasher
a7aea49cb3 Rename osuPreviousHitObject to currentHitObject 2021-12-21 20:06:07 +11:00
MBmasher
0a33f336b0
Merge branch 'master' into fl-opacity 2021-12-21 19:48:49 +11:00
Dan Balasescu
05b79f864e
Merge pull request #15867 from MBmasher/fl-cumulative-strain
Fix cumulative strain time calculation in Flashlight skill
2021-12-21 17:19:09 +09:00
Dan Balasescu
f366cdc73e Extract initial set out of loop 2021-12-21 12:39:34 +09:00
Dan Balasescu
c21b2d1662 Fix incorrect variable 2021-12-21 12:39:09 +09:00
Dan Balasescu
e21dbf10ff Refactor further to remove indexing confusion 2021-12-21 12:25:32 +09:00
Dan Balasescu
377cb1d9e3
Merge pull request #15728 from MBmasher/fl-decay
Remove decay factor in Flashlight skill
2021-12-21 07:59:32 +09:00
MBmasher
c71655a75e
Merge branch 'master' into fl-cumulative-strain 2021-12-21 06:06:19 +11:00
MBmasher
6caa950c44 Rename osuPrevious to osuLoop 2021-12-20 19:16:41 +11:00
StanR
2f2006715e Slightly refactor difficulty and pp calculators 2021-12-17 23:40:23 +03:00
rumoi
e662a9f0c4 Remove redundant code. 2021-12-15 12:36:45 +13:00
rumoi
4664bb1d29 Remove uneeded complexity 2021-12-15 05:16:10 +13:00
rumoi
c87ff82c1c calculateRhythmBonus performance fix. 2021-12-14 09:25:29 +13:00
Dan Balasescu
99991a6703 Minor cleanups, unifying wording a bit more 2021-12-08 15:59:15 +09:00
Dan Balasescu
1a09a3469a Merge branch 'master' into refactor-osu-difficulty-hit-object 2021-12-08 15:53:44 +09:00
Dan Balasescu
11104124f1 Restructure doc for easier readability 2021-12-08 15:52:59 +09:00
Dan Balasescu
814f072767 Use new LazyJumpDistance terminology in documentation 2021-12-08 15:17:56 +09:00
Dan Balasescu
7c0f7b1baa Use "x" for cursor position in diagrams 2021-12-08 14:57:21 +09:00
Dan Balasescu
ded86282c1 Rename + better documentation 2021-12-07 23:14:35 +09:00
MBmasher
9824d805ea Remove unnecessary clockRate in Opacity function 2021-11-30 14:36:38 +11:00
MBmasher
5884b058b9 Add blank line 2021-11-30 13:54:41 +11:00
MBmasher
3339afd648 Change input variable name in Opacity function 2021-11-30 13:52:58 +11:00
MBmasher
b0dc8bf061 Change Opacity function to take in absolute map time rather than relative time 2021-11-30 12:58:49 +11:00
MBmasher
4354699258 Fix cumulative strain time calculation in Flashlight skill 2021-11-30 12:51:23 +11:00
Dan Balasescu
383bf7cdfc Only allow HD combination alongside FL 2021-11-30 10:39:48 +09:00
Dan Balasescu
e6e6e2d951 Merge branch 'master' into fl-opacity 2021-11-30 10:00:44 +09:00
Dan Balasescu
3e4b774992 Invert lines for better chronological order 2021-11-25 14:08:08 +09:00
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