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

Don't show decimal points for CS/HP/AR/OD values unless needed.

Browse Source 
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-09-19 15:30:41 -04:00
parent 5634a673bb
commit c69f34adc3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/itdelatrisu/opsu/beatmap/BeatmapSet.java
View File

@ -20,6 +20,8 @@ package itdelatrisu.opsu.beatmap;
import itdelatrisu.opsu.GameMod; import itdelatrisu.opsu.GameMod;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -81,6 +83,7 @@ public class BeatmapSet implements Iterable<Beatmap> {
int bpmMin = (int) (beatmap.bpmMin * speedModifier); int bpmMin = (int) (beatmap.bpmMin * speedModifier);
int bpmMax = (int) (beatmap.bpmMax * speedModifier); int bpmMax = (int) (beatmap.bpmMax * speedModifier);
float multiplier = GameMod.getDifficultyMultiplier(); float multiplier = GameMod.getDifficultyMultiplier();
NumberFormat nf = new DecimalFormat("##.#");
String[] info = new String[5]; String[] info = new String[5];
info[0] = beatmap.toString(); info[0] = beatmap.toString();
info[1] = String.format("Mapped by %s", beatmap.creator); info[1] = String.format("Mapped by %s", beatmap.creator);
@ -92,11 +95,11 @@ public class BeatmapSet implements Iterable<Beatmap> {
(beatmap.hitObjectCircle + beatmap.hitObjectSlider + beatmap.hitObjectSpinner)); (beatmap.hitObjectCircle + beatmap.hitObjectSlider + beatmap.hitObjectSpinner));
info[3] = String.format("Circles: %d Sliders: %d Spinners: %d", info[3] = String.format("Circles: %d Sliders: %d Spinners: %d",
beatmap.hitObjectCircle, beatmap.hitObjectSlider, beatmap.hitObjectSpinner); beatmap.hitObjectCircle, beatmap.hitObjectSlider, beatmap.hitObjectSpinner);
info[4] = String.format("CS:%.1f HP:%.1f AR:%.1f OD:%.1f%s", info[4] = String.format("CS:%s HP:%s AR:%s OD:%s%s",
Math.min(beatmap.circleSize * multiplier, 10f), nf.format(Math.min(beatmap.circleSize * multiplier, 10f)),
Math.min(beatmap.HPDrainRate * multiplier, 10f), nf.format(Math.min(beatmap.HPDrainRate * multiplier, 10f)),
Math.min(beatmap.approachRate * multiplier, 10f), nf.format(Math.min(beatmap.approachRate * multiplier, 10f)),
Math.min(beatmap.overallDifficulty * multiplier, 10f), nf.format(Math.min(beatmap.overallDifficulty * multiplier, 10f)),
(beatmap.starRating >= 0) ? String.format(" Stars:%.2f", beatmap.starRating) : ""); (beatmap.starRating >= 0) ? String.format(" Stars:%.2f", beatmap.starRating) : "");
return info; return info;
} }