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

getting rid of repetitions

Browse Source
This commit is contained in:
yugecin
2016-11-20 17:01:56 +01:00
parent 726fef9b38
commit 30186b94f4
2 changed files with 39 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/itdelatrisu/opsu/states/Game.java
View File

@@ -424,58 +424,17 @@ public class Game extends BasicGameState {
autoMousePressed = false;
if (GameMod.AUTO.isActive() || GameMod.AUTOPILOT.isActive()) {
Vec2f autoPoint;
if (objectIndex < beatmap.objects.length - (Dancer.multipoint ? Dancer.polyMoverFactories[Dancer.instance.getPolyMoverFactoryIndex()].getMinBufferSize() : 0)) {
int lastObjectForDancer = beatmap.objects.length;
if (Dancer.multipoint) {
lastObjectForDancer -= Dancer.polyMoverFactories[Dancer.instance.getPolyMoverFactoryIndex()].getMinBufferSize();
}
if (objectIndex < lastObjectForDancer) {
Dancer d = Dancer.instance;
if (Dancer.multipoint) {
d.update(trackPosition, gameObjects, objectIndex);
} else {
GameObject p;
if (objectIndex > 0) {
p = gameObjects[objectIndex - 1];
}
else {
p = Dancer.d;
}
d.update(trackPosition, p, gameObjects[objectIndex]);
}
d.update(trackPosition, objectIndex);
autoPoint = new Vec2f(d.x, d.y);
if (trackPosition < gameObjects[objectIndex].getTime()) {
autoMousePressed = true;
}
/*
// normal object
int objectTime = beatmap.objects[objectIndex].getTime();
if (trackPosition < objectTime) {
Vec2f startPoint = gameObjects[objectIndex - 1].getPointAt(trackPosition);
int startTime = gameObjects[objectIndex - 1].getEndTime();
if (beatmap.breaks != null && breakIndex < beatmap.breaks.size()) {
// starting a break: keep cursor at previous hit object position
if (breakTime > 0 || objectTime > beatmap.breaks.get(breakIndex))
autoPoint = startPoint;
// after a break ends: move startTime to break end time
else if (breakIndex > 1) {
int lastBreakEndTime = beatmap.breaks.get(breakIndex - 1);
if (objectTime > lastBreakEndTime && startTime < lastBreakEndTime)
startTime = lastBreakEndTime;
}
}
if (autoPoint == null) {
Vec2f endPoint = gameObjects[objectIndex].getPointAt(trackPosition);
int totalTime = objectTime - startTime;
autoPoint = getPointAt(startPoint.x, startPoint.y, endPoint.x, endPoint.y, (float) (trackPosition - startTime) / totalTime);
// hit circles: show a mouse press
int offset300 = hitResultOffset[GameData.HIT_300];
if ((beatmap.objects[objectIndex].isCircle() && objectTime - trackPosition < offset300) ||
(beatmap.objects[objectIndex - 1].isCircle() && trackPosition - beatmap.objects[objectIndex - 1].getTime() < offset300))
autoMousePressed = true;
}
} else {
autoPoint = gameObjects[objectIndex].getPointAt(trackPosition);
autoMousePressed = true;
}
*/
} else {
// last object
autoPoint = gameObjects[objectIndex - 1].getPointAt(trackPosition);
@@ -1501,6 +1460,7 @@ public class Game extends BasicGameState {
sbOverlay.updateIndex(0);
}
Dancer.instance.setGameObjects(gameObjects);
Pippi.reset();
mirrorFrom = 0;
mirrorTo = gameObjects.length;