more turns

co_ActionState.py

@@ -176,18 +176,18 @@ def main():
     #check last actionState to see if an out action is needed    
     if requestAction not in jump_overrideList:
 
-        if l_actionState == 'fak_turnRight' and requestAction != 'fak_turnRight':
-            if requestAction not in ['fak_turnRight', 'fak_pump_right', 'fak_pump']:
-                requestAction = 'fak_turnRight_out'
-                actionState = 'fak_turnRight_out'
-            elif requestAction == 'fak_pump_right':
-                requestAction = 'fak_right-pump'    
-        if l_actionState == 'fak_turnLeft' and requestAction != 'fak_turnLeft':
-            if requestAction not in ['fak_turnLeft', 'fak_pump_left', 'fak_pump']:
-                requestAction = 'fak_turnLeft_out'
-                actionState = 'fak_turnLeft_out'                        
-            elif requestAction == 'fak_pump_left':
-                requestAction = 'fak_left-pump'    
+        # if l_actionState == 'fak_turnRight' and requestAction != 'fak_turnRight':
+        #     if requestAction not in ['fak_turnRight', 'fak_pump_right', 'fak_pump']:
+        #         requestAction = 'fak_turnRight_out'
+        #         actionState = 'fak_turnRight_out'
+        #     elif requestAction == 'fak_pump_right':
+        #         requestAction = 'fak_right-pump'    
+        # if l_actionState == 'fak_turnLeft' and requestAction != 'fak_turnLeft':
+        #     if requestAction not in ['fak_turnLeft', 'fak_pump_left', 'fak_pump']:
+        #         requestAction = 'fak_turnLeft_out'
+        #         actionState = 'fak_turnLeft_out'                        
+        #     elif requestAction == 'fak_pump_left':
+        #         requestAction = 'fak_left-pump'    
                 
         
         #-----
@@ -215,21 +215,24 @@ def main():
             actionState = 'fak_nopos_out' 
 #*********************************            
 
-        if l_actionState == 'fak_turnLeft' and requestAction == 'fak_pump_left':
-            requestAction = 'fak_pump_left-left'
-            actionState = 'fak_pump_left-left'
-        if l_actionState == 'fak_turnRight' and requestAction == 'fak_pump_right':
-            requestAction = 'fak_pump_right-right'
-            actionState = 'fak_pump_right-right'                        
+        # if l_actionState == 'fak_turnLeft' and requestAction == 'fak_pump_left':
+        #     requestAction = 'fak_pump_left-left'
+        #     actionState = 'fak_pump_left-left'
+        # if l_actionState == 'fak_turnRight' and requestAction == 'fak_pump_right':
+        #     requestAction = 'fak_pump_right-right'
+        #     actionState = 'fak_pump_right-right'                        
             
 #**********************************            
 
         if l_actionState == 'reg_pump' and requestAction == 'reg_5050':
             requestAction = 'reg_5050'
-            actionState = 'reg_5050'    
-        if l_actionState == 'fak_pump' and requestAction not in ['fak_pump', 'fak_pump_right', 'fak_pump_left'] and requestAction not in pump_out_overList:
-            requestAction = 'fak_pump_out'
-            actionState = 'fak_pump_out'            
+            actionState = 'reg_5050'
+        if l_actionState == 'fak_pump' and requestAction == 'fak_5050':
+            requestAction = 'fak_5050'
+            actionState = 'fak_5050'                
+        # if l_actionState == 'fak_pump' and requestAction not in ['fak_pump', 'fak_pump_right', 'fak_pump_left'] and requestAction not in pump_out_overList:
+        #     requestAction = 'fak_pump_out'
+        #     actionState = 'fak_pump_out'            
             
         if l_actionState == 'reg_powerslide' and requestAction != 'reg_powerslide':
             requestAction = 'reg_powerslide_out'
@@ -514,20 +517,20 @@ def main():
             actionState = 'fak_judo_out'
                         
             
-        if l_actionState == 'fak_pump_right' and requestAction != 'fak_pump_right':
-            requestAction = 'fak_pump_right_out'
-            actionState = 'fak_pump_right_out'                                       
+        # if l_actionState == 'fak_pump_right' and requestAction != 'fak_pump_right':
+        #     requestAction = 'fak_pump_right_out'
+        #     actionState = 'fak_pump_right_out'                                       
 
