Added an option to disable follow points.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-03-18 23:23:34 -04:00
parent ad5379b8f0
commit 5061b45f84
3 changed files with 15 additions and 0 deletions

View File

@ -194,6 +194,7 @@ public class Options {
SHOW_HIT_LIGHTING ("Show Hit Lighting", "Adds an effect behind hit explosions.", true), SHOW_HIT_LIGHTING ("Show Hit Lighting", "Adds an effect behind hit explosions.", true),
SHOW_COMBO_BURSTS ("Show Combo Bursts", "A character image is displayed at combo milestones.", true), SHOW_COMBO_BURSTS ("Show Combo Bursts", "A character image is displayed at combo milestones.", true),
SHOW_PERFECT_HIT ("Show Perfect Hits", "Whether to show perfect hit result bursts (300s, slider ticks).", true), SHOW_PERFECT_HIT ("Show Perfect Hits", "Whether to show perfect hit result bursts (300s, slider ticks).", true),
SHOW_FOLLOW_POINTS ("Show Follow Points", "Whether to show follow points between hit objects.", true),
NEW_CURSOR ("Enable New Cursor", "Use the new cursor style (may cause higher CPU usage).", true) { NEW_CURSOR ("Enable New Cursor", "Use the new cursor style (may cause higher CPU usage).", true) {
@Override @Override
public void click(GameContainer container) { public void click(GameContainer container) {
@ -604,6 +605,12 @@ public class Options {
*/ */
public static boolean isPerfectHitBurstEnabled() { return GameOption.SHOW_PERFECT_HIT.getBooleanValue(); } public static boolean isPerfectHitBurstEnabled() { return GameOption.SHOW_PERFECT_HIT.getBooleanValue(); }
/**
* Returns whether or not to show follow points.
* @return true if enabled
*/
public static boolean isFollowPointEnabled() { return GameOption.SHOW_FOLLOW_POINTS.getBooleanValue(); }
/** /**
* Returns the background dim level. * Returns the background dim level.
* @return the alpha level [0, 1] * @return the alpha level [0, 1]
@ -1025,6 +1032,9 @@ public class Options {
case "PerfectHit": case "PerfectHit":
GameOption.SHOW_PERFECT_HIT.setValue(Boolean.parseBoolean(value)); GameOption.SHOW_PERFECT_HIT.setValue(Boolean.parseBoolean(value));
break; break;
case "FollowPoints":
GameOption.SHOW_FOLLOW_POINTS.setValue(Boolean.parseBoolean(value));
break;
case "ScoreMeter": case "ScoreMeter":
GameOption.SHOW_HIT_ERROR_BAR.setValue(Boolean.parseBoolean(value)); GameOption.SHOW_HIT_ERROR_BAR.setValue(Boolean.parseBoolean(value));
break; break;
@ -1141,6 +1151,8 @@ public class Options {
writer.newLine(); writer.newLine();
writer.write(String.format("PerfectHit = %b", isPerfectHitBurstEnabled())); writer.write(String.format("PerfectHit = %b", isPerfectHitBurstEnabled()));
writer.newLine(); writer.newLine();
writer.write(String.format("FollowPoints = %b", isFollowPointEnabled()));
writer.newLine();
writer.write(String.format("ScoreMeter = %b", isHitErrorBarEnabled())); writer.write(String.format("ScoreMeter = %b", isHitErrorBarEnabled()));
writer.newLine(); writer.newLine();
writer.write(String.format("LoadHDImages = %b", loadHDImages())); writer.write(String.format("LoadHDImages = %b", loadHDImages()));

View File

@ -1195,6 +1195,8 @@ public class Game extends BasicGameState {
stack.add(index); stack.add(index);
// draw follow points // draw follow points
if (!Options.isFollowPointEnabled())
continue;
if (osu.objects[index].isSpinner()) { if (osu.objects[index].isSpinner()) {
lastObjectIndex = -1; lastObjectIndex = -1;
continue; continue;

View File

@ -76,6 +76,7 @@ public class OptionsMenu extends BasicGameState {
GameOption.SHOW_HIT_LIGHTING, GameOption.SHOW_HIT_LIGHTING,
GameOption.SHOW_COMBO_BURSTS, GameOption.SHOW_COMBO_BURSTS,
GameOption.SHOW_PERFECT_HIT, GameOption.SHOW_PERFECT_HIT,
GameOption.SHOW_FOLLOW_POINTS,
GameOption.SHOW_HIT_ERROR_BAR GameOption.SHOW_HIT_ERROR_BAR
}), }),
INPUT ("Input", new GameOption[] { INPUT ("Input", new GameOption[] {