reg pumps-left

co_ActionState.py

@@ -204,9 +204,6 @@ def main():
             requestAction = 'fak_nopos_out'
             actionState = 'fak_nopos_out' 
 #*********************************            
-        if l_actionState == 'reg_turnLeft' and requestAction == 'reg_pump_left':
-            requestAction = 'reg_pump_left-left'
-            actionState = 'reg_pump_left-left'
 
         if l_actionState == 'fak_turnLeft' and requestAction == 'fak_pump_left':
             requestAction = 'fak_pump_left-left'
@@ -506,9 +503,6 @@ def main():
             requestAction = 'fak_judo_out'
             actionState = 'fak_judo_out'
                         
-        if l_actionState == 'reg_pump_left' and requestAction != 'reg_pump_left':
-            requestAction = 'reg_pump_left_out'
-            actionState = 'reg_pump_left_out' 
             
         if l_actionState == 'fak_pump_right' and requestAction != 'fak_pump_right':
             requestAction = 'fak_pump_right_out'
@@ -518,10 +512,6 @@ def main():
             requestAction = 'fak_pump_left_out'
             actionState = 'fak_pump_left_out' 
 
-        if l_actionState == 'reg_pump_left_out' and requestAction != 'reg_pump_left_out':
-            requestAction = 'reg_pump'
-            actionState = 'reg_pump'
-
         if l_actionState == 'fak_pump_left_out' and requestAction != 'fak_pump_left_out':
             requestAction = 'fak_pump'
             actionState = 'fak_pump'
@@ -623,55 +613,88 @@ def main():
         if l_actionState in ['fak_left-pump', 'fak_right-pump'] and requestAction == 'reg_roll':
             requestAction = 'fak_pump_out' 
 
+#---
+
         if l_actionState == 'reg_pump' and requestAction == 'reg_pump_right' and trans_playing != 0:
             requestAction = 'reg_pump'
         if l_actionState == 'reg_turnRight' and requestAction == 'reg_pump_right' and trans_playing != 0:
             requestAction = 'reg_turnRight'  
+        if l_actionState == 'reg_turnLeft' and requestAction == 'reg_pump_left' and trans_playing != 0:
+            requestAction = 'reg_turnLeft'  
 
         if l_actionState == 'reg_turnRight' and requestAction in ['reg_roll', 'reg_pump']:
             requestAction = 'reg_turnRight_out'
+        if l_actionState == 'reg_turnLeft' and requestAction in ['reg_roll', 'reg_pump']:
+            requestAction = 'reg_turnLeft_out'    
         if l_actionState == 'reg_pump' and requestAction == 'reg_roll':
             requestAction = 'reg_pump_out' 
         
         if l_actionState == 'reg_turnRight' and requestAction in ['reg_pump_right']:
             requestAction = 'reg_pump_right'    
+        if l_actionState == 'reg_turnLeft' and requestAction in ['reg_pump_left']:
+            requestAction = 'reg_pump_left'    
         
         if l_actionState == 'reg_pump_right' and requestAction in ['reg_pump', 'reg_roll']:
             requestAction = 'reg_pump_right_out'
             own['actionState'] = 'reg_pump_right_out'
+        if l_actionState == 'reg_pump_left' and requestAction in ['reg_pump', 'reg_roll']:
+            requestAction = 'reg_pump_left_out'
+            own['actionState'] = 'reg_pump_left_out'    
 
         if l_actionState == 'reg_pump_right_out' and requestAction == 'reg_roll':
             requestAction = 'reg_pump'
+        if l_actionState == 'reg_pump_left_out' and requestAction == 'reg_roll':
+            requestAction = 'reg_pump'    
             
         if l_actionState == 'reg_pump_right-rightb' and requestAction == 'reg_roll':
             requestAction = 'reg_turnRight'   
+        if l_actionState == 'reg_pump_left-leftb' and requestAction == 'reg_roll':
+            requestAction = 'reg_turnLeft'   
         
         if l_actionState == 'reg_turnRight' and requestAction == 'reg_pump_right':
-            requestAction = 'reg_pump_right-right'    
+            requestAction = 'reg_pump_right-right' 
+        if l_actionState == 'reg_turnLeft' and requestAction == 'reg_pump_left':
+            requestAction = 'reg_pump_left-left'                
                                                                     
         if l_actionState == 'reg_pump_right' and requestAction == 'reg_turnRight':
             requestAction = 'reg_pump_right-rightb'
+        if l_actionState == 'reg_pump_left' and requestAction == 'reg_turnLeft':
+            requestAction = 'reg_pump_left-leftb'            
             
         if l_actionState == 'reg_turnRight_out' and requestAction == 'fak_roll':
