stance change fixes

co_ActionState.py

@@ -62,19 +62,19 @@ def main():
 #================
     #stance change detection
     if requestAction == 'reg_roll' and (l_actionState == 'fak_roll' or l_actionState == 'fak_land'):
-        #print("fak-reg_roll")
+        print("fak-reg_roll")
         requestAction = 'fak-reg_roll'
         own['requestAction'] = 'fak-reg_roll' 
     if requestAction == 'fak_roll' and (l_actionState == 'reg_roll' or l_actionState == 'reg_land'):
-        #print("reg-fak_roll")
+        print("reg-fak_roll")
         requestAction = 'reg-fak_roll'
         own['requestAction'] = 'reg-fak_roll'
-    if requestAction == 'reg_5050' and (l_actionState == 'fak_5050' or l_actionState == 'fak_air'):
-        #print("fak-reg_5050")
+    if requestAction == 'reg_5050' and (l_actionState == 'fak_5050' or l_actionState == 'fak_air') or (l_actionState == 'fak-reg_5050' and actionTimer > 1):
+        print("fak-reg_5050")
         requestAction = 'fak-reg_5050'
         own['requestAction'] = 'fak-reg_5050'
-    if requestAction == 'fak_5050' and (l_actionState == 'reg_5050' or l_actionState == 'reg_air'):
-        #print("reg-fak_5050")
+    if requestAction == 'fak_5050' and (l_actionState == 'reg_5050' or l_actionState == 'reg_air') or (l_actionState == 'reg-fak_5050' and actionTimer > 1):
+        print("reg-fak_5050")
         requestAction = 'reg-fak_5050'
         own['requestAction'] = 'reg-fak_5050'                                
 
@@ -1394,7 +1394,7 @@ def main():
                         deck.playAction("a_fak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
                         trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)                                 
                 
-                if actionState == 'fak_roll':
+                if requestAction == 'fak_roll':
                     actionState = 'fak_roll' 
                     skater.playAction("nfak", 1,60, layer=loop_layer, play_mode=1, speed=.5)
                     deck.playAction("a_reg", 1,40, layer=loop_layer, play_mode=1, speed=.5)
@@ -1674,19 +1674,19 @@ def main():
                     skater.stopAction(flip_layer)
                     deck.stopAction(flip_layer)
                     trucks.stopAction(flip_layer)
-                    # skater.playAction("reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
-                    # deck.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
-                    # trucks.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
-                    skater.playAction("reg_nmanual", 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:
-                    # skater.playAction("reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
-                    # deck.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
-                    # trucks.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
-                    skater.playAction("reg_nmanual", 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("reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
+                    #skater.playAction("reg_nmanual", 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:
+                    skater.playAction("reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
+                    deck.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
+                    trucks.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
+                    #skater.playAction("reg_nmanual", 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 == 'fak_noseg':
                 actionState = 'fak_noseg'
@@ -1694,19 +1694,19 @@ def main():
                     skater.stopAction(flip_layer)
                     deck.stopAction(flip_layer)
                     trucks.stopAction(flip_layer)                    
-                    # skater.playAction("fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
-                    # deck.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
-                    # trucks.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)        
-                    skater.playAction("fak_nmanual", 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:
-                    # skater.playAction("fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    # deck.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    # trucks.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    skater.playAction("fak_nmanual", 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("fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)        
+                    #skater.playAction("fak_nmanual", 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:
+                    skater.playAction("fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
+                    deck.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
+                    trucks.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
+                    #skater.playAction("fak_nmanual", 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 == 'reg_tailg':
                 actionState = 'reg_tailg'
@@ -1714,19 +1714,19 @@ 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)                            
-                else:
-                    # 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", 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)                            
+                else:
+                    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)                    
 
             if requestAction == 'fak_tailg':
                 actionState = 'fak_tailg'
@@ -1734,19 +1734,19 @@ 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)                    
-                else:
-                    # 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", 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)                    
+                else:
+                    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)                                           
             if requestAction == 'reg_tailgr':
                 actionState = 'reg_tailgr'
                 if l_actionState != 'reg_tailgr' and l_actionState != 'reg_air_tail':
@@ -1963,7 +1963,7 @@ def main():
                 trucks.playAction("a_reg", 1,30, layer=loop_layer, play_mode=1, speed=.5)                                     
             if requestAction == 'fak_5050':
                 actionState = 'fak_5050'
-                own['actionTimer'] = 0
+                #own['actionTimer'] = 0
                 skater.playAction("fak_5050", 1,30, layer=loop_layer, play_mode=1, speed=.5)
                 deck.playAction("a_reg", 1,30, layer=loop_layer, play_mode=1, speed=.5)
                 trucks.playAction("a_reg", 1,30, layer=loop_layer, play_mode=1, speed=.5)                                                                              
@@ -2419,7 +2419,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():
@@ -2446,7 +2446,7 @@ def main():
     #printplaying()     
 
     if actionState == 'empty':
-        print("EMPTY ACTION!!!")
+        #print("EMPTY ACTION!!!")
         skater.stopAction(loop_layer)
         deck.stopAction(loop_layer)
         trucks.stopAction(loop_layer)