New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set Correct values for addDelayedMovements() function #2308

Merged
merged 6 commits into from Apr 2, 2018

Conversation

3 participants
@johnneijzen
Contributor

johnneijzen commented Mar 24, 2018

it is duplicate from the one on line 97.

@peppy peppy added this to the Candidate Issues milestone Mar 24, 2018

@smoogipoo

This comment has been minimized.

Contributor

smoogipoo commented Mar 24, 2018

Here's the relevant code from osu!stable:

//Make the cursor stay at a hitObject as long as possible (mainly for autopilot).
if (h.StartTime - HitObjectManager.HITTABLE_RANGE > last.EndTime + hitObjectManager.HitWindow50 + 50)
{
    if (!(last is Spinner) && h.StartTime - last.EndTime < 1000) AddFrameToReplay(replay, new bReplayFrame(last.EndTime + hitObjectManager.HitWindow50, last.EndPosition.X, last.EndPosition.Y, pButtonState.None));
    if (!(h is Spinner)) AddFrameToReplay(replay, new bReplayFrame(h.StartTime - HitObjectManager.HITTABLE_RANGE, h.Position.X, h.Position.Y, pButtonState.None));
}
else if (h.StartTime - hitObjectManager.HitWindow50 > last.EndTime + hitObjectManager.HitWindow50 + 50)
{
    if (!(last is Spinner) && h.StartTime - last.EndTime < 1000) AddFrameToReplay(replay, new bReplayFrame(last.EndTime + hitObjectManager.HitWindow50, last.EndPosition.X, last.EndPosition.Y, pButtonState.None));
    if (!(h is Spinner)) AddFrameToReplay(replay, new bReplayFrame(h.StartTime - hitObjectManager.HitWindow50, h.Position.X, h.Position.Y, pButtonState.None));
}
else if (h.StartTime - hitObjectManager.HitWindow100 > last.EndTime + hitObjectManager.HitWindow100 + 50)
{
    if (!(last is Spinner) && h.StartTime - last.EndTime < 1000) AddFrameToReplay(replay, new bReplayFrame(last.EndTime + hitObjectManager.HitWindow100, last.EndPosition.X, last.EndPosition.Y, pButtonState.None));
    if (!(h is Spinner)) AddFrameToReplay(replay, new bReplayFrame(h.StartTime - hitObjectManager.HitWindow100, h.Position.X, h.Position.Y, pButtonState.None));
}

It looks like one of these conditionals is wrong.

@smoogipoo

As commented.

@johnneijzen

This comment has been minimized.

Contributor

johnneijzen commented Mar 24, 2018

i have look up HitResult
HitResult.Great = 300
HitResult.Good = 100
HitResult.Meh = 50
HitResult.Miss = 0

based on osu!stable code I think
first condition supposed to be HitResult.Miss
second condition supposed to be HitResult.Meh
third condition supposed to be HitResult.Good

@smoogipoo

This comment has been minimized.

Contributor

smoogipoo commented Mar 24, 2018

Sounds about right

@johnneijzen johnneijzen changed the title from Remove duplicate condition to Change duplicate condition to HitResult.Good instead of HitResult.Meh Mar 24, 2018

johnneijzen added some commits Mar 24, 2018

@johnneijzen

This comment has been minimized.

Contributor

johnneijzen commented Mar 24, 2018

Found Cause of this mistake it happen during this commit
b15f184#diff-6a517b1f5ef61bdcc38d771d55109c98

@johnneijzen johnneijzen changed the title from Change duplicate condition to HitResult.Good instead of HitResult.Meh to Set Correct values for addDelayedMovements() function Mar 24, 2018

@smoogipoo smoogipoo modified the milestones: Candidate Issues, April 2018 Apr 2, 2018

@smoogipoo

This comment has been minimized.

Contributor

smoogipoo commented Apr 2, 2018

Good stuff.

@smoogipoo smoogipoo merged commit ad4f38f into ppy:master Apr 2, 2018

1 check passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details

@johnneijzen johnneijzen deleted the johnneijzen:Small-Clean-Up branch Apr 2, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment