Halve the song cooldown

R-a-dio · Jul 25, 2017 · 62ef298 · 62ef298
1 parent 3cb9b31
commit 62ef298
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/manager/song.py b/manager/song.py
@@ -194,8 +194,8 @@ def delay(self):
         rc = min(rc, 30)
 
         if 0 <= rc <= 7:
-            return -11057 * rc ** 2 + 172954 * rc + 81720
-        return int(599955 * math.exp(0.0372 * rc) + 0.5)
+            return (-11057 * rc ** 2 + 172954 * rc + 81720) / 2
+        return int(599955 * math.exp(0.0372 * rc) + 0.5) / 2
 
     @property
     def requestable(self):

diff --git a/requests_.py b/requests_.py
@@ -26,9 +26,10 @@ def songdelay(val):
     # return int(25133*math.exp(0.1625*val)+0.5)
     # return int(-123.82*val**3 + 3355.2*val**2 + 10110*val + 51584 + 0.5)
     if 0 <= val <= 7:
-        return -11057 * val ** 2 + 172954 * val + 81720
+        cd = -11057 * val ** 2 + 172954 * val + 81720
     else:
-        return int(599955 * math.exp(0.0372 * val) + 0.5)
+        cd = int(599955 * math.exp(0.0372 * val) + 0.5)
+    return cd / 2
 
 
 def check_hmac(value, hash):