-        if l_actionState == 'fak_pump_left' and requestAction != 'fak_pump_left':
-            requestAction = 'fak_pump_left_out'
-            actionState = 'fak_pump_left_out' 
+        # if l_actionState == 'fak_pump_left' and requestAction != 'fak_pump_left':
+        #     requestAction = 'fak_pump_left_out'
+        #     actionState = 'fak_pump_left_out' 
 
-        if l_actionState == 'fak_pump_left_out' and requestAction != 'fak_pump_left_out':
-            requestAction = 'fak_pump'
-            actionState = 'fak_pump'
-        if l_actionState == 'fak_pump_right_out' and requestAction != 'fak_pump_right_out':
-            requestAction = 'fak_pump'
-            actionState = 'fak_pump'                        
+        # if l_actionState == 'fak_pump_left_out' and requestAction != 'fak_pump_left_out':
+        #     requestAction = 'fak_pump'
+        #     actionState = 'fak_pump'
+        # if l_actionState == 'fak_pump_right_out' and requestAction != 'fak_pump_right_out':
+        #     requestAction = 'fak_pump'
+        #     actionState = 'fak_pump'                        
                         
         if l_actionState == 'reg_walk_air' and requestAction != 'reg_walk_air':
             requestAction = 'reg_walk_air_out'
@@ -623,7 +626,7 @@ def main():
         if l_actionState in ['fak_left-pump', 'fak_right-pump'] and requestAction == 'reg_roll':
             requestAction = 'fak_pump_out' 
 
-#---
+#---new pump turns reg
 
         if l_actionState == 'reg_pump' and requestAction == 'reg_pump_right' and trans_playing != 0:
             requestAction = 'reg_pump'
@@ -632,9 +635,6 @@ def main():
         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']:
@@ -674,7 +674,6 @@ def main():
                 requestAction = 'reg_pump_right-rightb'
             else:
                 requestAction == 'reg_pump_right'
-            
                 
         if l_actionState == 'reg_pump_left' and requestAction == 'reg_turnLeft':
             if trans_playing == False:
@@ -682,8 +681,6 @@ def main():
             else:
                 requestAction == 'reg_pump_left'    
             
-            
-            
         if l_actionState == 'reg_turnRight_out' and requestAction == 'fak_roll':
             requestAction = 'reg_roll' 
         if l_actionState == 'reg_turnLeft_out' and requestAction == 'fak_roll':
@@ -705,11 +702,7 @@ def main():
             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'        
@@ -733,6 +726,108 @@ def main():
         if l_actionState == 'reg_turnRight_out' and requestAction in ['reg_pump_left', 'reg_pump_right']:
             requestAction = 'reg_pump'                 
               
