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

Rename osuPrevious to osuLoop

Browse Source
This commit is contained in:
MBmasher 2021-12-20 19:16:41 +11:00
parent 4354699258
commit 6caa950c44
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,27 +42,27 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
for (int i = 0; i < Previous.Count; i++) for (int i = 0; i < Previous.Count; i++)
{ {
var osuPrevious = (OsuDifficultyHitObject)Previous[i]; var osuLoop = (OsuDifficultyHitObject)Previous[i];
var osuPreviousHitObject = (OsuHitObject)(osuPrevious.BaseObject); var osuLoopHitObject = (OsuHitObject)(osuLoop.BaseObject);
OsuDifficultyHitObject osuLastPrevious; OsuDifficultyHitObject osuLoopNext;
if (i == 0) if (i == 0)
osuLastPrevious = osuCurrent; osuLoopNext = osuCurrent;
else else
osuLastPrevious = (OsuDifficultyHitObject)Previous[i - 1]; osuLoopNext = (OsuDifficultyHitObject)Previous[i - 1];
if (!(osuPrevious.BaseObject is Spinner)) if (!(osuLoop.BaseObject is Spinner))
{ {
double jumpDistance = (osuHitObject.StackedPosition - osuPreviousHitObject.EndPosition).Length; double jumpDistance = (osuHitObject.StackedPosition - osuLoopHitObject.EndPosition).Length;
cumulativeStrainTime += osuLastPrevious.StrainTime; cumulativeStrainTime += osuLoopNext.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, (osuPrevious.JumpDistance / scalingFactor) / 25.0); double stackNerf = Math.Min(1.0, (osuLoop.JumpDistance / scalingFactor) / 25.0);
result += Math.Pow(0.8, i) * stackNerf * scalingFactor * jumpDistance / cumulativeStrainTime; result += Math.Pow(0.8, i) * stackNerf * scalingFactor * jumpDistance / cumulativeStrainTime;
} }