Fixed broken "Easy" mod.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
parent
a2eaf35664
commit
e767800702
|
@ -116,7 +116,7 @@ public class BeatmapSetNode {
|
|||
Image star = GameImage.STAR.getImage();
|
||||
float starOffset = star.getWidth() * 1.7f;
|
||||
float starX = cx + starOffset * 0.04f;
|
||||
float starY = cy + Fonts.MEDIUM.getLineHeight() + Fonts.DEFAULT.getLineHeight() * 2 - 10f * GameImage.getUIscale();
|
||||
float starY = cy + Fonts.MEDIUM.getLineHeight() + Fonts.DEFAULT.getLineHeight() * 2 - 8f * GameImage.getUIscale();
|
||||
float starCenterY = starY + star.getHeight() / 2f;
|
||||
final float baseAlpha = focus ? 1f : 0.8f;
|
||||
final float smallStarScale = 0.4f;
|
||||
|
|
|
@ -642,6 +642,17 @@ public class Game extends BasicGameState {
|
|||
return;
|
||||
}
|
||||
|
||||
// "Easy" mod: multiple "lives"
|
||||
if (GameMod.EASY.isActive() && deathTime > -1) {
|
||||
if (data.getHealth() < 99f) {
|
||||
data.changeHealth(delta / 10f);
|
||||
data.updateDisplays(delta);
|
||||
return;
|
||||
}
|
||||
MusicController.resume();
|
||||
deathTime = -1;
|
||||
}
|
||||
|
||||
// normal game update
|
||||
if (!isReplay)
|
||||
addReplayFrameAndRun(mouseX, mouseY, lastKeysPressed, trackPosition);
|
||||
|
@ -706,16 +717,6 @@ public class Game extends BasicGameState {
|
|||
* @param keys the keys that are pressed
|
||||
*/
|
||||
private void updateGame(int mouseX, int mouseY, int delta, int trackPosition, int keys) {
|
||||
// "Easy" mod: multiple "lives"
|
||||
if (GameMod.EASY.isActive() && deathTime > -1) {
|
||||
if (data.getHealth() < 99f)
|
||||
data.changeHealth(delta / 10f);
|
||||
else {
|
||||
MusicController.resume();
|
||||
deathTime = -1;
|
||||
}
|
||||
}
|
||||
|
||||
// map complete!
|
||||
if (objectIndex >= gameObjects.length || (MusicController.trackEnded() && objectIndex > 0)) {
|
||||
// track ended before last object was processed: force a hit result
|
||||
|
|
Loading…
Reference in New Issue
Block a user