|
@@ -221,7 +221,7 @@ if r_ground.positive and xBut == False and lastx == False:
|
221
|
221
|
|
222
|
222
|
|
223
|
223
|
#idle
|
224
|
|
-if stance == 0 and skater.isPlayingAction(fliplay) == False and yBut == False and r_ground.triggered and xBut == False and noidle == 0 and own['walk_idling'] == 0 and own['sit'] == 0:
|
|
224
|
+if stance == 0 and skater.isPlayingAction(fliplay) == False and yBut == False and r_ground.triggered and xBut == False and noidle == 0 and own['walk_idling'] == 0 and own['sit'] == 0 and own['dropinTimer'] == 0 and own['lasty'] == False:
|
225
|
225
|
own['requestAction'] = 'reg_idle'
|
226
|
226
|
if own['throw_deck'] == True:
|
227
|
227
|
own['requestAction'] = 'reg_idle_nb'
|
|
@@ -231,7 +231,7 @@ if stance == 0 and skater.isPlayingAction(fliplay) == False and yBut == False an
|
231
|
231
|
skater.playAction("reg_idle1", 1,120, layer=3, play_mode=1, speed=.5)
|
232
|
232
|
deck.playAction("a_reg_idle1", 1,120, layer=3, play_mode=1, speed=.5)
|
233
|
233
|
trucks.playAction("a_reg_idle1", 1,120, layer=3, play_mode=1, speed=.5)
|
234
|
|
-if stance == 1 and skater.isPlayingAction(fliplay) == False and yBut == False and r_ground.triggered and xBut == False and noidle == 0 and own['walk_idling'] == 0 and own['sit'] == 0:
|
|
234
|
+if stance == 1 and skater.isPlayingAction(fliplay) == False and yBut == False and r_ground.triggered and xBut == False and noidle == 0 and own['walk_idling'] == 0 and own['sit'] == 0 and own['dropinTimer'] == 0 and own['lasty'] == False:
|
235
|
235
|
own['requestAction'] = 'fak_idle'
|
236
|
236
|
if own['throw_deck'] == True:
|
237
|
237
|
own['requestAction'] = 'fak_idle_nb'
|
|
@@ -624,14 +624,16 @@ def getonboard():
|
624
|
624
|
killact(4)
|
625
|
625
|
killact(5)
|
626
|
626
|
killact(6)
|
627
|
|
- killact(7)
|
628
|
|
- skater.playAction("nreg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
629
|
|
- deck.playAction("a_reg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
630
|
|
- trucks.playAction("a_reg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
631
|
|
- if lasty == False:
|
632
|
|
- skater.playAction("nreg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
633
|
|
- deck.playAction("a_reg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
634
|
|
- trucks.playAction("a_reg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
|
627
|
+ killact(7)
|
|
628
|
+ own['requestAction'] ='reg_dropin_pos'
|
|
629
|
+ own['dropinTimer'] = 60
|
|
630
|
+# skater.playAction("nreg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
|
631
|
+# deck.playAction("a_reg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
|
632
|
+# trucks.playAction("a_reg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
|
633
|
+# if lasty == False:
|
|
634
|
+# skater.playAction("nreg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
|
635
|
+# deck.playAction("a_reg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
|
636
|
+# trucks.playAction("a_reg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
635
|
637
|
|
636
|
638
|
if STANCE == 1 and dropinCol.positive == True:
|
637
|
639
|
cont.deactivate(skater.actuators['aRest'])
|
|
@@ -640,30 +642,21 @@ def getonboard():
|
640
|
642
|
killact(5)
|
641
|
643
|
killact(6)
|
642
|
644
|
killact(7)
|
643
|
|
- skater.playAction("nfak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
644
|
|
- deck.playAction("a_fak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
645
|
|
- trucks.playAction("a_fak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
646
|
|
- if lasty == False:
|
647
|
|
- skater.playAction("nfak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
648
|
|
- deck.playAction("a_fak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
649
|
|
- trucks.playAction("a_fak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
|
645
|
+ own['requestAction'] ='fak_dropin_pos'
|
|
646
|
+ own['dropinTimer'] = 60
|
|
647
|
+# skater.playAction("nfak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
|
648
|
+# deck.playAction("a_fak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
|
649
|
+# trucks.playAction("a_fak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
|
|
650
|
+# if lasty == False:
|
|
651
|
+# skater.playAction("nfak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
|
652
|
+# deck.playAction("a_fak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
|
653
|
+# trucks.playAction("a_fak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
|
650
|
654
|
if getonboard == 1:
|
651
|
655
|
fliplay3 = 6000
|
652
|
|
- onboard_speed = .1
|
653
|
|
-# if STANCE == 1:
|
654
|
|
-# skater.playAction("nfak_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)
|
655
|
|
-# deck.playAction("a_fak_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)
|
656
|
|
-# trucks.playAction("a_fak_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)
|
657
|
|
-# if STANCE == 0:
|
658
|
|
-# skater.playAction("nreg_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)
|
659
|
|
-# deck.playAction("a_reg_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)
|
660
|
|
-# trucks.playAction("a_reg_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)
|
|
656
|
+ onboard_speed = .1
|
661
|
657
|
own['getonboard'] = 0
|
662
|
658
|
if yBut == False and lasty == True:
|
663
|
|
- own['getonboard'] = 1
|
664
|
|
- #camera.height = -.5
|
665
|
|
- #camera.min = .75
|
666
|
|
- #camera.max = 1.25
|
|
659
|
+ own['getonboard'] = 1
|
667
|
660
|
|
668
|
661
|
def nextframe():
|
669
|
662
|
framenumber = own["framenum"]
|