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

Mod difficulty multipliers are now reflected in displayed song info.

Browse Source 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han
2015-04-04 12:30:23 -04:00
parent 2efb18e225
commit 07075c094b
4 changed files with 40 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/itdelatrisu/opsu/GameMod.java
View File

@@ -176,6 +176,9 @@ public enum GameMod {
/** The last calculated track speed multiplier, or -1f if it must be recalculated. */
private static float speedMultiplier = -1f;
/** The last calculated difficulty multiplier, or -1f if it must be recalculated. */
private static float difficultyMultiplier = -1f;
/**
* Initializes the game mods.
* @param width the container width
@@ -201,7 +204,7 @@ public enum GameMod {
mod.active = false;
}
scoreMultiplier = speedMultiplier = -1f;
scoreMultiplier = speedMultiplier = difficultyMultiplier = -1f;
}
/**
@@ -224,16 +227,31 @@ public enum GameMod {
*/
public static float getSpeedMultiplier() {
if (speedMultiplier < 0f) {
float multiplier = 1f;
if (DOUBLE_TIME.isActive())
multiplier = 1.5f;
speedMultiplier = 1.5f;
else if (HALF_TIME.isActive())
multiplier = 0.75f;
speedMultiplier = multiplier;
speedMultiplier = 0.75f;
else
speedMultiplier = 1f;
}
return speedMultiplier;
}
/**
* Returns the current difficulty multiplier from all active mods.
*/
public static float getDifficultyMultiplier() {
if (difficultyMultiplier < 0f) {
if (HARD_ROCK.isActive())
difficultyMultiplier = 1.4f;
else if (EASY.isActive())
difficultyMultiplier = 0.5f;
else
difficultyMultiplier = 1f;
}
return difficultyMultiplier;
}
/**
* Returns the current game mod state (bitwise OR of active mods).
*/
@@ -251,7 +269,7 @@ public enum GameMod {
* @param state the state (bitwise OR of active mods)
*/
public static void loadModState(int state) {
scoreMultiplier = speedMultiplier = -1f;
scoreMultiplier = speedMultiplier = difficultyMultiplier = -1f;
for (GameMod mod : GameMod.values())
mod.active = ((state & mod.getBit()) > 0);
}
@@ -371,7 +389,7 @@ public enum GameMod {
return;
active = !active;
scoreMultiplier = speedMultiplier = -1f;
scoreMultiplier = speedMultiplier = difficultyMultiplier = -1f;
if (checkInverse) {
if (AUTO.isActive()) {