shuvs

controller2.py

@@ -1382,14 +1382,14 @@ def main():
 
     #nollie_fsshuvit360()
     def nollie_fsshuvit360():
-        dict['trick_string'] = 'Nollie Frontside shuvit'
+        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_fsshuvit'
+            own['requestAction'] = 'reg_nollie_fsshuvit_360'
             jump()
         elif (r_ground.triggered == 1 and STANCE == True) or (grindHit == True and STANCE == True):
             own["wallride_off"] = 1
-            own['requestAction'] = 'fak_nollie_fsshuvit'
+            own['requestAction'] = 'fak_nollie_fsshuvit_360'
             jump()
         if r_ground.triggered == 0 and STANCE == False:
             own["wallride_off"] = 1
@@ -3254,7 +3254,7 @@ def main():
         q8oncd = 0            
 
     #shuvit
-    if q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q4oncd <= q5oncd <= q6oncd and q3oncd < 1:
+    if q7oncd > 0 and q5oncd > 0 and q6oncd > 0 and q5oncd <= q6oncd <= q7oncd:# and q3oncd < 1:
         shuvit()
         reset_rtimers()
         q1oncd = 0
@@ -3266,7 +3266,7 @@ def main():
         q7oncd = 0
         q8oncd = 0         
     #nollie_shuvit
-    if q2oncd > 0 and q1oncd > 0 and q8oncd > 0 and q2oncd <= q1oncd <= q8oncd and q3oncd == 0:
+    if q7oncd > 0 and q1oncd > 0 and q8oncd > 0 and q1oncd <= q8oncd <= q7oncd:# and q3oncd == 0:
         nollie_shuvit()
         print('nollie shuvit')
         #nollie_fsshuvit()
@@ -3280,7 +3280,7 @@ def main():
         q7oncd = 0
         q8oncd = 0         
     #fsshuvit
-    if q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q6oncd <= q5oncd <= q4oncd and q7oncd < 1:
+    if q4oncd > 0 and q5oncd > 0 and q3oncd > 0 and q5oncd <= q4oncd <= q3oncd:# and q7oncd < 1:
         fsshuvit()
         reset_rtimers()
         q1oncd = 0
@@ -3292,7 +3292,7 @@ def main():
         q7oncd = 0
         q8oncd = 0         
     #nollie_fsshuvit
-    if q8oncd > 0 and q1oncd > 0 and q2oncd > 0 and q8oncd <= q1oncd <= q2oncd and q7oncd == 0:
+    if q3oncd > 0 and q1oncd > 0 and q2oncd > 0 and q1oncd <= q2oncd <= q3oncd:# and q7oncd == 0:
         print ("nollie fsshuvit")
         nollie_fsshuvit()
         reset_rtimers()