more

co_ActionState.py

@@ -312,7 +312,7 @@ def main():
                 deck.stopAction(trans_layer)
                 print("stopping loop and trans")                                
                 actionState = 'reg_land'
-                own['actionTimer'] = 39
+                own['actionTimer'] = 37
                 skater.playAction("reg_land", 1,20, layer=trans_layer, play_mode=0, speed=.5)
                 deck.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)
                 trucks.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)                        
@@ -325,7 +325,7 @@ def main():
                 skater.stopAction(trans_layer)
                 trucks.stopAction(trans_layer)
                 deck.stopAction(trans_layer)                                
-                own['actionTimer'] = 39
+                own['actionTimer'] = 37
                 skater.playAction("fak_land", 1,20, layer=trans_layer, play_mode=0, speed=.5)                        
                 deck.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)
                 trucks.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)        

controller2.py

@@ -4152,6 +4152,7 @@ def air_mover():
             
             own.applyForce(force2, True)
             #own.applyForce([0,0,5], False)
+            own['no_grind_pull'] = 1
     if r_ground.triggered == False and jump_timer > 10 and lUD > 0.075 and frames_since_grinding > 50:
         #print(lUD)
         print("air_mover", jump_timer)
@@ -4163,9 +4164,17 @@ def air_mover():
         own.applyForce(force2, True)
         own.applyForce([0,0,5], False)
         own['air_mover'] = True
+        own['no_grind_pull'] = 1
     else:
-        own['air_mover'] = False        
+        own['air_mover'] = False 
         
+        
+framenum = own['framenum']
+last_ground_frame = own['lF_ground_frame']
+lF_air_frame = own['lF_air_frame']
+frames_since_ground = framenum - lF_air_frame               
+if framenum - lF_air_frame > 30:
+    own['no_grind_pull'] = 0           
 #if grindHit == 1:
 #    skater.applyRotation([0,0,.05], False)
 #    deck.applyRotation([0,0,.05], False)

grindV2.py

@@ -80,7 +80,11 @@ def main():
     #print("--------frame: ", own['framenum'])
     #inertia = player.linearVelocity
     #print(rotz)
-
+    try:
+        no_grind_pull = own['no_grind_pull']
+    except:    
+        own['no_grind_pull'] = 0
+        no_grind_pull = 0
     #no grind
     no_grind = 0
     if jump_timer > 50:
@@ -564,7 +568,7 @@ def main():
             #print('invertOn')
 
         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:
+        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:
         #if grindold == 0 and dropin == 0 and grind_jump == 0 and manual == 0 and no_grind == 0 and nearestObject != lastObject:    
             print("new grind trigger")           
             npos = nearestObject.worldPosition
@@ -582,7 +586,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:
+        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:
             #print("grind")    
             hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
             if grindold == 0: