misc airs

scripts/co_ActionState.py

             requestAction = 'fak_air_tail to manual'                                    
             
         if l_actionState == 'fak_air_nose to nmanual' and requestAction in ['reg_land', 'fak_land'] and own['actionTimer'] > 1:
-            requestAction = 'fak_air_nose to nmanual'                                               
+            requestAction = 'fak_air_nose to nmanual'            
+
+        if requestAction in ['fak_land', 'reg_land']:  
+            requestAction = own['lland']
+        if l_actionState == 'reg_air-roll' and requestAction == 'fak_landL':
+            requestAction = 'reg_landL'    
+        if l_actionState == 'reg_air-roll' and requestAction == 'fak_landLb':
+            requestAction = 'reg_landLb'
+        if l_actionState == 'reg_air-roll' and requestAction == 'fak_landR':
+            requestAction = 'reg_landR'    
+        if l_actionState == 'reg_air-roll' and requestAction == 'fak_landRb':
+            requestAction = 'reg_landRb'    
+        if l_actionState == 'reg_air-roll' and requestAction == 'fak_land':
+            requestAction = 'reg_land'            
+        if l_actionState == 'fak_air-roll' and requestAction == 'reg_landL':
+            requestAction = 'fak_landL'    
+        if l_actionState == 'fak_air-roll' and requestAction == 'reg_landLb':
+            requestAction = 'fak_landLb'
+        if l_actionState == 'fak_air-roll' and requestAction == 'reg_landR':
+            requestAction = 'fak_landR'    
+        if l_actionState == 'fak_air-roll' and requestAction == 'reg_landRb':
+            requestAction = 'fak_landRb'            
+        if l_actionState == 'fak_air-roll' and requestAction == 'reg_land':
+            requestAction = 'fak_land'                
 #---------------------------------------------------                                                                                  
                                                                                   
                                                                                                                                                         
     if trans_playing:
         cur_frame = skater.getActionFrame(trans_layer)  
         cur_frame = round(cur_frame, 2)     
-    #print('oG: ', og_request, 'rA:', requestAction, '|aS:', own['actionState'], 'q', queueAction, own['actionTimer'], 'cf', cur_frame)
+    print('oG: ', og_request, 'rA:', requestAction, '|aS:', own['actionState'], 'q', queueAction, own['actionTimer'], 'cf', cur_frame)
     #print('rA:', requestAction, '|aS:', own['actionState'], own['actionTimer'], 'cf', cur_frame)
     cur_frame = skater.getActionFrame(trans_layer)
     #print(cur_frame)

scripts/controller2.py

         balance = 0
     #print(balance)
     #if ground_since > 0 and ground_since < 5 and jump_timer < 30:
-    if ground_since > -1 and ground_since < 2000000:
+    if ground_since > -1 and ground_since < 200:
         #print(balance, 'balance')
-        sens = 2
-        sens2 = .6
+        sens = 1.8
+        sens2 = .2
         sens3 = 1.2
         if balance > sens or balance < - sens:
             #fall
         Distance = -2
         End = Vector.copy(own.worldPosition + (own.worldOrientation.col[Axis]*Distance))
         Start = Vector.copy(own.worldPosition)
-        localRay_v = own.rayCast(End, Start, 0, 'vert', 1, 0, 0)
+        localRay_v = own.rayCast(End, Start, 0, 'vert', 1, 0, 0, 61439)
         if localRay_v[0] and own['LAST_GRIND'] == False and rBump == 0 and ((own['framenum'] - own['last_transition_frame'] < 10) or (own['framenum'] - own['last_vert_frame'] < 10)):
             own['vert'] = 1
+            print('vert hit')
             own['last_vert_frame'] = own['framenum']
             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:    
+            #if localHitDist < .8:    
+            if localHitDist < 1.5:        
                 #own.applyMovement((0,0,((.4 - (localHitDist) * .1))), True)
-                own.applyMovement((0, 0, (.4 - localHitDist)), True)
+                own.applyMovement((0, 0, (.3 - localHitDist)), True)
                 #print('moving vert ray')
                 if localRay_v[2] != [0, 0, -1] and grindHit == 0:
                 #if localRay_v[2] != [0,0,-1]:
             aligned = True
             print('rayb hit')
 
-    #print(raytof, raytob)
 
     if not aligned:
-        own.alignAxisToVect([0.0, 0.0, 1.0], 2, .03)
+        own.alignAxisToVect([0.0, 0.0, 1.0], 2, .00003)
 
     if own.linearVelocity.x > 12:
         own.linearVelocity.x = 12
         elif land_overRideRb == True:
             own['requestAction'] = 'fak_landRb'
             print('requesting unbalanced land2b')
+    if own['requestAction'] in ['fak_land', 'reg_land', 'fak_landL', 'reg_landR', 'fak_landRb', 'reg_landLb']:
+        own['lland'] = own['requestAction']

scripts/grindV2.py

         no_grind = 0
         own['no_grind_timer'] -= 1
 
-    if grindold == 1:
-        no_grind = 0
+    
 
-    if frames_since_ground > 30 or since_jumped < 120:
-        no_grind = 0
-    if jump_timer > 50:
-        no_grind = 1
+    # if frames_since_ground > 30 or since_jumped < 120:
+    #     no_grind = 0
+    # if jump_timer > 50:
+    #     no_grind = 1
 
     if (own['fak_nmanual'] == 1 or own['reg_nmanual'] == 1 or own['fak_manual'] == 1 or own['reg_manual'] == 1):
         manual = 1
     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:
+    if dict['rBump'] == 1 or (framenum - own['last_vert_frame'] > 40):
         no_grind = 0
 
     if own['LAST_GRIND']:
         no_grind = 0
-    
+
+    if grindold == 1:
+        no_grind = 0
 #---------###########___###########-----------
 #start new                     #######
 ##----------##############----------############

scripts/scene_init.py

         own['last_vert_frame'] = 0
         own['ragdoll_active'] = False
         own['rd_to_delete'] = None
+        own['lland'] = ''
         
         colors.update_shirt_tex() 
         colors.update_truck_tex()