From 8ea4bcf7de2a8c56e3573b3afc487a9de19c663c Mon Sep 17 00:00:00 2001 From: yugecin Date: Sat, 10 Dec 2016 02:13:56 +0100 Subject: [PATCH] expand followcircle on sliderticks --- src/itdelatrisu/opsu/objects/Slider.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/itdelatrisu/opsu/objects/Slider.java b/src/itdelatrisu/opsu/objects/Slider.java index 54fb899f..03cb7770 100644 --- a/src/itdelatrisu/opsu/objects/Slider.java +++ b/src/itdelatrisu/opsu/objects/Slider.java @@ -104,6 +104,12 @@ public class Slider implements GameObject { /** Number of ticks hit and tick intervals so far. */ private int ticksHit = 0, tickIntervals = 1; + /** The current tick expanded time */ + private int tickExpand = 0; + + /** The duration of the tick expand */ + private final int TICKEXPANDTIME = 200; + /** Container dimensions. */ private static int containerWidth, containerHeight; @@ -290,7 +296,7 @@ public class Slider implements GameObject { // follow circle if (followCircleActive) { - GameImage.SLIDER_FOLLOWCIRCLE.getImage().drawCentered(c.x, c.y); + GameImage.SLIDER_FOLLOWCIRCLE.getImage().getScaledCopy(1f + (tickExpand / (float) TICKEXPANDTIME) * 0.1f).drawCentered(c.x, c.y); // "flashlight" mod: dim the screen if (GameMod.FLASHLIGHT.isActive()) { @@ -477,9 +483,17 @@ public class Slider implements GameObject { mousePressed(mouseX, mouseY, trackPosition); } + if (tickExpand > 0) { + tickExpand -= delta; + if (tickExpand < 0) { + tickExpand = 0; + } + } + // end of slider if (trackPosition > hitObject.getTime() + sliderTimeTotal) { tickIntervals++; + tickExpand = TICKEXPANDTIME; // check if cursor pressed and within end circle if (keyPressed || GameMod.RELAX.isActive()) { @@ -508,6 +522,7 @@ public class Slider implements GameObject { float t = getT(trackPosition, true); if (Math.floor(t) > currentRepeats) { currentRepeats++; + tickExpand = TICKEXPANDTIME; isNewRepeat = true; tickIndex = 0; } @@ -522,6 +537,7 @@ public class Slider implements GameObject { if (t - Math.floor(t) >= ticksT[tickIndex]) { tickIntervals++; tickIndex = (tickIndex + 1) % ticksT.length; + tickExpand = TICKEXPANDTIME; isNewTick = true; } }