everythings broke

controller2.py

@@ -559,11 +559,15 @@ def main():
         LAST_RIGHT = own["LAST_RIGHT"]
         own["LAST_RIGHT"] = 0  
         
-    def reg_stance_on():
+    def reg_stance_on(inc):
         #revert_timer
         playing = deck.isPlayingAction(40)
         if own["revert_timer"] < 1 and own['manual_v2'] == 0 and playing == 0:
-            own['requestAction'] = 'reg_roll'
+            if inc == 1:
+                print('inc stance')
+                own['requestAction'] = 'reg_pump'
+            else:    
+                own['requestAction'] = 'reg_roll'
     def reg_stance_off():
         pass 
         
@@ -612,7 +616,10 @@ def main():
                     
     def reg_stance_left_on():
         if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1 and ground_since > 30:
-            own['requestAction'] = 'reg_turnLeft'    
+            if own["Pump"] == 1:
+                own['requestAction'] = 'reg_pump_left'
+            else:    
+                own['requestAction'] = 'reg_turnLeft'    
             LAST_LEFT = own["LAST_LEFT"]
             playing_action_frame = skater.getActionFrame(LAND_LAYER)
             if LAST_LEFT == 0 or (playing_action_frame > (LAND_END - 2) and playing_action_frame < (LAND_END - 1)):
@@ -622,23 +629,32 @@ def main():
              
     def reg_stance_right_on():
         if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1 and ground_since > 30:
-            own['requestAction'] = 'reg_turnRight' 
+            if own["Pump"] == 1:
+                own['requestAction'] = 'reg_pump_right'
+            else:               
+                own['requestAction'] = 'reg_turnRight' 
             LAST_RIGHT = own["LAST_RIGHT"]
             playing_action_frame = skater.getActionFrame(LAND_LAYER)
             if LAST_RIGHT == 0 or (playing_action_frame > (LAND_END - 2) and playing_action_frame < (LAND_END - 1)):
                 LAST_RIGHT = 1
             own["LAST_RIGHT"] = 1                   
        
-    def fak_stance_on():
+    def fak_stance_on(inc):
         playing = deck.isPlayingAction(40)
         if own['manual_v2'] == 0 and own["revert_timer"] < 1 and playing == 0 and own['gt_cd2'] < 1:
-            own['requestAction'] = 'fak_roll'
+            if inc == 1:
+                own['requestAction'] = 'fak_pump'
+            else:    
+                own['requestAction'] = 'fak_roll'
     def fak_stance_off():
         pass
         
     def fak_stance_left_on():
         if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1 and ground_since > 30:
-            own['requestAction'] = 'fak_turnLeft'     
+            if own["Pump"] == 1:
+                own['requestAction'] = 'fak_pump_left'
+            else:               
+                own['requestAction'] = 'fak_turnLeft'     
             LAST_LEFT_FAK = own["LAST_LEFT_FAK"]
             playing_action_frame = skater.getActionFrame(LAND_LAYER)
             if LAST_LEFT_FAK == 0 or (playing_action_frame > (LAND_END - 2) and playing_action_frame < (LAND_END - 1)):
@@ -650,7 +666,10 @@ def main():
         
     def fak_stance_right_on():
         if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1 and ground_since > 30:
-            own['requestAction'] = 'fak_turnRight' 
+            if own["Pump"] == 1:
+                own['requestAction'] = 'fak_pump_right'
+            else:               
+                own['requestAction'] = 'fak_turnRight' 
             LAST_RIGHT_FAK = own["LAST_RIGHT_FAK"]
             own["LAST_RIGHT_FAK"] = 1        
     def fak_stance_right_off():
@@ -681,6 +700,10 @@ def main():
         #print(flipping)
         #ground
         ground_since = own["framenum"] - own['lF_air_frame']
+        inc = 0
+        if rot.z < .98:
+            inc = 1
+        
         if r_ground.triggered == True and grindHit == False and flipping == False and own["wallride"] == None and own['revert_timer'] < 2:    
             if STANCE == 0:
                 reg_manual = own['reg_manual']
@@ -696,7 +719,7 @@ def main():
                     if last_manual == 1:
                         reg_manual_off()                   
                         fak_manual_off()
-                    reg_stance_on()
+                    reg_stance_on(inc)
                 if own['manual_v2_type'] == 'reg manual':    
                     reg_manual_on()                   
                 elif own['manual_v2_type'] == 'reg nose manual':    
@@ -719,7 +742,7 @@ def main():
                     if last_manual == 1:
                         fak_manual_off()
                         reg_manual_off()
-                    fak_stance_on()                    
+                    fak_stance_on(inc)                    
                 if own['manual_v2_type'] == 'fak manual':
                     fak_manual_on()
                 elif own['manual_v2_type'] == 'fak nose manual':
@@ -728,24 +751,23 @@ def main():
                     reg_manual_on()
                 elif own['manual_v2_type'] == 'reg nose manual':
                     reg_nmanual_on()                     