+
+
+        #fak
+
+        if l_actionState == 'fak_pump' and requestAction == 'fak_pump_right' and trans_playing != 0:
+            requestAction = 'fak_pump'
+        if l_actionState == 'fak_turnRight' and requestAction == 'fak_pump_right' and trans_playing != 0:
+            requestAction = 'fak_turnRight'  
+        if l_actionState == 'fak_turnLeft' and requestAction == 'fak_pump_left' and trans_playing != 0:
+            requestAction = 'fak_turnLeft'   
+
+        if l_actionState == 'fak_turnRight' and requestAction in ['fak_roll', 'fak_pump']:
+            requestAction = 'fak_turnRight_out'
+        if l_actionState == 'fak_turnLeft' and requestAction in ['fak_roll', 'fak_pump']:
+            requestAction = 'fak_turnLeft_out'    
+        if l_actionState == 'fak_pump' and requestAction == 'fak_roll':
+            requestAction = 'fak_pump_out' 
+        
+        if l_actionState == 'fak_turnRight' and requestAction in ['fak_pump_right']:
+            requestAction = 'fak_pump_right'    
+        if l_actionState == 'fak_turnLeft' and requestAction in ['fak_pump_left']:
+            requestAction = 'fak_pump_left'    
+        
+        if l_actionState == 'fak_pump_right' and requestAction in ['fak_pump', 'fak_roll']:
+            requestAction = 'fak_pump_right_out'
+            own['actionState'] = 'fak_pump_right_out'
+        if l_actionState == 'fak_pump_left' and requestAction in ['fak_pump', 'fak_roll']:
+            requestAction = 'fak_pump_left_out'
+            own['actionState'] = 'fak_pump_left_out'    
+
+        if l_actionState == 'fak_pump_right_out' and requestAction == 'fak_roll':
+            requestAction = 'fak_pump'
+        if l_actionState == 'fak_pump_left_out' and requestAction == 'fak_roll':
+            requestAction = 'fak_pump'    
+            
+        if l_actionState == 'fak_pump_right-rightb' and requestAction == 'fak_roll':
+            requestAction = 'fak_turnRight'   
+        if l_actionState == 'fak_pump_left-leftb' and requestAction == 'fak_roll':
+            requestAction = 'fak_turnLeft'   
+        
+        if l_actionState == 'fak_turnRight' and requestAction == 'fak_pump_right':
+            requestAction = 'fak_pump_right-right' 
+        if l_actionState == 'fak_turnLeft' and requestAction == 'fak_pump_left':
+            requestAction = 'fak_pump_left-left'                
+                                                                    
+        if l_actionState == 'fak_pump_right' and requestAction == 'fak_turnRight':
+            if trans_playing == False:
+                requestAction = 'fak_pump_right-rightb'
+            else:
+                requestAction == 'fak_pump_right'
+                
+        if l_actionState == 'fak_pump_left' and requestAction == 'fak_turnLeft':
+            if trans_playing == False:
+                requestAction = 'fak_pump_left-leftb'            
+            else:
+                requestAction == 'fak_pump_left'    
+                   
+        if l_actionState == 'fak_turnRight_out' and requestAction == 'reg_roll':
+            requestAction = 'fak_roll' 
+        if l_actionState == 'fak_turnLeft_out' and requestAction == 'reg_roll':
+            requestAction = 'fak_roll'      
+            
+        if l_actionState == 'fak_pump' and requestAction == 'fak_turnRight':
+            requestAction = 'fak_pump_out' 
+        if l_actionState == 'fak_pump' and requestAction == 'fak_turnLeft':
+            requestAction = 'fak_pump_out'               
+            
+        if l_actionState == 'fak_pump_right-right' and requestAction == 'fak_turnRight':
+            requestAction = 'fak_pump_right-rightb'
+        if l_actionState == 'fak_pump_left-left' and requestAction == 'fak_turnLeft':
+            requestAction = 'fak_pump_left-leftb'    
+        
+        if l_actionState == 'fak_pump_right-rightb' and requestAction == 'fak_pump_right':
+            requestAction = 'fak_pump_right-right' 
+        if l_actionState == 'fak_pump_left-leftb' and requestAction == 'fak_pump_left':
+            requestAction = 'fak_pump_left-left'                     
+        
+        if l_actionState == 'fak_pump_right-right' and requestAction not in [ 'fak_pump_right-right', 'fak_pump_right-rightb']:
+            requestAction = 'fak_pump_right' 
+                  
+        if l_actionState == 'fak_pump_left-left' and requestAction not in [ 'fak_pump_left-left', 'fak_pump_left-leftb']:
+            requestAction = 'fak_pump_left'        
+            
+        if l_actionState == 'fak_pump_right_out' and requestAction in ['fak_turnRight', 'fak_turnLeft']:
+            requestAction = 'fak_pump'
+        if l_actionState == 'fak_pump_left_out' and requestAction in ['fak_turnLeft', 'fak_turnRight']:
+            requestAction = 'fak_pump'    
+                      
+        if l_actionState == 'fak_pump_out' and requestAction == 'fak_pump_right':
+            requestAction = 'fak_roll'
+        if l_actionState == 'fak_pump_out' and requestAction == 'fak_pump_left':
+            requestAction = 'fak_roll'  
+            
+        if l_actionState == 'fak_roll' and requestAction in ['fak_pump_right', 'fak_pump_left']:
+            requestAction = 'fak_pump' 
+            
+        if l_actionState == 'fak_turnLeft_out' and requestAction in ['fak_pump_right', 'fak_pump_left']:
+            requestAction = 'fak_pump'
+        
+        if l_actionState == 'fak_turnRight_out' and requestAction in ['fak_pump_left', 'fak_pump_right']:
+            requestAction = 'fak_pump'                 
+
                                                                                   
 #---------------------------------------------------                                                                                  
                                                                                   

scene_init.py

@@ -23,8 +23,6 @@ def main():
     dict['overlay_fadeout'] = 1
     scenes = bge.logic.getSceneList()
     own['pre_pause_linvel'] = 0.0
-    #own['last_roll_frame'] = 0
-  
 
     objList = scene.objects