|
@@ -22,8 +22,8 @@ def main():
|
22
|
22
|
|
23
|
23
|
pump_out_overList = ['reg_nosegr','reg_nosegl', 'fak_noseg','fak_nosegr', 'fak_nosegl', 'reg_nosegl', 'fak_tailg', 'fak_tailgr', 'fak_tailgl', 'reg_tailg', 'reg_tailgr', 'reg_tailgl', 'reg_tailslide', 'fak_tailslide', 'reg_noseslide', 'fak_noseslide', 'nose_stall','tail_stall', 'reg_5050', 'fak_5050', 'reg_tailg', 'reg_bsboard', 'fak_bsboard', 'reg_fsboard']
|
24
|
24
|
|
25
|
|
- reg_fliplist = ['reg_ollie', 'reg_nollie', 'reg_nollie', 'reg_kickflip', 'reg_varial_kickflip', 'reg_nollie_varial_kickflip', 'reg_nollie_varial_heelflip', 'fak_nollie_varial_heelflip', 'reg_varial_heelflip', 'reg_nollie_kickflip', 'reg_heelflip', 'reg_nollie_heelflip', 'reg_shuvit', 'reg_shuvit360', 'reg_fsshuvit360', 'reg_nollie_shuvit', 'fak_nollie_shuvit', 'reg_fsshuvit', 'fak_fsshuvit', 'reg_nollie_fsshuvit', 'reg_nollie_shuvit360', 'reg_nollie_fsshuvit', 'reg_brfoot', 'reg_frfoot', 'reg_blfoot', 'reg_flfoot', 'reg_inward_heelflip', 'reg_hardflip', 'reg_nollie_inward_heelflip', 'reg_nollie_hardflip']
|
26
|
|
- fak_fliplist = ['fak_ollie', 'fak_nollie', 'fak_nollie', 'fak_kickflip', 'fak_varial_kickflip', 'fak_nollie_varial_kickflip', 'fak_nollie_varial_heelflip', 'fak_nollie_varial_heelflip', 'fak_varial_heelflip', 'fak_nollie_kickflip', 'fak_heelflip','fak_nollie_heelflip', 'fak_shuvit', 'fak_shuvit360', 'fak_fsshuvit360', 'fak_nollie_shuvit', 'fak_nollie_shuvit', 'fak_fsshuvit', 'fak_fsshuvit', 'fak_nollie_fsshuvit', 'fak_nollie_shuvit360', 'fak_nollie_fsshuvit', 'fak_brfoot', 'fak_frfoot', 'fak_blfoot', 'fak_flfoot', 'fak_inward_heelflip', 'fak_hardflip', 'fak_nollie_inward_heelflip', 'fak_nollie_hardflip']
|
|
25
|
+ reg_fliplist = ['reg_ollie', 'reg_nollie', 'reg_nollie', 'reg_kickflip', 'reg_varial_kickflip', 'reg_nollie_varial_kickflip', 'reg_nollie_varial_heelflip', 'fak_nollie_varial_heelflip', 'reg_varial_heelflip', 'reg_nollie_kickflip', 'reg_heelflip', 'reg_nollie_heelflip', 'reg_shuvit', 'reg_shuvit360', 'reg_fsshuvit360', 'reg_nollie_shuvit', 'fak_nollie_shuvit', 'reg_fsshuvit', 'fak_fsshuvit', 'reg_nollie_fsshuvit', 'reg_nollie_shuvit360', 'reg_nollie_fsshuvit', 'reg_brfoot', 'reg_frfoot', 'reg_blfoot', 'reg_flfoot', 'reg_inward_heelflip', 'reg_hardflip', 'reg_nollie_inward_heelflip', 'reg_nollie_hardflip', 'reg_offboard']
|
|
26
|
+ fak_fliplist = ['fak_ollie', 'fak_nollie', 'fak_nollie', 'fak_kickflip', 'fak_varial_kickflip', 'fak_nollie_varial_kickflip', 'fak_nollie_varial_heelflip', 'fak_nollie_varial_heelflip', 'fak_varial_heelflip', 'fak_nollie_kickflip', 'fak_heelflip','fak_nollie_heelflip', 'fak_shuvit', 'fak_shuvit360', 'fak_fsshuvit360', 'fak_nollie_shuvit', 'fak_nollie_shuvit', 'fak_fsshuvit', 'fak_fsshuvit', 'fak_nollie_fsshuvit', 'fak_nollie_shuvit360', 'fak_nollie_fsshuvit', 'fak_brfoot', 'fak_frfoot', 'fak_blfoot', 'fak_flfoot', 'fak_inward_heelflip', 'fak_hardflip', 'fak_nollie_inward_heelflip', 'fak_nollie_hardflip', 'fak_offboard']
|
27
|
27
|
|
28
|
28
|
#initialize variables
|
29
|
29
|
try:
|
|
@@ -67,11 +67,11 @@ def main():
|
67
|
67
|
own['requestAction'] = 'empty'
|
68
|
68
|
#================
|
69
|
69
|
#stance change detection
|
70
|
|
- if (requestAction == 'reg_roll' and l_actionState in ('fak_roll', 'fak_land', 'fak_pump_out', 'fak_nopos_out', 'fak_opos_out', 'fak_air-roll')) 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')):
|
|
70
|
+ 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')):
|
71
|
71
|
#print("fak-reg_roll")
|
72
|
72
|
requestAction = 'fak-reg_roll'
|
73
|
73
|
own['requestAction'] = 'fak-reg_roll'
|
74
|
|
- if (requestAction == 'fak_roll' and l_actionState in ('reg_roll', 'reg_land', 'reg_pump_out', 'reg_nopos_out', 'reg_opos_out', 'reg_air-roll')) 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')):
|
|
74
|
+ 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')):
|
75
|
75
|
#print("reg-fak_roll")
|
76
|
76
|
requestAction = 'reg-fak_roll'
|
77
|
77
|
own['requestAction'] = 'reg-fak_roll'
|
|
@@ -301,35 +301,7 @@ def main():
|
301
|
301
|
requestAction = 'fak_sit_out'
|
302
|
302
|
actionState = 'fak_sit_out'
|
303
|
303
|
|
304
|
|
- if l_actionState == 'reg_manual' and requestAction != 'reg_manual':
|
305
|
|
- if requestAction == 'fak_nmanual':
|
306
|
|
- requestAction = 'reg-fak_nmanual'
|
307
|
|
- actionState = 'reg-fak_nmanual'
|
308
|
|
- else:
|
309
|
|
- requestAction = 'reg_manual_out'
|
310
|
|
- actionState = 'reg_manual_out'
|
311
|
|
- if l_actionState == 'fak_manual' and requestAction != 'fak_manual':
|
312
|
|
- if requestAction == 'reg_nmanual':
|
313
|
|
- requestAction = 'fak-reg_nmanual'
|
314
|
|
- actionState = 'fak-reg_manual'
|
315
|
|
- else:
|
316
|
|
- requestAction = 'fak_manual_out'
|
317
|
|
- actionState = 'fak_manual_out'
|
318
|
|
- if l_actionState == 'reg_nmanual' and requestAction != 'reg_nmanual':
|
319
|
|
- if requestAction == 'fak_manual':
|
320
|
|
- requestAction = 'reg-fak_manual'
|
321
|
|
- actionState = 'reg-fak_manual'
|
322
|
|
- else:
|
323
|
|
- requestAction = 'reg_nmanual_out'
|
324
|
|
- actionState = 'reg_nmanual_out'
|
325
|
|
-
|
326
|
|
- if l_actionState == 'fak_nmanual' and requestAction != 'fak_nmanual':
|
327
|
|
- if requestAction == 'reg_manual':
|
328
|
|
- requestAction = 'fak-reg_manual'
|
329
|
|
- actionState = 'fak-reg_manual'
|
330
|
|
- else:
|
331
|
|
- requestAction = 'fak_nmanual_out'
|
332
|
|
- actionState = 'fak_nmanual_out'
|
|
304
|
+
|
333
|
305
|
|
334
|
306
|
if l_actionState == 'fak_nmanual_out' and requestAction == 'fak_nmanual':
|
335
|
307
|
actionTimer = 0
|
|
@@ -401,37 +373,15 @@ def main():
|
401
|
373
|
|
402
|
374
|
if l_actionState == 'fak_air_tail' and requestAction in ('reg_roll', 'reg_manual', 'fak_land'):
|
403
|
375
|
requestAction = 'fak_air_tail to manual'
|
404
|
|
- #print('fucking manuals')
|
405
|
|
-
|
406
|
|
-# if l_actionState == 'reg_air_tail' and requestAction in ('fak_roll', 'fak_manual'):
|
407
|
|
-# requestAction = 'reg_manual'
|
408
|
|
-
|
|
376
|
+
|
409
|
377
|
if l_actionState == 'reg_air_tail' and requestAction in ('fak_manual', 'fak_roll', 'reg_land'):
|
410
|
378
|
requestAction = 'reg_air_tail to manual'
|
411
|
|
- #print('fucking manuals')
|
412
|
|
-
|
413
|
|
-# if l_actionState == 'reg_air_tail' and requestAction in ('fak_manual', 'fak_roll'):
|
414
|
|
-# requestAction = 'fak_nmanual'
|
415
|
|
-
|
|
379
|
+
|
416
|
380
|
if l_actionState == 'fak_air_nose' and requestAction in ('reg_roll', 'reg_nmanual', 'fak_land'):
|
417
|
381
|
requestAction = 'fak_air_nose to nmanual'
|
418
|
|
- #print('fucking manuals')
|
419
|
382
|
|
420
|
383
|
if l_actionState == 'reg_air_nose' and requestAction in ('fak_roll', 'fak_nmanual', 'reg_land'):
|
421
|
384
|
requestAction = 'reg_air_nose to nmanual'
|
422
|
|
- #print('fucking manuals')
|
423
|
|
- #own['requestAction'] = requestAction
|
424
|
|
-# if l_actionState == 'reg_air_nose' and requestAction in ('fak_nmanual', 'fak_roll', 'reg_nmanual', 'reg_roll', 'reg_manual'):
|
425
|
|
-# requestAction == 'reg_air_nose to nmanual'
|
426
|
|
-
|
427
|
|
-# if l_actionState == 'reg_air_nose' and requestAction in ('fak_nmanual', 'fak_roll'):
|
428
|
|
-# requestAction = 'fak_manual'
|
429
|
|
-
|
430
|
|
-
|
431
|
|
-
|
432
|
|
-# if requestAction == 'reg_nmanual' and l_requestAction in ['fak-reg_manual', 'reg_nmanual']:
|
433
|
|
-# requestAction == 'reg_manual'
|
434
|
|
-
|
435
|
385
|
|
436
|
386
|
|
437
|
387
|
####
|
|
@@ -451,6 +401,39 @@ def main():
|
451
|
401
|
requestAction = 'fak-reg_manual'
|
452
|
402
|
|
453
|
403
|
|
|
404
|
+
|
|
405
|
+
|
|
406
|
+
|
|
407
|
+ if l_actionState in ['reg_manual'] and requestAction != 'reg_manual':
|
|
408
|
+ if requestAction == 'fak_nmanual':
|
|
409
|
+ requestAction = 'reg-fak_nmanual'
|
|
410
|
+ actionState = 'reg-fak_nmanual'
|
|
411
|
+ else:
|
|
412
|
+ requestAction = 'reg_manual_out'
|
|
413
|
+ actionState = 'reg_manual_out'
|
|
414
|
+ if l_actionState in ['fak_manual'] and requestAction != 'fak_manual':
|
|
415
|
+ if requestAction == 'reg_nmanual':
|
|
416
|
+ requestAction = 'fak-reg_nmanual'
|
|
417
|
+ actionState = 'fak-reg_manual'
|
|
418
|
+ else:
|
|
419
|
+ requestAction = 'fak_manual_out'
|
|
420
|
+ actionState = 'fak_manual_out'
|
|
421
|
+ if l_actionState in ['reg_nmanual'] and requestAction != 'reg_nmanual':
|
|
422
|
+ if requestAction == 'fak_manual':
|
|
423
|
+ requestAction = 'reg-fak_manual'
|
|
424
|
+ actionState = 'reg-fak_manual'
|
|
425
|
+ else:
|
|
426
|
+ requestAction = 'reg_nmanual_out'
|
|
427
|
+ actionState = 'reg_nmanual_out'
|
|
428
|
+
|
|
429
|
+ if l_actionState in ['fak_nmanual'] and requestAction != 'fak_nmanual':
|
|
430
|
+ if requestAction == 'reg_manual':
|
|
431
|
+ requestAction = 'fak-reg_manual'
|
|
432
|
+ actionState = 'fak-reg_manual'
|
|
433
|
+ else:
|
|
434
|
+ requestAction = 'fak_nmanual_out'
|
|
435
|
+ actionState = 'fak_nmanual_out'
|
|
436
|
+
|
454
|
437
|
# if l_actionState == 'fak_air_nose to nmanual' and requestAction in ['reg_nmanual', 'reg_manual']:
|
455
|
438
|
# requestAction = 'fak-reg_manual'
|
456
|
439
|
#print('this???')
|
|
@@ -474,7 +457,8 @@ def main():
|
474
|
457
|
if l_actionState == 'reg_air_nose to nmanual' and requestAction == 'fak_roll':
|
475
|
458
|
requestAction = 'reg_nmanual_out'
|
476
|
459
|
if l_actionState == 'fak_air_nose to nmanual' and requestAction == 'reg_roll':
|
477
|
|
- requestAction = 'fak_nmanual_out'
|
|
460
|
+ requestAction = 'fak_nmanual_out'
|
|
461
|
+
|
478
|
462
|
if l_actionState == 'reg_air_tail to manual' and requestAction == 'fak_roll':
|
479
|
463
|
requestAction = 'reg_manual_out'
|
480
|
464
|
if l_actionState == 'fak_air_tail to manual' and requestAction == 'reg_roll':
|
|
@@ -1743,14 +1727,14 @@ def main():
|
1743
|
1727
|
deck.playAction("a_fak_noffboard", 10,1, layer=trans_layer, play_mode=0, speed=.5)
|
1744
|
1728
|
trucks.playAction("a_fak_noffboard", 10,1, layer=trans_layer, play_mode=0, speed=.5)
|
1745
|
1729
|
|
1746
|
|
- if requestAction == 'reg_offboard':
|
|
1730
|
+ if requestAction == 'reg_offboard' and l_actionState != 'reg_offboard':
|
1747
|
1731
|
actionState = 'reg_offboard'
|
1748
|
1732
|
own['actionTimer'] = 60
|
1749
|
1733
|
skater.playAction("reg_noffboard", 1,30, layer=trans_layer, play_mode=0, speed=.5)
|
1750
|
1734
|
deck.playAction("a_reg_noffboard", 1,30, layer=trans_layer, play_mode=0, speed=.5)
|
1751
|
1735
|
trucks.playAction("a_reg_noffboard", 1,30, layer=trans_layer, play_mode=0, speed=.5)
|
1752
|
1736
|
|
1753
|
|
- if requestAction == 'fak_offboard':
|
|
1737
|
+ if requestAction == 'fak_offboard' and l_actionState != 'fak_offboard':
|
1754
|
1738
|
actionState = 'fak_offboard'
|
1755
|
1739
|
own['actionTimer'] = 60
|
1756
|
1740
|
skater.playAction("fak_noffboard", 1,30, layer=trans_layer, play_mode=0, speed=.5)
|
|
@@ -3829,8 +3813,8 @@ def main():
|
3829
|
3813
|
if trans_playing:
|
3830
|
3814
|
cur_frame = skater.getActionFrame(trans_layer)
|
3831
|
3815
|
cur_frame = round(cur_frame, 2)
|
3832
|
|
- #print("oG: ", og_request, "rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'], 'cf', cur_frame)
|
3833
|
|
- print("rA:", requestAction, "|aS:", own['actionState'], own['actionTimer'], 'cf', cur_frame)
|
|
3816
|
+ print("oG: ", og_request, "rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'], 'cf', cur_frame)
|
|
3817
|
+ #print("rA:", requestAction, "|aS:", own['actionState'], own['actionTimer'], 'cf', cur_frame)
|
3834
|
3818
|
cur_frame = skater.getActionFrame(trans_layer)
|
3835
|
3819
|
#print(cur_frame)
|
3836
|
3820
|
def printplaying():
|