Fix SliderMutiplier

osuMapCombiner/src/osuMapCombiner/Convert.java

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

osuMapCombiner/src/osuMapCombiner/osuMapCombiner.java

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