sigonasr2/osuMarathon
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix SliderMutiplier

Browse Source
This commit is contained in:
Joshua Sigona 2021-10-24 05:19:53 +09:00
parent 947b604e81
commit 68d3b1f222
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
osuMapCombiner/osuMapCombiner.jar
View File

Binary file not shown.

BIN
osuMapCombiner/osuMapCombiner.zip
View File

Binary file not shown.

10
osuMapCombiner/src/osuMapCombiner/Convert.java
View File

@ -131,8 +131,14 @@ BeatmapSetID:-1
double averageOverallDifficulty = AverageValues(DifficultyValues.OverallDifficulty,maps); double averageOverallDifficulty = AverageValues(DifficultyValues.OverallDifficulty,maps);
double averageApproachRate = AverageValues(DifficultyValues.ApproachRate,maps); double averageApproachRate = AverageValues(DifficultyValues.ApproachRate,maps);
double averageSliderMultiplier = AverageValues(DifficultyValues.SliderMultiplier,maps); double averageSliderMultiplier = AverageValues(DifficultyValues.SliderMultiplier,maps);
double averageSliderTickRate = AverageValues(DifficultyValues.SliderTickRate,maps); double averageSliderTickRate = AverageValues(DifficultyValues.SliderTickRate,maps);
double maxSliderMultiplier = 0;
for (int i=0;i<maps.size();i++) {
maxSliderMultiplier = Math.max(maps.get(i).sliderMultiplier,maxSliderMultiplier);
}
System.out.println("Averages: "+averageHPDrain+"/"+averageCircleSize+"/"+averageOverallDifficulty+"/"+averageOverallDifficulty+"/"+averageApproachRate+"/"+averageSliderMultiplier+"/"+averageSliderTickRate); System.out.println("Averages: "+averageHPDrain+"/"+averageCircleSize+"/"+averageOverallDifficulty+"/"+averageOverallDifficulty+"/"+averageApproachRate+"/"+averageSliderMultiplier+"/"+averageSliderTickRate);
marathonMap.add("[Difficulty]"); marathonMap.add("[Difficulty]");
@ -140,7 +146,7 @@ BeatmapSetID:-1
marathonMap.add("CircleSize:"+(int)averageCircleSize); marathonMap.add("CircleSize:"+(int)averageCircleSize);
marathonMap.add("OverallDifficulty:"+(int)averageOverallDifficulty); marathonMap.add("OverallDifficulty:"+(int)averageOverallDifficulty);
marathonMap.add("ApproachRate:"+(int)averageApproachRate); marathonMap.add("ApproachRate:"+(int)averageApproachRate);
marathonMap.add("SliderMultiplier:1.0"); marathonMap.add("SliderMultiplier:"+maxSliderMultiplier);
marathonMap.add("SliderTickRate:"+(int)averageSliderTickRate); marathonMap.add("SliderTickRate:"+(int)averageSliderTickRate);
marathonMap.add(""); marathonMap.add("");
/*[Events] /*[Events]
@ -231,7 +237,7 @@ BeatmapSetID:-1
timePoint++; timePoint++;
remainder--; remainder--;
} }
double sliderMultiplierRatio = 1.0d/map.sliderMultiplier; double sliderMultiplierRatio = maxSliderMultiplier/map.sliderMultiplier;
for (int j=0;j<map.hitObjects.size();j++) { for (int j=0;j<map.hitObjects.size();j++) {
String hitobject = map.hitObjects.get(j); String hitobject = map.hitObjects.get(j);
String[] split = hitobject.split(","); String[] split = hitobject.split(",");

2
osuMapCombiner/src/osuMapCombiner/osuMapCombiner.java
View File

@ -171,8 +171,8 @@ public class osuMapCombiner extends JPanel implements ActionListener, ListSelect
(int)Math.floor(duration/1000)+"s long. Proceed?" (int)Math.floor(duration/1000)+"s long. Proceed?"
); );
if (pane == JOptionPane.YES_OPTION) { if (pane == JOptionPane.YES_OPTION) {
Convert.Convert();
} }
Convert.Convert();
} else { } else {
button2.setEnabled(false); button2.setEnabled(false);
JOptionPane.showMessageDialog(f, "You must have selected at least 2 songs to create a marathon map!"); JOptionPane.showMessageDialog(f, "You must have selected at least 2 songs to create a marathon map!");