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

add option to disable hit animations (close #95)

Browse Source
This commit is contained in:
yugecin 2016-12-10 17:33:34 +01:00
parent b76a3b366d
commit 7126cd58a5
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/itdelatrisu/opsu/GameData.java
View File

@ -897,7 +897,8 @@ public class GameData {
} }
// hit animation // hit animation
if (hitResult.result != HIT_MISS && ( if (Options.isHitAnimationEnabled() &&
hitResult.result != HIT_MISS && (
hitResult.hitResultType == null || // null => initial slider circle hitResult.hitResultType == null || // null => initial slider circle
hitResult.hitResultType == HitObjectType.CIRCLE || hitResult.hitResultType == HitObjectType.CIRCLE ||
hitResult.hitResultType == HitObjectType.SLIDER_FIRST || hitResult.hitResultType == HitObjectType.SLIDER_FIRST ||

7
src/itdelatrisu/opsu/Options.java
View File

@ -514,6 +514,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_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),
@ -1715,6 +1716,12 @@ public class Options {
*/ */
public static boolean isHitLightingEnabled() { return GameOption.SHOW_HIT_LIGHTING.getBooleanValue(); } public static boolean isHitLightingEnabled() { return GameOption.SHOW_HIT_LIGHTING.getBooleanValue(); }
/**
* Returns whether or not hit animation effects are enabled.
* @return true if enabled
*/
public static boolean isHitAnimationEnabled() { return GameOption.SHOW_HIT_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

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

@ -86,6 +86,7 @@ public class OptionsMenu extends BasicGameState {
GameOption.FALLBACK_SLIDERS, GameOption.FALLBACK_SLIDERS,
GameOption.MERGING_SLIDERS, GameOption.MERGING_SLIDERS,
GameOption.SHOW_HIT_LIGHTING, GameOption.SHOW_HIT_LIGHTING,
GameOption.SHOW_HIT_ANIMATIONS,
GameOption.SHOW_COMBO_BURSTS, GameOption.SHOW_COMBO_BURSTS,
GameOption.SHOW_PERFECT_HIT, GameOption.SHOW_PERFECT_HIT,
GameOption.SHOW_FOLLOW_POINTS, GameOption.SHOW_FOLLOW_POINTS,