sunday morn push

controller2.py

@@ -89,6 +89,7 @@ def main():
     frame = own['framenum']
     frames_since_grinding = frame - lgf
     ground_since = own["framenum"] - own['lF_air_frame']
+    gsf = frame - own['grind_start_frame']
     own['last_footplant'] = own['footplant_on']
     lastaBut_ground = own['lastaBut_ground'] 
     lastxBut_ground = own['lastxBut_ground'] 
@@ -288,6 +289,9 @@ def main():
             deck.stopAction(x)
             trucks.stopAction(x) 
 
+    def reset_rtimers_done():
+        print('rtimer reset:', q1oncd, q2oncd, q3oncd, q4oncd, q5oncd, q6oncd, q7oncd, q8oncd)
+
     def reset_rtimers():
         own["Q1oncd"] = 0
         own["Q2oncd"] = 0
@@ -304,7 +308,8 @@ def main():
         q5oncd = 0
         q6oncd = 0
         q7oncd = 0
-        q8oncd = 0    
+        q8oncd = 0 
+        reset_rtimers_done()   
 
     def check_fall():
         playing_frame = 20
@@ -1076,6 +1081,92 @@ def main():
             own['requestAction'] = 'fak_kickflip'
             if own["wallride"] != None: 
                 jump()
+
+
+    def inward_heelflip():
+        print("inward heelflip")
+        dict['trick_string'] = 'Inward Heelflip'
+        STANCE = own["stance"]
+        if (r_ground.triggered == 1 and STANCE == False) or ((grindHit == True or wallride != None) and STANCE == False):
+            own["wallride_off"] = 1
+            own['requestAction'] = 'reg_inward_heelflip'
+            jump()
+        elif (r_ground.triggered == 1 and STANCE == True) or ((grindHit == True or wallride != None) and STANCE == True):
+            own["wallride_off"] = 1
+            own['requestAction'] = 'fak_inward_heelflip'
+            jump()
+        if r_ground.triggered == 0 and STANCE == False:
+            own["wallride_off"] = 1
+            if own["wallride"] != None: 
+                jump()              
+        elif r_ground.triggered == 0 and STANCE == True:
+            own["wallride_off"] = 1
+            if own["wallride"] != None: 
+                jump()              
+
+    def hardflip():
+        print("hardflip")
+        dict['trick_string'] = 'Hardflip'
+        STANCE = own["stance"]
+        if (r_ground.triggered == 1 and STANCE == False) or ((grindHit == True or wallride != None) and STANCE == False):
+            own["wallride_off"] = 1
+            own['requestAction'] = 'reg_hardflip'
+            jump()
+        elif (r_ground.triggered == 1 and STANCE == True) or ((grindHit == True or wallride != None) and STANCE == True):
+            own["wallride_off"] = 1
+            own['requestAction'] = 'fak_hardflip'
+            jump()
+        if r_ground.triggered == 0 and STANCE == False:
+            own["wallride_off"] = 1
+            if own["wallride"] != None: 
+                jump()              
+        elif r_ground.triggered == 0 and STANCE == True:
+            own["wallride_off"] = 1
+            if own["wallride"] != None: 
+                jump()
+                
+    def nollie_inward_heelflip():
+        print("nollie inward heelflip")
+        dict['trick_string'] = 'Nollie Inward Heelflip'
+        STANCE = own["stance"]
+        if (r_ground.triggered == 1 and STANCE == False) or ((grindHit == True or wallride != None) and STANCE == False):
+            own["wallride_off"] = 1
+            own['requestAction'] = 'reg_nollie_inward_heelflip'
+            jump()
+        elif (r_ground.triggered == 1 and STANCE == True) or ((grindHit == True or wallride != None) and STANCE == True):
+            own["wallride_off"] = 1
+            own['requestAction'] = 'fak_nollie_inward_heelflip'
+            jump()
+        if r_ground.triggered == 0 and STANCE == False:
+            own["wallride_off"] = 1
+            if own["wallride"] != None: 
+                jump()              
+        elif r_ground.triggered == 0 and STANCE == True:
+            own["wallride_off"] = 1
+            if own["wallride"] != None: 
+                jump()
+
+    def nollie_hardflip():
+        print("nollie hardflip")
+        dict['trick_string'] = 'Nollie Hardflip'
+        STANCE = own["stance"]
+        if (r_ground.triggered == 1 and STANCE == False) or ((grindHit == True or wallride != None) and STANCE == False):
+            own["wallride_off"] = 1
+            own['requestAction'] = 'reg_nollie_hardflip'
+            jump()
+        elif (r_ground.triggered == 1 and STANCE == True) or ((grindHit == True or wallride != None) and STANCE == True):
+            own["wallride_off"] = 1
+            own['requestAction'] = 'fak_nollie_hardflip'
+            jump()
+        if r_ground.triggered == 0 and STANCE == False:
+            own["wallride_off"] = 1
+            if own["wallride"] != None: 
+                jump()              
+        elif r_ground.triggered == 0 and STANCE == True:
+            own["wallride_off"] = 1
+            if own["wallride"] != None: 
+                jump()                  
+
                 
     def varial_kickflip():
         print("varial kickflip")
