PIPPI!

src/itdelatrisu/opsu/states/Game.java

@@ -73,6 +73,7 @@ import org.newdawn.slick.state.transition.FadeInTransition;
 import yugecin.opsudance.Dancer;
 import yugecin.opsudance.MoverDirection;
 import yugecin.opsudance.ObjectColorOverrides;
+import yugecin.opsudance.Pippi;
 
 /**
  * "Game" state.
@@ -631,6 +632,7 @@ public class Game extends BasicGameState {
 	public void update(GameContainer container, StateBasedGame game, int delta)
 			throws SlickException {
 		UI.update(delta);
+		Pippi.update(delta);
 		int mouseX = input.getMouseX(), mouseY = input.getMouseY();
 		skipButton.hoverUpdate(delta, mouseX, mouseY);
 		if (isReplay || GameMod.AUTO.isActive())
@@ -1165,6 +1167,7 @@ public class Game extends BasicGameState {
 			throw new RuntimeException("Running game with no beatmap loaded.");
 
 		Dancer.instance.reset();
+		Pippi.reset();
 		MoverDirection.reset(beatmap.getTitle());
 
 		// free all previously cached hitobject to framebuffer mappings if some still exist

src/yugecin/opsudance/Dancer.java

@@ -144,8 +144,6 @@ public class Dancer {
 				x = (float) point[0];
 				y = (float) point[1];
 			}
-			x = Utils.clamp(x, 10, Options.width - 10);
-			y = Utils.clamp(y, 10, Options.height - 10);
 		} else {
 			if (c.isSpinner()) {
 				double[] point = spinner.getPoint();
@@ -161,6 +159,9 @@ public class Dancer {
 				y = point.y;
 			}
 		}
+		Pippi.dance(time, c, isCurrentLazySlider);
+		x = Utils.clamp(x, 10, Options.width - 10);
+		y = Utils.clamp(y, 10, Options.height - 10);
 	}
 
 }

src/yugecin/opsudance/Pippi.java

@@ -17,9 +17,14 @@
  */
 package yugecin.opsudance;
 
+import itdelatrisu.opsu.objects.Circle;
+import itdelatrisu.opsu.objects.GameObject;
+
 public class Pippi {
 
-	private int angle;
+	private static double angle = 0;
+	private static int currentdelta;
+	private static final int targetdelta = 4;
 
 	public static boolean enabled;
 	public static int angleInc = 10;
@@ -28,4 +33,55 @@ public class Pippi {
 	public static boolean followcircleExpand = true;
 	public static boolean circleSlowSliders = true;
 
+	private static double pippirad;
+	private static double pippiminrad;
+	private static double pippimaxrad;
+	private static GameObject previous;
+
+	public static void reset() {
+		angle = 0;
+		currentdelta = 0;
+		pippiminrad = pippirad = Circle.diameter / 2d - 10d;
+		pippimaxrad = Circle.diameter - 10d;
+	}
+
+	public static void dance(int time, GameObject c, boolean isCurrentLazySlider) {
+		if (!enabled || c.isSpinner()) {
+			return;
+		}
+		if (currentdelta >= targetdelta && c != previous) {
+			currentdelta = 0;
+			if (c.isSlider() && c.getTime() < time) {
+				angle += angleSliderInc / 1800d * Math.PI;
+				if (followcircleExpand && !isCurrentLazySlider) {
+					if (c.getEndTime() - time < 40 && pippirad > pippimaxrad) {
+						pippirad -= 5d;
+					} else if (time - c.getTime() > 10 && c.getEndTime() - c.getTime() > 600 && pippirad < pippimaxrad){
+						pippirad += 3d;
+					}
+				}
+			} else if (!c.isSpinner()) {
+				if (followcircleExpand && pippirad != pippiminrad) {
+					pippirad = pippiminrad;
+				}
+				angle += angleInc / 1800d * Math.PI;
+			}
+			// don't inc on long movements
+			if (c.getTime() - time > 400) {
+				previous = c;
+				return;
+			}
+		}
+		Dancer.instance.x += pippirad * Math.cos(angle);
+		Dancer.instance.y += pippirad * Math.sin(angle);
+	}
+
+	public static void update(int delta) {
+		currentdelta += delta;
+	}
+
+	public static boolean shouldPreventWobblyStream(double distance) {
+		 return enabled && distance < Circle.diameter * 1.7f && preventWobblyStreams;
+	}
+
 }

src/yugecin/opsudance/movers/factories/AutoMoverFactory.java

@@ -22,6 +22,7 @@ import itdelatrisu.opsu.Utils;
 import itdelatrisu.opsu.beatmap.HitObject;
 import itdelatrisu.opsu.objects.Circle;
 import itdelatrisu.opsu.objects.GameObject;
+import yugecin.opsudance.Pippi;
 import yugecin.opsudance.movers.*;
 
 public class AutoMoverFactory implements MoverFactory {
@@ -47,12 +48,9 @@ public class AutoMoverFactory implements MoverFactory {
 
 		}
 
-		/*
-		// TODO streams: linear if pippi+preventwobblystreams
-		if (distance < Circle.diameter * 1.7f && pippi && pippipreventwobblystreams) {
+		if (Pippi.shouldPreventWobblyStream(distance)) {
 			return new LinearMover(start, end, dir);
 		}
-		*/
 
 		endtime = end.getTime();