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

Fixed some game mod inverse checks.

Browse Source 
- Fixed issues with Auto and Spun Out/No Fail.
- Added checks for Half Time and Double Time.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-03-17 16:03:49 -04:00
parent ebbe9db717
commit e362232d5f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,17 +355,16 @@ public enum GameMod {
scoreMultiplier = -1f; scoreMultiplier = -1f;
if (checkInverse) { if (checkInverse) {
boolean b = (this == SUDDEN_DEATH || this == NO_FAIL || this == RELAX || this == AUTOPILOT);
if (AUTO.isActive()) { if (AUTO.isActive()) {
if (this == AUTO) { if (this == AUTO) {
SPUN_OUT.active = false; SPUN_OUT.active = false;
SUDDEN_DEATH.active = false; SUDDEN_DEATH.active = false;
RELAX.active = false; RELAX.active = false;
AUTOPILOT.active = false; AUTOPILOT.active = false;
} else if (b) } else if (this == SPUN_OUT || this == SUDDEN_DEATH || this == RELAX || this == AUTOPILOT)
this.active = false; this.active = false;
} }
if (active && b) { if (active && (this == SUDDEN_DEATH || this == NO_FAIL || this == RELAX || this == AUTOPILOT)) {
SUDDEN_DEATH.active = false; SUDDEN_DEATH.active = false;
NO_FAIL.active = false; NO_FAIL.active = false;
RELAX.active = false; RELAX.active = false;
@ -384,6 +383,12 @@ public enum GameMod {
else else
EASY.active = false; EASY.active = false;
} }
if (HALF_TIME.isActive() && DOUBLE_TIME.isActive()) {
if (this == HALF_TIME)
DOUBLE_TIME.active = false;
else
HALF_TIME.active = false;
}
} }
} }