Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Options to use object color overrides

Browse Source
This commit is contained in:
yugecin
2016-09-30 19:05:53 +02:00
parent 05c29f1106
commit add5e96af1
8 changed files with 168 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/itdelatrisu/opsu/states/Game.java
View File

@@ -71,6 +71,7 @@ import org.newdawn.slick.state.transition.EasedFadeOutTransition;
import org.newdawn.slick.state.transition.EmptyTransition;
import org.newdawn.slick.state.transition.FadeInTransition;
import yugecin.opsudance.Dancer;
import yugecin.opsudance.ObjectColorOverrides;
/**
* "Game" state.
@@ -1196,7 +1197,8 @@ public class Game extends BasicGameState {
}
// initialize object maps
Color[] combo = beatmap.getComboColors();
ObjectColorOverrides.comboColors = beatmap.getComboColors();
ObjectColorOverrides.hue = 0f;
for (int i = 0; i < beatmap.objects.length; i++) {
HitObject hitObject = beatmap.objects[i];
@@ -1205,7 +1207,7 @@ public class Game extends BasicGameState {
if (i + 1 >= beatmap.objects.length || beatmap.objects[i + 1].isNewCombo())
comboEnd = true;
Color color = combo[hitObject.getComboIndex()];
Color color = ObjectColorOverrides.comboColors[hitObject.getComboIndex()];
// pass beatLength to hit objects
int hitObjectTime = hitObject.getTime();

4
src/itdelatrisu/opsu/states/OptionsMenu.java
View File

@@ -112,7 +112,9 @@ public class OptionsMenu extends BasicGameState {
GameOption.DANCE_ONLY_CIRCLE_STACKS,
GameOption.DANCE_MIRROR,
GameOption.DANCE_DRAW_APPROACH,
GameOption.DANCE_RGB_OBJECTS,
GameOption.DANCE_OBJECT_COLOR_OVERRIDE,
GameOption.DANCE_OBJECT_COLOR_OVERRIDE_MIRRORED,
GameOption.DANCE_RGB_INC,
GameOption.DANCE_REMOVE_BG,
GameOption.DANCE_HIDE_UI,
}),