Fixed some game mod inverse checks.

- 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

View File

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