Option to disable reverse arrow hit anim

This commit is contained in:
yugecin
2016-12-12 08:37:21 +01:00
parent 6f46092766
commit 1c5f66f149
2 changed files with 22 additions and 13 deletions

View File

@@ -512,6 +512,7 @@ public class Options {
}, },
SHOW_HIT_LIGHTING ("Show Hit Lighting", "HitLighting", "Adds an effect behind hit explosions.", true), SHOW_HIT_LIGHTING ("Show Hit Lighting", "HitLighting", "Adds an effect behind hit explosions.", true),
SHOW_HIT_ANIMATIONS ("Show Hit Animations", "HitAnimations", "Fade out circles and curves.", true), SHOW_HIT_ANIMATIONS ("Show Hit Animations", "HitAnimations", "Fade out circles and curves.", true),
SHOW_REVERSEARROW_ANIMATIONS ("Show reverse arrow animations", "ReverseArrowAnimations", "Fade out reverse arrows after passing.", true),
SHOW_COMBO_BURSTS ("Show Combo Bursts", "ComboBurst", "A character image is displayed at combo milestones.", true), SHOW_COMBO_BURSTS ("Show Combo Bursts", "ComboBurst", "A character image is displayed at combo milestones.", true),
SHOW_PERFECT_HIT ("Show Perfect Hits", "PerfectHit", "Whether to show perfect hit result bursts (300s, slider ticks).", true), SHOW_PERFECT_HIT ("Show Perfect Hits", "PerfectHit", "Whether to show perfect hit result bursts (300s, slider ticks).", true),
SHOW_FOLLOW_POINTS ("Show Follow Points", "FollowPoints", "Whether to show follow points between hit objects.", true), SHOW_FOLLOW_POINTS ("Show Follow Points", "FollowPoints", "Whether to show follow points between hit objects.", true),
@@ -1423,6 +1424,12 @@ public class Options {
*/ */
public static boolean isHitAnimationEnabled() { return GameOption.SHOW_HIT_ANIMATIONS.getBooleanValue(); } public static boolean isHitAnimationEnabled() { return GameOption.SHOW_HIT_ANIMATIONS.getBooleanValue(); }
/**
* Returns whether or not hit animation effects are enabled.
* @return true if enabled
*/
public static boolean isReverseArrowAnimationEnabled() { return GameOption.SHOW_REVERSEARROW_ANIMATIONS.getBooleanValue(); }
/** /**
* Returns whether or not combo burst effects are enabled. * Returns whether or not combo burst effects are enabled.
* @return true if enabled * @return true if enabled

View File

@@ -647,20 +647,22 @@ public class Slider extends GameObject {
isNewRepeat = true; isNewRepeat = true;
tickExpandTime = TICK_EXPAND_TIME; tickExpandTime = TICK_EXPAND_TIME;
// send hit result, to fade out reversearrow if (Options.isReverseArrowAnimationEnabled()) {
HitObjectType type; // send hit result, to fade out reversearrow
float posX, posY; HitObjectType type;
if (currentRepeats % 2 == 1) { float posX, posY;
type = HitObjectType.SLIDER_LAST; if (currentRepeats % 2 == 1) {
Vec2f endPos = curve.pointAt(1); type = HitObjectType.SLIDER_LAST;
posX = endPos.x; Vec2f endPos = curve.pointAt(1);
posY = endPos.y; posX = endPos.x;
} else { posY = endPos.y;
type = HitObjectType.SLIDER_FIRST; } else {
posX = this.x; type = HitObjectType.SLIDER_FIRST;
posY = this.y; posX = this.x;
posY = this.y;
}
data.sendRepeatSliderResult(trackPosition, posX, posY, Color.white, curve, type);
} }
data.sendRepeatSliderResult(trackPosition, posX, posY, Color.white, curve, type);
} }
} }