turn off jumpstance

co_ActionState.py

@@ -1615,11 +1615,6 @@ def main():
                     trucks.playAction("a_reg", 10,30, layer=loop_layer, play_mode=1, speed=.5)  
 
 
-
-
-
-
-
             if requestAction == 'frontside_tail_grab':
                 actionState = 'frontside_tail_grab'
                 if l_actionState != 'frontside_tail_grab':

controller2.py

@@ -185,8 +185,8 @@ grablay = 600 #this plus 1
 fliplay = 470
 MAX_VEL = 6.7
 SPEEDUP = .055
-SPEEDPUMP = .13 #.09
-SPEEDPUMPFAST = .16 #.13
+SPEEDPUMP = .12 #.09
+SPEEDPUMPFAST = .14 #.13
 PUMP_SPEED_SENS = .4
 PUMP_SENS = .98
 ACCEL = 10
@@ -195,7 +195,7 @@ COUNTDOWN = 20 #pump and speed stuff
 JUMPHEIGHT = 800 #775#750
 JUMPSTRENGTH = 0
 own['flip_manual_stance'] = 0
-CAVEMAN_SPEED = .75
+#CAVEMAN_SPEED = .75
 LAND_LAYER = 100
 LAND_END = 20
 
@@ -378,48 +378,29 @@ def check_landing():
         #own["lastPump"] = False
         #own["Pump"] = False
     if lf_ground == False and r_ground.triggered == True:
-        #resetjumpstance()
-        #print(r_ground.hitObject)
         own['jump_from_trans'] = 0
         nearestObject = None
         minDist = None
         detectedObjects = grindDar2.hitObjectList
-        #if grindHit == False and gray.triggered == False and touched == False:
 
-#        if grindDar2.positive:
-#            for obj in detectedObjects:
-#                dist = own.getDistanceTo(obj)
-#                if (minDist is None or dist < minDist):
-#                    nearestObject = obj
-#                    minDist = dist                    
-#        if nearestObject != None and 'rail' in scene.objects[nearestObject]:
-#            cont.activate(own.actuators["landonrail"])
-#            print("landonrail***************")
-        #play landing sound
         if grindDar == 0:
             #print("you are not grinding", grindHit)
             lastheight = own["air_height"]
             pos = own.worldPosition.z
             dist = lastheight - pos
             dist = dist * 2
-            #print(dist, "-------------dist")
-            
+
             if dist > 1:
                 dist = 1
             own.actuators["land"].volume = dist 
-            #cont.deactivate(own.actuators["land"])
             sact = own.actuators["land"]
             sact.stopSound()   
             cont.activate(own.actuators["land"])
             own['land_sound'] = 1
         if grindDar == 1:
             pass
-            #cont.activate(own.actuators["landonrail"])    
-        #vibrate
-        #set_vibration(0, 0.3, 0.3)
         own["vib_Countdown"] = 14
         cont.activate(own.actuators["Vibration"])
-        #print("vibrate")
         if own['manual_v2'] == 0 and grindDar == 0:           
             if STANCE == 0:
                 own['requestAction'] = 'reg_land'
@@ -432,10 +413,7 @@ def check_landing():
     lf_ground = r_ground.triggered
     own["lF_ground"] = lf_ground
     vib_countdown = own["vib_Countdown"]
-    if vib_countdown == 0:
-        pass
-        #set_vibration(0, 0, 0)
-    elif vib_countdown > 0:
+    if vib_countdown > 0:
         vib_countdown = vib_countdown - 1
         own["vib_Countdown"] = vib_countdown
     if vib_countdown == 1:
@@ -470,7 +448,6 @@ if rUD < .04 and rUD > -.04:
     own['manual_v2_type'] = None
 if own['manual_v2'] == 1:    
     if own['last_manual_v2'] == 0:
-        #print("don't flip")
         if STANCE == 0:
             if rUD > .04 and rUD < .07:
                 #print("reg manual")
@@ -505,7 +482,7 @@ if own['manual_v2'] == 1:
                 own['manual_v2_type'] = 'fak nose manual'
             if own['manual_v2_type'] == 'reg nose manual':
                 own['manual_v2_type'] = 'fak manual'                                
-#print(own['manual_v2'], own['manual_v2_type'])    
+   
 #check manual
 ####
 #reg
@@ -522,15 +499,13 @@ if rUD <= .04 and (STANCE == 1 or STANCE == 0) and rUD >= -.04:
     #print("reg_man off2")   
 #####
 if own["reg_manual_timer"] > 10 and own["fak_manual"] == 0 and own['reg_nmanual'] == 0:
-#if own["reg_manual_timer"] > 10 and own["fak_manual"] == 0:
-    #if own['fak_nmanual'] == 0:
     own["reg_manual"] = 1
 ######
 if own["reg_manual_timer"] == 0:
     own["reg_manual"] = 0 
 if own['last_reg_manual'] == 1 and own['reg_manual'] == 0:
-    killall()   
-#print(own["reg_manual"])    
+    #killall()   
+    pass
       
 ####   
 #fak
@@ -548,7 +523,8 @@ if own["fak_manual_timer"] > 10 and own["reg_manual"] == 0:
 if own["fak_manual_timer"] == 0:
     own["fak_manual"] = 0 
 if own['last_fak_manual'] == 1 and own['fak_manual'] == 0:
-    killall()   
+    #killall() 
+    pass  
 #print(own["reg_manual"], own["fak_manual"])    
  
 #####
