1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-29 02:12:57 +08:00
Commit Graph

2235 Commits

Author SHA1 Message Date
Bartłomiej Dach
13c81db0cf Fix incorrect classic score formula
Upon closer inspection the classic score formula was subtly wrong. The
version given in the wiki is:

	Score = Hit Value + (Hit Value * ((Combo multiplier * Difficulty
	multiplier * Mod multiplier) / 25))

The code previously used:

	bonusScore + baseScore * ((1 + Math.Max(0, HighestCombo.Value - 1)
	* scoreMultiplier) / 25);

which is not equivalent to the version on the wiki. The error is in the 1
factor, as in the above version it is being divided by 25, while it should
be outside the division to keep parity with the previous formula.

The tests attached in the previous commit demonstrate that this change
causes a single hit without combo to increase total score by its exact
numeric value.
2020-04-14 01:09:58 +02:00
smoogipoo
a84fe2525b Fix nested hitobjects potentially indirectly masked away 2020-04-11 16:53:45 +09:00
smoogipoo
ee6ea08cf8 Cleanup handling of hitobject updates 2020-04-09 20:16:44 +09:00
Dean Herbert
7b2144a1a7 Fix merge mishap 2020-04-03 23:31:46 +09:00
Dean Herbert
3289fa7c66
Merge branch 'master' into better-mania-scrollspeed 2020-04-03 23:25:14 +09:00
Dean Herbert
eacbb20d87
Merge branch 'master' into fix-convert-scroll-speed 2020-04-03 22:47:53 +09:00
smoogipoo
d90db5649d Improve comment slightly 2020-04-03 18:32:07 +09:00
smoogipoo
1ff2cc31d1 Implement more familiar scroll speed options in mania 2020-04-03 18:25:01 +09:00
smoogipoo
b42d1104b7 Fix mania converts scrolling at incorrect speeds 2020-04-03 13:16:01 +09:00
smoogipoo
1f797207f7 Rework lookups to not require total playfield columns 2020-04-03 12:31:05 +09:00
smoogipoo
66486b094c Remove unnecessary dependency, allow null mods 2020-04-01 13:31:17 +09:00
Dan Balasescu
03cd9aa060
Merge branch 'master' into spun-out 2020-03-30 12:31:53 +09:00
Dean Herbert
7db9bd798c Remove handle overrides 2020-03-30 11:59:51 +09:00
Dean Herbert
2abb8a37df
Merge branch 'master' into show-mod-settings-tooltip 2020-03-29 14:35:04 +09:00
Dean Herbert
a2b3fe180e Add the ability to disable user input on specific DrawableHitObjects 2020-03-29 14:30:45 +09:00
Dan Balasescu
005a818f32
Merge branch 'master' into fix-slider-end-sounds 2020-03-27 19:26:32 +09:00
Dean Herbert
f80efd10c2 Avoid using a miss judgement 2020-03-26 19:54:17 +09:00
Dean Herbert
07462120e4 Split break tracking into its own component 2020-03-26 15:30:23 +09:00
Dean Herbert
2b1245f63a Improve xmldoc in a couple of places 2020-03-26 12:50:00 +09:00
Dean Herbert
8a2aac5f83 Rename conversion methods for clarity 2020-03-25 20:21:34 +09:00
Dean Herbert
800e395bc8 Merge branch 'master' into replay-recording 2020-03-25 20:20:59 +09:00
Dean Herbert
6d81da5419
Merge branch 'master' into video-offset 2020-03-25 11:28:59 +09:00
Dean Herbert
448961b330 Rename incorrect variable 2020-03-24 15:39:01 +09:00
Dean Herbert
388cf5c83a Fix catch positional data being incorrectly recorded 2020-03-24 15:38:54 +09:00
Dean Herbert
022465f546 Add encoding and import support 2020-03-24 14:51:52 +09:00
Dean Herbert
546772192c Add helper method to convert to legacy mods enums 2020-03-24 13:07:51 +09:00
Liam DeVoe
2fa42ed644 use N2 for ModTimeRamp, add x text 2020-03-23 12:54:08 -04:00
Dean Herbert
617149fb27 Implement in player 2020-03-23 20:06:18 +09:00
Dean Herbert
14a85a84bf Add proper screen space - gamefield mapping 2020-03-23 20:06:18 +09:00
Dean Herbert
6d48068061 Move replay recorder to final location 2020-03-23 20:04:15 +09:00
Dean Herbert
232c255986 Basic test scene setup 2020-03-23 17:33:02 +09:00
Dean Herbert
2dbcf9e346
Merge branch 'master' into taiko-random-mod 2020-03-23 16:33:59 +09:00
Dean Herbert
205f4dcb54 Simplify string construction logic 2020-03-23 15:20:56 +09:00
Dean Herbert
a6b153673e Fix icons not updating tooltip text correctly 2020-03-23 14:58:02 +09:00
Dean Herbert
4f9ac7b81e Merge branch 'master' into show-mod-settings-tooltip 2020-03-23 14:57:54 +09:00
smoogipoo
e3a5be71cc Implement random mod for taiko 2020-03-23 12:09:30 +09:00
Liam DeVoe
64fc116d67 use two decimal points for ModRateAdjust format 2020-03-22 23:08:00 -04:00
Liam DeVoe
5cc626d37b move SettingDescription override to ModRateAdjust 2020-03-22 22:57:46 -04:00
Liam DeVoe
1da590c63f use N1 format instead of 0.# 2020-03-22 22:54:21 -04:00
Liam DeVoe
889608a408 remove redundant ToString call 2020-03-22 22:51:29 -04:00
Liam DeVoe
98b8f82810 simplify SettingDescription default definition 2020-03-22 22:07:09 -04:00
Liam DeVoe
ea87afd577 use string.Empty in IconTooltip 2020-03-22 22:06:54 -04:00
Liam DeVoe
cb6e602556 enforce single signficiant digit precision for other mods 2020-03-22 22:06:35 -04:00
Liam DeVoe
67667b3d22 enforce precision for ModDifficultyAdjust and derived classes 2020-03-22 21:22:46 -04:00
Liam DeVoe
63e9b2a299 use string.Empty, use base SettingDescription for [Osu/Catch]ModDifficultyAdjust 2020-03-22 18:50:09 -04:00
Dean Herbert
d8041a0dcb Increase sample concurrency to better match stable 2020-03-22 02:16:28 +09:00
Dean Herbert
729e006c3a
Merge branch 'master' into video-offset 2020-03-21 20:03:46 +09:00
Liam DeVoe
4907fb8fd1 remove another ToString statement 2020-03-20 17:04:22 -04:00
Liam DeVoe
eab705a9b6 remove another ToString statement 2020-03-20 17:00:36 -04:00
Liam DeVoe
ac202ba7ea remove unused using directive 2020-03-20 16:57:37 -04:00