grind corner aligns

scripts/controller2.py

     localRay = groundRay
     own['vert'] = 0
     own['transition'] = False
+    aligned = False
     #if localRay[0] or grindRay[0]:
     if localRay[0]:
 
             if localRay[2] != [0, 0, -1]:    
                 #own.alignAxisToVect(localRay[2], 2, .25)
                 own.alignAxisToVect(localRay[2], 2, .5)
+                aligned = True
             #print('localRay')
 
 
                         #print('moving new rayb')
                         if localRay[2] != [0, 0, -1] and grindHit == 0:
                             own.alignAxisToVect(localRay[2], 2, .25)
+                            aligned = True
 
     else:
         #print('vh')
             localHitDist = Vector.copy(Start - localRay_v[1]).length
             own.linearVelocity.x *= .98
             own.linearVelocity.z = .1
-            if localHitDist < .8 and (dict['lUD'] < .04 or dict['lUD'] > -.04):
+            #if localHitDist < .8 and (dict['lUD'] < .04 or dict['lUD'] > -.04):
+            if localHitDist < .8:    
                 #own.applyMovement((0,0,((.4 - (localHitDist) * .1))), True)
-                own.applyMovement((0, 0, (.287 - localHitDist)), True)
+                own.applyMovement((0, 0, (.4 - localHitDist)), True)
                 #print('moving vert ray')
                 if localRay_v[2] != [0, 0, -1] and grindHit == 0:
                 #if localRay_v[2] != [0,0,-1]:
-                    own.alignAxisToVect(localRay_v[2], 2, .3)
+                    own.alignAxisToVect(localRay_v[2], 2, .4)
+                    aligned = True
         #print(own['lGobj'], 'lGobj')                         
 
 
         if rayf[0]:
             print('rayf hit')
             own.alignAxisToVect(rayf[2], 2, .2)
+            aligned = True
         elif rayb[0]:
             own.alignAxisToVect(rayb[2], 2, .2)
+            aligned = True
             print('rayb hit')
 
     #print(raytof, raytob)
 
-
-
+    if not aligned:
+        own.alignAxisToVect([0.0, 0.0, 1.0], 2, .03)
 
     if own.linearVelocity.x > 12:
         own.linearVelocity.x = 12

scripts/grindV2.py

 
     if grindold == 1:
         no_grind = 0
-    #don't grind unless you were in the air recently or were on a ramp recently or were grinding.
-
-    #if (own['onramp'] == 0 and frames_since_grind > 30):
-        #no_grind = 1
-
-    #if frames_since_grind > 30:
-        #no_grind = 0
 
     if frames_since_ground > 30 or since_jumped < 120:
         no_grind = 0
     if jump_timer > 50:
         no_grind = 1
-    if grindold == 0 and  (dict['lUD'] < -.04 or dict['lUD'] > .04):
-        no_grind = 1
-
-    #print('no grind timer', no_grind, own['no_grind_timer'])
-
 
     if (own['fak_nmanual'] == 1 or own['reg_nmanual'] == 1 or own['fak_manual'] == 1 or own['reg_manual'] == 1):
         manual = 1
     else:
         manual = 0
-    #manual = own['manual']
+
     own["nogrindsound"] = 0
     no_grind = 1
-    if (dict['rBump'] == 1 or own['vert'] == 0):
-    #print(own['last_vert_frame'])
-    #if (dict['rBump'] == 1 or (framenum - own['last_vert_frame'] < 10) and own['vert'] == 0):
+    
+    if (framenum - own['last_vert_frame'] < 40) and own['vert'] == 0:
+        no_grind = 1
+        print('no_grind = 1 last vert = ', (framenum - own['last_vert_frame']))
+    if dict['rBump'] == 1:
         no_grind = 0
-        #print('no_grind = 0')
+
     if own['LAST_GRIND']:
         no_grind = 0
-    # if (dict['lUD'] < -.04 or dict['lUD'] > .04):
-    #     no_grind = 0
+    
 #---------###########___###########-----------
 #start new                     #######
 ##----------##############----------############