sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 23:53:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

Adjust computations to return sane values

Browse Source
This commit is contained in:
smoogipoo
2018-12-08 15:52:12 +09:00
parent f4eabacd15
commit 9ad7970167
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
View File

@ -3,6 +3,7 @@
using System; using System;
using osu.Game.Rulesets.Osu.Difficulty.Preprocessing; using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
using osuTK;
namespace osu.Game.Rulesets.Osu.Difficulty.Skills namespace osu.Game.Rulesets.Osu.Difficulty.Skills
{ {
@ -11,28 +12,22 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
/// </summary> /// </summary>
public class Aim : Skill public class Aim : Skill
{ {
private const double min_angle_bonus = 0;
private const double max_angle_bonus = 0.5;
private const double angle_bonus_begin = 5 * Math.PI / 12;
private const double pi_over_2 = Math.PI / 2;
protected override double SkillMultiplier => 26.25; protected override double SkillMultiplier => 26.25;
protected override double StrainDecayBase => 0.15; protected override double StrainDecayBase => 0.15;
protected override double StrainValueOf(OsuDifficultyHitObject current) protected override double StrainValueOf(OsuDifficultyHitObject current)
{ {
double angleBonus = 1.0; double angleBonus = 0;
if (current.Angle != null) if (current.Angle != null)
{ angleBonus = MathHelper.Clamp((current.Angle.Value - angle_bonus_begin) / pi_over_2, min_angle_bonus, max_angle_bonus);
double angle = current.Angle.Value * 180 / Math.PI;
if (current.JumpDistance > SINGLE_SPACING_THRESHOLD) return (angleBonus * Math.Pow(Math.Max(0, current.JumpDistance - SINGLE_SPACING_THRESHOLD), 0.99)
{
if (angle > 75)
angleBonus = (angle / 45 - 75) / 2;
else if (angle > 120)
angleBonus = 0.5;
}
}
return angleBonus * (
Math.Pow(current.JumpDistance - SINGLE_SPACING_THRESHOLD, 0.99)
+ Math.Pow(current.TravelDistance, 0.99) + Math.Pow(current.TravelDistance, 0.99)
+ Math.Pow(current.JumpDistance, 0.99) + Math.Pow(current.JumpDistance, 0.99)
) / current.StrainTime; ) / current.StrainTime;

15
osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
View File

@ -3,6 +3,7 @@
using System; using System;
using osu.Game.Rulesets.Osu.Difficulty.Preprocessing; using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
using osuTK;
namespace osu.Game.Rulesets.Osu.Difficulty.Skills namespace osu.Game.Rulesets.Osu.Difficulty.Skills
{ {
@ -11,6 +12,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
/// </summary> /// </summary>
public class Speed : Skill public class Speed : Skill
{ {
private const double min_angle_bonus = 1.0;
private const double max_angle_bonus = 1.25;
private const double angle_bonus_begin = 3 * Math.PI / 4;
private const double pi_over_4 = Math.PI / 4;
protected override double SkillMultiplier => 1400; protected override double SkillMultiplier => 1400;
protected override double StrainDecayBase => 0.3; protected override double StrainDecayBase => 0.3;
@ -30,14 +36,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
double angleBonus = 1.0; double angleBonus = 1.0;
if (current.Angle != null) if (current.Angle != null)
{ angleBonus = MathHelper.Clamp((angle_bonus_begin - current.Angle.Value) / pi_over_4 * 0.25 + 1.0, min_angle_bonus, max_angle_bonus);
double angle = current.Angle.Value * 180 / Math.PI;
if (angle < 135)
angleBonus = (135 - angle / 45) * 0.25 + 1.0;
else if (angle <= 90)
angleBonus = 1.25;
}
return angleBonus * (0.95 + Math.Pow(distance / SINGLE_SPACING_THRESHOLD, 4)) / current.StrainTime; return angleBonus * (0.95 + Math.Pow(distance / SINGLE_SPACING_THRESHOLD, 4)) / current.StrainTime;
} }