1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 07:32:55 +08:00
Commit Graph

325 Commits

Author SHA1 Message Date
Xexxar
cdd813926b nerf to high bpm rhythm changes, nerf to 1/3->1/4 2021-09-17 00:27:42 +00:00
smoogipoo
7976442aec Fix CI issues 2021-09-16 14:20:42 +09:00
smoogipoo
2dd9d457e8 Merge branch 'master' into speedpp 2021-09-16 14:18:47 +09:00
apollo-dw
2637c063a9 forgot a deltatime 2021-09-15 15:40:26 +01:00
apollo-dw
2c3e7bfd2d moved 2b straintime cap up to 25ms 2021-09-15 15:27:36 +01:00
apollo-dw
463b92fcca remove unused strings 2021-09-15 12:41:29 +01:00
apollo-dw
cf63a45f32 swap speedwindowratio in cap so values are correct 2021-09-15 12:36:15 +01:00
apollo-dw
2fe0681310 elaborate comment 2021-09-15 12:03:47 +01:00
apollo-dw
7f6722e43f throw math.max(N, 1) into straintime 2021-09-15 11:24:48 +01:00
apollo-dw
4017598af0 simplify algebra down 2021-09-15 11:15:05 +01:00
apollo-dw
3a16ec277a refactor speed window ratios 2021-09-15 11:12:36 +01:00
apollo-dw
a0bd73c356 refactor hit window calc 2021-09-15 10:52:50 +01:00
apollo-dw
49658b6f82 set greatWindow to readonly 2021-09-15 10:29:30 +01:00
apollo-dw
6d254fba0a digestify speed return 2021-09-15 10:27:18 +01:00
MBmasher
a8539bc75b Add newline to end of file 2021-09-15 19:04:36 +10:00
MBmasher
33e1273df8 Include Flashlight in total SR calculation 2021-09-15 19:03:42 +10:00
MBmasher
31baac5879
Merge branch 'master' into fl-skill 2021-09-15 11:50:25 +10:00
apollo-dw
8796e45f63 prevent 2B objects from dividing by zero 2021-09-14 15:22:03 +01:00
smoogipoo
81ced68f89 Merge branch 'master' into display-sr-changes 2021-09-14 13:32:58 +09:00
MBmasher
c4fbae136a Rename FlashlightStrain to FlashlightRating 2021-09-14 10:34:21 +10:00
MBmasher
453d63cd5c Merge branch 'fl-skill' of https://github.com/mbmasher/osu into fl-skill 2021-09-14 10:23:41 +10:00
MBmasher
178a3d1132 Remove redundant check 2021-09-14 10:23:11 +10:00
apollo-dw
e9f7258f2b adjust hitwindow nerf to be harsher 2021-09-13 14:50:40 +01:00
smoogipoo
0dc31a476f Invert condition to reduce nesting 2021-09-13 16:39:05 +09:00
Xexxar
44163dc9ec updated to use deltaTime not stainTime for more accuracy 2021-09-12 18:14:05 +00:00
Xexxar
b05963cc50 update to fix review issues 2021-09-12 16:08:17 +00:00
smoogipoo
aafbc3e0e4 Merge branch 'master' into fl-skill 2021-09-10 16:39:39 +09:00
apollo-dw
3fce3f620f use OsuHitWindows, amend comment 2021-09-04 16:56:15 +01:00
apollo-dw
8654a0af05 remove unnecessary min & renamed variable so its more descriptive 2021-09-03 03:01:25 +01:00
apollo-dw
bf87a4b2d3 interpolate the doubletap cheese nerf instead 2021-09-03 02:39:21 +01:00
apollo-dw
0beef9c1e7 made double cheese detection stricter 2021-09-03 02:20:22 +01:00
apollo-dw
57a2ba9aa8 remove "straintime" 2021-09-02 18:29:55 +01:00
apollo-dw
0d60076f34 fix doubletap cheese detect (base on hitwindow) 2021-09-02 17:14:23 +01:00
apollo-dw
d9cc497801 refactoring 2021-09-02 17:02:23 +01:00
apollo-dw
3e98c71ece cap deltatime to hitwindow sorta 2021-09-02 16:48:34 +01:00
apollo-dw
711baa12ba emu's doubletap cheese nerf 2021-09-02 16:31:31 +01:00
mrowswares
a190038c33 remove writelines 2021-08-29 20:16:13 +01:00
mrowswares
1ca0223c71 remove straintime & speed skill caps, implement basic doubletap cheese detection 2021-08-29 17:19:26 +01:00
MBmasher
c91feb2968 Fix multiplying instead of dividing by scalingFactor 2021-08-25 11:18:21 +10:00
MBmasher
7188a3268f Apply a nerf to stacks for Flashlight skill 2021-08-24 14:01:54 +10:00
Xexxar
aaffc05b82 removed accuracy penalty for misses 2021-08-21 17:56:45 +00:00
Xexxar
0402f85eb0 left residual code from testing prevprevdeltas 2021-08-21 17:29:17 +00:00
Xexxar
536aef6f2f merged latest from origin 2021-08-21 17:25:06 +00:00
Xexxar
270f497af8 penalized 1/1->1/2->1/4 rhythm transitions 2021-08-21 17:23:17 +00:00
Bartłomiej Dach
812c85f3de
Clean up code style issues 2021-08-21 17:26:05 +02:00
Xexxar
a46ae855aa implemented object count limitation for rhythm build up 2021-08-20 15:40:34 +00:00
Xexxar
d36eb269b4 fixed code quality issues 2021-08-19 20:11:18 +00:00
Xexxar
5b2cfcc2ff adjusted low acc nerf on speed 2021-08-19 15:27:37 +00:00
Xexxar
b44e6f634d noticed a bug with double applying historicaldecay 2021-08-19 15:05:39 +00:00
Xexxar
7b70d41a93 forgot about the / 0 2021-08-19 14:49:44 +00:00
Xexxar
0effc8f5d8 refactored speed skill, implemented better acc pp 2021-08-19 14:12:03 +00:00
Xexxar
b9ba4c1d97 finalized change for PR 2021-08-17 19:25:49 +00:00
Xexxar
ac1ed00f3e added initial balance of rhythm complexity to tap 2021-08-17 14:39:43 +00:00
Xexxar
471ae9664e cleaned up jank 2021-08-17 13:47:45 +00:00
Xexxar
c99a96a8c8 initial rhythm calc testing 2021-08-17 13:39:18 +00:00
Xexxar
9b21016eed accidently renamed osuStrainSkill, fixed 2021-08-16 22:46:56 +00:00
Xexxar
5561e4852e removed stuff 2021-08-16 22:23:40 +00:00
Xexxar
176b3e7533 changed decay system to allow for customizing the currentStrain 2021-08-16 22:14:29 +00:00
Xexxar
7d46b3f9c5 initial testing and debugging 2021-08-16 16:06:50 +00:00
Xexxar
19cdd5c323 recoded and added rhythm complexity calculator (untested) 2021-08-16 15:25:35 +00:00
emu1337
df6e4664e0 changed history length in speed 2021-08-16 16:42:07 +02:00
emu1337
29a22bd11f added rhythm multiplier for strain sections 2021-08-15 20:48:00 +02:00
MBmasher
eaa0d38315 Add a buff to short maps for Flashlight skill 2021-08-12 10:00:24 +10:00
MBmasher
b06226e738 Change comments 2021-08-12 09:54:25 +10:00
MBmasher
27918583e1 Increase the multiplier when hidden is applied on the Flashlight skill 2021-08-11 15:55:13 +10:00
MBmasher
1cadcb43d9 Apply nerf to Flashlight skill on high star maps 2021-08-11 15:54:30 +10:00
MBmasher
b1d25346a2 Move HistoryLength override from OsuStrainSkill to Flashlight 2021-08-11 13:30:40 +10:00
MBmasher
cee69eaad0 Add a nerf to FL for TD plays 2021-08-11 06:14:38 +10:00
MBmasher
f4ceb17064 Cleanup of code 2021-08-10 16:06:20 +10:00
MBmasher
6b1a4a53d4 Cleanup of code 2021-08-09 08:31:28 +10:00
MBmasher
acdd08c966 Add Flashlight skill 2021-08-08 23:56:03 +10:00
02Naitsirk
db1f43f6eb
Multiply star rating by a constant 2021-08-03 18:57:33 -04:00
Bartłomiej Dach
ea2ef55a8b
Remove unnecessary whitespace 2021-08-01 15:27:05 +02:00
02Naitsirk
5b5cf30cbd
Fix incorrect performance formula
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-07-31 12:23:03 -04:00
02Naitsirk
b31fef7e00
Implement total SR formula that better correlates with pp 2021-07-22 13:49:47 -04:00
emu1337
84fd59777c Merge branch 'master' into diffspike-balance 2021-07-20 19:39:41 +02:00
Bartłomiej Dach
fb5d25405e
Replace calls to obsoleted GetOrDefault() extension 2021-07-18 21:52:16 +02:00
StanR
02298c2cf4 Fix incorrect curve, move total hits factor into a separate variable for clarity 2021-07-09 00:06:05 +03:00
StanR
592d3fdf00 Cleanup 2021-07-08 11:54:58 +03:00
StanR
c67f756c75 Change approach rate bonuses to be less punishing on mid-length maps 2021-07-08 11:52:43 +03:00
emu1337
8c4e60e5cc xmldoc and refactoring 2021-06-17 21:41:06 +02:00
emu1337
2665a873f8 fixed an error with extremely short maps 2021-06-16 19:55:19 +02:00
emu1337
41662a1643 refactored for clarity 2021-06-16 19:54:22 +02:00
emu1337
18fe05b7b5 diffspikes balance 2021-06-16 15:13:46 +02:00
emu1337
be68950c30 refactoring 2021-06-16 03:34:46 +02:00
emu1337
e987a511ba diffspike & wide angle balance 2021-06-14 19:22:35 +02:00
emu1337
fea7b029aa refactored diffspike nerf 2021-06-14 19:18:49 +02:00
emu1337
4c949d9829 reduced diffspike nerf 2021-06-13 21:20:08 +02:00
emu1337
3309ab2be3 balance changes 2021-06-13 15:18:35 +02:00
Dan Balasescu
35d5632355
Merge pull request #13378 from Syriiin/diffcalc/refactor/auto-properties
Refactor DifficultyAttributes to use auto properties over public fields
2021-06-10 18:42:11 +09:00
Dean Herbert
85abee5fc7 Remove difficulty calculator exceptions
I don't think there's any reason difficulty calculators shouldn't be
able to calculate for autoplays.
2021-06-09 14:33:35 +09:00
Dean Herbert
d0e9f8ef90 Replace and obsolete Ranked flag with IsUserPlayable 2021-06-09 14:17:03 +09:00
Samuel Cattini-Schultz
f1bef989b7 Refactor DifficultyAttributes to use auto properties over public fields 2021-06-08 19:43:59 +10:00
Samuel Cattini-Schultz
f51413ead9 Refactor to pass clockrate in constructor rather than deriving from mods 2021-06-03 16:09:42 +10:00
Samuel Cattini-Schultz
85d2b1232a Refactor to abstract out strain logic into StrainSkill class
While it is the case for the existing official Skills, Skill implementations shouldn't be required to conform to a strain based approach.
There are other valid approaches to calculating skill difficulty that can be supported by abstracting the strain logic into its own StrainSkill class.
2021-04-03 20:52:39 +11:00
Samuel Cattini-Schultz
66643a97b0 Add a list of mods to Skill class
Although this isn't necessary for existing official rulesets and calculators, custom calculators can have use cases for accessing mods in difficulty calculation.
For example, accounting for the effects of visual mods.
2021-02-20 20:37:44 +11:00
Bartłomiej Dach
1ba586a683 Revert overlooked AR<8 speed buff
Pull request #11107 introduced changes in osu! performance calculation,
related to a scaling coefficient applied to the speed and aim skills.
The coefficient in question was dependent on the approach rate of
a map. During a post-merge review of that PR, it was spotted that
the scaling coefficient for speed also had a 10x buff applied for AR<8,
which could reach magnitudes as large as 80% on AR0, which seems quite
exorbitant. This change was not discussed or mentioned anywhere in the
review process.

