Minor code cleaning.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
@@ -160,7 +160,7 @@ public class Beatmap implements Comparable<Beatmap> {
|
||||
public float HPDrainRate = 5f;
|
||||
|
||||
/** CS: Size of circles and sliders (0:large ~ 10:small). */
|
||||
public float circleSize = 4f;
|
||||
public float circleSize = 5f;
|
||||
|
||||
/** OD: Affects timing window, spinners, and approach speed (0:easy ~ 10:hard). */
|
||||
public float overallDifficulty = 5f;
|
||||
@@ -169,7 +169,7 @@ public class Beatmap implements Comparable<Beatmap> {
|
||||
public float approachRate = -1f;
|
||||
|
||||
/** Slider movement speed multiplier. */
|
||||
public float sliderMultiplier = 1f;
|
||||
public float sliderMultiplier = 1.4f;
|
||||
|
||||
/** Rate at which slider ticks are placed (x per beat). */
|
||||
public float sliderTickRate = 1f;
|
||||
|
||||
@@ -69,7 +69,7 @@ public class BeatmapSet implements Iterable<Beatmap> {
|
||||
* <li>1: Mapped by {Creator}
|
||||
* <li>2: Length: {} BPM: {} Objects: {}
|
||||
* <li>3: Circles: {} Sliders: {} Spinners: {}
|
||||
* <li>4: CS:{} HP:{} AR:{} OD:{}
|
||||
* <li>4: CS:{} HP:{} AR:{} OD:{} Stars:{}
|
||||
* </ul>
|
||||
* @param index the beatmap index
|
||||
* @throws IndexOutOfBoundsException
|
||||
@@ -97,7 +97,7 @@ public class BeatmapSet implements Iterable<Beatmap> {
|
||||
Math.min(beatmap.HPDrainRate * multiplier, 10f),
|
||||
Math.min(beatmap.approachRate * multiplier, 10f),
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -131,7 +131,7 @@ public class BeatmapSet implements Iterable<Beatmap> {
|
||||
return true;
|
||||
|
||||
// search: version, tags (remaining beatmaps)
|
||||
for (int i = 1; i < beatmaps.size(); i++) {
|
||||
for (int i = 1, n = beatmaps.size(); i < n; i++) {
|
||||
beatmap = beatmaps.get(i);
|
||||
if (beatmap.version.toLowerCase().contains(query) ||
|
||||
beatmap.tags.contains(query))
|
||||
|
||||
@@ -45,7 +45,7 @@ public class BeatmapSetList {
|
||||
|
||||
/** Search pattern for conditional expressions. */
|
||||
private static final Pattern SEARCH_CONDITION_PATTERN = Pattern.compile(
|
||||
"(ar|cs|od|hp|bpm|length|stars?)(=|==|>|>=|<|<=)((\\d*\\.)?\\d+)"
|
||||
"(ar|cs|od|hp|bpm|length|stars?)(==?|>=?|<=?)((\\d*\\.)?\\d+)"
|
||||
);
|
||||
|
||||
/** List containing all parsed nodes. */
|
||||
|
||||
@@ -39,13 +39,6 @@ public class HitObject {
|
||||
TYPE_NEWCOMBO = 4, // not an object
|
||||
TYPE_SPINNER = 8;
|
||||
|
||||
/** Hit object type names. */
|
||||
private static final String
|
||||
CIRCLE = "circle",
|
||||
SLIDER = "slider",
|
||||
SPINNER = "spinner",
|
||||
UNKNOWN = "unknown object";
|
||||
|
||||
/** Hit sound types (bits). */
|
||||
public static final byte
|
||||
SOUND_NORMAL = 0,
|
||||
@@ -320,13 +313,13 @@ public class HitObject {
|
||||
*/
|
||||
public String getTypeName() {
|
||||
if (isCircle())
|
||||
return CIRCLE;
|
||||
return "circle";
|
||||
else if (isSlider())
|
||||
return SLIDER;
|
||||
return "slider";
|
||||
else if (isSpinner())
|
||||
return SPINNER;
|
||||
return "spinner";
|
||||
else
|
||||
return UNKNOWN;
|
||||
return "unknown object type";
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user