-            if own["Pump"] == False:
-                
-                if (lLR < -turnsens or dict['kb_la'] == 2) and STANCE == 0:
-                    reg_stance_left_on()
-                if lLR > -turnsens or LAST_GRIND != grindHit or dict['kb_la'] == 0:
-                    reg_stance_left_off()    
-                if (lLR > turnsens or dict['kb_ra'] == 2) and STANCE == 0:
-                    reg_stance_right_on()
-                if lLR < turnsens or LAST_GRIND != grindHit or dict['kb_ra'] == 0:
-                    reg_stance_right_off()   
-                if (lLR < -turnsens or dict['kb_la'] == 2) and STANCE == 1: 
-                    fak_stance_left_on()
-                if lLR > -turnsens or LAST_GRIND != grindHit or dict['kb_la'] == 0:
-                    fak_stance_left_off()    
-                if (lLR > turnsens or dict['kb_ra'] == 2) and STANCE == 1:
-                    fak_stance_right_on()
-                if lLR < turnsens or LAST_GRIND != grindHit or dict['kb_ra'] == 0:
-                    fak_stance_right_off()                       
+            #if own["Pump"] == False:
+            if (lLR < -turnsens or dict['kb_la'] == 2) and STANCE == 0:
+                reg_stance_left_on()
+            if lLR > -turnsens or LAST_GRIND != grindHit or dict['kb_la'] == 0:
+                reg_stance_left_off()    
+            if (lLR > turnsens or dict['kb_ra'] == 2) and STANCE == 0:
+                reg_stance_right_on()
+            if lLR < turnsens or LAST_GRIND != grindHit or dict['kb_ra'] == 0:
+                reg_stance_right_off()   
+            if (lLR < -turnsens or dict['kb_la'] == 2) and STANCE == 1: 
+                fak_stance_left_on()
+            if lLR > -turnsens or LAST_GRIND != grindHit or dict['kb_la'] == 0:
+                fak_stance_left_off()    
+            if (lLR > turnsens or dict['kb_ra'] == 2) and STANCE == 1:
+                fak_stance_right_on()
+            if lLR < turnsens or LAST_GRIND != grindHit or dict['kb_ra'] == 0:
+                fak_stance_right_off()                       
         #air
         playing = deck.isPlayingAction(fliplay)
         if r_ground.triggered == False and playing == False and flipping == False:
@@ -883,7 +905,7 @@ def main():
 
     def pump():
         velocity = own['velocity']
-        #regular
+        #switch
         local = True
         downforce = -.1        
         lF_air_frame = own['lF_air_frame']
@@ -899,8 +921,9 @@ def main():
                 own.setLinearVelocity(force, local)
             if rot.z < PUMP_SENS and rot.z <= PUMP_SPEED_SENS:
                 own.setLinearVelocity(force2, local)
-            own['requestAction'] = 'fak_pump'
-        #switch
+            if own['requestAction'] not in ['fak_pump_left', 'fak_pump_right'] and own['l_actionState'] not in ['fak_turnLeft', 'fak_turnRight']:
+                own['requestAction'] = 'fak_pump'
+        #reg
         if linVelocity.x > -MAX_VEL and linVelocity.x <= 0 and STANCE == 0 and grindHit == False and frames_since_ground > 30 and own['last_manual_v2'] == 0:
             countdown = COUNTDOWN
             yvel = linVelocity.x - SPEEDPUMP
@@ -912,7 +935,8 @@ def main():
                 own.setLinearVelocity(force, local)
             if rot.z < PUMP_SENS and rot.z <= PUMP_SPEED_SENS:
                 own.setLinearVelocity(force2, local)
-            own['requestAction'] = 'reg_pump'    
+            if own['requestAction'] not in ['reg_pump_left', 'reg_pump_right'] and own['l_actionState'] not in ['reg_turnLeft', 'reg_turnRight']:  
+                own['requestAction'] = 'reg_pump'    
         own["Pump"] = True
         own["lastPump"] = True
                 
@@ -1806,7 +1830,7 @@ def main():
     def turn():   
         rotamt = .02
         linVelocity2 = own.getLinearVelocity(True)
-        speed = .002
+        speed = .004
         manual = 0
         if own['manual_v2'] == 1:     
             manual = 1       
@@ -2213,10 +2237,14 @@ def main():
         if r_ground.positive:
             if 'ramp' in r_ground.hitObject:
                 own['onramp'] = 1
+                own['last_ramp'] = frame
             else:
                 own['onramp'] = 0   
         else:
-            own['onramp'] = 0        
+            own['onramp'] = 0   
+    #num = frame - own['last_ramp']
+    #print(num)             
+    
     def grindtype(gtype):
         own['grindType'] = gtype
         
@@ -2607,6 +2635,8 @@ def main():
 
     def killopos():
         pass    
+    
+
                     
     stopAnims() 
     #nextframe()  

scene_init.py

@@ -152,5 +152,6 @@ def main():
     cam['dof_on'] = dict['dof_on']
     cam['bloom_on'] = dict['bloom_on'] 
     own['grindnew_timer'] = 0   
+    own['last_ramp'] = 0
            
 main()