Merge pull request #69 from DarkTigrus/stack-hardrock

Correct Y offset with HardRock mod
This commit is contained in:
Jeffrey Han 2015-04-01 10:26:26 -04:00
commit 28514a8606

View File

@ -274,7 +274,7 @@ public class OsuHitObject {
*/ */
public float getScaledY() { public float getScaledY() {
if (GameMod.HARD_ROCK.isActive()) if (GameMod.HARD_ROCK.isActive())
return containerHeight - ((y - stack * stackOffset) * yMultiplier + yOffset); return containerHeight - ((y + stack * stackOffset) * yMultiplier + yOffset);
else else
return (y - stack * stackOffset) * yMultiplier + yOffset; return (y - stack * stackOffset) * yMultiplier + yOffset;
} }
@ -364,7 +364,7 @@ public class OsuHitObject {
float[] y = new float[sliderY.length]; float[] y = new float[sliderY.length];
if (GameMod.HARD_ROCK.isActive()) { if (GameMod.HARD_ROCK.isActive()) {
for (int i = 0; i < y.length; i++) for (int i = 0; i < y.length; i++)
y[i] = containerHeight - ((sliderY[i] - stack * stackOffset) * yMultiplier + yOffset); y[i] = containerHeight - ((sliderY[i] + stack * stackOffset) * yMultiplier + yOffset);
} else { } else {
for (int i = 0; i < y.length; i++) for (int i = 0; i < y.length; i++)
y[i] = (sliderY[i] - stack * stackOffset) * yMultiplier + yOffset; y[i] = (sliderY[i] - stack * stackOffset) * yMultiplier + yOffset;