option for rgb objs

This commit is contained in:
yugecin
2016-09-30 09:17:39 +02:00
parent 0d77d7f56a
commit 46e2b7069f
5 changed files with 22 additions and 2 deletions

View File

@@ -666,6 +666,20 @@ public class Options {
} }
}, },
DANCE_RGB_OBJECTS ("Use rgb objects", "RGBObj", "Give each object a new color", false) {
@Override
public void click(GameContainer container) {
bool = !bool;
Dancer.rgbobj = bool;
}
@Override
public void read(String s) {
super.read(s);
Dancer.rgbobj = bool;
}
},
PIPPI_ENABLE ("Pippi", "Pippi", "Move in circles like dancing pippi (osu! april fools joke 2016)", false) { PIPPI_ENABLE ("Pippi", "Pippi", "Move in circles like dancing pippi (osu! april fools joke 2016)", false) {
// TODO // TODO
}, },

View File

@@ -89,7 +89,9 @@ public class Circle extends GameObject {
this.color = color; this.color = color;
this.comboEnd = comboEnd; this.comboEnd = comboEnd;
updatePosition(); updatePosition();
this.color = Utils.nextColor(); if (Dancer.rgbobj) {
this.color = Utils.nextColor();
}
} }
@Override @Override

View File

@@ -159,7 +159,9 @@ public class Slider extends GameObject {
this.data = data; this.data = data;
this.color = color; this.color = color;
this.comboEnd = comboEnd; this.comboEnd = comboEnd;
this.color = Utils.nextColor(); if (Dancer.rgbobj) {
this.color = Utils.nextColor();
}
updatePosition(); updatePosition();
// slider time calculations // slider time calculations

View File

@@ -112,6 +112,7 @@ public class OptionsMenu extends BasicGameState {
GameOption.DANCE_ONLY_CIRCLE_STACKS, GameOption.DANCE_ONLY_CIRCLE_STACKS,
GameOption.DANCE_MIRROR, GameOption.DANCE_MIRROR,
GameOption.DANCE_DRAW_APPROACH, GameOption.DANCE_DRAW_APPROACH,
GameOption.DANCE_RGB_OBJECTS,
}), }),
PIPPI ("Pippi", new GameOption[] { PIPPI ("Pippi", new GameOption[] {
GameOption.PIPPI_ENABLE, GameOption.PIPPI_ENABLE,

View File

@@ -52,6 +52,7 @@ public class Dancer {
public static boolean mirror; // this should really get its own place somewhere... 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 drawApproach; // this should really get its own place somewhere...
public static boolean rgbobj; // this should really get its own place somewhere...
private int dir; private int dir;
private GameObject p; private GameObject p;