Fix hardcoded stack timeout in stacking algorithm. (#183)

Signed-off-by: Jeffrey Han <[email protected]>
itdelatrisu · Jan 7, 2017 · 9b5f26d · 9b5f26d
1 parent e62822a
commit 9b5f26d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/itdelatrisu/opsu/beatmap/BeatmapHPDropRateCalculator.java b/src/itdelatrisu/opsu/beatmap/BeatmapHPDropRateCalculator.java
@@ -78,7 +78,7 @@ public void calculate() {
 		float lowestHpComboEnd = Utils.mapDifficultyRange(hpDrainRate, 198, 170, 80);
 		float lowestHpEnd = Utils.mapDifficultyRange(hpDrainRate, 198, 180, 80);
 		float hpRecoveryAvailable = Utils.mapDifficultyRange(hpDrainRate, 8, 4, 0);
-		int difficultyPreEmpt = (int) Utils.mapDifficultyRange(overallDifficulty, 1800, 1200, 450);
+		int approachTime = (int) Utils.mapDifficultyRange(overallDifficulty, 1800, 1200, 450);
 
 		float testDrop = 0.05f;
 		Health health = new Health();
@@ -88,7 +88,7 @@ public void calculate() {
 			health.reset();
 			health.setModifiers(hpDrainRate, hpMultiplierNormal, hpMultiplierComboEnd);
 			double lowestHp = health.getRawHealth();
-			int lastTime = beatmap.objects[0].getTime() - difficultyPreEmpt;
+			int lastTime = beatmap.objects[0].getTime() - approachTime;
 			int comboTooLowCount = 0;
 			boolean fail = false;
 			int timingPointIndex = 0;

diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
@@ -119,9 +119,6 @@ public enum Restart {
 	/** Tolerance in case if hit object is not snapped to the grid. */
 	private static final float STACK_LENIENCE = 3f;
 
-	/** Stack time window of the previous object, in ms. */
-	private static final int STACK_TIMEOUT = 1000;
-
 	/** Stack position offset modifier. */
 	private static final float STACK_OFFSET_MODIFIER = 0.05f;
 
@@ -1776,10 +1773,7 @@ private void setMapModifiers() {
 				Options.getSkin().getSliderBorderColor() : beatmap.getSliderBorderColor());
 
 		// approachRate (hit object approach time)
-		if (approachRate < 5)
-			approachTime = (int) (1800 - (approachRate * 120));
-		else
-			approachTime = (int) (1200 - ((approachRate - 5) * 150));
+		approachTime = (int) Utils.mapDifficultyRange(approachRate, 1800, 1200, 450);
 
 		// overallDifficulty (hit result time offsets)
 		hitResultOffset = new int[GameData.HIT_MAX];
@@ -2070,7 +2064,7 @@ private void calculateStacks() {
 					continue;
 
 				// check if in range stack calculation
-				float timeI = hitObjectI.getTime() - (STACK_TIMEOUT * beatmap.stackLeniency);
+				float timeI = hitObjectI.getTime() - (approachTime * beatmap.stackLeniency);
 				float timeN = hitObjectN.isSlider() ? gameObjects[n].getEndTime() : hitObjectN.getTime();
 				if (timeI > timeN)
 					break;