@@ -2979,8 +3070,16 @@ def main():
     if q6oncd > 0 and q5oncd > 0 and q8oncd > 0 and q6oncd <= q5oncd <= q8oncd:
         print ("Hardflip")
         dict['trick_string'] = 'Hardflip'
-        aollie()
-        reset_rtimers()    
+        hardflip()
+        reset_rtimers() 
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0            
 
     # inward heelflip
     # 4 > 5 > 2
@@ -2988,27 +3087,48 @@ def main():
     if q4oncd > 0 and q5oncd > 0 and q2oncd > 0 and q4oncd <= q5oncd <= q2oncd:
         print ("Inward Heelflip")
         dict['trick_string'] = 'Inward Heelflip'
-        aollie()
+        inward_heelflip()
         reset_rtimers()     
-
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0 
     # nollie hard flip
     # 8 > 1 > 6
 
     if q8oncd > 0 and q1oncd > 0 and q6oncd > 0 and q8oncd <= q1oncd <= q6oncd:
         print ("Nollie Hardflip")
         dict['trick_string'] = 'Nollie Hardflip'
-        aollie()
+        nollie_hardflip()
         reset_rtimers()
-
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0 
     # nollie inward heelflip
     # 2 > 1 > 4
 
     if q2oncd > 0 and q1oncd > 0 and q4oncd > 0 and q2oncd <= q1oncd <= q4oncd:
         print ("Nollie Inward Heelflip")
         dict['trick_string'] = 'Nollie Inward Heelflip'
-        aollie()
+        nollie_inward_heelflip()
         reset_rtimers()    
-
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0 
     # 360 flip
     # 3 > 4 > 5 > 8
 
@@ -3021,7 +3141,14 @@ def main():
         dict['trick_string'] = 'Nollie 360 shuvit'
         nollie_shuvit360()
         reset_rtimers()
-
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0 
     #nollie fs 360 shuvit
     if q7oncd > 0 and q8oncd > 0 and q1oncd > 0 and q2oncd > 0 and q3oncd > 0 and q3oncd <= q2oncd <= q1oncd <= q8oncd <= q7oncd:
         #print("q4oncd: ", q4oncd, " q5oncd: ", q5oncd, " q6oncd: ", q6oncd)
@@ -3029,21 +3156,42 @@ def main():
         dict['trick_string'] = 'Nollie FS 360 shuvit'
         nollie_fsshuvit360()
         reset_rtimers()   
-
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0 
     # varial heelflip
     # 7 < 6 < 2
     if q7oncd > 0 and q6oncd > 0 and q2oncd > 0 and q7oncd < q6oncd < q2oncd:
         dict['trick_string'] = 'Varial Heelflip'
         varial_heelflip()
         reset_rtimers()
-        
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0         
     # varial kickflip 
     # 3 < 4 < 8
     if q3oncd > 0 and q4oncd > 0 and q8oncd > 0 and q3oncd < q4oncd < q8oncd:
         dict['trick_string'] = 'Varial Kickflip'
         varial_kickflip()
         reset_rtimers()
-
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0 
     # nollie varial kickflip
     # 3 < 2 < 6
     if q3oncd > 0 and q2oncd > 0 and q6oncd > 0 and q3oncd <= q2oncd <= q6oncd:
@@ -3051,7 +3199,14 @@ def main():
         print('Nollie Varial Kickflip')
         nollie_varial_kickflip()
         reset_rtimers()   
-        
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0         
     # nollie varial heelflip
     # 7 < 8 < 4
     if q7oncd > 0 and q8oncd > 0 and q4oncd > 0 and q7oncd <= q8oncd <= q4oncd:
@@ -3059,7 +3214,14 @@ def main():
         print('Nollie Varial Heelflip')
         nollie_varial_heelflip()
         reset_rtimers()   
-
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0 
     #360 shuvit
     if q3oncd > 0 and q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q7oncd > 0 and q7oncd >= q6oncd >= q5oncd >= q4oncd >= q3oncd:
     #    print("q4oncd: ", q4oncd, " q5oncd: ", q5oncd, " q6oncd: ", q6oncd)
