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

780 Commits

Author SHA1 Message Date
Dan Balasescu
bfa449e47a Adjust attribute data 2023-06-19 21:38:13 +09:00
Dan Balasescu
b9f485b551 Merge classes + split out 2023-06-13 02:32:54 +09:00
Dan Balasescu
446807e7f6 Add combo score / bonus score attributes 2023-06-12 23:00:29 +09:00
Dan Balasescu
d10c63ed2d Fix difficulty calculation when mods are involved 2023-06-08 16:29:34 +09:00
Dan Balasescu
77c745cc94 "TotalScoreV1" -> "LegacyTotalScore" 2023-06-06 17:25:28 +09:00
Dan Balasescu
e402c6d2b4 Write max combo attribute from base class 2023-06-02 21:53:25 +09:00
Dan Balasescu
02111e3854 Implement ScoreV1 calculation for OsuRuleset 2023-06-02 17:36:45 +09:00
apollo-dw
23d0c03fc8 Merge branch 'master' into no-combo-scaling 2022-10-24 02:17:39 +01:00
abstrakt
6e1edc4d8d Use the StackedEndPosition to determine the jump distance in the FlashlightEvaluator.
Signed-off-by: abstrakt <abstrakt.osu@gmail.com>
2022-09-26 14:06:35 +02:00
Dan Balasescu
1e9b60f07f
Merge pull request #16524 from stanriders/move-td-reduction
Fix touch device difficulty reduction not affecting star rating
2022-09-21 12:51:14 +09:00
StanR
1801ae3c6a Move flashlight TD difficulty reduction to diffcalc 2022-09-14 17:40:22 +03:00
StanR
6338b87c63 attributes 2022-09-09 17:31:52 +03:00
StanR
c2e3fcfa3f Merge branch 'master' into move-td-reduction 2022-09-09 17:24:58 +03:00
apollo-dw
1997519364 Don't use full hit window in rhythm 2022-09-07 13:25:35 +01:00
apollo-dw
b5779508d0 Retrieve great hit window from the hit object 2022-09-06 17:10:32 +01:00
Dan Balasescu
9645bfe708 Bump difficulty calculator versions 2022-09-02 16:27:25 +09:00
apollo-dw
ad650adab0 Fix speed note count sum 2022-08-30 18:03:44 +01:00
Dan Balasescu
e34c8e4975
Merge pull request #19716 from MBmasher/fl-grid
Nerf repeated angles in Flashlight skill
2022-08-29 21:15:45 +09:00
MBmasher
b082dc1fe4 Slightly buff flashlight multiplier 2022-08-27 18:31:07 +10:00
MBmasher
454d868dd5 Remove unnecessary using call 2022-08-26 20:42:02 +10:00
MBmasher
249c3f868f Compare raw angle values instead of rounding angles 2022-08-26 20:40:18 +10:00
MBmasher
5082ee26cf Ensure a negative value cannot be added to angleRepeatCount 2022-08-26 20:30:14 +10:00
MBmasher
08cb70b093 Lessen repeated angle nerf for objects further back in time 2022-08-26 20:27:31 +10:00
MBmasher
d8854413cb Add newline 2022-08-26 12:38:36 +10:00
MBmasher
6651e76e2e Remove whitespace 2022-08-26 12:37:56 +10:00
MBmasher
b0e7f63361 Update angle multiplier to nerf repeated angles 2022-08-26 12:34:33 +10:00
StanR
43e471c2a5 Clamp effective miss count to maximum amount of possible braks 2022-08-16 16:12:13 +03:00
MBmasher
21c5fed45f Adjust capitalisation 2022-08-12 14:09:16 +10:00
MBmasher
f70588a423 Add newline before brace 2022-08-12 14:08:32 +10:00
MBmasher
037f56077b Apply Flashlight grid nerf 2022-08-12 13:29:04 +10:00
Dan Balasescu
61a3758cd9 Merge branch 'master' into pp-balancing 2022-08-11 19:46:16 +09:00
Dan Balasescu
7cac089246
Merge branch 'master' into fl-slider 2022-08-10 21:19:05 +09:00
Dan Balasescu
2c6c315e3a
Merge branch 'master' into pp-balancing 2022-08-04 15:40:46 +09:00
MBmasher
267d55a6a8 Remove osuSlider from statement 2022-07-23 14:48:39 +10:00
MBmasher
230943f698 Merge branch 'fl-slider' of https://github.com/mbmasher/osu into fl-slider 2022-07-23 14:40:54 +10:00
MBmasher
f44a5def90 Move repeat bonus to TravelDistance 2022-07-23 14:40:16 +10:00
Dan Balasescu
71912e10c4
Merge branch 'master' into fl-slider 2022-07-22 15:22:50 +09:00
Dean Herbert
aca19a005e Add versioning to difficulty calculators 2022-07-21 18:15:25 +09:00
StanR
163c3f9c2d Adjust multipliers to account for speed changes 2022-07-20 16:10:34 +03:00
StanR
35e841de95 Move base performance multiplier to a const 2022-07-20 15:54:49 +03:00
StanR
9c9f32b435 Merge branch 'master' into pp-balancing 2022-07-20 15:40:29 +03:00
StanR
633f6fe620 Increase global multiplier 2022-07-18 21:58:11 +03:00
MBmasher
42b9dc877d Divide slider bonus by repeat count 2022-07-18 16:14:06 +10:00
MBmasher
72c096f9af Update xmldoc 2022-07-18 15:59:20 +10:00
MBmasher
7c680afc3c Change initialisation of osuSlider 2022-07-18 15:59:00 +10:00
MBmasher
204fbde07b Remove debug code 2022-07-18 15:58:32 +10:00
MBmasher
8413c40442 Remove debug code 2022-07-18 15:58:09 +10:00
MBmasher
68caafa210 Update xmldoc 2022-07-17 17:02:30 +10:00
MBmasher
dae698638c Add repeat bonus to Flashlight, move repeat multiplier to AimEvaluator 2022-07-17 16:56:05 +10:00
MBmasher
a950deb7db Re-implement slider changes to FlashlightEvaluator 2022-07-17 16:27:55 +10:00
Jamieson Berida
a0dd6cbab3
Merge branch 'master' into fl-slider 2022-07-17 16:18:18 +10:00
StanR
760742e358 Move relax global multiplier to diffcalc 2022-07-14 00:42:50 +03:00
StanR
0983e4f81e Increase 50s nerf again 2022-07-12 17:57:00 +03:00
StanR
58c687172b Reduce low AR bonus 2022-07-12 10:52:44 +03:00
apollo-dw
5b96f67a8b Remove non-overlapping velocity buff 2022-07-04 20:49:26 +01:00
StanR
4f77637946 Update desmos 2022-07-04 21:52:57 +03:00
StanR
bf738aa04f Account for extreme ODs in relax multipliers 2022-07-04 21:49:45 +03:00
StanR
afa3f8cda3 Make relax ok/meh multipliers dependent on OD 2022-07-04 20:53:20 +03:00
StanR
11eb344476 Reduce 50s nerf further 2022-07-04 20:28:15 +03:00
StanR
db8bb07c78 Reduce 50s nerf effect 2022-07-04 20:10:26 +03:00
StanR
212360f67e Make relax ok/meh nerfs less drastic, add flashlight nerf, remove ar bonus for relax 2022-07-04 19:59:30 +03:00
StanR
45258b3f14 Buff aim slightly 2022-07-04 19:53:34 +03:00
Dan Balasescu
d4aa18112b
Merge pull request #15035 from emu1337/speed-acc-scaling
Change speed accuracy scaling to be closer to worst case scenario
2022-06-29 18:04:23 +09:00
Dan Balasescu
6d91c0f375 Resolve inspection issue 2022-06-29 16:57:11 +09:00
Dan Balasescu
ad95f037de Prevent another case of potential div-by-0 2022-06-29 16:42:53 +09:00
Dan Balasescu
e6ccca8045 Fix inspection 2022-06-29 16:29:17 +09:00
Dan Balasescu
0211fe7ae8 Fix exception + possible div-by-0 2022-06-29 16:29:14 +09:00
Dan Balasescu
2989803b71 Merge branch 'master' into speed-acc-scaling 2022-06-29 16:15:20 +09:00
Dan Balasescu
34b9118fb3 Cleanup by using const value 2022-06-29 16:10:06 +09:00
Dan Balasescu
7d743994bc Merge branch 'master' into FL-diffspike 2022-06-29 16:05:53 +09:00
Dan Balasescu
0fd2c010e5 Remove NRT disables from attributes classes 2022-06-27 16:07:15 +09:00
Dan Balasescu
0579780bb8 Add IBeatmapOnlineInfo parameter and use to extract more data 2022-06-27 16:07:15 +09:00
Dan Balasescu
a7de43ade6 Add attribute ID 2022-06-21 19:31:45 +09:00
apollo-dw
630bd244d5 Inherit StrainSkill instead 2022-06-21 10:01:11 +01:00
apollo-dw
0f6f000188 Remove difficulty spike nerf 2022-06-21 09:13:44 +01:00
emu1337
26b0815fc8 fixed casting the wrong skill 2022-06-20 04:19:07 +02:00
emu1337
ecbbd29c9b Merge branch 'master' into speed-acc-scaling
# Conflicts:
#	osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
#	osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
#	osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
#	osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
2022-06-20 04:15:35 +02:00
Dan Balasescu
1bd6198da2
Merge pull request #18692 from apollo-dw/dbltap
Rework doubletap detection in osu!'s Speed evaluator
2022-06-19 11:03:16 +09:00
apollo-dw
c4d69405bf Adjust speed ratio fraction to avoid division by 0 2022-06-17 21:18:16 +01:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
apollo-dw
2634e56944 Further adjustments 2022-06-14 16:16:12 +01:00
apollo-dw
737197591d Change doubletap algorithm 2022-06-13 17:49:56 +01:00
Dan Balasescu
f73142c50f Remove for loop 2022-06-13 20:43:56 +09:00
Dan Balasescu
b300bc1e24 Fix ever-increasing flashlight-strain 2022-06-13 20:41:32 +09:00
apollo-dw
4e3dd1ce18 Merge remote-tracking branch 'master/master' into evaluators 2022-06-13 12:27:02 +01:00
apollo-dw
e7602563fb Fetch lastlast object from beatmap, not objects list 2022-06-10 10:28:14 +01:00
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
apollo-dw
2f335a76dc Switch to using osuAttributes 2022-03-17 22:08:56 +00:00
apollo
0d4fe96ddf
Merge branch 'master' into no-combo-scaling 2022-03-17 21:13:07 +00: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
apollo
580e43b5ea
Merge branch 'master' into no-combo-scaling 2022-03-03 14:55:41 +00:00
apollo-dw
c18df86720 Remove clockrate factor 2022-02-19 15:33:28 +00: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
apollo-dw
94a46ab640 Rescale miss penalty for note strains 2022-02-14 02:02:46 +00:00
apollo-dw
da31ca17e7 Use note strains instead of sectional strains 2022-02-14 01:53:03 +00:00
apollo
1ae8ff0cf6
Merge branch 'master' into no-combo-scaling 2022-02-10 22:34:34 +00: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
apollo-dw
598946737f Reword comment and rename argument 2022-01-12 14:38:53 +00:00
Dan Balasescu
b88a65166e Fix pp counter underflow with SpunOut mod 2022-01-11 10:22:16 +09:00
Dan Balasescu
400abc147b Add attribute ids to mapping functions 2022-01-06 16:28:04 +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
apollo-dw
dcb969316d Weight difficult strain count against the top strain 2022-01-04 17:33:23 +00:00
Luminiscental
132079004c
Remove unnecessary truncation 2022-01-04 12:30:05 +00:00
Luminiscental
75be4e83d6
Remove abusable 0.66 threshold by averaging 2022-01-03 22:32:21 +00:00
apollo-dw
d2b815b745 Add miss penalty comment 2022-01-02 19:20:20 +00:00
apollo-dw
fd1028f3bb Use clockrate in the difficult strain count method 2021-12-29 23:49:07 +00:00
apollo-dw
4f257d6987 Clean up unsuccessful merge 2021-12-29 18:59:17 +00:00
apollo-dw
8ce6e3c573 Remove mathnet 2021-12-29 18:49:13 +00:00
apollo-dw
d51456741c Merge master 2021-12-29 18:12:30 +00:00
Bartłomiej Dach
63e0492725
Mark ShouldSerialize() methods as implicitly used 2021-12-28 09:02:03 +01:00
apollo-dw
e9589e57a6 Fix logical error 2021-12-27 02:23:03 +00:00
apollo-dw
5640918c8c New miss penalty formula, using relevant difficult notes in each skill (targets diffspikes) 2021-12-26 23:51:49 +00: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
apollo-dw
60e2a8ed4b Use MathNet for miss penalty calculation, and use old penalty formula for Flashlight 2021-12-21 17:54:26 +00: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
apollo-dw
bac4cfed50 Use frost's miss count penalty 2021-12-16 18:37:57 +00:00
rumoi
e662a9f0c4 Remove redundant code. 2021-12-15 12:36:45 +13:00
apollo-dw
489aa43b1b Make miss penalty harsher 2021-12-14 19:57:36 +00:00
apollo-dw
86ad42a744 Nerf length bonus 2021-12-14 17:47:41 +00:00
rumoi
4664bb1d29 Remove uneeded complexity 2021-12-15 05:16:10 +13:00
apollo-dw
cff9dab650 Remove combo scaling and change miss penalty 2021-12-14 03:11:04 +00: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