friday night grinds

co_ActionState.py

@@ -105,7 +105,8 @@ def main():
             actionTimer = 0 
     if (own['l_requestAction'] == 'reg_air_nose' or own['l_requestAction'] == 'reg_air_tail' or own['l_requestAction'] == 'fak_air_nose' or own['l_requestAction'] == 'fak_air_tail') and ((requestAction == 'reg_land' or requestAction == 'fak_land') or (own['requestAction'] == 'reg_roll' or own['requestAction'] == 'fak_roll')):            
     #if (own['l_requestAction'] == 'reg_air_nose' or own['l_requestAction'] == 'reg_air_tail' or own['l_requestAction'] == 'fak_air_nose' or own['l_requestAction'] == 'fak_air_tail') and (requestAction == 'reg_land' or requestAction == 'fak_land'):
-        requestAction = own['l_requestAction']
+        #requestAction = own['l_requestAction']
+        pass
         
         
     #grind override
@@ -131,10 +132,6 @@ def main():
             skater.stopAction(trans_layer)
             trucks.stopAction(trans_layer)
             deck.stopAction(trans_layer)                 
-
-    #dirty tailslide fix
-#    if l_requestAction == 'reg_tailslide' and (requestAction == 'reg_5050' or requestAction == 'reg_roll' or requestAction == 'reg_opos'):
-#        requestAction = 'reg_tailslide'
             
     #check last actionState to see if an out action is needed
     
@@ -693,74 +690,78 @@ def main():
 
             if requestAction == 'reg_noseg_out':
                 actionState = 'reg_noseg_out'
-                #own['requestAction'] = 'reg_noseg_out'
-                own['actionTimer'] = 19
+                own['requestAction'] = 'reg_noseg_out'
+                own['actionTimer'] = 9
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
                     #cur_frame -= 2                    
                 if trans_playing and cur_frame > 1:                
