diff --git a/src/itdelatrisu/opsu/beatmap/BeatmapSetNode.java b/src/itdelatrisu/opsu/beatmap/BeatmapSetNode.java index 80a09ce8..84b9771a 100644 --- a/src/itdelatrisu/opsu/beatmap/BeatmapSetNode.java +++ b/src/itdelatrisu/opsu/beatmap/BeatmapSetNode.java @@ -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; diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java index 61a5e41e..5c006c98 100644 --- a/src/itdelatrisu/opsu/states/Game.java +++ b/src/itdelatrisu/opsu/states/Game.java @@ -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