From 4ab767f4642f34173b2fbf567430d986f6b6549f Mon Sep 17 00:00:00 2001 From: yugecin Date: Fri, 30 Sep 2016 21:51:59 +0200 Subject: [PATCH] Adjust default values for dancer options --- src/itdelatrisu/opsu/Options.java | 16 ++++++++-------- src/yugecin/opsudance/Dancer.java | 12 +++++------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/itdelatrisu/opsu/Options.java b/src/itdelatrisu/opsu/Options.java index 15eff8a0..1e870b8c 100644 --- a/src/itdelatrisu/opsu/Options.java +++ b/src/itdelatrisu/opsu/Options.java @@ -626,7 +626,7 @@ public class Options { } }, - DANCE_LAZY_SLIDERS ("Lazy sliders", "LazySliders", "Don't do short sliders", true) { + DANCE_LAZY_SLIDERS ("Lazy sliders", "LazySliders", "Don't do short sliders", Dancer.LAZY_SLIDERS) { @Override public void click(GameContainer container) { bool = !bool; @@ -640,7 +640,7 @@ public class Options { } }, - DANCE_ONLY_CIRCLE_STACKS ("Only circle stacks", "CircleStacks", "Only do circle movement on stacks", true) { + DANCE_ONLY_CIRCLE_STACKS ("Only circle stacks", "CircleStacks", "Only do circle movement on stacks", AutoMoverFactory.ONLY_CIRCLE_STACKS) { @Override public void click(GameContainer container) { bool = !bool; @@ -654,7 +654,7 @@ public class Options { } }, - DANCE_CIRCLE_STREAMS ("Circle streams", "CircleStreams", "Make circles while streaming", false) { + DANCE_CIRCLE_STREAMS ("Circle streams", "CircleStreams", "Make circles while streaming", AutoMoverFactory.CIRCLE_STREAM == 58) { @Override public void click(GameContainer container) { bool = !bool; @@ -668,7 +668,7 @@ public class Options { } }, - DANCE_MIRROR ("Mirror collage", "MirrorCollage", "Hypnotizing stuff", false) { + DANCE_MIRROR ("Mirror collage", "MirrorCollage", "Hypnotizing stuff", Dancer.mirror) { @Override public void click(GameContainer container) { bool = !bool; @@ -682,7 +682,7 @@ public class Options { } }, - DANCE_DRAW_APPROACH ("Draw approach circles", "DrawApproach", "Can get a bit busy when using mirror collage", true) { + DANCE_DRAW_APPROACH ("Draw approach circles", "DrawApproach", "Can get a bit busy when using mirror collage", Dancer.drawApproach) { @Override public void click(GameContainer container) { bool = !bool; @@ -769,7 +769,7 @@ public class Options { } }, - DANCE_CURSOR_USE_OBJECT_COLOR ("Give object color to cursor", "CursorUseObjectColor", "The color of the last object will be used on the cursor", false) { + DANCE_CURSOR_USE_OBJECT_COLOR ("Give object color to cursor", "CursorUseObjectColor", "The color of the last object will be used on the cursor", Dancer.cursoruselastobjectcolor) { @Override public void click(GameContainer container) { bool = !bool; @@ -783,7 +783,7 @@ public class Options { } }, - DANCE_REMOVE_BG ("Never draw background", "RemoveBG", "Hello darkness my old friend", true) { + DANCE_REMOVE_BG ("Never draw background", "RemoveBG", "Hello darkness my old friend", Dancer.removebg) { @Override public void click(GameContainer container) { bool = !bool; @@ -801,7 +801,7 @@ public class Options { // TODO }, - DANCE_HIDE_UI ("Hide all UI", "HideUI", ".", true) { + DANCE_HIDE_UI ("Hide all UI", "HideUI", ".", Dancer.hideui) { @Override public void click(GameContainer container) { bool = !bool; diff --git a/src/yugecin/opsudance/Dancer.java b/src/yugecin/opsudance/Dancer.java index 9effc665..1b3c2eb1 100644 --- a/src/yugecin/opsudance/Dancer.java +++ b/src/yugecin/opsudance/Dancer.java @@ -28,8 +28,6 @@ import yugecin.opsudance.movers.factories.*; import yugecin.opsudance.spinners.RektSpinner; import yugecin.opsudance.spinners.Spinner; -import java.util.Random; - public class Dancer { public static MoverFactory[] moverFactories = new MoverFactory[] { @@ -50,14 +48,14 @@ public class Dancer { public static Dancer instance = new Dancer(); - public static boolean mirror; // this should really get its own place somewhere... - public static boolean drawApproach; // this should really get its own place somewhere... - public static boolean removebg; // this should really get its own place somewhere... - public static boolean hideui; // this should really get its own place somewhere... + public static boolean mirror = false; // this should really get its own place somewhere... + public static boolean drawApproach = true; // this should really get its own place somewhere... + public static boolean removebg = true; // this should really get its own place somewhere... + public static boolean hideui = true; // this should really get its own place somewhere... public static ObjectColorOverrides colorOverride = ObjectColorOverrides.NONE; public static ObjectColorOverrides colorMirrorOverride = ObjectColorOverrides.NONE; public static int rgbhueinc = 70; // this should really get its own place somewhere... - public static boolean cursoruselastobjectcolor; + public static boolean cursoruselastobjectcolor = false; public static MoverDirection moverDirection = MoverDirection.RANDOM; private int dir;