-            requestAction = 'reg_roll'  
+            requestAction = 'reg_roll' 
+        if l_actionState == 'reg_turnLeft_out' and requestAction == 'fak_roll':
+            requestAction = 'reg_roll'      
             
         if l_actionState == 'reg_pump' and requestAction == 'reg_turnRight':
-            requestAction = 'reg_pump_out'   
+            requestAction = 'reg_pump_out' 
+        if l_actionState == 'reg_pump' and requestAction == 'reg_turnLeft':
+            requestAction = 'reg_pump_out'               
             
         if l_actionState == 'reg_pump_right-right' and requestAction == 'reg_turnRight':
             requestAction = 'reg_pump_right-rightb'
+        if l_actionState == 'reg_pump_left-left' and requestAction == 'reg_turnLeft':
+            requestAction = 'reg_pump_left-leftb'    
         
         if l_actionState == 'reg_pump_right-rightb' and requestAction == 'reg_pump_right':
-            requestAction = 'reg_pump_right-right'         
+            requestAction = 'reg_pump_right-right' 
+        if l_actionState == 'reg_pump_left-leftb' and requestAction == 'reg_pump_left':
+            requestAction = 'reg_pump_left-left'                     
         
         if l_actionState == 'reg_pump_right-right' and requestAction not in [ 'reg_pump_right-right', 'reg_pump_right-rightb']:
-            requestAction = 'reg_pump_right'    
+            requestAction = 'reg_pump_right' 
+        if l_actionState == 'reg_pump_left-left' and requestAction not in [ 'reg_pump_left-left', 'reg_pump_left-leftb']:
+            requestAction = 'reg_pump_left'        
             
         if l_actionState == 'reg_pump_right_out' and requestAction == 'reg_turnRight':
             requestAction = 'reg_pump'
+        if l_actionState == 'reg_pump_left_out' and requestAction == 'reg_turnLeft':
+            requestAction = 'reg_pump'    
                       
         if l_actionState == 'reg_pump_out' and requestAction == 'reg_pump_right':
             requestAction = 'reg_roll'
+        if l_actionState == 'reg_pump_out' and requestAction == 'reg_pump_left':
+            requestAction = 'reg_roll'    
                                                                                   
 #---------------------------------------------------                                                                                  
                                                                                   
@@ -760,7 +783,7 @@ def main():
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)        
-                if trans_playing and cur_frame > .5:                
+                if trans_playing and cur_frame > .5 and cur_frame < 39:                
                     skater.playAction("nreg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
                     deck.playAction("a_reg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
@@ -806,10 +829,22 @@ def main():
             if requestAction == 'reg_pump_left-left':
                 actionState = 'reg_pump_left-left'
                 own['actionTimer'] = 19
-                    
-                skater.playAction("nreg_pump_left", 40,30, layer=trans_layer, play_mode=0, speed=.5)
-                deck.playAction("a_reg_left", 10,10, layer=trans_layer, play_mode=0, speed=.5)
-                trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)  
+                
+                if l_actionState == 'reg_pump_left-leftb':
+                    trans_playing = skater.isPlayingAction(trans_layer)
+                    if trans_playing:
+                        skater.playAction("nreg_pump_left", 40,30, layer=trans_layer, play_mode=0, speed=.5)
+                        deck.playAction("a_reg_left", 10,10, layer=trans_layer, play_mode=0, speed=.5)
+                        trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)  
+                        own['actionTimer'] = cur_frame * 2  
+                    else:        
+                        skater.playAction("nreg_pump_left", 40,30, layer=trans_layer, play_mode=0, speed=.5)
+                        deck.playAction("a_reg_left", 10,10, layer=trans_layer, play_mode=0, speed=.5)
+                        trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)  
+                else:
+                    skater.playAction("nreg_pump_left", 40,30, layer=trans_layer, play_mode=0, speed=.5)
+                    deck.playAction("a_reg_left", 10,10, layer=trans_layer, play_mode=0, speed=.5)
+                    trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)        
                 
             if requestAction == 'reg_pump_right-right':
                 actionState = 'reg_pump_right-right'
