dropins5

controller2.py

@@ -2203,14 +2203,17 @@ def main():
                 deck.stopAction(fliplay)
                 trucks.stopAction(fliplay)
                 killall() 
-                if own['dropinTimer'] > 30:
-                    print("dropinanim2")
+                if own['dropinCol'] == True:
                     own['requestAction'] = 'fak_dropin'
+                    own['dropinTimer'] = 60
                 else: 
                     own['requestAction'] = 'fak_onboard'
-                force = (linVelocity.x +1, linVelocity.y, linVelocity.z)
-                own.setLinearVelocity(force, True)
-                own['dropinTimer'] = 60
+                    force = (linVelocity.x +1, linVelocity.y, linVelocity.z)
+                    if own['dropinTimer'] == 0:
+                        own.setLinearVelocity(force, True)                    
+                #force = (linVelocity.x +1, linVelocity.y, linVelocity.z)
+                #own.setLinearVelocity(force, True)
+                #own['dropinTimer'] = 60
         else:
             num = own['dropinTimer']
             if num > 0:
@@ -3992,12 +3995,19 @@ def main():
     def dropinRotate():
         if own['dropinTimer'] > 30 and own['dropinTimer'] < 40:
             rot = [ 0.01, 0.0, 0]
+            vel = [linVelocity.x - .25, linVelocity.y, linVelocity.z - .01]
+            if STANCE == 1:
+                rot = [-0.01, 0.0, 0]
+                vel = [linVelocity.x + .25, linVelocity.y, linVelocity.z - .01]
             local = True
             own.applyRotation(rot,local)
-            force = (linVelocity.x - .25, linVelocity.y, linVelocity.z - .01 )
-            own.setLinearVelocity(force, local)            
+            #force = (linVelocity.x - .25, linVelocity.y, linVelocity.z - .01 )
+            own.setLinearVelocity(vel, local)            
         if own['dropinTimer'] == 50:
-            force = (linVelocity.x -1, linVelocity.y, linVelocity.z )
+            if STANCE == 1:
+                force = (linVelocity.x +1, linVelocity.y, linVelocity.z )
+            else:
+                force = (linVelocity.x -1, linVelocity.y, linVelocity.z )                    
             own.setLinearVelocity(force, True)               
 
     framenum = own['framenum']

walk.py

@@ -658,7 +658,10 @@ def getonboard():
                     else:
                         grindside = "left"                    
                     deltamove = delta[2] * .1#.25
-                    move = [-deltamove, 0, 0]
+                    if STANCE == 0:
+                        move = [-deltamove, 0, 0]
+                    else:
+                        move = [deltamove, 0, 0]                            
                     #print("1deltamove", deltamove)
                     own.applyMovement(move, True)                    
                 except: