dropins

controller2.py

@@ -2174,9 +2174,9 @@ def main():
             own["coping"] = 1
         else:
             own["coping"] = 0    
-
+    #print(own['dropinTimer'], 'dtimer')
     def onboard():
-        if own['walk'] == 1:
+        if own['walk'] == 1 and own['lasty'] == False:
             cont.deactivate(cam.actuators['replayCam'])
             cont.activate(cam.actuators['Camera'])
             killall()
@@ -2190,7 +2190,7 @@ def main():
                 killall() 
                 if own['dropinCol'] == True:
                     print("dropinanim")
-                    own['requestAction'] = reg_dropin
+                    own['requestAction'] = 'reg_dropin'
                 else:
                     own['requestAction'] = 'reg_onboard'    
                 force = (linVelocity.x -1, linVelocity.y, linVelocity.z)
@@ -2203,7 +2203,7 @@ def main():
                 killall() 
                 if own['dropinTimer'] > 30:
                     print("dropinanim2")
-                    own['requestAction'] = fak_dropin
+                    own['requestAction'] = 'fak_dropin'
                 else: 
                     own['requestAction'] = 'fak_onboard'
                 force = (linVelocity.x +1, linVelocity.y, linVelocity.z)

walk.py

@@ -221,7 +221,7 @@ if r_ground.positive and xBut == False and lastx == False:
     
 
 #idle      
-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:
+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:
     own['requestAction'] = 'reg_idle'
     if own['throw_deck'] == True:
         own['requestAction'] = 'reg_idle_nb'
@@ -231,7 +231,7 @@ if stance == 0 and skater.isPlayingAction(fliplay) == False and yBut == False an
         skater.playAction("reg_idle1", 1,120, layer=3, play_mode=1, speed=.5)
         deck.playAction("a_reg_idle1", 1,120, layer=3, play_mode=1, speed=.5)
         trucks.playAction("a_reg_idle1", 1,120, layer=3, play_mode=1, speed=.5) 
-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:
+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:
     own['requestAction'] = 'fak_idle'
     if own['throw_deck'] == True:
         own['requestAction'] = 'fak_idle_nb'
@@ -624,14 +624,16 @@ def getonboard():
             killact(4)
             killact(5)
             killact(6)
-            killact(7)                        
-            skater.playAction("nreg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-            deck.playAction("a_reg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-            trucks.playAction("a_reg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-            if lasty == False:
-                skater.playAction("nreg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
-                deck.playAction("a_reg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
-                trucks.playAction("a_reg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)                
+            killact(7) 
+            own['requestAction'] ='reg_dropin_pos' 
+            own['dropinTimer'] = 60                      
+#            skater.playAction("nreg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
+#            deck.playAction("a_reg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
+#            trucks.playAction("a_reg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
+#            if lasty == False:
+#                skater.playAction("nreg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
+#                deck.playAction("a_reg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
+#                trucks.playAction("a_reg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)                
                 
         if STANCE == 1 and dropinCol.positive == True: 
             cont.deactivate(skater.actuators['aRest'])
@@ -640,30 +642,21 @@ def getonboard():
             killact(5)
             killact(6)
             killact(7)                        
-            skater.playAction("nfak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-            deck.playAction("a_fak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-            trucks.playAction("a_fak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-            if lasty == False:
-                skater.playAction("nfak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
-                deck.playAction("a_fak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
-                trucks.playAction("a_fak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)                      
+            own['requestAction'] ='fak_dropin_pos'  
+            own['dropinTimer'] = 60                                 
+#            skater.playAction("nfak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
+#            deck.playAction("a_fak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
+#            trucks.playAction("a_fak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
+#            if lasty == False:
+#                skater.playAction("nfak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
+#                deck.playAction("a_fak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
+#                trucks.playAction("a_fak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)                      
     if getonboard == 1:
         fliplay3 = 6000 
-        onboard_speed = .1   
-#        if STANCE == 1:
-#            skater.playAction("nfak_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)
-#            deck.playAction("a_fak_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)
-#            trucks.playAction("a_fak_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)
-#        if STANCE == 0:
-#            skater.playAction("nreg_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)
-#            deck.playAction("a_reg_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)
-#            trucks.playAction("a_reg_dropin", 60,80, layer=fliplay3, priority=0, play_mode=0, speed=onboard_speed)                                    
+        onboard_speed = .1                                      
         own['getonboard'] = 0 
     if yBut == False and lasty == True:
-        own['getonboard'] = 1
-        #camera.height = -.5
-        #camera.min = .75
-        #camera.max = 1.25         
+        own['getonboard'] = 1       
 
 def nextframe():
     framenumber = own["framenum"]