-                    skater.playAction("reg_noseg.002", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_reg_noseg.002", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_reg_noseg.002", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
+                    skater.playAction("reg_noseg.002", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_reg_noseg.002", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_reg_noseg.002", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
                     own['actionTimer'] = cur_frame
                 else:                      
-                    skater.playAction("reg_noseg.002", 10,1, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_reg_noseg.002", 10,1, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_reg_noseg.002", 10,1, layer=trans_layer, play_mode=0, speed=.5)
+                    skater.playAction("reg_noseg.002", 10,1, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_reg_noseg.002", 10,1, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_reg_noseg.002", 10,1, layer=trans_layer, play_mode=0, speed=1)
             if requestAction == 'fak_noseg_out':
                 actionState = 'fak_noseg_out'
-                own['actionTimer'] = 19
+                own['actionTimer'] = 9
+                own['requestAction'] = 'fak_noseg_out'
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
                     #cur_frame -= 2                    
                 if trans_playing and cur_frame > 1:                
-                    skater.playAction("fak_noseg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_fak_noseg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_fak_noseg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
+                    skater.playAction("fak_noseg", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_fak_noseg", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_fak_noseg", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
                     own['actionTimer'] = cur_frame
                 else:                      
-                    skater.playAction("fak_noseg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_fak_noseg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_fak_noseg", 30,40, layer=trans_layer, play_mode=0, speed=.5)        
+                    skater.playAction("fak_noseg", 30,40, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_fak_noseg", 30,40, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_fak_noseg", 30,40, layer=trans_layer, play_mode=0, speed=1)        
 
             if requestAction == 'reg_tailg_out':
                 actionState = 'reg_tailg_out'
-                own['actionTimer'] = 19
+                own['requestAction'] = 'reg_tailg_out'
+                own['actionTimer'] = 9
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
                     #cur_frame -= 2                    
                 if trans_playing and cur_frame > 1:                
-                    skater.playAction("reg_tailg.001", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_reg_tailg.001", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_reg_tailg.001", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
+                    skater.playAction("reg_tailg.001", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_reg_tailg.001", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_reg_tailg.001", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
                     own['actionTimer'] = cur_frame
                 else:                      
-                    skater.playAction("reg_tailg.001", 30,40, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_reg_tailg.001", 30,40, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_reg_tailg.001", 30,40, layer=trans_layer, play_mode=0, speed=.5)
+                    skater.playAction("reg_tailg.001", 30,40, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_reg_tailg.001", 30,40, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_reg_tailg.001", 30,40, layer=trans_layer, play_mode=0, speed=1)
             if requestAction == 'fak_tailg_out':
                 actionState = 'fak_tailg_out'
-                own['actionTimer'] = 19
+                own['actionTimer'] = 9
+                own['requestAction'] = 'fak_tailg_out'
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
                     #cur_frame -= 2                    
                 if trans_playing and cur_frame > 1:                
-                    skater.playAction("fak_tailg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_fak_tailg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_fak_tailg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
+                    skater.playAction("fak_tailg", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_fak_tailg", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_fak_tailg", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
                     own['actionTimer'] = cur_frame
                 else:                      
-                    skater.playAction("fak_tailg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_fak_tailg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_fak_tailg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
+                    skater.playAction("fak_tailg", 30,40, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_fak_tailg", 30,40, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_fak_tailg", 30,40, layer=trans_layer, play_mode=0, speed=1)
                     
             if requestAction == 'reg_nosegr_out':
                 actionState = 'reg_nosegr_out'
-                own['actionTimer'] = 5
+                own['actionTimer'] = 19
+                own['requestAction'] = 'reg_nosegr_out'
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
@@ -777,6 +778,7 @@ def main():
             if requestAction == 'fak_nosegr_out':
                 actionState = 'fak_nosegr_out'
                 own['actionTimer'] = 5
+                own['requestAction'] = 'fak_nosegr_out'
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
@@ -794,6 +796,7 @@ def main():
             if requestAction == 'reg_tailgr_out':
                 actionState = 'reg_tailgr_out'
                 own['actionTimer'] = 5
+                own['requestAction'] = 'reg_tailgr_out'
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
@@ -810,6 +813,7 @@ def main():
             if requestAction == 'fak_tailgr_out':
                 actionState = 'fak_tailgr_out'
                 own['actionTimer'] = 5
+                own['requestAction'] = 'fak_tailgr_out'
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
@@ -827,6 +831,7 @@ def main():
             if requestAction == 'reg_nosegl_out':
                 actionState = 'reg_nosegl_out'
                 own['actionTimer'] = 5
+                own['requestAction'] = 'reg_nosegl_out'
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
@@ -843,6 +848,7 @@ def main():
             if requestAction == 'fak_nosegl_out':
                 actionState = 'fak_nosegl_out'
                 own['actionTimer'] = 5
+                own['requestAction'] = 'fak_nosegl_out'
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
@@ -860,6 +866,7 @@ def main():
             if requestAction == 'reg_tailgl_out':
                 actionState = 'reg_tailgl_out'
                 own['actionTimer'] = 5
+                own['requestAction'] = 'reg_tailgl_out'
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
@@ -876,6 +883,7 @@ def main():
             if requestAction == 'fak_tailgl_out':
                 actionState = 'fak_tailgl_out'
                 own['actionTimer'] = 5
+                own['requestAction'] = 'fak_tailgl_out'
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
@@ -2494,20 +2502,20 @@ def main():
                     skater.stopAction(flip_layer)
                     deck.stopAction(flip_layer)
                     trucks.stopAction(flip_layer)                    
-                    # skater.playAction("reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
-                    # deck.playAction("a_reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
-                    # trucks.playAction("a_reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
-                    skater.playAction("reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                
-                    deck.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                            
+                    skater.playAction("reg_tailg.001", 40,35, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_reg_tailg.001", 40,35, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_reg_tailg.001", 40,35, layer=trans_layer, play_mode=0, speed=1)
+                    #skater.playAction("reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                
+                    #deck.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
+                    #trucks.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                            
                 else:
                     #pass
-                    # skater.playAction("reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    # deck.playAction("a_reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    # trucks.playAction("a_reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    skater.playAction("reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                
-                    deck.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
-                    trucks.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                     
+                    skater.playAction("reg_tailg.001", 35,35, layer=loop_layer, play_mode=1, speed=.5)
+                    deck.playAction("a_reg_tailg.001", 35,35, layer=loop_layer, play_mode=1, speed=.5)
+                    trucks.playAction("a_reg_tailg.001", 35,35, layer=loop_layer, play_mode=1, speed=.5)
+                    #skater.playAction("reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                
+                    #deck.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
+                    #trucks.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                     
             if requestAction == 'fak_air_tail':
                 actionState = 'fak_air_tail'
                 if l_actionState != 'fak_air_tail':
@@ -2517,20 +2525,20 @@ def main():
                     skater.stopAction(flip_layer)
                     deck.stopAction(flip_layer)
                     trucks.stopAction(flip_layer)                    
-                    # skater.playAction("fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)
-                    # deck.playAction("a_fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)
-                    # trucks.playAction("a_fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)
-                    skater.playAction("fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                
-                    deck.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                            
+                    skater.playAction("fak_tailg", 40,35, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_fak_tailg", 40,35, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_fak_tailg", 40,35, layer=trans_layer, play_mode=0, speed=1)
+                    #skater.playAction("fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                
+                    #deck.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
+                    #trucks.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                            
                 else:
                     #pass
-                    # skater.playAction("fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    # deck.playAction("a_fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    # trucks.playAction("a_fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    skater.playAction("fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                
-                    deck.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
-                    trucks.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                                         
+                    skater.playAction("fak_tailg", 35,35, layer=loop_layer, play_mode=1, speed=.5)
+                    deck.playAction("a_fak_tailg", 35,35, layer=loop_layer, play_mode=1, speed=.5)
+                    trucks.playAction("a_fak_tailg", 35,35, layer=loop_layer, play_mode=1, speed=.5)
+                    #skater.playAction("fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                
+                    #deck.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
+                    #trucks.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                                         
             
             if requestAction == 'reg_stop':
                 actionState = 'reg_stop'
@@ -2901,7 +2909,7 @@ def main():
 ###################  
     
     #debug
-    #print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'])
+    print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'])
     cur_frame = skater.getActionFrame(trans_layer)
     #print(cur_frame)
     def printplaying():

controller2.py

@@ -2403,6 +2403,12 @@ def revert():
     local = True
     rot = [ 0.0, 0.0, 3.14]
     own.applyRotation(rot,local)
+    
+    framenum = own['framenum']
+    last_ground_frame = own['lF_ground_frame']
+    lF_air_frame = own['lF_air_frame']
+    frames_since_ground = framenum - lF_air_frame    
+    #if frames_since_ground  > 20:
     if own['manual_v2_type'] == 'reg manual': 
         own['requestAction'] = 'reg_manual_revert_ccw'   
         print("reg")
@@ -2753,26 +2759,29 @@ elif q3oncdl > 0:
     own["Q3oncdl"] = q3oncdl       
 #34567
 own['set_revert_timer'] = 0
-if q3oncdl < q4oncdl < q5oncdl < q6oncdl < q7oncdl:
-    if r_ground.triggered == True:
-        print("REVERT!!!")
-        revert()
-        own['set_revert_timer'] = 1
-if q3oncdl > q4oncdl > q5oncdl > q6oncdl > q7oncdl:
-    if r_ground.triggered == True:
-        print("REVERT2!!!")
-        revert2()
-        own['set_revert_timer'] = 1
-if q7oncdl < q8oncdl < q1oncdl < q2oncdl < q3oncdl:
-    if r_ground.triggered == True:
-        print("REVERT3!!!")
-        revert3()
-        own['set_revert_timer'] = 1
-if q7oncdl > q8oncdl > q1oncdl > q2oncdl > q3oncdl:
-    if r_ground.triggered == True:
-        print("REVERT4!!!")
-        revert4()
-        own['set_revert_timer'] = 1           
+ground_since = own["framenum"] - own['lF_air_frame']
+if ground_since > 20 and frames_since_grinding > 20:
+
+    if q3oncdl < q4oncdl < q5oncdl < q6oncdl < q7oncdl:
+        if r_ground.triggered == True:
+            print("REVERT!!!")
+            revert()
+            own['set_revert_timer'] = 1
+    if q3oncdl > q4oncdl > q5oncdl > q6oncdl > q7oncdl:
+        if r_ground.triggered == True:
+            print("REVERT2!!!")
+            revert2()
+            own['set_revert_timer'] = 1
+    if q7oncdl < q8oncdl < q1oncdl < q2oncdl < q3oncdl:
+        if r_ground.triggered == True:
+            print("REVERT3!!!")
+            revert3()
+            own['set_revert_timer'] = 1
+    if q7oncdl > q8oncdl > q1oncdl > q2oncdl > q3oncdl:
+        if r_ground.triggered == True:
+            print("REVERT4!!!")
+            revert4()
+            own['set_revert_timer'] = 1           
 ################
 #q6
 if rUD > .04 and rLR < -0.04 :