|
@@ -80,11 +80,11 @@ def main():
|
80
|
80
|
own['requestAction'] = 'empty'
|
81
|
81
|
#================
|
82
|
82
|
#stance change detection
|
83
|
|
- if (requestAction == 'reg_roll' and l_actionState in ('fak_roll', 'fak_land', 'fak_pump_out', 'fak_nopos_out', 'fak_opos_out', 'fak_air-roll', 'fak_fs_powerslide_out', 'fak_bs_powerslide_out', 'fak_nmanual_out', 'fak_manual_out')) or l_actionState == 'fak_land' and (requestAction == 'reg_turnLeft' or requestAction == 'reg_turnRight' or requestAction == 'reg_turnLeft_out' or requestAction == 'reg_turnRight_out' or requestAction == 'reg_opos' or requestAction == 'reg_nopos' or requestAction == 'reg_pump' or requestAction == 'reg_push' or requestAction == 'reg_push_goof' or requestAction == 'fak_5050-roll') and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('reg_turnLeft', 'reg_turnRight') and l_actionState in ('fak_turnLeft', 'fak_turnRight')):
|
|
83
|
+ if (requestAction == 'reg_roll' and l_actionState in ('fak_roll', 'fak_land', 'fak_pump_out', 'fak_nopos_out', 'fak_opos_out', 'fak_air-roll', 'fak_fs_powerslide_out', 'fak_bs_powerslide_out', 'fak_nmanual_out', 'fak_manual_out', 'fak_tailslide_out', 'fak_noseslide_out', 'fak_5050_out')) or l_actionState == 'fak_land' and (requestAction == 'reg_turnLeft' or requestAction == 'reg_turnRight' or requestAction == 'reg_turnLeft_out' or requestAction == 'reg_turnRight_out' or requestAction == 'reg_opos' or requestAction == 'reg_nopos' or requestAction == 'reg_pump' or requestAction == 'reg_push' or requestAction == 'reg_push_goof' or requestAction == 'fak_5050-roll') and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('reg_turnLeft', 'reg_turnRight') and l_actionState in ('fak_turnLeft', 'fak_turnRight')):
|
84
|
84
|
#print("fak-reg_roll")
|
85
|
85
|
requestAction = 'fak-reg_roll'
|
86
|
86
|
own['requestAction'] = 'fak-reg_roll'
|
87
|
|
- if (requestAction == 'fak_roll' and l_actionState in ('reg_roll', 'reg_land', 'reg_pump_out', 'reg_nopos_out', 'reg_opos_out', 'reg_air-roll', 'reg_fs_powerslide_out', 'reg_bs_powerslide_out', 'reg_nmanual_out', 'reg_manual_out')) or l_actionState == 'reg_land' and (requestAction == 'fak_turnLeft' or requestAction == 'fak_turnRight' or requestAction == 'fak_turnLeft_out' or requestAction == 'fak_turnRight_out' or requestAction == 'fak_opos' or requestAction == 'fak_nopos' or requestAction == 'fak_pump' or requestAction == 'fak_push' or requestAction == 'reg_push_goof' or requestAction == 'reg_5050-roll') and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('fak_turnLeft', 'fak_turnRight') and l_actionState in ('reg_turnLeft', 'reg_turnRight')):
|
|
87
|
+ if (requestAction == 'fak_roll' and l_actionState in ('reg_roll', 'reg_land', 'reg_pump_out', 'reg_nopos_out', 'reg_opos_out', 'reg_air-roll', 'reg_fs_powerslide_out', 'reg_bs_powerslide_out', 'reg_nmanual_out', 'reg_manual_out', 'reg_tailslide_out', 'reg_noseslide_out', 'reg_5050_out')) or l_actionState == 'reg_land' and (requestAction == 'fak_turnLeft' or requestAction == 'fak_turnRight' or requestAction == 'fak_turnLeft_out' or requestAction == 'fak_turnRight_out' or requestAction == 'fak_opos' or requestAction == 'fak_nopos' or requestAction == 'fak_pump' or requestAction == 'fak_push' or requestAction == 'reg_push_goof' or requestAction == 'reg_5050-roll') and requestAction not in ['reg_push', 'reg_push_goof', 'fak_push', 'fak_push_goof'] or (requestAction in ('fak_turnLeft', 'fak_turnRight') and l_actionState in ('reg_turnLeft', 'reg_turnRight')):
|
88
|
88
|
#print("reg-fak_roll")
|
89
|
89
|
requestAction = 'reg-fak_roll'
|
90
|
90
|
own['requestAction'] = 'reg-fak_roll'
|
|
@@ -157,7 +157,20 @@ def main():
|
157
|
157
|
if 'invert' in requestAction:
|
158
|
158
|
actionTimer = 0
|
159
|
159
|
own['actionTimer'] = 0
|
160
|
|
-
|
|
160
|
+
|
|
161
|
+
|
|
162
|
+ #dirty stall fix
|
|
163
|
+ fixer = 0
|
|
164
|
+ if requestAction in ['reg_5050', 'reg_tailslide', 'reg_noseslide'] and actionState in ['reg_pump_out', 'fak_nopos_out'] and actionTimer > 10:
|
|
165
|
+ fixer = 1
|
|
166
|
+ if requestAction in ['fak_5050', 'fak_tailslide', 'fak_noseslide'] and actionState in ['fak_pump_out', 'fak_nopos_out'] and actionTimer > 10:
|
|
167
|
+ fixer = 1
|
|
168
|
+
|
|
169
|
+ if fixer == 1:
|
|
170
|
+ actionTimer = 0
|
|
171
|
+ own['actionTimer'] = 0
|
|
172
|
+ stopActs()
|
|
173
|
+
|
161
|
174
|
#grind override
|
162
|
175
|
# if requestAction in pump_out_overList and requestAction != l_requestAction and l_actionState not in jump_overrideList:
|
163
|
176
|
# skater.stopAction(loop_layer)
|
|
@@ -200,7 +213,8 @@ def main():
|
200
|
213
|
requestAction = 'reg_turnRight_out'
|
201
|
214
|
actionState = 'reg_turnRight_out'
|
202
|
215
|
elif requestAction == 'reg_pump_right':
|
203
|
|
- requestAction = 'reg_right-pump'
|
|
216
|
+ requestAction = 'reg_right-pump'
|
|
217
|
+
|
204
|
218
|
if l_actionState == 'reg_turnLeft':
|
205
|
219
|
if requestAction not in ['reg_turnLeft', 'reg_pump_left', 'reg_pump']:
|
206
|
220
|
requestAction = 'reg_turnLeft_out'
|
|
@@ -251,10 +265,12 @@ def main():
|
251
|
265
|
actionState = 'fak_pump_right-right'
|
252
|
266
|
|
253
|
267
|
#**********************************
|
254
|
|
- if l_actionState == 'reg_pump' and requestAction not in ['reg_pump', 'reg_pump_left', 'reg_pump_right'] and requestAction not in pump_out_overList:
|
|
268
|
+ if l_actionState == 'reg_pump' and requestAction not in ['reg_pump', 'reg_pump_left', 'reg_pump_right', 'reg_5050'] and requestAction not in pump_out_overList:
|
255
|
269
|
requestAction = 'reg_pump_out'
|
256
|
270
|
actionState = 'reg_pump_out'
|
257
|
|
-
|
|
271
|
+ if l_actionState == 'reg_pump' and requestAction == 'reg_5050':
|
|
272
|
+ requestAction = 'reg_5050'
|
|
273
|
+ actionState = 'reg_5050'
|
258
|
274
|
if l_actionState == 'fak_pump' and requestAction not in ['fak_pump', 'fak_pump_right', 'fak_pump_left'] and requestAction not in pump_out_overList:
|
259
|
275
|
requestAction = 'fak_pump_out'
|
260
|
276
|
actionState = 'fak_pump_out'
|
|
@@ -577,8 +593,8 @@ def main():
|
577
|
593
|
actionState = 'reg_pump_right-rightb'
|
578
|
594
|
|
579
|
595
|
if l_actionState == 'reg_pump_right-rightb' and requestAction == 'reg_roll':
|
580
|
|
- requestAction = 'reg_turnRight_out'
|
581
|
|
- actionState = 'reg_turnRight_out'
|
|
596
|
+ requestAction = 'reg_turnRight'
|
|
597
|
+ actionState = 'reg_turnRight'
|
582
|
598
|
|
583
|
599
|
if l_actionState == 'reg_right-pump' and requestAction == 'reg_roll':
|
584
|
600
|
requestAction = 'reg_pump_out'
|
|
@@ -717,7 +733,23 @@ def main():
|
717
|
733
|
requestAction = 'reg_air-roll'
|
718
|
734
|
|
719
|
735
|
|
|
736
|
+ if l_actionState == 'reg_land' and requestAction in ['reg_pump_left', 'reg_pump_right']:
|
|
737
|
+ requestAction = 'reg_pump_in'
|
|
738
|
+ if l_actionState == 'fak_land' and requestAction in ['fak_pump_left', 'fak_pump_right']:
|
|
739
|
+ requestAction = 'fak_pump_in'
|
|
740
|
+
|
|
741
|
+ if l_actionState in ['reg_pump_right', 'reg_pump_left'] and requestAction == 'reg_roll':
|
|
742
|
+ requestAction = 'reg_pump_out'
|
|
743
|
+ if l_actionState in ['fak_pump_right', 'fak_pump_left'] and requestAction == 'fak_roll':
|
|
744
|
+ requestAction = 'fak_pump_out'
|
|
745
|
+ if l_actionState in ['reg_left-pump', 'reg_right-pump'] and requestAction == 'reg_roll':
|
|
746
|
+ requestAction = 'reg_pump_out'
|
|
747
|
+ if l_actionState in ['fak_left-pump', 'fak_right-pump'] and requestAction == 'reg_roll':
|
|
748
|
+ requestAction = 'fak_pump_out'
|
720
|
749
|
|
|
750
|
+ if l_actionState in ['reg_pump_right-rightb'] and requestAction == 'reg_roll':
|
|
751
|
+ requestAction = 'reg_right_out'
|
|
752
|
+ print('asd;fjas;fjas;fkjs;fkjsa;kfjs;afkjs;dkfjs;fkjas;dkfjs;fj')
|
721
|
753
|
|
722
|
754
|
# if (l_actionState == 'fak_air-roll' and requestAction == 'fak_manual'):
|
723
|
755
|
# actionTimer = 0
|
|
@@ -790,19 +822,21 @@ def main():
|
790
|
822
|
trucks.playAction("a_fak_dropin", 60,80, layer=trans_layer, play_mode=0, speed=.75)
|
791
|
823
|
|
792
|
824
|
if requestAction == 'reg_turnRight_out':
|
793
|
|
- stopActs()
|
|
825
|
+ #stopActs()
|
794
|
826
|
actionState = 'reg_turnRight_out'
|
795
|
827
|
own['actionTimer'] = 19
|
796
|
828
|
trans_playing = skater.isPlayingAction(trans_layer)
|
797
|
829
|
if trans_playing:
|
798
|
830
|
cur_frame = skater.getActionFrame(trans_layer)
|
799
|
831
|
|
800
|
|
- if trans_playing and cur_frame > .5:
|
|
832
|
+ if trans_playing and cur_frame > .5 and cur_frame < 39:
|
801
|
833
|
skater.playAction("nreg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
|
802
|
834
|
deck.playAction("a_reg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
|
803
|
835
|
trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
|
804
|
|
- own['actionTimer'] = (10 - cur_frame)
|
805
|
|
- else:
|
|
836
|
+ #own['actionTimer'] = (10 - cur_frame)
|
|
837
|
+ own['actionTimer'] = cur_frame
|
|
838
|
+ else:
|
|
839
|
+ print('play from start', trans_playing)
|
806
|
840
|
skater.playAction("nreg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
|
807
|
841
|
deck.playAction("a_reg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
|
808
|
842
|
trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)
|
|
@@ -881,6 +915,7 @@ def main():
|
881
|
915
|
|
882
|
916
|
if requestAction == 'fak_pump_right-right':
|
883
|
917
|
actionState = 'fak_pump_right-right'
|
|
918
|
+ own['actionState'] = 'fak_pump_right-right'
|
884
|
919
|
own['actionTimer'] = 19
|
885
|
920
|
|
886
|
921
|
skater.playAction("nfak_pump_right", 40,30, layer=trans_layer, play_mode=0, speed=.5)
|
|
@@ -891,7 +926,8 @@ def main():
|
891
|
926
|
|
892
|
927
|
if requestAction == 'reg_pump_right-rightb':
|
893
|
928
|
actionState = 'reg_pump_right-rightb'
|
894
|
|
- own['actionTimer'] = 19
|
|
929
|
+ own['actionState'] = 'reg_pump_right-rightb'
|
|
930
|
+ own['actionTimer'] = 20
|
895
|
931
|
|
896
|
932
|
skater.playAction("nreg_pump_right", 30,40, layer=trans_layer, play_mode=0, speed=.5)
|
897
|
933
|
deck.playAction("a_reg_right", 10,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
@@ -951,7 +987,7 @@ def main():
|
951
|
987
|
trans_playing = skater.isPlayingAction(trans_layer)
|
952
|
988
|
if trans_playing:
|
953
|
989
|
cur_frame = skater.getActionFrame(trans_layer)
|
954
|
|
- if trans_playing and cur_frame > .5:
|
|
990
|
+ if trans_playing and cur_frame > .5 and cur_frame < 38:
|
955
|
991
|
skater.playAction("nreg_pump_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
|
956
|
992
|
deck.playAction("a_reg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
|
957
|
993
|
trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
|
|
@@ -2679,7 +2715,7 @@ def main():
|
2679
|
2715
|
skater.playAction('reg_fak_nosegr', 10,1, layer=trans_layer, play_mode=0, speed=1)
|
2680
|
2716
|
deck.playAction('a_reg_nosegR', 10,10, layer=trans_layer, play_mode=0, speed=1)
|
2681
|
2717
|
trucks.playAction('a_reg_nosegR', 10,10, layer=trans_layer, play_mode=0, speed=1)
|
2682
|
|
-
|
|
2718
|
+ own['actionState'] = actionState
|
2683
|
2719
|
|
2684
|
2720
|
#######################################
|
2685
|
2721
|
#loop actions
|
|
@@ -2860,7 +2896,8 @@ def main():
|
2860
|
2896
|
deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
|
2861
|
2897
|
trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
|
2862
|
2898
|
#print(cur_frame)
|
2863
|
|
- else:
|
|
2899
|
+ else:
|
|
2900
|
+ own['actionTimer'] = 20
|
2864
|
2901
|
skater.playAction("nreg_pump_in", 20,1, layer=trans_layer, play_mode=0, speed=1)
|
2865
|
2902
|
deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
|
2866
|
2903
|
trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
|
|
@@ -2967,7 +3004,8 @@ def main():
|
2967
|
3004
|
skater.playAction("nfak_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
|
2968
|
3005
|
deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
|
2969
|
3006
|
trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
|
2970
|
|
- else:
|
|
3007
|
+ else:
|
|
3008
|
+ own['actionTimer'] = 20
|
2971
|
3009
|
skater.playAction("nfak_pump_in", 20,1, layer=trans_layer, play_mode=0, speed=1)
|
2972
|
3010
|
deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
|
2973
|
3011
|
trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
|
|
@@ -4266,8 +4304,8 @@ def main():
|
4266
|
4304
|
if trans_playing:
|
4267
|
4305
|
cur_frame = skater.getActionFrame(trans_layer)
|
4268
|
4306
|
cur_frame = round(cur_frame, 2)
|
4269
|
|
- #print("oG: ", og_request, "rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'], 'cf', cur_frame)
|
4270
|
|
- print("rA:", requestAction, "|aS:", own['actionState'], own['actionTimer'], 'cf', cur_frame)
|
|
4307
|
+ print("oG: ", og_request, "rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'], 'cf', cur_frame)
|
|
4308
|
+ #print("rA:", requestAction, "|aS:", own['actionState'], own['actionTimer'], 'cf', cur_frame)
|
4271
|
4309
|
cur_frame = skater.getActionFrame(trans_layer)
|
4272
|
4310
|
#print(cur_frame)
|
4273
|
4311
|
def printplaying():
|