shuvit 6 years ago
parent
commit
6394715045
1 changed files with 4 additions and 6 deletions
  1. 4
    6
      co_ActionState.py

+ 4
- 6
co_ActionState.py View File

291
             requestAction = 'fak_air-roll'
291
             requestAction = 'fak_air-roll'
292
             actionState = 'fak_air-roll' 
292
             actionState = 'fak_air-roll' 
293
             
293
             
294
-            
295
-        if (l_actionState == 'reg_5050_out' and requestAction == 'reg_roll') or ((l_actionState == 'reg_noseg_out' or l_actionState == 'reg_nosegL_out' or l_actionState == 'reg_nosegR_out' or l_actionState == 'reg_tailg_out' or l_actionState == 'reg_tailgL_out' or l_actionState == 'reg_tailgR_out') and actionTimer < 10):
294
+        if (l_actionState == 'reg_5050_out' and requestAction == 'reg_roll') or (l_actionState in {'reg_noseg_out', 'reg_nosegR_out', 'reg_nosegL_out', 'reg_tailg_out', 'reg_tailg_outR', 'reg_tailgL_out'} and actionTimer < 10):    
296
             requestAction = 'reg_5050-roll'
295
             requestAction = 'reg_5050-roll'
297
             actionState = 'reg_5050-roll'
296
             actionState = 'reg_5050-roll'
298
             print('************************')  
297
             print('************************')  
299
-        if (l_actionState == 'fak_5050_out' and requestAction == 'fak_roll') or ((l_actionState == 'fak_noseg_out' or l_actionState == 'fak_nosegL_out' or l_actionState == 'fak_nosegR_out' or l_actionState == 'fak_tailg_out' or l_actionState == 'fak_tailgL_out' or l_actionState == 'fak_tailgR_out') and actionTimer < 10):
298
+        
299
+        if (l_actionState == 'fak_5050_out' and requestAction == 'fak_roll') or (l_actionState in {'fak_noseg_out', 'fak_nosegR_out', 'fak_nosegL_out', 'fak_tailg_out', 'fak_tailg_outR', 'fak_tailgL_out'} and actionTimer < 10): 
300
             requestAction = 'fak_5050-roll'
300
             requestAction = 'fak_5050-roll'
301
             actionState = 'fak_5050-roll' 
301
             actionState = 'fak_5050-roll' 
302
-            print('************************')
303
-            
304
-                                                                                                                           
302
+            print('************************')                                                                                                                  
305
     else:
303
     else:
306
         print("action over ridden")
304
         print("action over ridden")
307
         #own['actionState'] = requestAction                     
305
         #own['actionState'] = requestAction                     

Loading…
Cancel
Save