moar fliptricks

controller2.py

@@ -1022,7 +1022,7 @@ def main():
                 
     def aollie():
         print("ollie")
-        dict['trick_string'] = 'Ollie'
+        #dict['trick_string'] = 'Ollie'
         r_ground = cont.sensors["r_Ground"]
         trigger = r_ground.triggered
         STANCE = own["stance"]
@@ -1216,17 +1216,17 @@ def main():
             if own["wallride"] != None: 
                 jump()       
 
-    def shovit():
-        print("shovit")
-        dict['trick_string'] = 'Shovit'
+    def shuvit():
+        print("shuvit")
+        dict['trick_string'] = 'shuvit'
         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_shovit'
+            own['requestAction'] = 'reg_shuvit'
             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_shovit'
+            own['requestAction'] = 'fak_shuvit'
             jump()
         if r_ground.triggered == 0 and STANCE == False:     
             if own["wallride"] != None: 
@@ -1235,17 +1235,17 @@ def main():
             own["wallride_off"] = 1
             if own["wallride"] != None: 
                 jump()
-    def shovit360():
-        print("360shovit")
-        dict['trick_string'] = '360 Shovit'
+    def shuvit360():
+        print("360shuvit")
+        dict['trick_string'] = '360 shuvit'
         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_shovit360'
+            own['requestAction'] = 'reg_shuvit360'
             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_shovit360'
+            own['requestAction'] = 'fak_shuvit360'
             jump()
         if r_ground.triggered == 0 and STANCE == False:
             own["wallride_off"] = 1
@@ -1255,17 +1255,17 @@ def main():
             own["wallride_off"] = 1
             if own["wallride"] != None: 
                 jump()        
-    def fsshovit360():
-        print("360shovit")
-        dict['trick_string'] = '360 Shovit'
+    def fsshuvit360():
+        print("360shuvit")
+        dict['trick_string'] = '360 shuvit'
         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_fsshovit360'
+            own['requestAction'] = 'reg_fsshuvit360'
             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_fsshovit360'
+            own['requestAction'] = 'fak_fsshuvit360'
             jump()
         if r_ground.triggered == 0 and STANCE == False:
             own["wallride_off"] = 1
@@ -1275,17 +1275,17 @@ def main():
             own["wallride_off"] = 1
             if own["wallride"] != None: 
                 jump()
-    def nollie_shovit():
-        print("shovit")
-        dict['trick_string'] = 'Nollie Shovit'
+    def nollie_shuvit():
+        print("shuvit")
+        dict['trick_string'] = 'Nollie shuvit'
         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_shovit'
+            own['requestAction'] = 'reg_nollie_shuvit'
             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_shovit'
+            own['requestAction'] = 'fak_nollie_shuvit'
             jump()
         if r_ground.triggered == 0 and STANCE == False:
             own["wallride_off"] = 1
@@ -1296,15 +1296,15 @@ def main():
             if own["wallride"] != None: 
                 jump()        
 
-    def fsshovit():
-        dict['trick_string'] = 'Frontside Shovit'
+    def fsshuvit():
+        dict['trick_string'] = 'Frontside shuvit'
         if (r_ground.triggered == 1 and STANCE == False) or ((grindHit == True or wallride != None) and STANCE == False):
             own["wallride_off"] = 1
-            own['requestAction'] = 'reg_fsshovit'
+            own['requestAction'] = 'reg_fsshuvit'
             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_fsshovit'
+            own['requestAction'] = 'fak_fsshuvit'
             jump()
         if r_ground.triggered == 0 and STANCE == False:
             own["wallride_off"] = 1
@@ -1315,15 +1315,15 @@ def main():
             if own["wallride"] != None: 
                 jump()
             
-    def nollie_fsshovit():
-        dict['trick_string'] = 'Nollie Frontside Shovit'
+    def nollie_fsshuvit():
+        dict['trick_string'] = 'Nollie Frontside shuvit'
         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_fsshovit'