Revert back to the old multiplier of 0.01 rather than 0.1 for AR<8. The
negative slope through AR0 to 8 is retained in its previous form.
2021-01-13 17:59:29 +01:00
Dean Herbert
76ffe31855
Merge pull request #11138 from smoogipoo/stanr-nf-multiplier
Port StanR's NF multiplier changes
2020-12-17 18:59:46 +09:00
Dan Balasescu
8bdef0ff55
Code quality fix
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-12-15 13:18:41 +09:00
Xexxar
54827d4e96 fixed low 50s count still penalizing high obj count maps 2020-12-14 12:41:24 -06:00
Xexxar
1dce446c52 Merge branch 'miss-penalty-curve' 2020-12-11 10:49:31 -06:00
Xexxar
b7872a54b8 small factor rebalance 2020-12-11 10:48:53 -06:00
Xexxar
a5a66e71f9 Merge branch 'miss-penalty-curve' 2020-12-11 10:22:04 -06:00
Xexxar
abc8a2982c swapped ^.75 buff onto speed instead of aim 2020-12-11 08:20:56 -06:00
Xexxar
c20117f0fb Merge branch 'miss-penalty-curve' 2020-12-11 08:02:39 -06:00
Xexxar
544160798b cleaned up mistakes and made quality changes 2020-12-11 08:01:45 -06:00
Xexxar
fd0d793c69 changed the comment to reflect the change 2020-12-10 18:51:54 -06:00
Xexxar
e45417d4fe Merge branch 'lowacc-nerf' 2020-12-10 14:24:42 -06:00
Xexxar
1f2946d64c changed miss penalty curve to scale with totalhits 2020-12-10 14:21:06 -06:00
Xexxar
cc5639d2b4 added unneeded whitespace 2020-12-10 09:48:40 -06:00
smoogipoo
7c2f506b79 Port StanR's NF multiplier changes 2020-12-10 17:10:29 +09:00
Xexxar
54abc3bd4d revert aim curve and add new 50s nerf 2020-12-09 20:07:52 -06:00
Xexxar
149651dec1 Merge branch 'lowacc-nerf' of https://github.com/Xexxar/osu into lowacc-nerf 2020-12-09 13:05:11 -06:00
Xexxar
d604c51cbd capped scaling at OD 8 to prevent overscaling 2020-12-09 13:04:14 -06:00
Xexxar
a2bd8ece10
Merge branch 'master' into lowacc-nerf 2020-12-09 12:06:33 -06:00
Xexxar
05ad9aae8d changed curve to linear OD + acc based curve 2020-12-09 11:57:01 -06:00
Xexxar
cfc34a63bd realized i accidently deleted the OD scaling 2020-12-09 11:21:03 -06:00
Xexxar
7e3fcfe437 fixed issue with comment 2020-12-09 10:35:48 -06:00
Xexxar
748035e80a changes to acc scaling curve for speed and aim pp 2020-12-08 16:53:52 -06:00
smoogipoo
168ba62500 Port StanR's dynamic SO pp changes 2020-12-08 22:09:48 +09:00
smoogipoo
57b7ef88e2 Fix spacing 2020-12-08 12:12:53 +09:00
Xexxar
cf3fbe0b0b osuDifficulty ar11 nerf 2020-12-06 18:06:36 -06:00
Lucas A
27cc6c5046 Rename HitCirclesCount -> HitCircleCount. 2020-10-03 16:52:33 +02:00
Lucas A
abd395a030 Remove unecessary using references. 2020-10-02 19:41:24 +02:00
Lucas A
cb2f695fdd Calculate hit circle count in OsuPerformanceCalculator. 2020-10-02 19:34:41 +02:00
Lucas A
0163688a17 Remove IBeatmap from PerformanceCalculator. 2020-10-02 19:24:30 +02:00
smoogipoo
f439c1afbc Make osu/taiko/catch use Ok+Great 2020-09-29 17:16:55 +09:00
smoogipoo
1c1afa1c96 Move MaxCombo to base DifficultyAttributes 2020-08-28 19:16:20 +09:00
Huo Yaoyuan
c20902f249 Fix double in accuracy calculation in OsuPerformanceCalculator. 2020-05-18 18:22:03 +08:00
Huo Yaoyuan
373aae0610 Use int for total hits in OsuPerformanceCalculator. 2020-05-18 17:45:32 +08:00
smoogipoo
1865cd0762 Fix possible exceptions in performance calculators 2020-05-18 15:10:59 +09:00
Huo Yaoyuan
9ddfdab27a Remove meaningless Convert calls. 2019-12-03 20:47:00 +08:00
Dan Balasescu
c6a85a11bd
Merge branch 'master' into sharpen 2019-11-27 17:09:11 +09:00
Huo Yaoyuan
9425e80a5d Unify to use double in performance calculators. 2019-11-26 18:34:23 +08:00
Huo Yaoyuan
7d7b9e36b2 Use compound assignment. 2019-11-12 19:53:50 +08:00
Dean Herbert
f925e781a9 Refactor HitWindows for legibility 2019-09-06 15:24:14 +09:00
smoogipoo
4c150839c0 Fix potential diffcalc hitwindow nullref 2019-09-02 17:38:58 +09:00
HoLLy
7e9f5a0939 Add Skills to DifficultyAttributes 2019-05-29 11:22:51 +02:00
Dean Herbert
612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching 2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07 Use pattern matching wherever possible 2019-02-28 14:35:00 +09:00
Dean Herbert
26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo
0380293098 Add beatmap argument 2019-02-19 17:58:02 +09:00
smoogipoo
21f9c813b2 Fix mods not being populated 2019-02-19 17:46:18 +09:00
smoogipoo
8459cf6ed0 Missed argument 2019-02-19 17:43:12 +09:00
smoogipoo
f19a52b960 Rename argument 2019-02-19 17:40:35 +09:00
smoogipoo
37f9ac6eca Populate mods too 2019-02-19 17:39:30 +09:00
smoogipoo
847f7d8658 Adjust with PopulateAttributes() removal 2019-02-19 17:38:33 +09:00
smoogipoo
ade5763160 Fix post-merge errors 2019-02-19 14:34:02 +09:00
smoogipoo
659ec267b6 Fix spinners increasing strain 2019-02-18 14:58:33 +09:00