Browse Source

z122 - adding manual outs

shuvit 6 years ago
parent
commit
2946f7f61c
2 changed files with 35 additions and 10 deletions
  1. 30
    5
      co_ActionState.py
  2. 5
    5
      controller2.py

+ 30
- 5
co_ActionState.py
File diff suppressed because it is too large
View File


+ 5
- 5
controller2.py View File

701
     
701
     
702
                 
702
                 
703
 def reg_stance_left_on():
703
 def reg_stance_left_on():
704
-    if own['manual_v2'] == 0 and own["revert_timer"] < 1:
704
+    if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1:
705
         own['requestAction'] = 'reg_turnLeft'    
705
         own['requestAction'] = 'reg_turnLeft'    
706
         LAST_LEFT = own["LAST_LEFT"]
706
         LAST_LEFT = own["LAST_LEFT"]
707
         playing_action_frame = skater.getActionFrame(LAND_LAYER)
707
         playing_action_frame = skater.getActionFrame(LAND_LAYER)
711
                         
711
                         
712
          
712
          
713
 def reg_stance_right_on():
713
 def reg_stance_right_on():
714
-    if own['manual_v2'] == 0 and own["revert_timer"] < 1:
714
+    if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1:
715
         own['requestAction'] = 'reg_turnRight' 
715
         own['requestAction'] = 'reg_turnRight' 
716
         LAST_RIGHT = own["LAST_RIGHT"]
716
         LAST_RIGHT = own["LAST_RIGHT"]
717
         playing_action_frame = skater.getActionFrame(LAND_LAYER)
717
         playing_action_frame = skater.getActionFrame(LAND_LAYER)
722
    
722
    
723
 def fak_stance_on():
723
 def fak_stance_on():
724
     playing = deck.isPlayingAction(40)
724
     playing = deck.isPlayingAction(40)
725
-    if own['manual_v2'] == 0 and own["revert_timer"] < 1 and playing == 0:
725
+    if own['manual_v2'] == 0 and own["revert_timer"] < 1 and playing == 0 and own['gt_cd2'] < 1:
726
         own['requestAction'] = 'fak_roll'
726
         own['requestAction'] = 'fak_roll'
727
 def fak_stance_off():
727
 def fak_stance_off():
728
     killact(3)
728
     killact(3)
729
     
729
     
730
 def fak_stance_left_on():
730
 def fak_stance_left_on():
731
-    if own['manual_v2'] == 0 and own["revert_timer"] < 1:
731
+    if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1:
732
         own['requestAction'] = 'fak_turnLeft'     
732
         own['requestAction'] = 'fak_turnLeft'     
733
         LAST_LEFT_FAK = own["LAST_LEFT_FAK"]
733
         LAST_LEFT_FAK = own["LAST_LEFT_FAK"]
734
         playing_action_frame = skater.getActionFrame(LAND_LAYER)
734
         playing_action_frame = skater.getActionFrame(LAND_LAYER)
742
     own["LAST_LEFT_FAK"] = 0
742
     own["LAST_LEFT_FAK"] = 0
743
     
743
     
744
 def fak_stance_right_on():
744
 def fak_stance_right_on():
745
-    if own['manual_v2'] == 0 and own["revert_timer"] < 1:
745
+    if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1:
746
         own['requestAction'] = 'fak_turnRight' 
746
         own['requestAction'] = 'fak_turnRight' 
747
         LAST_RIGHT_FAK = own["LAST_RIGHT_FAK"]
747
         LAST_RIGHT_FAK = own["LAST_RIGHT_FAK"]
748
         own["LAST_RIGHT_FAK"] = 1        
748
         own["LAST_RIGHT_FAK"] = 1        

Loading…
Cancel
Save