+            own['requestAction'] = 'reg_nollie_fsshuvit'
             jump()
         elif (r_ground.triggered == 1 and STANCE == True) or (grindHit == True and STANCE == True):
             own["wallride_off"] = 1
-            own['requestAction'] = 'fak_nollie_fsshovit'
+            own['requestAction'] = 'fak_nollie_fsshuvit'
             jump()
         if r_ground.triggered == 0 and STANCE == False:
             own["wallride_off"] = 1
@@ -1334,16 +1334,16 @@ def main():
             if own["wallride"] != None: 
                 jump()
      
-    #nollie_shovit360()
-    def nollie_shovit360():
-        dict['trick_string'] = 'Nollie Frontside Shovit 360'
+    #nollie_shuvit360()
+    def nollie_shuvit360():
+        dict['trick_string'] = 'Nollie Frontside shuvit 360'
         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_shovit360'
+            own['requestAction'] = 'reg_nollie_shuvit360'
             jump()
         elif (r_ground.triggered == 1 and STANCE == True) or (grindHit == True and STANCE == True):
             own["wallride_off"] = 1
-            own['requestAction'] = 'fak_nollie_shovit360'
+            own['requestAction'] = 'fak_nollie_shuvit360'
             jump()
         if r_ground.triggered == 0 and STANCE == False:
             own["wallride_off"] = 1
@@ -1355,16 +1355,16 @@ def main():
                 jump() 
 
 
-    #nollie_fsshovit360()
-    def nollie_fsshovit360():
-        dict['trick_string'] = 'Nollie Frontside Shovit'
+    #nollie_fsshuvit360()
+    def nollie_fsshuvit360():
+        dict['trick_string'] = 'Nollie Frontside shuvit'
         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_fsshovit'
+            own['requestAction'] = 'reg_nollie_fsshuvit'
             jump()
         elif (r_ground.triggered == 1 and STANCE == True) or (grindHit == True and STANCE == True):
             own["wallride_off"] = 1
-            own['requestAction'] = 'fak_nollie_fsshovit'
+            own['requestAction'] = 'fak_nollie_fsshuvit'
             jump()
         if r_ground.triggered == 0 and STANCE == False:
             own["wallride_off"] = 1
@@ -2969,9 +2969,45 @@ def main():
         q3oncd = q3oncd - 1
         own["Q3oncd"] = q3oncd
 
+##########################################
     #trick calls
+##########################################
 
+    # hard flip
+    # 6 > 5 > 8
 
+    if q6oncd > 0 and q5oncd > 0 and q8oncd > 0 and q6oncd <= q5oncd <= q8oncd:
+        print ("Hardflip")
+        dict['trick_string'] = 'Hardflip'
+        aollie()
+        reset_rtimers()    
+
+    # inward heelflip
+    # 4 > 5 > 2
+
+    if q4oncd > 0 and q5oncd > 0 and q2oncd > 0 and q4oncd <= q5oncd <= q2oncd:
+        print ("Inward Heelflip")
+        dict['trick_string'] = 'Inward Heelflip'
+        aollie()
+        reset_rtimers()     
+
+    # 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()
+        reset_rtimers()
+
+    # 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()
+        reset_rtimers()    
 
     # 360 flip
     # 3 > 4 > 5 > 8
@@ -2979,38 +3015,20 @@ def main():
     # laser flip
     # 7 > 6 > 5 > 2  
 
-    #nollie 360 shovit
+    #nollie 360 shuvit
     if q7oncd > 0 and q8oncd > 0 and q1oncd > 0 and q2oncd > 0 and q3oncd > 0 and q7oncd <= q8oncd <= q1oncd <= q2oncd <= q3oncd:
-        print ("Nollie 360 shovit")
-        dict['trick_string'] = 'Nollie 360 Shovit'
-        nollie_shovit360()
-        q7oncd = 0
-        q8oncd = 0
-        q1oncd = 0
-        q2oncd = 0
-        q3oncd = 0
-        own["Q7oncd"] = q7oncd
-        own["Q8oncd"] = q8oncd
-        own["Q1oncd"] = q1oncd
-        own["Q2oncd"] = q2oncd
-        own["Q3oncd"] = q3oncd
+        print ("Nollie 360 shuvit")
+        dict['trick_string'] = 'Nollie 360 shuvit'
+        nollie_shuvit360()
+        reset_rtimers()
 
-    #nollie fs 360 shovit
+    #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)
-        print ("Nollie Front Side 360 shovit")
-        dict['trick_string'] = 'Nollie FS 360 Shovit'
-        nollie_fsshovit360()
-        q7oncd = 0
-        q8oncd = 0
-        q1oncd = 0
-        q2oncd = 0
-        q3oncd = 0
-        own["Q7oncd"] = q7oncd
-        own["Q8oncd"] = q8oncd
-        own["Q1oncd"] = q1oncd
-        own["Q2oncd"] = q2oncd
-        own["Q3oncd"] = q3oncd    
+        print ("Nollie Front Side 360 shuvit")
+        dict['trick_string'] = 'Nollie FS 360 shuvit'
+        nollie_fsshuvit360()
+        reset_rtimers()   
 
     # varial heelflip
     # 7 < 6 < 2
@@ -3042,36 +3060,18 @@ def main():
         nollie_varial_heelflip()
         reset_rtimers()   
 
-    #360 shovit
+    #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)
-        #print ("______-------360 shovit")
-        dict['trick_string'] = '360 Shovit'
-        shovit360()
-        q3oncd = 0
-        q4oncd = 0
-        q5oncd = 0
-        q6oncd = 0
-        q7oncd = 0
-        own["Q3oncd"] = q3oncd
-        own["Q4oncd"] = q4oncd
-        own["Q5oncd"] = q5oncd
-        own["Q6oncd"] = q6oncd
-        own["Q7oncd"] = q7oncd
-    #360 fs shovit    
+        #print ("______-------360 shuvit")
+        dict['trick_string'] = '360 shuvit'
+        shuvit360()
+        reset_rtimers()
+    #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 Shovit'
-        fsshovit360()
-        q3oncd = 0
-        q4oncd = 0
-        q5oncd = 0
-        q6oncd = 0
-        q7oncd = 0
-        own["Q3oncd"] = q3oncd
-        own["Q4oncd"] = q4oncd
-        own["Q5oncd"] = q5oncd
-        own["Q6oncd"] = q6oncd
-        own["Q7oncd"] = q7oncd    
+        dict['trick_string'] = '360 Frontside shuvit'
+        fsshuvit360()
+        reset_rtimers()    
 
     #ollie
     if q5oncd > 0 and q1oncd > 0 and q5oncd < q1oncd:
@@ -3084,11 +3084,7 @@ def main():
         if JUMPSTRENGTH >= 7:
            JUMPSTRENGTH = .9               
         aollie()
-        
-        q1oncd = 0
-        q5oncd = 0
-        own["Q1oncd"] = q1oncd
-        own["Q5oncd"] = q5oncd
+        reset_rtimers()
         
     #nollie
     if q5oncd > 0 and q1oncd > 0 and q5oncd > q1oncd:
@@ -3101,93 +3097,59 @@ def main():
         if JUMPSTRENGTH >= 7:
            JUMPSTRENGTH = .9
         nollie()
-        q1oncd = 0
-        q5oncd = 0
-        own["Q1oncd"] = q1oncd
-        own["Q5oncd"] = q5oncd
+        reset_rtimers()
         print("nollie")
 
     #kickflip
     if q5oncd > 0 and q8oncd > 0 and q5oncd < q8oncd and q3oncd < 1:
         kickflip()
-        q8oncd = 0
-        q5oncd = 0
-        own["Q8oncd"] = q8oncd
-        own["Q5oncd"] = q5oncd
+        reset_rtimers()
         
     #nollie kickflip
     if q1oncd > 0 and q6oncd > 0 and q1oncd < q6oncd:
         nollie_kickflip()
