|
@@ -62,19 +62,19 @@ def main():
|
62
|
62
|
#================
|
63
|
63
|
#stance change detection
|
64
|
64
|
if requestAction == 'reg_roll' and (l_actionState == 'fak_roll' or l_actionState == 'fak_land'):
|
65
|
|
- #print("fak-reg_roll")
|
|
65
|
+ print("fak-reg_roll")
|
66
|
66
|
requestAction = 'fak-reg_roll'
|
67
|
67
|
own['requestAction'] = 'fak-reg_roll'
|
68
|
68
|
if requestAction == 'fak_roll' and (l_actionState == 'reg_roll' or l_actionState == 'reg_land'):
|
69
|
|
- #print("reg-fak_roll")
|
|
69
|
+ print("reg-fak_roll")
|
70
|
70
|
requestAction = 'reg-fak_roll'
|
71
|
71
|
own['requestAction'] = 'reg-fak_roll'
|
72
|
|
- if requestAction == 'reg_5050' and (l_actionState == 'fak_5050' or l_actionState == 'fak_air'):
|
73
|
|
- #print("fak-reg_5050")
|
|
72
|
+ if requestAction == 'reg_5050' and (l_actionState == 'fak_5050' or l_actionState == 'fak_air') or (l_actionState == 'fak-reg_5050' and actionTimer > 1):
|
|
73
|
+ print("fak-reg_5050")
|
74
|
74
|
requestAction = 'fak-reg_5050'
|
75
|
75
|
own['requestAction'] = 'fak-reg_5050'
|
76
|
|
- if requestAction == 'fak_5050' and (l_actionState == 'reg_5050' or l_actionState == 'reg_air'):
|
77
|
|
- #print("reg-fak_5050")
|
|
76
|
+ if requestAction == 'fak_5050' and (l_actionState == 'reg_5050' or l_actionState == 'reg_air') or (l_actionState == 'reg-fak_5050' and actionTimer > 1):
|
|
77
|
+ print("reg-fak_5050")
|
78
|
78
|
requestAction = 'reg-fak_5050'
|
79
|
79
|
own['requestAction'] = 'reg-fak_5050'
|
80
|
80
|
|
|
@@ -1394,7 +1394,7 @@ def main():
|
1394
|
1394
|
deck.playAction("a_fak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
|
1395
|
1395
|
trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5)
|
1396
|
1396
|
|
1397
|
|
- if actionState == 'fak_roll':
|
|
1397
|
+ if requestAction == 'fak_roll':
|
1398
|
1398
|
actionState = 'fak_roll'
|
1399
|
1399
|
skater.playAction("nfak", 1,60, layer=loop_layer, play_mode=1, speed=.5)
|
1400
|
1400
|
deck.playAction("a_reg", 1,40, layer=loop_layer, play_mode=1, speed=.5)
|
|
@@ -1674,19 +1674,19 @@ def main():
|
1674
|
1674
|
skater.stopAction(flip_layer)
|
1675
|
1675
|
deck.stopAction(flip_layer)
|
1676
|
1676
|
trucks.stopAction(flip_layer)
|
1677
|
|
- # skater.playAction("reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
|
1678
|
|
- # deck.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
|
1679
|
|
- # trucks.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
|
1680
|
|
- skater.playAction("reg_nmanual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1681
|
|
- deck.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1682
|
|
- trucks.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1683
|
|
- else:
|
1684
|
|
- # skater.playAction("reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
|
1685
|
|
- # deck.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
|
1686
|
|
- # trucks.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
|
1687
|
|
- skater.playAction("reg_nmanual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1688
|
|
- deck.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1689
|
|
- trucks.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1677
|
+ skater.playAction("reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
|
|
1678
|
+ deck.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
|
|
1679
|
+ trucks.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
|
|
1680
|
+ #skater.playAction("reg_nmanual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1681
|
+ #deck.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1682
|
+ #trucks.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1683
|
+ else:
|
|
1684
|
+ skater.playAction("reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
|
|
1685
|
+ deck.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
|
|
1686
|
+ trucks.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
|
|
1687
|
+ #skater.playAction("reg_nmanual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1688
|
+ #deck.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1689
|
+ #trucks.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1690
|
1690
|
|
1691
|
1691
|
if requestAction == 'fak_noseg':
|
1692
|
1692
|
actionState = 'fak_noseg'
|
|
@@ -1694,19 +1694,19 @@ def main():
|
1694
|
1694
|
skater.stopAction(flip_layer)
|
1695
|
1695
|
deck.stopAction(flip_layer)
|
1696
|
1696
|
trucks.stopAction(flip_layer)
|
1697
|
|
- # skater.playAction("fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
1698
|
|
- # deck.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
1699
|
|
- # trucks.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
1700
|
|
- skater.playAction("fak_nmanual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1701
|
|
- deck.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1702
|
|
- trucks.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1703
|
|
- else:
|
1704
|
|
- # skater.playAction("fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
1705
|
|
- # deck.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
1706
|
|
- # trucks.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
1707
|
|
- skater.playAction("fak_nmanual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1708
|
|
- deck.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1709
|
|
- trucks.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1697
|
+ skater.playAction("fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
|
1698
|
+ deck.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
|
1699
|
+ trucks.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
|
1700
|
+ #skater.playAction("fak_nmanual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1701
|
+ #deck.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1702
|
+ #trucks.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1703
|
+ else:
|
|
1704
|
+ skater.playAction("fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
|
1705
|
+ deck.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
|
1706
|
+ trucks.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
|
1707
|
+ #skater.playAction("fak_nmanual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1708
|
+ #deck.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1709
|
+ #trucks.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1710
|
1710
|
|
1711
|
1711
|
if requestAction == 'reg_tailg':
|
1712
|
1712
|
actionState = 'reg_tailg'
|
|
@@ -1714,19 +1714,19 @@ def main():
|
1714
|
1714
|
skater.stopAction(flip_layer)
|
1715
|
1715
|
deck.stopAction(flip_layer)
|
1716
|
1716
|
trucks.stopAction(flip_layer)
|
1717
|
|
- # skater.playAction("reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
1718
|
|
- # deck.playAction("a_reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
1719
|
|
- # trucks.playAction("a_reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
1720
|
|
- skater.playAction("reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1721
|
|
- deck.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1722
|
|
- trucks.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1723
|
|
- else:
|
1724
|
|
- # skater.playAction("reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
1725
|
|
- # deck.playAction("a_reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
1726
|
|
- # trucks.playAction("a_reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
1727
|
|
- skater.playAction("reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1728
|
|
- deck.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1729
|
|
- trucks.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1717
|
+ skater.playAction("reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
|
1718
|
+ deck.playAction("a_reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
|
1719
|
+ trucks.playAction("a_reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
|
1720
|
+ #skater.playAction("reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1721
|
+ #deck.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1722
|
+ #trucks.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1723
|
+ else:
|
|
1724
|
+ skater.playAction("reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
|
1725
|
+ deck.playAction("a_reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
|
1726
|
+ trucks.playAction("a_reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
|
1727
|
+ #skater.playAction("reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1728
|
+ #deck.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1729
|
+ #trucks.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1730
|
1730
|
|
1731
|
1731
|
if requestAction == 'fak_tailg':
|
1732
|
1732
|
actionState = 'fak_tailg'
|
|
@@ -1734,19 +1734,19 @@ def main():
|
1734
|
1734
|
skater.stopAction(flip_layer)
|
1735
|
1735
|
deck.stopAction(flip_layer)
|
1736
|
1736
|
trucks.stopAction(flip_layer)
|
1737
|
|
- # skater.playAction("fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
1738
|
|
- # deck.playAction("a_fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
1739
|
|
- # trucks.playAction("a_fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
1740
|
|
- skater.playAction("fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1741
|
|
- deck.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1742
|
|
- trucks.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
1743
|
|
- else:
|
1744
|
|
- # skater.playAction("fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
1745
|
|
- # deck.playAction("a_fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
1746
|
|
- # trucks.playAction("a_fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
1747
|
|
- skater.playAction("fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1748
|
|
- deck.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1749
|
|
- trucks.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1737
|
+ skater.playAction("fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
|
1738
|
+ deck.playAction("a_fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
|
1739
|
+ trucks.playAction("a_fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)
|
|
1740
|
+ #skater.playAction("fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1741
|
+ #deck.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1742
|
+ #trucks.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
|
|
1743
|
+ else:
|
|
1744
|
+ skater.playAction("fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
|
1745
|
+ deck.playAction("a_fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
|
1746
|
+ trucks.playAction("a_fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
|
|
1747
|
+ #skater.playAction("fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1748
|
+ #deck.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
|
1749
|
+ #trucks.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
|
1750
|
1750
|
if requestAction == 'reg_tailgr':
|
1751
|
1751
|
actionState = 'reg_tailgr'
|
1752
|
1752
|
if l_actionState != 'reg_tailgr' and l_actionState != 'reg_air_tail':
|
|
@@ -1963,7 +1963,7 @@ def main():
|
1963
|
1963
|
trucks.playAction("a_reg", 1,30, layer=loop_layer, play_mode=1, speed=.5)
|
1964
|
1964
|
if requestAction == 'fak_5050':
|
1965
|
1965
|
actionState = 'fak_5050'
|
1966
|
|
- own['actionTimer'] = 0
|
|
1966
|
+ #own['actionTimer'] = 0
|
1967
|
1967
|
skater.playAction("fak_5050", 1,30, layer=loop_layer, play_mode=1, speed=.5)
|
1968
|
1968
|
deck.playAction("a_reg", 1,30, layer=loop_layer, play_mode=1, speed=.5)
|
1969
|
1969
|
trucks.playAction("a_reg", 1,30, layer=loop_layer, play_mode=1, speed=.5)
|
|
@@ -2419,7 +2419,7 @@ def main():
|
2419
|
2419
|
###################
|
2420
|
2420
|
|
2421
|
2421
|
#debug
|
2422
|
|
- #print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'])
|
|
2422
|
+ print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'])
|
2423
|
2423
|
cur_frame = skater.getActionFrame(trans_layer)
|
2424
|
2424
|
#print(cur_frame)
|
2425
|
2425
|
def printplaying():
|
|
@@ -2446,7 +2446,7 @@ def main():
|
2446
|
2446
|
#printplaying()
|
2447
|
2447
|
|
2448
|
2448
|
if actionState == 'empty':
|
2449
|
|
- print("EMPTY ACTION!!!")
|
|
2449
|
+ #print("EMPTY ACTION!!!")
|
2450
|
2450
|
skater.stopAction(loop_layer)
|
2451
|
2451
|
deck.stopAction(loop_layer)
|
2452
|
2452
|
trucks.stopAction(loop_layer)
|