grind fixes

Manager.py

@@ -353,11 +353,19 @@ def main():
             camspeed2 = .1 #.055
             camrot1 = .02 #.005
             camrot2 = .04 #.02
+#            perc = (lUD * 100 * (10 / 80)) *2
+#            perc = round(perc,2)
+#            print(perc)
+#            perc = .025 * perc
+#            newUD = (lUD * .1) * 5
+#            if lUD > .0005 or lUD < -.0005:
+#                camspeed1 = abs(perc)
+#                camspeed2 = abs(perc)
             #up
             if lUD < -0.080:
                 followcam.actuators["up"].dLoc = [ 0, 0, -camspeed2]
                 cont.activate(followcam.actuators["up"])
-                #print("fastup")
+                print("fastup")
             else:
                 cont.deactivate(followcam.actuators["up"])    
     #            #down    

controller2.py

@@ -2205,8 +2205,10 @@ def main():
                 own['airup'] = 1
             if pos > own['last_posz']:
                 own["air_height"] = pos  
-            own['last_posz'] = pos
-            
+            own['last_posz'] = pos   
+        else:
+            own['airup'] = 0  
+              
     def onramp():
         if r_ground.positive:
             if 'ramp' in r_ground.hitObject:

grindV2.py

@@ -116,7 +116,9 @@ def main():
          velx = linVelocity2.x
          vely = linVelocity2.y     
     if abs(own['pregrind_vely']) > abs(vely) and own['LAST_GRIND'] == 0:
-        convely = own['pregrind_vely']
+        #convely = own['pregrind_vely']
+        #print('changing convely')
+        convely = vely
     else:
         convely = vely  
     def grindvect(obj):
@@ -478,22 +480,25 @@ def main():
                 minDist = dist
         if nearestObject != None:                            
             own.linearVelocity.x = 0
-            own.linearVelocity.y = 0
-               
-            
+            own.linearVelocity.y = 0            
     
-    if grindDar.positive == False and grindTouch.positive and grindold == 0 and dropin == 0 and grind_jump == 0 and own["grindoutturn"] == 0 and gt_cd == 0 and manual == 0 and no_grind == 0 and nearestObject != lastObject and own['grindjumpturn'] == 0 and own['gt_cd2'] == 0 and own['air_mover'] == False:
+    if grindDar.positive == False and grindTouch.triggered and grindold == 0 and dropin == 0 and grind_jump == 0 and own["grindoutturn"] == 0 and gt_cd == 0 and manual == 0 and no_grind == 0 and nearestObject != lastObject and own['grindjumpturn'] == 0 and own['gt_cd2'] == 0 and own['air_mover'] == False:
         #print("touching, no dar")
         pass
     #print(grindold, "grindold")        
-    if grindDar.positive:
-        detectedObjects = grindDar.hitObjectList
-        dist = 0
-        for obj in detectedObjects:
-            dist = own.getDistanceTo(obj)
-            if (minDist is None or dist < minDist):
-                nearestObject = obj
-                minDist = dist     
+    if grindDar.positive or grindTouch.positive:        
+        if grindDar.positive:
+            detectedObjects = grindDar.hitObjectList
+            dist = 0
+            for obj in detectedObjects:
+                dist = own.getDistanceTo(obj)
+                if (minDist is None or dist < minDist):
+                    nearestObject = obj
+                    minDist = dist     
+        elif grindTouch.positive:
+            nearestObject = grindTouch.hitObject
+            dist = .7
+            #print('using touch object')                    
         
 #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@        
         #init grind
@@ -504,18 +509,12 @@ def main():
         else:
             own['inverting'] = False
         grind_dist = .8#.6
-        if dist < grind_dist and grindold == 0 and dropin == 0 and grind_jump == 0 and own["grindoutturn"] == 0 and gt_cd == 0 and manual == 0 and no_grind == 0 and nearestObject != lastObject and own['grindjumpturn'] == 0 and own['gt_cd2'] == 0 and invert_on == False and own['air_mover'] == False and no_grind_pull == 0:   
-            #print("new grind trigger")           
-            npos = nearestObject.worldPosition
-            
-            
-        #grind
-        #print(dist)
-        if dist < grind_dist and dropin == 0 and grind_jump == 0 and manual == 0 and no_grind == 0 and own['airup'] == 0 and own['grindoutturn'] == 0 and own['grindjumpturn'] == 0 and own['manual'] == 0 and own['gt_cd2'] < 55 and invert_on == False and own['air_mover'] == False and no_grind_pull == 0 and own['last_invert'] == False:
-            #print("grind")    
+
+        if dist < grind_dist and dropin == 0 and manual == 0 and no_grind == 0 and own['grindoutturn'] == 0 and own['manual'] == 0 and own['gt_cd2'] < 40 and invert_on == False and own['air_mover'] == False and no_grind_pull == 0 and own['last_invert'] == False and own['grindjumpturn'] == 0 and grind_jump == 0 and own['airup'] == 0:
+            #print('grind')      
             hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
             if grindold == 0:
-                if grindTouch.positive:
+                if grindTouch.triggered:
                     nearpos = nearestObject.worldPosition
                     if hitNormal != None:
                         stre = .05
@@ -523,8 +522,6 @@ def main():
                         #print("align")                   
                     own.worldPosition = [nearpos.x, nearpos.y, nearpos.z + .2975]
                     #print('moving world')
-
-
             #print("grinding")
             grind_height_dif = (own.worldPosition[2] - nearestObject.worldPosition[2]) - .287
             worldPos = own.worldPosition
@@ -534,8 +531,18 @@ def main():
                 grind(nearestObject)
                 grindold = True
                 own['grindold_timer'] = 0
-                own["grindHit"] = True                
-
+                own["grindHit"] = True
+                own['grindnew_timer'] += 1
+                
+                if own['grindnew_timer'] < 1:
+                    if grindTouch.triggered:
+                        nearpos = nearestObject.worldPosition
+                        if hitNormal != None:
+                            stre = .05
+                            own.alignAxisToVect(hitNormal, 2, stre) 
+                            #print("align")                   
+                        own.worldPosition = [nearpos.x, nearpos.y, nearpos.z + .2975]
+                        print('new moving world')                    
 
     else:
         #grindold = False 
@@ -548,7 +555,9 @@ def main():
         own['grind_start_frame'] = framenum
         own["grindSound"] = None
     
-    
+    if own['grindHit'] == False:
+        own['grindnew_timer'] = 0  
+ 
 #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@    
        
 #if you are touching grinder and last_manual is off keep manual off
@@ -616,9 +625,6 @@ def main():
         #own.alignAxisToVect(vect, 0, 0)
         own.worldPosition = [nearestObject.worldPosition.x, nearestObject.worldPosition.y, nearestObject.worldPosition.z +.1]
        #own.setLinearVelocity([0, 0.0, 0], 1)                    
-
-
-
             
     def set_pregrind_vel():
         if grindDar.triggered == False and ray.triggered == False:
@@ -639,9 +645,12 @@ def main():
         
     if grindDar_timer > 0:
         grindDar_timer -= 1
-    if grindDar_timer > 0 and ray.triggered == False and touched == True  and own['footplant_on'] == False and manual == 0:
+    if ray.triggered == False and touched == True  and own['footplant_on'] == False and manual == 0 and own['gt_cd2'] < 55 and own['grindoutturn'] == 0 and own['grindjumpturn'] == 0 :        
         obj = grindTouch.hitObject 
-        own.worlPosition = obj.worldPosition
+        try:
+            nearpos = obj.worldPosition
+        except:
+            pass    
     if ray.triggered == False:
         own["nogrindsound"] = 1                               
     timer()    

scene_init.py

@@ -150,6 +150,7 @@ def main():
     cam['sun_pos_y'] = dict['sun_rot_y']
     #cam['shadow_on'] = dict['shadow_on']
     cam['dof_on'] = dict['dof_on']
-    cam['bloom_on'] = dict['bloom_on']    
+    cam['bloom_on'] = dict['bloom_on'] 
+    own['grindnew_timer'] = 0   
            
 main()

walk.py

@@ -342,6 +342,9 @@ def onboard():
             trucks.stopAction(truckon)
             own['requestAction'] = 'fak_offboard'                          
 def jump():
+    #limit fall speed
+    if linvel.z < -10:
+        own.linearVelocity.z = -10
     if xBut == True or dict['kb_space'] == 1: 
         if own['lastx'] == 0:
             killact(3)
@@ -359,8 +362,9 @@ def jump():
             force = [ 0.0, 0.0, JUMPHEIGHT]
             # use local axis
             local = False
-            # apply force
-            own.applyForce(force, local)
+            # apply force -- limit jump speed
+            if linvel.z < 10:
+                own.applyForce(force, local)
         own['lastx'] = 1
     else:
         own['lastx'] = 0