h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 12:33:01 +08:00
Code Issues Releases Wiki Activity

Refactor further to remove indexing confusion

Browse Source
This commit is contained in:
Dan Balasescu 2021-12-21 12:25:32 +09:00
parent c71655a75e
commit e21dbf10ff
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,32 +40,33 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
double result = 0.0; double result = 0.0;
OsuDifficultyHitObject lastObj = null;
// This is iterating backwards in time from the current object.
for (int i = 0; i < Previous.Count; i++) for (int i = 0; i < Previous.Count; i++)
{ {
var osuLoop = (OsuDifficultyHitObject)Previous[i]; var currentObj = (OsuDifficultyHitObject)Previous[i];
var osuLoopHitObject = (OsuHitObject)(osuLoop.BaseObject); var currentHitObject = (OsuHitObject)(currentObj.BaseObject);
OsuDifficultyHitObject osuLoopNext; lastObj ??= currentObj;
if (i == 0)
osuLoopNext = osuCurrent;
else
osuLoopNext = (OsuDifficultyHitObject)Previous[i - 1];
if (!(osuLoop.BaseObject is Spinner)) if (!(currentObj.BaseObject is Spinner))
{ {
double jumpDistance = (osuHitObject.StackedPosition - osuLoopHitObject.EndPosition).Length; double jumpDistance = (osuHitObject.StackedPosition - currentHitObject.EndPosition).Length;
cumulativeStrainTime += osuLoopNext.StrainTime; cumulativeStrainTime += lastObj.StrainTime;
// We want to nerf objects that can be easily seen within the Flashlight circle radius. // We want to nerf objects that can be easily seen within the Flashlight circle radius.
if (i == 0) if (i == 0)
smallDistNerf = Math.Min(1.0, jumpDistance / 75.0); smallDistNerf = Math.Min(1.0, jumpDistance / 75.0);
// We also want to nerf stacks so that only the first object of the stack is accounted for. // We also want to nerf stacks so that only the first object of the stack is accounted for.
double stackNerf = Math.Min(1.0, (osuLoop.LazyJumpDistance / scalingFactor) / 25.0); double stackNerf = Math.Min(1.0, (currentObj.LazyJumpDistance / scalingFactor) / 25.0);
result += Math.Pow(0.8, i) * stackNerf * scalingFactor * jumpDistance / cumulativeStrainTime; result += Math.Pow(0.8, i) * stackNerf * scalingFactor * jumpDistance / cumulativeStrainTime;
} }
lastObj = currentObj;
} }
return Math.Pow(smallDistNerf * result, 2.0); return Math.Pow(smallDistNerf * result, 2.0);