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

Addition/Edge Addition SampleSet

Browse Source 
Minor fix with combo colors and spinners
This commit is contained in:
fd
2015-03-01 11:06:46 -05:00
parent 955a184d2c
commit 04bfbc70fc
10 changed files with 138 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/itdelatrisu/opsu/objects/Circle.java
View File

@@ -141,7 +141,7 @@ public class Circle implements HitObject {
data.hitResult(
hitObject.getTime(), result,
hitObject.getX(), hitObject.getY(),
color, comboEnd, hitObject.getHitSoundType(), false
color, comboEnd, hitObject, 0, false
);
return true;
}
@@ -153,7 +153,6 @@ public class Circle implements HitObject {
public boolean update(boolean overlap, int delta, int mouseX, int mouseY) {
int time = hitObject.getTime();
float x = hitObject.getX(), y = hitObject.getY();
byte hitSound = hitObject.getHitSoundType();
int trackPosition = MusicController.getPosition();
int[] hitResultOffset = game.getHitResultOffsets();
@@ -161,17 +160,17 @@ public class Circle implements HitObject {
if (overlap || trackPosition > time + hitResultOffset[GameData.HIT_50]) {
if (isAutoMod) // "auto" mod: catch any missed notes due to lag
data.hitResult(time, GameData.HIT_300, x, y, color, comboEnd, hitSound, false);
data.hitResult(time, GameData.HIT_300, x, y, color, comboEnd, hitObject, 0, false);
else // no more points can be scored, so send a miss
data.hitResult(time, GameData.HIT_MISS, x, y, null, comboEnd, hitSound, false);
data.hitResult(time, GameData.HIT_MISS, x, y, null, comboEnd, hitObject, 0, false);
return true;
}
// "auto" mod: send a perfect hit result
else if (isAutoMod) {
if (Math.abs(trackPosition - time) < hitResultOffset[GameData.HIT_300]) {
data.hitResult(time, GameData.HIT_300, x, y, color, comboEnd, hitSound, false);
data.hitResult(time, GameData.HIT_300, x, y, color, comboEnd, hitObject, 0, false);
return true;
}
}

30
src/itdelatrisu/opsu/objects/Slider.java
View File

@@ -253,10 +253,14 @@ public class Slider implements HitObject {
if (currentRepeats % 2 == 0) { // last circle
float[] lastPos = curve.pointAt(1);
data.hitResult(hitObject.getTime() + (int) sliderTimeTotal, result,
lastPos[0],lastPos[1], color, comboEnd, hitObject.getHitSoundType(), false);
lastPos[0],lastPos[1], color, comboEnd,
hitObject, currentRepeats+1
, false);
} else { // first circle
data.hitResult(hitObject.getTime() + (int) sliderTimeTotal, result,
hitObject.getX(), hitObject.getY(), color, comboEnd, hitObject.getHitSoundType(), false);
hitObject.getX(), hitObject.getY(), color, comboEnd,
hitObject, currentRepeats+1
, false);
}
return result;
@@ -286,7 +290,9 @@ public class Slider implements HitObject {
data.addHitError(hitObject.getTime(), x,y,trackPosition - hitObject.getTime());
sliderClickedInitial = true;
data.sliderTickResult(hitObject.getTime(), result,
hitObject.getX(), hitObject.getY(), hitObject.getHitSoundType());
hitObject.getX(), hitObject.getY(),
hitObject, currentRepeats
);
return true;
}
}
@@ -315,7 +321,6 @@ public class Slider implements HitObject {
}
}
byte hitSound = hitObject.getHitSoundType();
int trackPosition = MusicController.getPosition();
int[] hitResultOffset = game.getHitResultOffsets();
int lastIndex = hitObject.getSliderX().length - 1;
@@ -330,10 +335,10 @@ public class Slider implements HitObject {
if (isAutoMod) { // "auto" mod: catch any missed notes due to lag
ticksHit++;
data.sliderTickResult(time, GameData.HIT_SLIDER30,
hitObject.getX(), hitObject.getY(), hitSound);
hitObject.getX(), hitObject.getY(), hitObject, currentRepeats);
} else
data.sliderTickResult(time, GameData.HIT_MISS,
hitObject.getX(), hitObject.getY(), hitSound);
hitObject.getX(), hitObject.getY(), hitObject, currentRepeats);
}
// "auto" mod: send a perfect hit result
@@ -342,7 +347,7 @@ public class Slider implements HitObject {
ticksHit++;
sliderClickedInitial = true;
data.sliderTickResult(time, GameData.HIT_SLIDER30,
hitObject.getX(), hitObject.getY(), hitSound);
hitObject.getX(), hitObject.getY(), hitObject, currentRepeats);
}
}
}
@@ -411,17 +416,18 @@ public class Slider implements HitObject {
ticksHit++;
if (currentRepeats % 2 > 0) // last circle
data.sliderTickResult(trackPosition, GameData.HIT_SLIDER30,
hitObject.getSliderX()[lastIndex], hitObject.getSliderY()[lastIndex], hitSound);
hitObject.getSliderX()[lastIndex], hitObject.getSliderY()[lastIndex],
hitObject, currentRepeats);
else // first circle
data.sliderTickResult(trackPosition, GameData.HIT_SLIDER30,
c[0], c[1], hitSound);
c[0], c[1], hitObject, currentRepeats);
}
// held during new tick
if (isNewTick) {
ticksHit++;
data.sliderTickResult(trackPosition, GameData.HIT_SLIDER10,
c[0], c[1], (byte) -1);
c[0], c[1], hitObject, currentRepeats);
}
// held near end of slider
@@ -431,9 +437,9 @@ public class Slider implements HitObject {
followCircleActive = false;
if (isNewRepeat)
data.sliderTickResult(trackPosition, GameData.HIT_MISS, 0, 0, (byte) -1);
data.sliderTickResult(trackPosition, GameData.HIT_MISS, 0, 0, hitObject, currentRepeats);
if (isNewTick)
data.sliderTickResult(trackPosition, GameData.HIT_MISS, 0, 0, (byte) -1);
data.sliderTickResult(trackPosition, GameData.HIT_MISS, 0, 0, hitObject, currentRepeats);
}
return false;

2
src/itdelatrisu/opsu/objects/Spinner.java
View File

@@ -164,7 +164,7 @@ public class Spinner implements HitObject {
result = GameData.HIT_MISS;
data.hitResult(hitObject.getEndTime(), result, width / 2, height / 2,
Color.transparent, true, (byte) -1, true);
Color.transparent, true, hitObject, 0, true);
return result;
}