more grindouts2

co_ActionState.py

@@ -200,16 +200,16 @@ def main():
         if l_actionState == 'fak_stop' and requestAction != 'fak_stop':
             requestAction = 'fak_stop_out'
             actionState = 'fak_stop_out' 
-        if l_actionState == 'reg_noseslide' and requestAction != 'reg_noseslide':
+        if l_actionState == 'reg_noseslide' and requestAction != 'reg_noseslide' and requestAction != 'fak_tailslide':
             requestAction = 'reg_noseslide_out'
             actionState = 'reg_noseslide_out'
-        if l_actionState == 'fak_noseslide' and requestAction != 'fak_noseslide':
+        if l_actionState == 'fak_noseslide' and requestAction != 'fak_noseslide' and requestAction != 'reg_tailslide':
             requestAction = 'fak_noseslide_out'
             actionState = 'fak_noseslide_out'
-        if l_actionState == 'reg_tailslide' and requestAction != 'reg_tailslide':
+        if l_actionState == 'reg_tailslide' and requestAction != 'reg_tailslide' and requestAction != 'fak_noseslide':
             requestAction = 'reg_tailslide_out'
             actionState = 'reg_tailslide_out'     
-        if l_actionState == 'fak_tailslide' and requestAction != 'fak_tailslide':
+        if l_actionState == 'fak_tailslide' and requestAction != 'fak_tailslide' and requestAction != 'reg_noseslide':
             requestAction = 'fak_tailslide_out'
             actionState = 'fak_tailslide_out' 
         if l_actionState == 'reg_5050' and requestAction != 'reg_5050' and requestAction != 'reg-fak_5050':
@@ -2357,7 +2357,7 @@ def main():
 
             if requestAction == 'reg_tailslide':
                 actionState = 'reg_tailslide'
-                if l_actionState != 'reg_tailslide' and l_actionState != 'reg_air_tail' and l_actionState != 'reg_tailslide_out':
+                if l_actionState != 'reg_tailslide' and l_actionState != 'reg_air_tail' and l_actionState != 'reg_tailslide_out' and l_actionState != 'fak_noseslide':
                     skater.stopAction(flip_layer)
                     deck.stopAction(flip_layer)
                     trucks.stopAction(flip_layer)                    
@@ -2370,7 +2370,7 @@ def main():
                     trucks.playAction("a_fak_noses", 30,1, layer=loop_layer, play_mode=1, speed=.5)                    
             if requestAction == 'fak_tailslide':
                 actionState = 'fak_tailslide'
-                if l_actionState != 'fak_tailslide' and l_actionState != 'fak_air_tail' and l_actionState != 'reg_tailslide_out':
+                if l_actionState != 'fak_tailslide' and l_actionState != 'fak_air_tail' and l_actionState != 'reg_tailslide_out' and l_actionState != 'reg_noseslide':
                     skater.stopAction(flip_layer)
                     deck.stopAction(flip_layer)
                     trucks.stopAction(flip_layer)                    
@@ -2384,7 +2384,7 @@ def main():
 
             if requestAction == 'reg_noseslide':
                 actionState = 'reg_noseslide'
-                if l_actionState != 'reg_noseslide' and l_actionState != 'reg_air_nose' and l_actionState != 'reg_tailslide_out':
+                if l_actionState != 'reg_noseslide' and l_actionState != 'reg_air_nose' and l_actionState != 'reg_tailslide_out' and l_actionState != 'fak_tailslide':
                     skater.stopAction(flip_layer)
                     deck.stopAction(flip_layer)
                     trucks.stopAction(flip_layer)                    
@@ -2397,7 +2397,7 @@ def main():
                     trucks.playAction("a_fak_tails", 30,1, layer=loop_layer, play_mode=1, speed=.5)                    
             if requestAction == 'fak_noseslide':
                 actionState = 'fak_noseslide'
