Browse Source

good stuff

shuvit 3 years ago
parent
commit
5a0c3b850a
1 changed files with 25 additions and 2 deletions
  1. 25
    2
      co_ActionState.py

+ 25
- 2
co_ActionState.py View File

@@ -80,15 +80,26 @@ def main():
80 80
         own['requestAction'] = 'empty'              
81 81
 #================
82 82
     #stance change detection
83
-    if (requestAction == 'reg_roll' and l_actionState in ('fak_roll', 'fak_land', 'fak_pump_out', 'fak_nopos_out', 'fak_opos_out', 'fak_air-roll', 'fak_fs_powerslide_out', 'fak_bs_powerslide_out', 'fak_nmanual_out', 'fak_manual_out', 'fak_tailslide_out', 'fak_noseslide_out', 'fak_5050_out')) or l_actionState == 'fak_land' and (requestAction == 'reg_turnLeft' or requestAction == 'reg_turnRight' or requestAction == 'reg_turnLeft_out' or requestAction == 'reg_turnRight_out' or requestAction == 'reg_opos' or requestAction == 'reg_nopos' or requestAction == 'reg_pump' or requestAction == 'reg_push' or requestAction == 'reg_push_goof' or requestAction == 'fak_5050-roll') and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('reg_turnLeft', 'reg_turnRight') and l_actionState in ('fak_turnLeft', 'fak_turnRight')):
83
+    if (requestAction == 'reg_roll' and l_actionState in ('fak_roll', 'fak_land', 'fak_pump_out', 'fak_nopos_out', 'fak_opos_out', 'fak_air-roll', 'fak_fs_powerslide_out', 'fak_bs_powerslide_out', 'fak_nmanual_out', 'fak_manual_out', 'fak_tailslide_out', 'fak_noseslide_out', 'fak_5050_out')) or l_actionState == 'fak_land' and (requestAction in ['reg_turnLeft', 'reg_turnRight', 'reg_turnLeft_out', 'reg_turnRight_out', 'reg_opos', 'reg_nopos', 'reg_pump', 'reg_push', 'reg_push_goof', 'fak_5050-roll']) and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('reg_turnLeft', 'reg_turnRight') and l_actionState in ('fak_turnLeft', 'fak_turnRight')):
84 84
         #print("fak-reg_roll")
85 85
         requestAction = 'fak-reg_roll'
86 86
         own['requestAction'] = 'fak-reg_roll' 
87
-    if (requestAction == 'fak_roll' and l_actionState in ('reg_roll', 'reg_land', 'reg_pump_out', 'reg_nopos_out', 'reg_opos_out', 'reg_air-roll', 'reg_fs_powerslide_out', 'reg_bs_powerslide_out', 'reg_nmanual_out', 'reg_manual_out', 'reg_tailslide_out', 'reg_noseslide_out', 'reg_5050_out')) or l_actionState == 'reg_land' and (requestAction == 'fak_turnLeft' or requestAction == 'fak_turnRight' or requestAction == 'fak_turnLeft_out' or requestAction == 'fak_turnRight_out' or requestAction == 'fak_opos' or requestAction == 'fak_nopos' or requestAction == 'fak_pump' or requestAction == 'fak_push' or requestAction == 'reg_push_goof' or requestAction == 'reg_5050-roll') and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('fak_turnLeft', 'fak_turnRight') and l_actionState in ('reg_turnLeft', 'reg_turnRight')):
87
+    if (requestAction == 'fak_roll' and l_actionState in ('reg_roll', 'reg_land', 'reg_pump_out', 'reg_nopos_out', 'reg_opos_out', 'reg_air-roll', 'reg_fs_powerslide_out', 'reg_bs_powerslide_out', 'reg_nmanual_out', 'reg_manual_out', 'reg_tailslide_out', 'reg_noseslide_out', 'reg_5050_out')) or l_actionState == 'reg_land' and (requestAction in ['fak_turnLeft', 'fak_turnRight', 'fak_turnLeft_out', 'fak_turnRight_out', 'fak_opos', 'fak_nopos', 'fak_pump', 'fak_push', 'reg_push_goof', 'reg_5050-roll']) and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('fak_turnLeft', 'fak_turnRight') and l_actionState in ('reg_turnLeft', 'reg_turnRight')):
88 88
         #print("reg-fak_roll")
89 89
         requestAction = 'reg-fak_roll'
90 90
         own['requestAction'] = 'reg-fak_roll'
91 91
     
92
+    if requestAction in ['reg_pump'] and l_actionState in ['fak_roll']:
93
+        requestAction = 'fak-reg_roll'
94
+    if requestAction in ['fak_pump'] and l_actionState in ['reg_roll']:
95
+        requestAction = 'reg-fak_roll'   
96
+    
97
+    if l_actionState == 'reg_roll' and requestAction in ['fak_pump', 'fak_pump_left', 'fak_pump_right', 'fak_opos', 'fak_nopos', 'fak_turnLeft', 'fak_turnRight']:
98
+        requestAction = 'reg-fak_roll'
99
+    if l_actionState == 'fak_roll' and requestAction in ['reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_opos', 'reg_nopos', 'reg_turnLeft', 'reg_turnRight']:
100
+        requestAction = 'fak-reg_roll'                     
101
+    
102
+    
92 103
     if requestAction in ['reg_push', 'reg_push_goof'] and l_actionState == 'fak_land':
93 104
         requestAction = 'fak-reg_roll'
94 105
     if requestAction in ['fak_push', 'fak_push_goof'] and l_actionState == 'reg_land':
@@ -828,6 +839,18 @@ def main():
828 839
         if l_actionState == 'fak_turnRight_out' and requestAction in ['fak_pump_left', 'fak_pump_right']:
829 840
             requestAction = 'fak_pump'                 
830 841
 
842
+
843
+        if l_actionState == 'reg_pump' and requestAction in ['reg_pump_left', 'reg_pump_right'] and trans_playing == True:
844
+            requestAction = 'reg_pump'
845
+        if l_actionState == 'fak_pump' and requestAction in ['fak_pump_left', 'fak_pump_right'] and trans_playing == True:
846
+            requestAction = 'fak_pump'            
847
+
848
+
849
+
850
+        if l_actionState in ['reg_push', 'reg_push_goof', 'reg_land'] and requestAction != 'reg_roll':
851
+            requestAction = 'reg_roll'
852
+        if l_actionState in ['fak_push', 'fak_push_goof', 'fak_land'] and requestAction != 'fak_roll':
853
+            requestAction = 'fak_roll'
831 854
                                                                                   
832 855
 #---------------------------------------------------                                                                                  
833 856
                                                                                   

Loading…
Cancel
Save