diff --git a/src/itdelatrisu/opsu/Options.java b/src/itdelatrisu/opsu/Options.java index ce2b5f45..1bb5a740 100644 --- a/src/itdelatrisu/opsu/Options.java +++ b/src/itdelatrisu/opsu/Options.java @@ -756,6 +756,25 @@ public class Options { } }, + DANCE_RGB_OBJECT_INC ("RGB objects increment", "RGBInc", "Amount of hue to shift, used for rainbow object override", Dancer.rgbhueinc, -1800, 1800) { + @Override + public String getValueString() { + return String.format("%.1f°", val / 10f); + } + + @Override + public void drag(GameContainer container, int d) { + super.drag(container, d); + Dancer.rgbhueinc = val; + } + + @Override + public void read(String s) { + super.read(s); + Dancer.rgbhueinc = val; + } + }, + DANCE_CURSOR_COLOR_OVERRIDE ("Cursor color override", "CursorColorOverride", "Override cursor color") { @Override public String getValueString() { @@ -810,26 +829,25 @@ public class Options { } }, - DANCE_RGB_INC ("RGB objects increment", "RGBInc", "Amount of hue to shift, used for rainbow color override", Dancer.rgbhueinc, -1800, 1800) { + DANCE_RGB_CURSOR_INC ("RGB cursor increment", "RGBCursorInc", "Amount of hue to shift, used for rainbow cursor override", Dancer.rgbhueinc, -1800, 1800) { @Override public String getValueString() { - return String.format("%.1f°", val / 10f); + return String.format("%.1f°", val / 100f); } @Override public void drag(GameContainer container, int d) { super.drag(container, d); - Dancer.rgbhueinc = val; + Dancer.rgbcursorhueinc = val; } @Override public void read(String s) { super.read(s); - Dancer.rgbhueinc = val; + Dancer.rgbcursorhueinc = val; } }, - DANCE_HIDE_OBJECTS ("Don't draw objects", "HideObj", "If you only want to see cursors :)", Dancer.hideobjects) { @Override public void click(GameContainer container) { diff --git a/src/itdelatrisu/opsu/states/OptionsMenu.java b/src/itdelatrisu/opsu/states/OptionsMenu.java index e1bb31ba..613c8ed8 100644 --- a/src/itdelatrisu/opsu/states/OptionsMenu.java +++ b/src/itdelatrisu/opsu/states/OptionsMenu.java @@ -118,9 +118,10 @@ public class OptionsMenu extends BasicGameState { GameOption.DANCE_DRAW_APPROACH, GameOption.DANCE_OBJECT_COLOR_OVERRIDE, GameOption.DANCE_OBJECT_COLOR_OVERRIDE_MIRRORED, + GameOption.DANCE_RGB_OBJECT_INC, GameOption.DANCE_CURSOR_COLOR_OVERRIDE, GameOption.DANCE_CURSOR_MIRROR_COLOR_OVERRIDE, - GameOption.DANCE_RGB_INC, + GameOption.DANCE_RGB_CURSOR_INC, GameOption.DANCE_REMOVE_BG, GameOption.DANCE_HIDE_OBJECTS, GameOption.DANCE_HIDE_UI, diff --git a/src/yugecin/opsudance/CursorColorOverrides.java b/src/yugecin/opsudance/CursorColorOverrides.java index 6a845186..68c8a012 100644 --- a/src/yugecin/opsudance/CursorColorOverrides.java +++ b/src/yugecin/opsudance/CursorColorOverrides.java @@ -97,11 +97,12 @@ public enum CursorColorOverrides { } private static Color nextRainbowColor() { - hue += Dancer.rgbhueinc / 10f; + hue += Dancer.rgbcursorhueinc / 100f; return new Color(java.awt.Color.getHSBColor(hue / 360f, 1.0f, 1.0f).getRGB()); } private static Color nextMirrorRainbowColor() { + hue += Dancer.rgbcursorhueinc / 100f; return new Color(java.awt.Color.getHSBColor((hue + 180f) / 360f, 1.0f, 1.0f).getRGB()); } diff --git a/src/yugecin/opsudance/Dancer.java b/src/yugecin/opsudance/Dancer.java index 5a1f308d..6ce76ab4 100644 --- a/src/yugecin/opsudance/Dancer.java +++ b/src/yugecin/opsudance/Dancer.java @@ -65,6 +65,7 @@ public class Dancer { public static int rgbhueinc = 70; // this should really get its own place somewhere... public static CursorColorOverrides cursorColorOverride = CursorColorOverrides.NONE; public static CursorColorOverrides cursorColorMirrorOverride = CursorColorOverrides.NONE; + public static int rgbcursorhueinc = 10; // this should really get its own place somewhere... public static MoverDirection moverDirection = MoverDirection.RANDOM; public static boolean hideobjects = false;