-                if l_actionState != 'fak_noseslide' and l_actionState != 'fak_air_nose' and l_actionState != 'reg_tailslide_out':
+                if l_actionState != 'fak_noseslide' and l_actionState != 'fak_air_nose' and l_actionState != 'reg_tailslide_out' and l_actionState != 'reg_tailslide':
                     skater.stopAction(flip_layer)
                     deck.stopAction(flip_layer)
                     trucks.stopAction(flip_layer)                    

grindV2.py

@@ -52,6 +52,7 @@ def main():
     last_ground_frame = own['lF_ground_frame']
     frames_since_ground = framenum - last_ground_frame
     frames_since_grind = framenum - lgf
+    frames_grinding = framenum - gsf
     #if framenum - lgf > 60:
     minus = framenum - gsf
     grindspeed_rail = .996 #multiplied by current speed
@@ -178,23 +179,26 @@ def main():
         rot = round((rot * .01), 1)
         rot *= 100
         #print(rot)
-        
-        if (rot == 90 or rot == -270) and STANCE == True:
-            #print("90 fak stance")
-            own['stance'] = 1
-            STANCE = 1
-        if (rot == 90 or rot == -270) and STANCE == False:
-            #print("90 fak stance")
-            own['stance'] = 1
-            STANCE = 1
-        if (rot == -90 or rot == 270) and STANCE == True:
-            #print("-90 reg stance")
-            own['stance'] = 0
-            STANCE = 0
-        if (rot == -90 or rot == 270) and STANCE == False:
-            #print("-90 reg stance")                        
-            own['stance'] = 0
-            STANCE = 0
+
+
+        if frames_grinding > 20: 
+            print("setting stance")       
+            if (rot == 90 or rot == -270) and STANCE == True:
+                #print("90 fak stance")
+                own['stance'] = 1
+                STANCE = 1
+            if (rot == 90 or rot == -270) and STANCE == False:
+                #print("90 fak stance")
+                own['stance'] = 1
+                STANCE = 1
+            if (rot == -90 or rot == 270) and STANCE == True:
+                #print("-90 reg stance")
+                own['stance'] = 0
+                STANCE = 0
+            if (rot == -90 or rot == 270) and STANCE == False:
+                #print("-90 reg stance")                        
+                own['stance'] = 0
+                STANCE = 0
         #print("stance: ", STANCE)
     def grindrotvel(obj):        
         skipconst = 1
@@ -546,10 +550,6 @@ def main():
             if grinder_rot < 0:
                 grinder_rot = abs(grinder_rot) + 180                   
             subtraction = player_rot - grinder_rot
-
-            
-    #else:
-        #own['grind_rot'] = None 
         
     def invertpos(detectedObjects):
         minDist = None
@@ -591,22 +591,11 @@ 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 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:    
+        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
-            #own.worldPosition = [npos.x, npos.y, npos.z + .251]
             
-            #own.applyMovement([0,0,.05], False)
-
-
-#        grind_height_dif = (own.worldPosition[2] - nearestObject.worldPosition[2]) - .287
-
-#        if grind_height_dif < 0:
-#            newz = (own.worldPosition[2] + abs(grind_height_dif) + .05)
-#            own.worldPosition = [own.worldPosition[0],own.worldPosition[1], newz]
-#            print(newz, "new")
-
+            
         #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:
@@ -620,15 +609,7 @@ def main():
                         own.alignAxisToVect(hitNormal, 2, .05) 
                         print("align")                   
                     own.worldPosition = [nearpos.x, nearpos.y, nearpos.z + .2975]
-                    #print("setting pos")
-            
-            #if hitNormal != None:
-                #own.alignAxisToVect(hitNormal, 2, .4)
-                #print(hitNormal)
-
-
 
-         
             grindold = True
             own['grindold_timer'] = 0
             own["grindHit"] = True
@@ -653,6 +634,7 @@ def main():
     
     if own['grindold_timer'] > 5:
         grindold = False
+        own['grind_start_frame'] = framenum
         own["grindSound"] = None