|
@@ -1382,14 +1382,14 @@ def main():
|
1382
|
1382
|
|
1383
|
1383
|
#nollie_fsshuvit360()
|
1384
|
1384
|
def nollie_fsshuvit360():
|
1385
|
|
- dict['trick_string'] = 'Nollie Frontside shuvit'
|
|
1385
|
+ dict['trick_string'] = 'Nollie Frontside shuvit 360'
|
1386
|
1386
|
if (r_ground.triggered == 1 and STANCE == False) or ((grindHit == True or wallride != None) and STANCE == False):
|
1387
|
1387
|
own["wallride_off"] = 1
|
1388
|
|
- own['requestAction'] = 'reg_nollie_fsshuvit'
|
|
1388
|
+ own['requestAction'] = 'reg_nollie_fsshuvit_360'
|
1389
|
1389
|
jump()
|
1390
|
1390
|
elif (r_ground.triggered == 1 and STANCE == True) or (grindHit == True and STANCE == True):
|
1391
|
1391
|
own["wallride_off"] = 1
|
1392
|
|
- own['requestAction'] = 'fak_nollie_fsshuvit'
|
|
1392
|
+ own['requestAction'] = 'fak_nollie_fsshuvit_360'
|
1393
|
1393
|
jump()
|
1394
|
1394
|
if r_ground.triggered == 0 and STANCE == False:
|
1395
|
1395
|
own["wallride_off"] = 1
|
|
@@ -3254,7 +3254,7 @@ def main():
|
3254
|
3254
|
q8oncd = 0
|
3255
|
3255
|
|
3256
|
3256
|
#shuvit
|
3257
|
|
- if q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q4oncd <= q5oncd <= q6oncd and q3oncd < 1:
|
|
3257
|
+ if q7oncd > 0 and q5oncd > 0 and q6oncd > 0 and q5oncd <= q6oncd <= q7oncd:# and q3oncd < 1:
|
3258
|
3258
|
shuvit()
|
3259
|
3259
|
reset_rtimers()
|
3260
|
3260
|
q1oncd = 0
|
|
@@ -3266,7 +3266,7 @@ def main():
|
3266
|
3266
|
q7oncd = 0
|
3267
|
3267
|
q8oncd = 0
|
3268
|
3268
|
#nollie_shuvit
|
3269
|
|
- if q2oncd > 0 and q1oncd > 0 and q8oncd > 0 and q2oncd <= q1oncd <= q8oncd and q3oncd == 0:
|
|
3269
|
+ if q7oncd > 0 and q1oncd > 0 and q8oncd > 0 and q1oncd <= q8oncd <= q7oncd:# and q3oncd == 0:
|
3270
|
3270
|
nollie_shuvit()
|
3271
|
3271
|
print('nollie shuvit')
|
3272
|
3272
|
#nollie_fsshuvit()
|
|
@@ -3280,7 +3280,7 @@ def main():
|
3280
|
3280
|
q7oncd = 0
|
3281
|
3281
|
q8oncd = 0
|
3282
|
3282
|
#fsshuvit
|
3283
|
|
- if q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q6oncd <= q5oncd <= q4oncd and q7oncd < 1:
|
|
3283
|
+ if q4oncd > 0 and q5oncd > 0 and q3oncd > 0 and q5oncd <= q4oncd <= q3oncd:# and q7oncd < 1:
|
3284
|
3284
|
fsshuvit()
|
3285
|
3285
|
reset_rtimers()
|
3286
|
3286
|
q1oncd = 0
|
|
@@ -3292,7 +3292,7 @@ def main():
|
3292
|
3292
|
q7oncd = 0
|
3293
|
3293
|
q8oncd = 0
|
3294
|
3294
|
#nollie_fsshuvit
|
3295
|
|
- if q8oncd > 0 and q1oncd > 0 and q2oncd > 0 and q8oncd <= q1oncd <= q2oncd and q7oncd == 0:
|
|
3295
|
+ if q3oncd > 0 and q1oncd > 0 and q2oncd > 0 and q1oncd <= q2oncd <= q3oncd:# and q7oncd == 0:
|
3296
|
3296
|
print ("nollie fsshuvit")
|
3297
|
3297
|
nollie_fsshuvit()
|
3298
|
3298
|
reset_rtimers()
|