misc

co_ActionState.py

@@ -30,12 +30,14 @@ def main():
         actionState = own['actionState']
         l_actionState = own['l_actionState']
         requestAction = own['requestAction']
+        og_request = requestAction
         l_requestAction = own['l_requestAction']
         queueAction = own['queueAction']
         actionTimer = own['actionTimer']
     except:
         own['actionState'] = 'reg_walk'
-        own['l_actionState'] = 'empty'        
+        own['l_actionState'] = 'empty'  
+        og_request = 'empty'              
         own['requestAction'] = 'reg_walk'    
         own['l_requestAction'] = 'empty'
         own['queueAction'] = 'empty'
@@ -109,7 +111,8 @@ def main():
             own['l_actionState'] = requestAction
             actionState = requestAction
             own['actionTimer'] = 0
-            actionTimer = 0            
+            actionTimer = 0 
+    #print(own['manual_v2_timer'], 'man_timer###@!')                   
     if (own['l_requestAction'] == 'reg_air_nose' or own['l_requestAction'] == 'reg_air_tail' or own['l_requestAction'] == 'fak_air_nose' or own['l_requestAction'] == 'fak_air_tail') and (requestAction == 'reg_land' or requestAction == 'fak_land') and own['manual_v2_timer'] > 2:
     #if (requestAction == 'reg_land' or requestAction == 'fak_land') and own['manual_v2_timer'] > 2:
         requestAction = own['l_requestAction']
@@ -494,8 +497,36 @@ def main():
         if l_actionState in ('reg_air_tail', 'reg_air_nose') and requestAction in ('fak_opos', 'fak_nopos'):
             requestAction = 'reg_land'
         if l_actionState in ('fak_air_tail', 'fak_air_nose') and requestAction in ('reg_opos', 'reg_nopos'):
-            requestAction = 'fak_land'            
-                                                                                                                                                                                        
+            requestAction = 'fak_land'    
+            
+            
+        if l_actionState == 'reg_air' and requestAction == 'fak_air':
+            requestAction = 'reg_air'
+        if l_actionState == 'fak_air' and requestAction == 'reg_air':
+            requestAction = 'fak_air'   
+        if l_actionState == 'reg_air' and requestAction == 'fak_land':
+            requestAction = 'reg_land'
+        if l_actionState == 'fak_air' and requestAction == 'reg_land':
+            requestAction = 'fak_land'
+            
+        
+        if l_actionState == 'fak_5050-roll' and requestAction == 'reg_land':
+            requestAction = 'fak_land'
+        if l_actionState == 'reg_5050-roll' and requestAction == 'fak_land':
+            requestAction = 'reg_land'            
+        
+        
+        if requestAction in ('reg_pump', 'reg_opos', 'reg_nopos', 'reg_turnL', 'reg_turnR') and l_actionState in ('fak_nmanual_out', 'fak_manual_out'):
+            requestAction = 'fak-reg_roll'  
+        if requestAction in ('fak_pump', 'fak_opos', 'fak_nopos', 'fak_turnL', 'fak_turnR') and l_actionState in ('fak_nmanual_out', 'fak_manual_out'):
+            requestAction = 'reg-fak_roll'             
+                                             
+                                             
+        if l_actionState in ('reg_noseslide_out', 'regtailslide_out') and requestAction == ' fak_roll':
+            requestAction = 'reg-fak_roll'
+        if l_actionState in ('fak_noseslide_out', 'faktailslide_out') and requestAction == ' reg_roll':
+            requestAction = 'fak-reg_roll'            
+                                                                                                                                                        
     else:
         print("action over written")               
     def updateAction(requestAction, actionState):
@@ -1053,7 +1084,7 @@ def main():
                     skater.playAction("reg_manual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
                     deck.playAction("a_reg_manual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
                     trucks.playAction("a_reg_manual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
-                    own['actionTimer'] = cur_frame
+                    #own['actionTimer'] = cur_frame
                 else:                      
                     skater.playAction("reg_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)
                     deck.playAction("a_reg_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)
@@ -1070,7 +1101,7 @@ def main():
                     skater.playAction("fak_manual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
                     deck.playAction("a_fak_manual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
                     trucks.playAction("a_fak_manual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
-                    own['actionTimer'] = cur_frame
+                    #own['actionTimer'] = cur_frame
                 else:                      
                     skater.playAction("fak_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)
                     deck.playAction("a_fak_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)
@@ -1086,7 +1117,7 @@ def main():
                     skater.playAction("reg_nmanual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
                     deck.playAction("a_fak_manual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
                     trucks.playAction("a_fak_manual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
-                    own['actionTimer'] = cur_frame
+                    #own['actionTimer'] = cur_frame
                 else:                      
                     skater.playAction("reg_nmanual", 10,1, layer=trans_layer, play_mode=0, speed=1)
                     deck.playAction("a_fak_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)
@@ -1103,7 +1134,7 @@ def main():
                     skater.playAction("fak_nmanual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
                     deck.playAction("a_reg_manual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
                     trucks.playAction("a_reg_manual", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
-                    own['actionTimer'] = cur_frame
+                    #own['actionTimer'] = cur_frame
                 else:                      
                     skater.playAction("fak_nmanual", 10,1, layer=trans_layer, play_mode=0, speed=1)
                     deck.playAction("a_reg_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)
@@ -3672,8 +3703,9 @@ def main():
     cur_frame = -1
     trans_playing = skater.isPlayingAction(trans_layer)
     if trans_playing:
-        cur_frame = skater.getActionFrame(trans_layer)       
-    #print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'], 'cf', cur_frame)
+        cur_frame = skater.getActionFrame(trans_layer)  
+        cur_frame = round(cur_frame, 2)     
+    print("oG: ", og_request, "rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'], 'cf', cur_frame)
     cur_frame = skater.getActionFrame(trans_layer)
     #print(cur_frame)
     def printplaying():

controller2.py

@@ -947,7 +947,7 @@ def main():
         lF_air_frame = own['lF_air_frame']
         frames_since_ground = own['framenum'] - own['lF_air_frame']     
 
-        if linVelocity.x < MAX_VEL and linVelocity.x >= -0 and STANCE == 1 and grindHit == False and frames_since_ground > 30:            
+        if linVelocity.x < MAX_VEL and linVelocity.x >= -0 and STANCE == 1 and grindHit == False and frames_since_ground > 30 and own['last_manual_v2'] == 0:            
             countdown = COUNTDOWN
             yvel = linVelocity.x + SPEEDPUMP
             yvel2 = linVelocity.x + SPEEDPUMPFAST
@@ -960,7 +960,7 @@ def main():
                 own.setLinearVelocity(force2, local)
             own['requestAction'] = 'fak_pump'
         #switch
-        if linVelocity.x > -MAX_VEL and linVelocity.x <= 0 and STANCE == 0 and grindHit == False and frames_since_ground > 30:
+        if linVelocity.x > -MAX_VEL and linVelocity.x <= 0 and STANCE == 0 and grindHit == False and frames_since_ground > 30 and own['last_manual_v2'] == 0:
             countdown = COUNTDOWN
             yvel = linVelocity.x - SPEEDPUMP
             yvel2 = linVelocity.x - SPEEDPUMPFAST
@@ -2739,7 +2739,7 @@ def main():
     #34567
     own['set_revert_timer'] = 0
     ground_since = own["framenum"] - own['lF_air_frame']
-    if ground_since > 40 and frames_since_grinding > 40:
+    if ground_since > 80 and frames_since_grinding > 40:
 
         if q3oncdl < q4oncdl < q5oncdl < q6oncdl < q7oncdl:
             if r_ground.triggered == True: