-
-
Notifications
You must be signed in to change notification settings - Fork 2.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2366 from tgi74/ctb_hr_mangling
Add HardRock position mangling for CatchTheBeat
- Loading branch information
Showing
1 changed file
with
76 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,88 @@ | ||
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. | ||
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE | ||
|
||
using osu.Framework.MathUtils; | ||
using osu.Game.Rulesets.Catch.Objects; | ||
using osu.Game.Rulesets.Catch.UI; | ||
using osu.Game.Rulesets.Mods; | ||
using System; | ||
|
||
namespace osu.Game.Rulesets.Catch.Mods | ||
{ | ||
public class CatchModHardRock : ModHardRock | ||
public class CatchModHardRock : ModHardRock, IApplicableToHitObject<CatchHitObject> | ||
{ | ||
public override double ScoreMultiplier => 1.12; | ||
public override bool Ranked => true; | ||
|
||
private float lastStartX; | ||
private int lastStartTime; | ||
|
||
public void ApplyToHitObject(CatchHitObject hitObject) | ||
{ | ||
float position = hitObject.X; | ||
int startTime = (int)hitObject.StartTime; | ||
|
||
if (lastStartX == 0) | ||
{ | ||
lastStartX = position; | ||
lastStartTime = startTime; | ||
return; | ||
} | ||
|
||
float diff = lastStartX - position; | ||
int timeDiff = startTime - lastStartTime; | ||
|
||
if (timeDiff > 1000) | ||
{ | ||
lastStartX = position; | ||
lastStartTime = startTime; | ||
return; | ||
} | ||
|
||
if (diff == 0) | ||
{ | ||
bool right = RNG.NextBool(); | ||
|
||
float rand = Math.Min(20, (float)RNG.NextDouble(0, timeDiff / 4d)) / CatchPlayfield.BASE_WIDTH; | ||
|
||
if (right) | ||
{ | ||
if (position + rand <= 1) | ||
position += rand; | ||
else | ||
position -= rand; | ||
} | ||
else | ||
{ | ||
if (position - rand >= 0) | ||
position -= rand; | ||
else | ||
position += rand; | ||
} | ||
|
||
hitObject.X = position; | ||
|
||
return; | ||
} | ||
|
||
if (Math.Abs(diff) < timeDiff / 3d) | ||
{ | ||
if (diff > 0) | ||
{ | ||
if (position - diff > 0) | ||
position -= diff; | ||
} | ||
else | ||
{ | ||
if (position - diff < 1) | ||
position -= diff; | ||
} | ||
} | ||
|
||
hitObject.X = position; | ||
|
||
lastStartX = position; | ||
lastStartTime = startTime; | ||
} | ||
} | ||
} |