Shuvit-Org
/
shuvit
Watch 4
Star 3
Fork 0
Code Issues 9 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

more grindouts

shuvit 6 years ago
parent
6394715045
commit
7b0b165c1c
1 changed files with 60 additions and 60 deletions
Split View Show Diff Stats
  1. 60
    60
      co_ActionState.py

+ 60
- 60
co_ActionState.py View File 

@@ -291,12 +291,12 @@ def main():
291 291 
             requestAction = 'fak_air-roll'
292 292 
             actionState = 'fak_air-roll'
293 293
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):
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_tailgr_out', 'reg_tailgl_out'} and actionTimer < 10):
295 295 
             requestAction = 'reg_5050-roll'
296 296 
             actionState = 'reg_5050-roll'
297 297 
             print('************************')
298 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):
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_tailgr_out', 'fak_tailgl_out'} and actionTimer < 10):
300 300 
             requestAction = 'fak_5050-roll'
301 301 
             actionState = 'fak_5050-roll'
302 302 
             print('************************')                                                                                                                  
@@ -513,8 +513,8 @@ def main():
513 513 
                     #cur_frame -= 2
514 514 
                 if trans_playing and cur_frame > 1:
515 515 
                     skater.playAction("nreg_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
516 
-                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
517 
-                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
516 
+                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
517 
+                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
518 518
519 519 
                     own['actionTimer'] = cur_frame
520 520 
                 else:                      
@@ -758,143 +758,143 @@ def main():
758 758
759 759 
             if requestAction == 'reg_nosegr_out':
760 760 
                 actionState = 'reg_nosegr_out'
761 
-                own['actionTimer'] = 19
761 
+                own['actionTimer'] = 9
762 762 
                 own['requestAction'] = 'reg_nosegr_out'
763 763 
                 trans_playing = skater.isPlayingAction(trans_layer)
764 764 
                 if trans_playing:
765 765 
                     cur_frame = skater.getActionFrame(trans_layer)
766 766 
                     #cur_frame -= 2
767 767 
                 if trans_playing and cur_frame > 1:
768 
-                    skater.playAction("reg_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
769 
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
770 
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
768 
+                    skater.playAction("reg_nosegR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
769 
+                    deck.playAction("a_reg_nosegR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
770 
+                    trucks.playAction("a_reg_nosegR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
771 771 
                     own['actionTimer'] = cur_frame
772 772 
                 else:
773 
-                    skater.playAction("reg_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
774 
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
775 
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
773 
+                    skater.playAction("reg_nosegR", 30,40, layer=trans_layer, play_mode=0, speed=1)
774 
+                    deck.playAction("a_reg_nosegR", 30,40, layer=trans_layer, play_mode=0, speed=1)
775 
+                    trucks.playAction("a_reg_nosegR", 30,40, layer=trans_layer, play_mode=0, speed=1)
776 776 
             if requestAction == 'fak_nosegr_out':
777 777 
                 actionState = 'fak_nosegr_out'
778 
-                own['actionTimer'] = 5
778 
+                own['actionTimer'] = 9
779 779 
                 own['requestAction'] = 'fak_nosegr_out'
780 780 
                 trans_playing = skater.isPlayingAction(trans_layer)
781 781 
                 if trans_playing:
782 782 
                     cur_frame = skater.getActionFrame(trans_layer)
783 783 
                     #cur_frame -= 2
784 784 
                 if trans_playing and cur_frame > 1:
785 
-                    skater.playAction("fak_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
786 
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
787 
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
785 
+                    skater.playAction("fak_nosegR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
786 
+                    deck.playAction("a_fak_nosegR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
787 
+                    trucks.playAction("a_fak_nosegR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
788 788 
                     own['actionTimer'] = cur_frame
789 789 
                 else:
790 
-                    skater.playAction("fak_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
791 
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
792 
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
790 
+                    skater.playAction("fak_nosegR", 30,40, layer=trans_layer, play_mode=0, speed=1)
791 
+                    deck.playAction("a_fak_nosegR", 30,40, layer=trans_layer, play_mode=0, speed=1)
792 
+                    trucks.playAction("a_fak_nosegR", 30,40, layer=trans_layer, play_mode=0, speed=1)
793 793
794 794 
             if requestAction == 'reg_tailgr_out':
795 795 
                 actionState = 'reg_tailgr_out'
796 
-                own['actionTimer'] = 5
796 
+                own['actionTimer'] = 9
797 797 
                 own['requestAction'] = 'reg_tailgr_out'
798 798 
                 trans_playing = skater.isPlayingAction(trans_layer)
799 799 
                 if trans_playing:
800 800 
                     cur_frame = skater.getActionFrame(trans_layer)
801 801 
                     #cur_frame -= 2
802 802 
                 if trans_playing and cur_frame > 1:
803 
-                    skater.playAction("reg_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
804 
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
805 
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
803 
+                    skater.playAction("reg_tailgR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
804 
+                    deck.playAction("a_reg_tailgR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
805 
+                    trucks.playAction("a_reg_tailgR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
806 806 
                     own['actionTimer'] = cur_frame
807 807 
                 else:
808 
-                    skater.playAction("reg_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
809 
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
810 
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
808 
+                    skater.playAction("reg_tailgR", 30,40, layer=trans_layer, play_mode=0, speed=1)
809 
+                    deck.playAction("a_reg_tailgR", 30,40, layer=trans_layer, play_mode=0, speed=1)
810 
+                    trucks.playAction("a_reg_tailgR", 30,40, layer=trans_layer, play_mode=0, speed=1)
811 811 
             if requestAction == 'fak_tailgr_out':
812 812 
                 actionState = 'fak_tailgr_out'
813 
-                own['actionTimer'] = 5
813 
+                own['actionTimer'] = 9
814 814 
                 own['requestAction'] = 'fak_tailgr_out'
815 815 
                 trans_playing = skater.isPlayingAction(trans_layer)
816 816 
                 if trans_playing:
817 817 
                     cur_frame = skater.getActionFrame(trans_layer)
818 818 
                     #cur_frame -= 2
819 819 
                 if trans_playing and cur_frame > 1:
820 
-                    skater.playAction("fak_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
821 
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
822 
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
820 
+                    skater.playAction("fak_tailgR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
821 
+                    deck.playAction("a_fak_tailgR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
822 
+                    trucks.playAction("a_fak_tailgR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
823 823 
                     own['actionTimer'] = cur_frame
824 824 
                 else:
825 
-                    skater.playAction("fak_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
826 
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
827 
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
825 
+                    skater.playAction("fak_tailgR", 30,40, layer=trans_layer, play_mode=0, speed=1)
826 
+                    deck.playAction("a_fak_tailgR", 30,40, layer=trans_layer, play_mode=0, speed=1)
827 
+                    trucks.playAction("a_fak_tailgR", 30,40, layer=trans_layer, play_mode=0, speed=1)
828 828
829 829 
             if requestAction == 'reg_nosegl_out':
830 830 
                 actionState = 'reg_nosegl_out'
831 
-                own['actionTimer'] = 5
831 
+                own['actionTimer'] = 9
832 832 
                 own['requestAction'] = 'reg_nosegl_out'
833 833 
                 trans_playing = skater.isPlayingAction(trans_layer)
834 834 
                 if trans_playing:
835 835 
                     cur_frame = skater.getActionFrame(trans_layer)
836 836 
                     #cur_frame -= 2
837 837 
                 if trans_playing and cur_frame > 1:
838 
-                    skater.playAction("reg_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
839 
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
840 
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
838 
+                    skater.playAction("reg_nosegL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
839 
+                    deck.playAction("a_reg_nosegL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
840 
+                    trucks.playAction("a_reg_nosegL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
841 841 
                     own['actionTimer'] = cur_frame
842 842 
                 else:
843 
-                    skater.playAction("reg_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
844 
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
845 
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
843 
+                    skater.playAction("reg_nosegL", 30,40, layer=trans_layer, play_mode=0, speed=1)
844 
+                    deck.playAction("a_reg_nosegL", 30,40, layer=trans_layer, play_mode=0, speed=1)
845 
+                    trucks.playAction("a_reg_nosegL", 30,40, layer=trans_layer, play_mode=0, speed=1)
846 846 
             if requestAction == 'fak_nosegl_out':
847 847 
                 actionState = 'fak_nosegl_out'
848 
-                own['actionTimer'] = 5
848 
+                own['actionTimer'] = 9
849 849 
                 own['requestAction'] = 'fak_nosegl_out'
850 850 
                 trans_playing = skater.isPlayingAction(trans_layer)
851 851 
                 if trans_playing:
852 852 
                     cur_frame = skater.getActionFrame(trans_layer)
853 853 
                     #cur_frame -= 2
854 854 
                 if trans_playing and cur_frame > 1:
855 
-                    skater.playAction("fak_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
856 
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
857 
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
855 
+                    skater.playAction("fak_nosegL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
856 
+                    deck.playAction("a_fak_nosegL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
857 
+                    trucks.playAction("a_fak_nosegL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
858 858 
                     own['actionTimer'] = cur_frame
859 859 
                 else:
860 
-                    skater.playAction("fak_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
861 
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
862 
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
860 
+                    skater.playAction("fak_nosegL", 30,40, layer=trans_layer, play_mode=0, speed=1)
861 
+                    deck.playAction("a_fak_nosegL", 30,40, layer=trans_layer, play_mode=0, speed=1)
862 
+                    trucks.playAction("a_fak_nosegL", 30,40, layer=trans_layer, play_mode=0, speed=1)
863 863
864 864 
             if requestAction == 'reg_tailgl_out':
865 865 
                 actionState = 'reg_tailgl_out'
866 
-                own['actionTimer'] = 5
866 
+                own['actionTimer'] = 9
867 867 
                 own['requestAction'] = 'reg_tailgl_out'
868 868 
                 trans_playing = skater.isPlayingAction(trans_layer)
869 869 
                 if trans_playing:
870 870 
                     cur_frame = skater.getActionFrame(trans_layer)
871 871 
                     #cur_frame -= 2
872 872 
                 if trans_playing and cur_frame > 1:
873 
-                    skater.playAction("reg_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
874 
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
875 
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
873 
+                    skater.playAction("reg_tailgL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
874 
+                    deck.playAction("a_reg_tailgL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
875 
+                    trucks.playAction("a_reg_tailgL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
876 876 
                     own['actionTimer'] = cur_frame
877 877 
                 else:
878 
-                    skater.playAction("reg_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
879 
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
880 
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
878 
+                    skater.playAction("reg_tailgL", 30,40, layer=trans_layer, play_mode=0, speed=1)
879 
+                    deck.playAction("a_reg_tailgL", 30,40, layer=trans_layer, play_mode=0, speed=1)
880 
+                    trucks.playAction("a_reg_tailgL", 30,40, layer=trans_layer, play_mode=0, speed=1)
881 881 
             if requestAction == 'fak_tailgl_out':
882 882 
                 actionState = 'fak_tailgl_out'
883 
-                own['actionTimer'] = 5
883 
+                own['actionTimer'] = 9
884 884 
                 own['requestAction'] = 'fak_tailgl_out'
885 885 
                 trans_playing = skater.isPlayingAction(trans_layer)
886 886 
                 if trans_playing:
887 887 
                     cur_frame = skater.getActionFrame(trans_layer)
888 888 
                     #cur_frame -= 2
889 889 
                 if trans_playing and cur_frame > 1:
890 
-                    skater.playAction("fak_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
891 
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
892 
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
890 
+                    skater.playAction("fak_tailgL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
891 
+                    deck.playAction("a_fak_tailgL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
892 
+                    trucks.playAction("a_fak_tailgL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
893 893 
                     own['actionTimer'] = cur_frame
894 894 
                 else:
895 
-                    skater.playAction("fak_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
896 
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
897 
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
895 
+                    skater.playAction("fak_tailgL", 30,40, layer=trans_layer, play_mode=0, speed=1)
896 
+                    deck.playAction("a_fak_tailgL", 30,40, layer=trans_layer, play_mode=0, speed=1)
897 
+                    trucks.playAction("a_fak_tailgL", 30,40, layer=trans_layer, play_mode=0, speed=1)
898 898
899 899
900 900 
             if requestAction == 'reg_manual_out':

Write Preview
Loading…
Cancel
Save