Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed broken "Easy" mod.

Browse Source 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-09-03 00:14:25 -05:00
parent a2eaf35664
commit e767800702
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/itdelatrisu/opsu/beatmap/BeatmapSetNode.java
View File

@ -116,7 +116,7 @@ public class BeatmapSetNode {
Image star = GameImage.STAR.getImage(); Image star = GameImage.STAR.getImage();
float starOffset = star.getWidth() * 1.7f; float starOffset = star.getWidth() * 1.7f;
float starX = cx + starOffset * 0.04f; 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; float starCenterY = starY + star.getHeight() / 2f;
final float baseAlpha = focus ? 1f : 0.8f; final float baseAlpha = focus ? 1f : 0.8f;
final float smallStarScale = 0.4f; final float smallStarScale = 0.4f;

21
src/itdelatrisu/opsu/states/Game.java
View File

@ -642,6 +642,17 @@ public class Game extends BasicGameState {
return; 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 // normal game update
if (!isReplay) if (!isReplay)
addReplayFrameAndRun(mouseX, mouseY, lastKeysPressed, trackPosition); addReplayFrameAndRun(mouseX, mouseY, lastKeysPressed, trackPosition);
@ -706,16 +717,6 @@ public class Game extends BasicGameState {
* @param keys the keys that are pressed * @param keys the keys that are pressed
*/ */
private void updateGame(int mouseX, int mouseY, int delta, int trackPosition, int keys) { 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! // map complete!
if (objectIndex >= gameObjects.length || (MusicController.trackEnded() && objectIndex > 0)) { if (objectIndex >= gameObjects.length || (MusicController.trackEnded() && objectIndex > 0)) {
// track ended before last object was processed: force a hit result // track ended before last object was processed: force a hit result