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

anim_add_loop_missing_decks2

shuvit 6 years ago
parent
9d0270f3fa
commit
cf87aff6d2
1 changed files with 41 additions and 5 deletions
Split View Show Diff Stats
  1. 41
    5
      co_ActionState.py

+ 41
- 5
co_ActionState.py View File 

@@ -833,18 +833,26 @@ def main():
833 833 
                         #cur_frame -= 2
834 834 
                     if trans_playing and cur_frame > 1:
835 835 
                         skater.playAction("nreg_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
836 
+                        deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
837 
+                        trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
836 838 
                         #print(cur_frame)
837 839 
                     else:
838 840 
                         skater.playAction("nreg_pump_in", 20,1, layer=trans_layer, play_mode=0, speed=1)
841 
+                        deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
842 
+                        trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
839 843 
                 if l_actionState == 'reg_opos':
840 844 
                     trans_playing = skater.isPlayingAction(trans_layer)
841 845 
                     if trans_playing:
842 846 
                         cur_frame = skater.getActionFrame(trans_layer)
843 847 
                     if trans_playing and cur_frame > 1:
844 848 
                         skater.playAction("noposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
849 
+                        deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
850 
+                        trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
845 851 
                     else:
846 852 
                         own['actionTimer'] = 20
847 
-                        skater.playAction("noposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
853 
+                        skater.playAction("noposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
854 
+                        deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
855 
+                        trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
848 856 
                 if l_requestAction == 'reg_nopos':
849 857 
                     flipping = skater.isPlayingAction(flip_layer)
850 858 
                     if flipping == 0:
 
@@ -857,10 +865,14 @@ def main():
857 865 
                             #deck.stopAction(trans_layer)
858 866 
                             #trucks.stopAction(trans_layer)
859 867 
                             skater.playAction("nnoposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
868 
+                            deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
869 
+                            trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
860 870 
                             #print(cur_frame)
861 871 
                         else:
862 872 
                             own['actionTimer'] = 20
863 873 
                             skater.playAction("nnoposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
874 
+                            deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
875 
+                            trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
864 876
865 877 
                 if l_requestAction == 'reg_manual':
866 878 
                     trans_playing = skater.isPlayingAction(trans_layer)
 
@@ -899,12 +911,14 @@ def main():
899 911 
                     if trans_playing and cur_frame > 1:
900 912 
                         skater.playAction("nreg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
901 913 
                         deck.playAction("a_reg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
914 
+                        trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
902 915 
                     else:
903 916 
                         own['actionTimer'] = 20
904 917 
                         requestAction = 'reg_turnLeft_out'
905 918 
                         actionState = 'reg_turnLeft_out'
906 919 
                         skater.playAction("nreg_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
907 
-                        deck.playAction("a_reg_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
920 
+                        deck.playAction("a_reg_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
921 
+                        trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)
908 922 
                 if l_actionState == 'reg_Right':
909 923 
                     #requestAction = 'reg_turnRight_out'
910 924 
                     trans_playing = skater.isPlayingAction(trans_layer)
 
@@ -914,10 +928,12 @@ def main():
914 928 
                     if trans_playing and cur_frame > 1:
915 929 
                         skater.playAction("nreg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
916 930 
                         deck.playAction("a_reg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
931 
+                        trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
917 932 
                     else:
918 933 
                         own['actionTimer'] = 20
919 934 
                         skater.playAction("nreg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
920 935 
                         deck.playAction("a_reg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
936 
+                        trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)
921 937 
                 if requestAction == 'reg_roll':
922 938 
                     actionState = 'reg_roll'
923 939 
                     skater.playAction("nreg", 1,60, layer=loop_layer, play_mode=1, speed=.5)
 
@@ -951,10 +967,14 @@ def main():
951 967 
                         #deck.stopAction(trans_layer)
952 968 
                         #trucks.stopAction(trans_layer)
953 969 
                         skater.playAction("fak_oposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
970 
+                        deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
971 
+                        trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
954 972 
                         #print(cur_frame)
955 973 
                     else:
956 974 
                         own['actionTimer'] = 20
957 975 
                         skater.playAction("fak_oposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
976 
+                        deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
977 
+                        trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
958 978 
                 if l_requestAction == 'fak_nopos':
959 979 
                     trans_playing = skater.isPlayingAction(trans_layer)
960 980 
                     if trans_playing:
 
@@ -965,10 +985,14 @@ def main():
965 985 
                         #deck.stopAction(trans_layer)
966 986 
                         #trucks.stopAction(trans_layer)
967 987 
                         skater.playAction("fak_noposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
988 
+                        deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
989 
+                        trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
968 990 
                         #print(cur_frame)
969 991 
                     else:
970 992 
                         own['actionTimer'] = 20
971 
-                        skater.playAction("fak_noposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
993 
+                        skater.playAction("fak_noposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
994 
+                        deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
995 
+                        trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
972 996 
                 if l_requestAction == 'fak_manual':
973 997 
                     trans_playing = skater.isPlayingAction(trans_layer)
974 998 
                     if trans_playing:
 
@@ -1008,9 +1032,11 @@ def main():
1008 1032 
                     if trans_playing and cur_frame > 1:
1009 1033 
                         skater.playAction("nfak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
1010 1034 
                         deck.playAction("a_fak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
1035 
+                        trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
1011 1036 
                     else:
1012 1037 
                         skater.playAction("nfak_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
1013 
-                        deck.playAction("a_fak_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
1038 
+                        deck.playAction("a_fak_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
1039 
+                        trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
1014 1040 
                 if l_requestAction == 'fak_turnRight':
1015 1041 
                     trans_playing = skater.isPlayingAction(trans_layer)
1016 1042 
                     if trans_playing:
 
@@ -1019,9 +1045,11 @@ def main():
1019 1045 
                     if trans_playing and cur_frame > 1:
1020 1046 
                         skater.playAction("nfak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
1021 1047 
                         deck.playAction("a_fak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
1048 
+                        trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
1022 1049 
                     else:
1023 1050 
                         skater.playAction("nfak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
1024 
-                        deck.playAction("a_fak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
1051 
+                        deck.playAction("a_fak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
1052 
+                        trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)
1025 1053
1026 1054 
                 if requestAction == 'fak_roll':
1027 1055 
                     actionState = 'fak_roll' 
@@ -1035,10 +1063,14 @@ def main():
1035 1063 
                 #in
1036 1064 
                 if l_actionState != 'reg_opos':
1037 1065 
                     skater.playAction("noposin", 1,20, layer=trans_layer, play_mode=0, speed=1)
1066 
+                    deck.playAction("a_reg", 1,20, layer=trans_layer, play_mode=0, speed=1)
1067 
+                    trucks.playAction("a_reg", 1,20, layer=trans_layer, play_mode=0, speed=1)
1038 1068 
                 #loop
1039 1069 
                 else:
1040 1070
1041 1071 
                     skater.playAction("nopos", 1,40, layer=loop_layer, play_mode=1, speed=1)
1072 
+                    deck.playAction("a_reg", 1,40, layer=loop_layer, play_mode=1, speed=1)
1073 
+                    trucks.playAction("a_reg", 1,40, layer=loop_layer, play_mode=1, speed=1)
1042 1074
1043 1075 
             #fak_opos
1044 1076 
             if requestAction == 'fak_opos':
 
@@ -1046,9 +1078,13 @@ def main():
1046 1078 
                 #in
1047 1079 
                 if l_actionState != 'fak_opos':
1048 1080 
                     skater.playAction("fak_oposin", 1,20, layer=trans_layer, play_mode=0, speed=1)
1081 
+                    deck.playAction("a_reg", 1,20, layer=trans_layer, play_mode=0, speed=1)
1082 
+                    trucks.playAction("a_reg", 1,20, layer=trans_layer, play_mode=0, speed=1)
1049 1083 
                 #loop
1050 1084 
                 else:
1051 1085 
                     skater.playAction("fak_opos", 1,40, layer=loop_layer, play_mode=1, speed=1)
1086 
+                    deck.playAction("a_reg", 1,40, layer=loop_layer, play_mode=1, speed=1)
1087 
+                    trucks.playAction("a_reg", 1,40, layer=loop_layer, play_mode=1, speed=1)
1052 1088
1053 1089 
             #reg_nopos
1054 1090 
             if requestAction == 'reg_nopos':

Write Preview
Loading…
Cancel
Save