From ae149a61f68ed01b0ea002df63f838ed4a679310 Mon Sep 17 00:00:00 2001 From: Jeffrey Han Date: Thu, 20 Aug 2015 21:24:58 -0500 Subject: [PATCH] HP is now drained while holding sliders. (fixes #103) Slider ticks now give HP, and the HP for SLIDER30 results is doubled. Signed-off-by: Jeffrey Han --- src/itdelatrisu/opsu/GameData.java | 3 ++- src/itdelatrisu/opsu/objects/Slider.java | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/itdelatrisu/opsu/GameData.java b/src/itdelatrisu/opsu/GameData.java index a9473715..b72810c2 100644 --- a/src/itdelatrisu/opsu/GameData.java +++ b/src/itdelatrisu/opsu/GameData.java @@ -1188,7 +1188,7 @@ public class GameData { switch (result) { case HIT_SLIDER30: hitValue = 30; - changeHealth(1f); + changeHealth(2f); SoundController.playHitSound( hitObject.getEdgeHitSoundType(repeat), hitObject.getSampleSet(repeat), @@ -1196,6 +1196,7 @@ public class GameData { break; case HIT_SLIDER10: hitValue = 10; + changeHealth(1f); SoundController.playHitSound(HitSound.SLIDERTICK); break; case HIT_MISS: diff --git a/src/itdelatrisu/opsu/objects/Slider.java b/src/itdelatrisu/opsu/objects/Slider.java index 2fe24b73..65f513f5 100644 --- a/src/itdelatrisu/opsu/objects/Slider.java +++ b/src/itdelatrisu/opsu/objects/Slider.java @@ -485,7 +485,6 @@ public class Slider implements GameObject { if (((keyPressed || GameMod.RELAX.isActive()) && distance < followRadius) || isAutoMod) { // mouse pressed and within follow circle followCircleActive = true; - data.changeHealth(delta * GameData.HP_DRAIN_MULTIPLIER); // held during new repeat if (isNewRepeat) {