@@ -868,7 +903,32 @@ def main():
                 else:    
                     skater.playAction("nreg_pump_right", 30,40, layer=trans_layer, play_mode=0, speed=.5)
                     deck.playAction("a_reg_right", 10,10, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_reg", 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 requestAction == 'reg_pump_left-leftb':
+                actionState = 'reg_pump_left-leftb'
+                own['actionState'] = 'reg_pump_left-leftb'
+                own['actionTimer'] = 20
+                
+                if l_actionState == 'reg_pump_left-left':
+                    trans_playing = skater.isPlayingAction(trans_layer)
+                    if trans_playing:
+                        cur_frame = skater.getActionFrame(trans_layer)
+                        skater.playAction("nreg_pump_left", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
+                        deck.playAction("a_reg_left", 10,10, layer=trans_layer, play_mode=0, speed=.5)
+                        trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)  
+                        own['actionTimer'] = cur_frame * 2 
+                    else:    
+                        skater.playAction("nreg_pump_left", 30,40, layer=trans_layer, play_mode=0, speed=.5)
+                        deck.playAction("a_reg_left", 10,10, layer=trans_layer, play_mode=0, speed=.5)
+                        trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)                                                             
+                else:    
+                    skater.playAction("nreg_pump_left", 30,40, layer=trans_layer, play_mode=0, speed=.5)
+                    deck.playAction("a_reg_left", 10,10, layer=trans_layer, play_mode=0, speed=.5)
+                    trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)                     
+                    
+                         
             if requestAction == 'fak_pump_left-left':
                 actionState = 'fak_pump_left-left'
                 own['actionTimer'] = 19
@@ -925,7 +985,6 @@ def main():
                 
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
-                    
                     if cur_frame >= 32 and cur_frame <= 40 and l_actionState == 'reg_pump_right':
                         cur_frame = cur_frame - 30   
                     if cur_frame < 32 and cur_frame > 26:
@@ -941,21 +1000,35 @@ def main():
                     skater.playAction("nreg_pump_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
                     deck.playAction("a_reg_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 requestAction == 'reg_pump_left_out':
                 actionState = 'reg_pump_left_out'
-                own['actionTimer'] = 19
+                own['actionState'] = 'reg_pump_left_out'
+                requestAction = 'reg_pump_left_out'
+                own['actionTimer'] = 18
                 trans_playing = skater.isPlayingAction(trans_layer)
                 if trans_playing:
                     cur_frame = skater.getActionFrame(trans_layer)
-                if trans_playing and cur_frame > .5:                
-                    skater.playAction("nreg_pump_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_reg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
-                    own['actionTimer'] = (10 - cur_frame) *2
-                else:                      
+                    if cur_frame >= 32 and cur_frame <= 40 and l_actionState == 'reg_pump_left':
+                        cur_frame = cur_frame - 30   
+                    if cur_frame < 32 and cur_frame > 26:
+                        cur_frame = 10
+                    if trans_playing and cur_frame > .5:      
+                        #cur_frame = 20 - cur_frame         
+                        skater.playAction("nreg_pump_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
+                        deck.playAction("a_reg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
+                        trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
+                        own['actionTimer'] = cur_frame
+                        own['actionTimer'] = 19
+                else:                     
                     skater.playAction("nreg_pump_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
                     deck.playAction("a_reg_left", 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 requestAction == 'fak_pump_right_out':
                 actionState = 'fak_pump_right_out'
                 own['actionTimer'] = 19
@@ -2675,7 +2748,7 @@ def main():
             if requestAction == 'reg_turnLeft':
                 actionState = 'reg_turnLeft'
                 #in
-                if l_actionState != 'reg_turnLeft':
+                if l_actionState not in ['reg_turnLeft', 'reg_pump_left-leftb']:
                     skater.playAction("nreg_left", 1,10, layer=trans_layer, play_mode=0, speed=.5)
                     deck.playAction("a_reg_left", 1,10, layer=trans_layer, play_mode=0, speed=.5)
                     trucks.playAction("a_reg", 1,10, layer=trans_layer, play_mode=0, speed=.5)
@@ -2730,7 +2803,7 @@ def main():
                 actionState = 'reg_pump_left'
                 #in
                 if l_actionState not in ['reg_pump_left', 'reg_pump_left-left', 'reg_left-pump']:
-                    own['actionTimer'] = 19
+                    own['actionTimer'] = 18
                     skater.playAction("nreg_pump_left", 1,10, layer=trans_layer, play_mode=0, speed=.5)
                     deck.playAction("a_reg_left", 1,10, layer=trans_layer, play_mode=0, speed=.5)
                     trucks.playAction("a_reg", 1,10, layer=trans_layer, play_mode=0, speed=.5)
@@ -3104,7 +3177,7 @@ def main():
             #reg_pump
             if requestAction == 'reg_pump':
                 actionState = 'reg_pump'
-                if l_actionState not in ['reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_pump_left_out', 'reg_pump_right_out', 'reg_pump_right-rightb']:
+                if l_actionState not in ['reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_pump_left_out', 'reg_pump_right_out', 'reg_pump_right-rightb', 'reg_pump_left-leftb']:
                     skater.playAction("nreg_pump_in", 1,20, layer=trans_layer, play_mode=0, speed=1)
                     deck.playAction("a_reg", 1,20, layer=trans_layer, play_mode=0, speed=1)
                     trucks.playAction("a_reg", 1,20, layer=trans_layer, play_mode=0, speed=1)