@@ -3067,12 +3229,27 @@ def main():
         dict['trick_string'] = '360 shuvit'
         shuvit360()
         reset_rtimers()
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0         
     #360 fs shuvit    
     if q3oncd > 0 and q4oncd > 0 and q5oncd > 0 and q6oncd >= 0 and q7oncd > 0 and q7oncd <= q6oncd <= q5oncd <= q4oncd <= q3oncd:
         dict['trick_string'] = '360 Frontside shuvit'
         fsshuvit360()
         reset_rtimers()    
-
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0 
     #ollie
     if q5oncd > 0 and q1oncd > 0 and q5oncd < q1oncd:
         JUMPSTRENGTH = q1oncd - q5oncd
@@ -3085,7 +3262,14 @@ def main():
            JUMPSTRENGTH = .9               
         aollie()
         reset_rtimers()
-        
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0         
     #nollie
     if q5oncd > 0 and q1oncd > 0 and q5oncd > q1oncd:
         JUMPSTRENGTH = q5oncd - q1oncd
@@ -3099,51 +3283,114 @@ def main():
         nollie()
         reset_rtimers()
         print("nollie")
-
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0 
     #kickflip
     if q5oncd > 0 and q8oncd > 0 and q5oncd < q8oncd and q3oncd < 1:
         kickflip()
         reset_rtimers()
-        
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0         
     #nollie kickflip
     if q1oncd > 0 and q6oncd > 0 and q1oncd < q6oncd:
         nollie_kickflip()
         reset_rtimers()  
-
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0 
     #heelflip
     if q5oncd > 0 and q2oncd > 0 and q5oncd < q2oncd:
         heelflip()
         reset_rtimers()
-        
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0         
     #nollie_heelflip
     if q1oncd > 0 and q4oncd > 0 and q1oncd < q4oncd:
         nollie_heelflip()
         reset_rtimers()
-           
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0            
 
     #shuvit
     if q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q4oncd <= q5oncd <= q6oncd and q3oncd < 1:
-       shuvit()
-       reset_rtimers()
-        
+        shuvit()
+        reset_rtimers()
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0         
     #nollie_shuvit
     if q2oncd > 0 and q1oncd > 0 and q8oncd > 0 and q2oncd <= q1oncd <= q8oncd and q3oncd == 0:
         nollie_shuvit()
         print('nollie shuvit')
         #nollie_fsshuvit()
         reset_rtimers()   
-        
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0         
     #fsshuvit
     if q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q6oncd <= q5oncd <= q4oncd and q7oncd < 1:
         fsshuvit()
         reset_rtimers()
-        
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0         
     #nollie_fsshuvit
     if q8oncd > 0 and q1oncd > 0 and q2oncd > 0 and q8oncd <= q1oncd <= q2oncd and q7oncd == 0:
         print ("nollie fsshuvit")
         nollie_fsshuvit()
         reset_rtimers()
-
+        q1oncd = 0
+        q2oncd = 0
+        q3oncd = 0
+        q4oncd = 0
+        q5oncd = 0
+        q6oncd = 0
+        q7oncd = 0
+        q8oncd = 0 
     #360 shuvit
 
     # 360 shuvit
@@ -3325,7 +3572,7 @@ def main():
         lF_air_frame = own['lF_air_frame']
         frames_since_ground = framenum - lF_air_frame
         frames_since_grind = framenum - own['last_grind_frame']
-        if grindHit == True and aBut == True:
+        if grindHit == True and aBut == True and ground_since < 10:
             own.linearVelocity.x = 0
             own.linearVelocity.y = 0                         
             own['footplant_on'] = 1
@@ -3342,7 +3589,7 @@ def main():
                     own['requestAction'] = 'fak_fp_rback'
                
     def invert():    
-        if grindHit == True and own['grindpos'] == 'reg_board':   
+        if grindHit == True and own['grindpos'] == 'reg_board' and gsf < 10:   
             if lBump == 1:   
                 own['invert_on'] = 1
                 own.linearVelocity.x = 0

walk.py

@@ -1075,7 +1075,8 @@ def onground():
                 own['requestAction'] = 'fak_walk_air' 
     #if control bottom is touching ground object, turn ground on            
     if cb.positive:
-        if own['framenum'] - own['lF_ground_frame'] > 30:
+        #if own['framenum'] - own['lF_ground_frame'] > 30:
+        if own['framenum'] - own['last_fall_frame'] < 90:
             own['lF_ground_frame'] = own['framenum']