Browse Source

Merge branch 'friday_cleaning' of Shuvit-Org/shuvit into dev

shuvit 5 years ago
parent
commit
e3cc481ea4
1 changed files with 5 additions and 9 deletions
  1. 5
    9
      scripts/controller2.py

+ 5
- 9
scripts/controller2.py View File

@@ -595,8 +595,7 @@ def main():
595 595
         own["LAST_RIGHT"] = 0
596 596
 
597 597
     def reg_stance_on(inc):
598
-        playing = deck.isPlayingAction(40)
599
-        if own["revert_timer"] < 1 and own['manual_v2'] == 0 and playing == 0:
598
+        if own["revert_timer"] < 1 and own['manual_v2'] == 0:
600 599
             own['requestAction'] = 'reg_roll'
601 600
 
602 601
     def reg_manual_on():
@@ -652,8 +651,7 @@ def main():
652 651
             own["LAST_RIGHT"] = 1
653 652
 
654 653
     def fak_stance_on(inc):
655
-        playing = deck.isPlayingAction(40)
656
-        if own['manual_v2'] == 0 and own["revert_timer"] < 1 and playing == 0 and own['gt_cd2'] < 1:
654
+        if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1:
657 655
             own['requestAction'] = 'fak_roll'
658 656
 
659 657
     def fak_stance_left_on():
@@ -684,9 +682,7 @@ def main():
684 682
         own["LAST_RIGHT_FAK"] = 0
685 683
 
686 684
     def reg_air_on():
687
-        playing = deck.isPlayingAction(fliplay)
688
-        if playing == False:
689
-            own['requestAction'] = 'reg_air'
685
+        own['requestAction'] = 'reg_air'
690 686
 
691 687
     def reg_air_off():
692 688
         pass
@@ -768,8 +764,8 @@ def main():
768 764
             if lLR < turnsens or LAST_GRIND != grindHit or dict['kb_ra'] == 0:
769 765
                 fak_stance_right_off()
770 766
         #air
771
-        playing = deck.isPlayingAction(fliplay)
772
-        if not onGround and playing == False and flipping == False:
767
+
768
+        if not onGround and flipping == False:
773 769
             if STANCE == 0:
774 770
                 if LAST_STANCE != STANCE or LAST_GROUND != onGround:
775 771
                     fak_air_off()

Loading…
Cancel
Save