zS142

controller2.py

@@ -1987,10 +1987,23 @@ def main():
         STANCE = own["stance"]
         jumpstance = own["jump_stance"]
         lif = frame - own['last_invert_frame']
+        giniter = 0
         if own['LAST_GRIND'] == False and grindHit == True:
             own['grindstartFrame'] = own['framenum']
+            giniter = 1
         #print(own['grindstartFrame'])    
-        if grindHit == True and own['invert_on'] == 0 and own['footplant_on'] == False and own['manual'] == 0 and lif > 40 and own['dropinTimer'] < 30:  
+        if grindHit == True and own['invert_on'] == 0 and own['footplant_on'] == False and own['manual'] == 0 and lif > 40 and own['dropinTimer'] < 30 and giniter == 0: 
+            
+            control_bottom = scene.objects['control_bottom']
+            grindTouch = control_bottom.sensors['grindCol_bottom']
+            edge = 0
+            try:
+                if 'edge' in grindTouch.hitObject:
+                    print('Edge')
+                    edge = 1
+            except:
+                pass               
+             
             gblend = 1    
             if LAST_GRIND == 0:
                 gt = own['grindType']
@@ -2043,14 +2056,14 @@ def main():
                 elif own['grindType'] == "fak_tailgL":
                     own['requestAction'] = 'fak_tailgl' 
                 
-                elif own['grindType'] == "reg_tailslide":
+                elif own['grindType'] == "reg_tailslide" and edge == 1:
                     #own['requestAction'] = 'reg_tailslide'
                     own['requestAction'] = 'fak_noseslide'  
                     own['grind_stance'] = 0                
                 elif own['grindType'] == "fak_tailslide":
                     own['requestAction'] = 'fak_tailslide'                
                     own['grind_stance'] = 1
-                elif own['grindType'] == "reg_noseslide":
+                elif own['grindType'] == "reg_noseslide" and edge == 1:
                     #own['requestAction'] = 'reg_noseslide'
                     own['requestAction'] = 'fak_tailslide'  
                     own['grind_stance'] = 0
@@ -2097,13 +2110,14 @@ def main():
                     own['requestAction'] = 'fak_tailgl' 
                 elif own['grindType'] == "reg_tailslide":
                     own['requestAction'] = 'reg_tailslide'
-                elif own['grindType'] == "fak_tailslide":
+                    
+                elif own['grindType'] == "fak_tailslide" and edge == 1:
                     own['grind_stance'] = 1
                     own['requestAction'] = 'reg_noseslide'
                 elif own['grindType'] == "reg_noseslide":
                     own['grind_stance'] = 0
                     own['requestAction'] = 'reg_noseslide'
-                elif own['grindType'] == "fak_noseslide":  
+                elif own['grindType'] == "fak_noseslide" and edge == 1:  
                     own['grind_stance'] = 1              
                     own['requestAction'] = 'reg_tailslide'                                
                 else:
@@ -2325,10 +2339,10 @@ def main():
             killact(4)
             if STANCE == 0:
                 own['requestAction'] = 'reg_air_nose' 
-                print("reg_air_nose")
+                #print("reg_air_nose")
             else:
                 own['requestAction'] = 'fak_air_nose' 
-                print("fak_air_nose")
+                #print("fak_air_nose")
 
     def air_turn_boost():
         pass

grindV2.py

@@ -227,7 +227,7 @@ def main():
             #player.applyForce([0, 0, 0], True)            
             player.setLinearVelocity([velxb, 0.0, zvel], 1)  
             grindpos = "reg_5050"
-            print("50-1")
+            #print("50-1")
 
 
         elif rot >= 45 and rot < 90:  
@@ -519,9 +519,7 @@ def main():
                     own.worldPosition = [nearpos.x, nearpos.y, nearpos.z + .2975]
                     print('moving world')
 
-            grindold = True
-            own['grindold_timer'] = 0
-            own["grindHit"] = True
+
             #print("grinding")
             grind_height_dif = (own.worldPosition[2] - nearestObject.worldPosition[2]) - .287
             worldPos = own.worldPosition
@@ -529,6 +527,9 @@ def main():
                 grindvect(nearestObject)          
                 grindrotvel(nearestObject)
                 grind(nearestObject)
+                grindold = True
+                own['grindold_timer'] = 0
+                own["grindHit"] = True                
 
 
     else:

walk.py

@@ -930,10 +930,12 @@ def throwdeck():
         wheel4act.visibility = False
         act = throw_deck_empty.actuators['throw_dec_act']
         if STANCE == True:
-            skater.playAction("fak_throw", 10,30, layer=29, priority=0, play_mode=0, speed=.5)
+            #skater.playAction("fak_throw", 10,30, layer=29, priority=0, play_mode=0, speed=.5)
+            own['requestAction'] = 'fak_throw'
             act.linearVelocity = [0.0, 5.0, 5.0]
         if STANCE == False:
-            skater.playAction("reg_throw", 10,30, layer=29, priority=0, play_mode=0, speed=.5)  
+            #skater.playAction("reg_throw", 10,30, layer=29, priority=0, play_mode=0, speed=.5)  
+            own['requestAction'] = 'fak_throw'
             act.linearVelocity = [0.0, 5.0, -5.0]  
         cont.activate(act)
     else:
@@ -1288,6 +1290,23 @@ if yBut == True:
     own['walk_idling'] = 0
     own["walk_idle_frame"] = 0
 
+
+if own['requestAction'] == None:
+    if own['throw_deck'] == False:
+        if STANCE == 1:
+            own['requestAction'] = reg_idle
+        else:
+            own['requestAction'] = fak_idle        
+    else:
+        if STANCE == 1:
+            own['requestAction'] = reg_idle_nb
+        else:
+            own['requestAction'] = fak_idle_nb                            
+   
+if deck.visible:
+    own['deckvis'] = 1
+else:
+    own['deckvis'] = 0       
                     
 onboard() 
 jump()