air mover and pump timer mods

co_ActionState.py

@@ -485,7 +485,7 @@ def main():
                     
             if requestAction == 'reg_pump_out':
                 actionState = 'reg_pump_out'
-                own['actionTimer'] = 19
+                own['actionTimer'] = 39
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
@@ -510,7 +510,7 @@ def main():
                     
             if requestAction == 'fak_pump_out':
                 actionState = 'fak_pump_out'
-                own['actionTimer'] = 19
+                own['actionTimer'] = 39#19
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)

controller2.py

@@ -2812,8 +2812,8 @@ if rUD > .070:
         q5oncd = countdown
         own["Q5oncd"] = q5oncd
     oposin()  
-    
-if (rTrig > 0.02 and GRAB_ON == False and r_ground.triggered == 1) or (lTrig > 0.02 and GRAB_ON == False and r_ground.triggered == 1):
+ground_since = own["framenum"] - own['lF_air_frame']    
+if (rTrig > 0.02 and GRAB_ON == False and r_ground.triggered == 1) or (lTrig > 0.02 and GRAB_ON == False and r_ground.triggered == 1) and ground_since > 10:
     pump()
 else:
     own["lastPump"] = False 
@@ -4141,7 +4141,7 @@ def trans_jump():
             own.applyMovement(move, True)               
 
 def air_mover():
-    if r_ground.triggered == False and jump_timer > 53:
+    if r_ground.triggered == False and jump_timer > 53 and frames_since_grinding > 50:
         #print(lUD)
         if lUD > 0.075:
             print("air_mover", jump_timer)
@@ -4152,7 +4152,7 @@ def air_mover():
             
             own.applyForce(force2, True)
             #own.applyForce([0,0,5], False)
-    if r_ground.triggered == False and jump_timer > 10 and lUD > 0.075:
+    if r_ground.triggered == False and jump_timer > 10 and lUD > 0.075 and frames_since_grinding > 50:
         #print(lUD)
         print("air_mover", jump_timer)
         if STANCE == 0: