Revert triggerMiss and triggerPick because the new code was even buggier

stump · Sep 21, 2011 · 753d54c · 753d54c
1 parent 9b9985c
commit 753d54c
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/Rockmeter.py b/src/Rockmeter.py
@@ -434,11 +434,17 @@ def f(x):
     return f((x - min) / (max - min))
 
   def triggerPick(self):
-    return self.scene.notesHit[playerNum]
-
+    if not self.stage.lastPickPos:
+      return 0.0
+    t = position - self.stage.lastPickPos
+    return (1.0 - self._smoothstep(0, 500.0, t))
+
   def triggerMiss(self):
-    return self.scene.notesMissed[playerNum] or self.scene.lessMissed[playerNum]
-
+    if not self.stage.lastMissPos:
+      return 0.0
+    t = position - self.stage.lastMissPos
+    return (1.0 - self._smoothstep(0, 500.0, t))
+
   def update(self):
     pass