breaking things

controller2.py

@@ -367,7 +367,7 @@ else:
         own['requestAction'] = 'fak_roll'
 
 #check manual_v2
-if (rUD > .04 and rUD < .07) or (rUD < -.04 and rUD > -.07):
+if (rUD > .03 and rUD < .08) or (rUD < -.03 and rUD > -.08):
 #if (rUD > .04 and rUD < .07):
     #print("zoned")    
     timer = own['manual_v2_timer']
@@ -419,14 +419,14 @@ if own['manual_v2'] == 1:
 #check manual
 ####
 #reg
-if rUD > .04 and rUD < .07 and STANCE == 0 and rLR < .035 and rLR > -.035:
+if rUD > .03 and rUD < .08 and STANCE == 0 and rLR < .035 and rLR > -.035:
     timer = own["reg_manual_timer"]
     timer = timer + 1
     own["reg_manual_timer"] = timer
     if timer > 20 and rUD < .04:
         own["reg_manual"] = 0
         #print("reg_man off")
-if rUD <= .04 and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
+if rUD <= .03 and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
     own["reg_manual_timer"] = 0
     own["reg_manual"] = 0 
     #print("reg_man off2")   
@@ -442,13 +442,13 @@ if own['last_reg_manual'] == 1 and own['reg_manual'] == 0:
       
 ####   
 #fak
-if rUD > .04 and rUD < .07 and STANCE == 1 and rLR < .035 and rLR > -.035:
+if rUD > .03 and rUD < .08 and STANCE == 1 and rLR < .035 and rLR > -.035:
     timer = own["fak_manual_timer"]
     timer = timer + 1
     own["fak_manual_timer"] = timer
     if timer > 20:
         own["fak_manual"] = 0
-if rUD <= .04 and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
+if rUD <= .03 and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
     own["fak_manual_timer"] = 0
     own["fak_manual"] = 0
 if own["fak_manual_timer"] > 10 and own["reg_manual"] == 0:
@@ -462,13 +462,13 @@ if own['last_fak_manual'] == 1 and own['fak_manual'] == 0:
  
 #####
 #reg nmanual
-if rUD < -.04 and rUD > -.07 and STANCE == 0 and rLR < .035 and rLR > -.035:
+if rUD < -.03 and rUD > -.08 and STANCE == 0 and rLR < .035 and rLR > -.035:
     timer = own["reg_nmanual_timer"]
     timer = timer + 1
     own["reg_nmanual_timer"] = timer
     if timer > 20:
         own["reg_nmanual"] = 0
-if rUD >= -.04 and (STANCE == 1 or STANCE == 0) and rUD <= .04:
+if rUD >= -.03 and (STANCE == 1 or STANCE == 0) and rUD <= .04:
     own["reg_nmanual_timer"] = 0
     own["reg_nmanual"] = 0
 
@@ -486,13 +486,13 @@ if own['last_reg_nmanual'] == 1 and own['reg_nmanual'] == 0:
 #####
 #fak nmanual
 #print (rUD)
-if rUD < -.04 and rUD > -.07 and STANCE == 1 and rLR < .035 and rLR > -.035:
+if rUD < -.03 and rUD > -.08 and STANCE == 1 and rLR < .035 and rLR > -.035:
     timer = own["fak_nmanual_timer"]
     timer = timer + 1
     own["fak_nmanual_timer"] = timer
     if timer > 20:
         own["fak_nmanual"] = 0
-if rUD >= -.04 and (STANCE == 1 or STANCE == 0) and rUD <= .04:
+if rUD >= -.03 and (STANCE == 1 or STANCE == 0) and rUD <= .04:
     own["fak_nmanual_timer"] = 0
     own["fak_nmanual"] = 0
     #print('@@@@@@@@@fak_man_off_1')
@@ -2371,20 +2371,25 @@ def air_pos():
     grindpos = own['grindpos']
     GRAB_ON = own["GRAB_ON"]
     wr = own["wallride"]
-    if rUD > .040 and r_ground.triggered == False and GRAB_ON == False and wr == None and jump_timer < 20:
+    jump_timer = own['jump_timer']
+    if rUD > .040 and r_ground.triggered == False and GRAB_ON == False and wr == None and jump_timer < 30:
         killact(2)
         killact(4)
         if STANCE == 0:
-            own['requestAction'] = 'reg_air_tail'    
+            own['requestAction'] = 'reg_air_tail'
+            print("reg_air_tail")    
         else:
             own['requestAction'] = 'fak_air_tail' 
-    elif rUD < -.040 and r_ground.triggered == False and GRAB_ON == False and wr == None and jump_timer < 20:
+            print("fak_air_tail")
+    elif rUD < -.040 and r_ground.triggered == False and GRAB_ON == False and wr == None and jump_timer < 30:
         killact(2)
         killact(4)
         if STANCE == 0:
             own['requestAction'] = 'reg_air_nose' 
+            print("reg_air_nose")
         else:
             own['requestAction'] = 'fak_air_nose' 
+            print("fak_air_nose")
 
 def air_turn_boost():
     pass
@@ -4260,5 +4265,7 @@ if r_ground.triggered and own["jump_timer"] < 20:
     force2 = [0.0, 0, -10]
     own.applyForce(force2, True)
 #print('grindtouch = ',  own['grindTouch'])
-if grindDar == False and r_ground.triggered and own['grindTouch'] == False:
-    own['grindType'] = ''
+if (grindDar == False and r_ground.triggered and own['grindTouch'] == False) or own['jump_timer'] > 40:
+    own['grindType'] = ''
+    
+#print(own['grindType'])    

grindV2.py

@@ -180,22 +180,22 @@ def main():
         #print(rot)
         
         if (rot == 90 or rot == -270) and STANCE == True:
-            print("90 fak stance")
+            #print("90 fak stance")
             own['stance'] = 1
             STANCE = 1
         if (rot == 90 or rot == -270) and STANCE == False:
-            print("90 fak stance")
+            #print("90 fak stance")
             own['stance'] = 1
             STANCE = 1
         if (rot == -90 or rot == 270) and STANCE == True:
-            print("-90 reg stance")
+            #print("-90 reg stance")
             own['stance'] = 0
             STANCE = 0
         if (rot == -90 or rot == 270) and STANCE == False:
-            print("-90 reg stance")                        
+            #print("-90 reg stance")                        
             own['stance'] = 0
             STANCE = 0
-        print("stance: ", STANCE)
+        #print("stance: ", STANCE)
     def grindrotvel(obj):        
         skipconst = 1
         #print("set jumponinit")              
@@ -609,7 +609,7 @@ def main():
 
         #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'] < 50 and invert_on == False and own['air_mover'] == False and no_grind_pull == 0:
+        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:
             #print("grind")    
             hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
             if grindold == 0: