sit and dropin sensors fix

scripts/walk.py

@@ -426,18 +426,21 @@ def main(cont):
                     own['walk_jump_timer'] = 20
             own['lastx'] = 1
         else:
-            own['lastx'] = 0
-    def dropin():
-        if dropinCol.positive == True:
-            pass       
+            own['lastx'] = 0  
             
-    def getonboard(dict):
-        #print(dict['kb_q'])
+    def getonboard(dict, cont):
+        grindDar = cont.sensors['grindDar2']
         getonboard = own['getonboard']
         fliplay2 = 50#8560
         if ((yBut == True and dict['last_yBut'] == False) or dict['kb_q'] == 2):# and (cont.sensors["vehicleNear"].positive == False and own['throw_deck'] == False):
-            fliplay3 = fliplay2 + 1 
-            if dropinCol.positive == True: 
+            fliplay3 = fliplay2 + 1
+            dar = 0 
+            if grindDar.hitObjectList != None:
+                for x in grindDar.hitObjectList:
+                    to_grinder = (x.worldPosition - own.worldPosition).length
+                    if 'coping' in x and to_grinder < .36:
+                        dar = 1
+            if dropinCol.positive == True or dar == 1: 
                 nearestObject = None
                 grindEmpty = scene.objects['grindEmpty']
                 grindDar = grindEmpty.sensors['grindDar2']
@@ -450,36 +453,36 @@ def main(cont):
                         if (minDist is None or dist < minDist):
                             nearestObject = obj
                             minDist = dist
-                if nearestObject != None:
-                    #print(nearestObject)
-                    obj = nearestObject
-                    player_e = own.worldOrientation.to_euler()
-                    player_pos = own.worldPosition
-                    player_rotz = math.degrees(player_e[2])                
-                    grinder_e = obj.worldOrientation.to_euler()
-                    grinder_rotz = math.degrees(grinder_e[2])            
-                    rot = player_rotz - grinder_rotz  
-                    grinder_pos = obj.worldPosition 
-                    worldVect = [1, 0, 0]
-                    vect = obj.getAxisVect(worldVect)      
-                    go = obj.worldOrientation
-                    grinder_axis = [1,0,0] 
-                    try: 
-                        delta = player_pos - grinder_pos
+                # if nearestObject != None:
+                #     #print(nearestObject)
+                #     obj = nearestObject
+                #     player_e = own.worldOrientation.to_euler()
+                #     player_pos = own.worldPosition
+                #     player_rotz = math.degrees(player_e[2])                
+                #     grinder_e = obj.worldOrientation.to_euler()
+                #     grinder_rotz = math.degrees(grinder_e[2])            
+                #     rot = player_rotz - grinder_rotz  
+                #     grinder_pos = obj.worldPosition 
+                #     worldVect = [1, 0, 0]
+                #     vect = obj.getAxisVect(worldVect)      
+                #     go = obj.worldOrientation
+                #     grinder_axis = [1,0,0] 
+                #     try: 
+                #         delta = player_pos - grinder_pos
                         
-                        delta = delta.cross(vect)
-                        if delta[2] >= 0:
-                            grindside = "right"
-                        else:
-                            grindside = "left"                    
-                        deltamove = delta[2] * .1#.25
-                        if STANCE == 0:
-                            move = [-deltamove, 0, 0]
-                        else:
-                            move = [deltamove, 0, 0]                            
-                        own.applyMovement(move, True)                    
-                    except:
-                        pass 
+                #         delta = delta.cross(vect)
+                #         if delta[2] >= 0:
+                #             grindside = "right"
+                #         else:
+                #             grindside = "left"                    
+                #         deltamove = delta[2] * .1#.25
+                #         if STANCE == 0:
+                #             move = [-deltamove, 0, 0]
+                #         else:
+                #             move = [deltamove, 0, 0]                            
+                #         own.applyMovement(move, True)                    
+                #     except:
+                #         pass 
 
                 if STANCE == 0: 
                     own['requestAction'] ='reg_dropin_pos' 
@@ -804,7 +807,7 @@ def main(cont):
                 killact(299)
             own['sit'] = 0
 
-        if aBut == False and lasta == True:
+        if aBut == True and lasta == False:
             try:
                 if 'sit' in r_ground.hitObject:
                     #print("sit")
@@ -1240,12 +1243,12 @@ def main(cont):
 
     onboard() 
     jump()
-    dropin()
+    #dropin()
     throwdeck_trigger()
 
     nextframe()
     checkidle()
-    getonboard(dict)
+    getonboard(dict, cont)
     reset_pos()
     switchcam()
     move_flycam()