Skip to content

Commit

Permalink
More skin v1 changes.
Browse files Browse the repository at this point in the history
- Only show spinner-osu result for v1 skins.
- Only use white warning arrows for v1 skins, otherwise use red arrows.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
  • Loading branch information
itdelatrisu committed Jan 6, 2017
1 parent 7a1f527 commit 3d01e43
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/itdelatrisu/opsu/GameData.java
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,8 @@ public void drawHitResults(int trackPosition, boolean over) {
// results drawn OVER hit objects
if (over) {
// spinner
if (hitResult.hitResultType == HitObjectType.SPINNER && hitResult.result != HIT_MISS) {
if (hitResult.hitResultType == HitObjectType.SPINNER && hitResult.result != HIT_MISS &&
Options.getSkin().getVersion() == 1) {
Image spinnerOsu = GameImage.SPINNER_OSU.getImage();
spinnerOsu.setAlpha(hitResult.alpha);
spinnerOsu.drawCentered(width / 2, height / 4);
Expand Down
9 changes: 5 additions & 4 deletions src/itdelatrisu/opsu/states/Game.java
Original file line number Diff line number Diff line change
Expand Up @@ -525,12 +525,13 @@ else if (breakIndex > 1) {
if ((endTimeDiff > 1500 && endTimeDiff < 2000) ||
(endTimeDiff > 500 && endTimeDiff < 1000)) {
Image arrow = GameImage.WARNINGARROW.getImage();
Color color = (Options.getSkin().getVersion() == 1) ? Color.white : Color.red;
arrow.setRotation(0);
arrow.draw(width * 0.15f, height * 0.15f);
arrow.draw(width * 0.15f, height * 0.75f);
arrow.draw(width * 0.15f, height * 0.15f, color);
arrow.draw(width * 0.15f, height * 0.75f, color);
arrow.setRotation(180);
arrow.draw(width * 0.75f, height * 0.15f);
arrow.draw(width * 0.75f, height * 0.75f);
arrow.draw(width * 0.75f, height * 0.15f, color);
arrow.draw(width * 0.75f, height * 0.75f, color);
}
}
}
Expand Down

0 comments on commit 3d01e43

Please # to comment.