shuvit 6 years ago
parent
commit
56382c7ddb
2 changed files with 53 additions and 85 deletions
  1. 46
    78
      co_ActionState.py
  2. 7
    7
      controller2.py

+ 46
- 78
co_ActionState.py
File diff suppressed because it is too large
View File


+ 7
- 7
controller2.py View File

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

Loading…
Cancel
Save