-        q6oncd = 0
-        q1oncd = 0
-        own["Q6oncd"] = q6oncd
-        own["Q1oncd"] = q1oncd    
+        reset_rtimers()  
 
     #heelflip
     if q5oncd > 0 and q2oncd > 0 and q5oncd < q2oncd:
         heelflip()
-        q2oncd = 0
-        q5oncd = 0
-        own["Q2oncd"] = q2oncd
-        own["Q5oncd"] = q5oncd
+        reset_rtimers()
         
     #nollie_heelflip
     if q1oncd > 0 and q4oncd > 0 and q1oncd < q4oncd:
         nollie_heelflip()
-        q1oncd = 0
-        q4oncd = 0
-        own["Q1oncd"] = q1oncd
-        own["Q4oncd"] = q4oncd    
+        reset_rtimers()
+           
 
-    #shovit
+    #shuvit
     if q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q4oncd <= q5oncd <= q6oncd and q3oncd < 1:
-       shovit()
-       q4oncd = 0
-       q5oncd = 0
-       q6oncd = 0
-       own["Q4oncd"] = q4oncd
-       own["Q5oncd"] = q5oncd
-       own["Q6oncd"] = q6oncd
+       shuvit()
+       reset_rtimers()
         
-    #nollie_shovit
+    #nollie_shuvit
     if q2oncd > 0 and q1oncd > 0 and q8oncd > 0 and q2oncd <= q1oncd <= q8oncd and q3oncd == 0:
-        nollie_shovit()
+        nollie_shuvit()
         print('nollie shuvit')
-        #nollie_fsshovit()
-        q2oncd = 0
-        q1oncd = 0
-        q8oncd = 0
-        own["Q2oncd"] = q2oncd
-        own["Q1oncd"] = q1oncd
-        own["Q8oncd"] = q8oncd    
+        #nollie_fsshuvit()
+        reset_rtimers()   
         
-    #fsshovit
+    #fsshuvit
     if q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q6oncd <= q5oncd <= q4oncd and q7oncd < 1:
-        fsshovit()
-        q4oncd = 0
-        q5oncd = 0
-        q6oncd = 0
-        own["Q4oncd"] = q4oncd
-        own["Q5oncd"] = q5oncd
-        own["Q6oncd"] = q6oncd
+        fsshuvit()
+        reset_rtimers()
         
-    #nollie_fsshovit
+    #nollie_fsshuvit
     if q8oncd > 0 and q1oncd > 0 and q2oncd > 0 and q8oncd <= q1oncd <= q2oncd and q7oncd == 0:
-        print ("nollie fsshovit")
-        nollie_fsshovit()
-        q8oncd = 0
-        q1oncd = 0
-        q2oncd = 0
-        own["Q8oncd"] = q4oncd
-        own["Q1oncd"] = q5oncd
-        own["Q2oncd"] = q6oncd 
+        print ("nollie fsshuvit")
+        nollie_fsshuvit()
+        reset_rtimers()
 
-    #360 shovit
+    #360 shuvit
 
-    # 360 shovit
+    # 360 shuvit
     # 3 > 4 > 5 >6 > 7
 
-    # fs 360 shovit
+    # fs 360 shuvit
     # 7 > 6 > 5 > 4 > 3     
 
     def hippy_jump():
@@ -4210,4 +4172,6 @@ def main():
         force2 = [0.0, 0, -10]
         own.applyForce(force2, True)
     if (grindDar == False and r_ground.triggered and own['grindTouch'] == False) or own['jump_timer'] > 40:
-        own['grindType'] = ''
+        own['grindType'] = ''
+        
+    #print('q1:', q1oncd, 'q2:', q2oncd, 'q3:', q3oncd, 'q4:', q4oncd, 'q5:', q5oncd, 'q6:', q6oncd, 'q7:', q7oncd, 'q8:', q8oncd)