@@ -571,7 +547,8 @@ if own["reg_nmanual_timer"] > 10 and own["fak_nmanual"] == 0 and own['reg_manual
 if own["reg_nmanual_timer"] == 0:
     own["reg_nmanual"] = 0 
 if own['last_reg_nmanual'] == 1 and own['reg_nmanual'] == 0:
-    killall()   
+    pass
+    #killall()   
  
 #####
 #fak nmanual
@@ -592,7 +569,8 @@ if own["fak_nmanual_timer"] == 0 and own['reg_manual'] == 0:
     #if own['flip_manual_stance'] == 0:
     own["fak_nmanual"] = 0 
 if own['last_fak_nmanual'] == 1 and own['fak_nmanual'] == 0:
-    killall()   
+    #killall() 
+    pass  
 
 
 #print("rm ", own["reg_manual"], "rnm ", own["reg_nmanual"], "fm ", own["fak_manual"], "fnm ", own["fak_nmanual"])
@@ -932,7 +910,7 @@ def jump():
             own["jump_stance"] = 1
         if STANCE == False:
             own["jump_stance"] = 0        
-        #own["jump_stance"] = own["stance"]
+        own["jump_stance"] = own["stance"]
         if grindHit == True:
             own['grind_jump'] = 1
             if lLR > turnsens or lLR < -turnsens or lUD > turnsens or lUD < -turnsens:
@@ -2452,14 +2430,14 @@ 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 < 50:
+    if rUD > .040 and r_ground.triggered == False and GRAB_ON == False and wr == None and jump_timer < 40:
         killact(2)
         killact(4)
         if STANCE == 0:
             own['requestAction'] = '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 < 50:
+    elif rUD < -.040 and r_ground.triggered == False and GRAB_ON == False and wr == None and jump_timer < 40:
         killact(2)
         killact(4)
         if STANCE == 0:
@@ -2986,8 +2964,7 @@ if rUD < -0.020:
                         grindtype("reg_nosegR")
                     elif rLR < -.02:
                         grindtype("reg_nosegL")    
-                    else:
-                        #print("gtype reg_nosegR")    
+                    else:   
                         grindtype("reg_noseg")
                 if jumpstance == 1:
                     if rLR > .02:
@@ -3012,7 +2989,6 @@ if rUD < -0.020:
                     else:    
                         grindtype("fak_noseg")        
         elif grindpos == "reg_board":
-            #print("nose something")
             if jumpstance != 3:
                 if jumpstance == 0:
                     grindtype("reg_noseslide")    
@@ -3032,8 +3008,6 @@ if rUD > -0.020 and rUD <= .020 and LAST_GRIND == False:
     if own['grindpos'] == 'fak_5050':
         grindtype("fak_5050")
         
-    
-   
 if q1oncd > 0:
     q1on = 0
     q1oncd = q1oncd - 1
@@ -3294,11 +3268,7 @@ if q8oncd > 0 and q1oncd > 0 and q2oncd > 0 and q8oncd <= q1oncd <= q2oncd and q
 # 3 > 4 > 5 >6 > 7
 
 # fs 360 shovit
-# 7 > 6 > 5 > 4 > 3
-
-
-
-     
+# 7 > 6 > 5 > 4 > 3     
 
 def hippy_jump():
     STANCE = own["stance"]
@@ -3506,23 +3476,20 @@ def invert():
         if lBump == 1:
             #print("invert")
         #if coping_on ==1 and lBump == 1:
-            print("IIIIIINVVERT")   
+            print("invert")   
             own['invert_on'] = 1
             own.setLinearVelocity([0,0,0],0)
     if own["coping"] == 1 and invert_on == 1:
-        # killact(25)
-        # killact(24)
         if own['invert_on'] == 1 and own['last_invert'] == False:
             #killall()
             cont.activate(own.actuators['invertOn_sound'])
-            
-            # if STANCE == False:
-            #     own['invert_type'] = "reg_back_invert_in"
+            if STANCE == False:
+                own['invert_type'] = "reg_back_invert_in"
             #     skater.playAction("reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1) 
             #     deck.playAction("a_reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1)
             #     trucks.playAction("a_reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1) 
-            # if STANCE == True:
-            #     own['invert_type'] = "fak_fr_invert"
+            if STANCE == True:
+                own['invert_type'] = "fak_fr_invert"
             #     skater.playAction("fak_fr_invert", 10,30, layer=303, play_mode=0, speed=1) 
             #     deck.playAction("a_fak_fr_invert", 10,30, layer=303, play_mode=0, speed=1)
             #     trucks.playAction("a_fak_fr_invert", 10,30, layer=303, play_mode=0, speed=1)                           
@@ -3625,8 +3592,7 @@ def ylimit():
         newy = linVelocity4.y * .8 #.4    
         force = [linVelocity4.x, newy, linVelocity4.z]
         own.setLinearVelocity(force, True)   
-        #print("limitting y")       
-#        own["linVely"] = linVelocity.y 
+
 def getoffboard():
     lasty = own['lasty']
     getoffboard = own['getoffboard']
@@ -4119,15 +4085,12 @@ def grind_turn():
                 if STANCE == False:
                     own.applyForce([-bsforce, 0, 0], True)
                 own.applyMovement([-bs_dloc,0,0], True)                                             
-                                                       
-    #print("setting linvel", own.linearVelocity, outvel)                     
+                                                                          
     if own['gt_cd2'] > 0:
         own['gt_cd2'] -= 1
     if own['gt_cd2'] == 0:    
         own['grind_out_type'] = None 
-#print(own['grind_out_type'])                       
-             
-#print(own["gt_cd"])
+
 if own["grindoutturn"] > 0:
     own["grindoutturn"] = own["grindoutturn"] - 1
     
@@ -4212,8 +4175,6 @@ def wallride_sound():
 if own['revert_timer'] > 0:
     own['revert_timer'] = own['revert_timer'] - 1 
     
-              
-    
 def shutoff_timers():
     #print(wallride)
     if (LAST_GRIND == False and grindHit == True) or (jump_timer > 10 and own['wallride'] == None):