Przeglądaj źródła

controller cleanup2

shuvit 6 lat temu
rodzic
commit
a31f730509
3 zmienionych plików z 102 dodań i 596 usunięć
  1. 60
    227
      co_ActionState.py
  2. 29
    255
      controller2.py
  3. 13
    114
      grindV2.py

+ 60
- 227
co_ActionState.py Wyświetl plik

@@ -33,7 +33,6 @@ def main():
33 33
         queueAction = own['queueAction']
34 34
         actionTimer = own['actionTimer']
35 35
     except:
36
-        #print("init")
37 36
         own['actionState'] = 'reg_walk'
38 37
         own['l_actionState'] = 'empty'        
39 38
         own['requestAction'] = 'reg_walk'    
@@ -47,14 +46,11 @@ def main():
47 46
         actionState = 'empty'
48 47
         l_actionState = 'empty'
49 48
         l_requestAction = 'empty'
50
-    #print("ra1: ", requestAction) \
51 49
     if requestAction == 'empty':
52 50
         print("*******empty request****")
53 51
         
54 52
     isplaying = skater.isPlayingAction(flip_layer)
55 53
     transPlaying = skater.isPlayingAction(trans_layer)
56
-    #if isplaying  == False:    
57
-        #own['actionTimer'] = 0
58 54
         
59 55
     if own['clear_request'] == 1:
60 56
         requestAction = 'empty'
@@ -62,11 +58,8 @@ def main():
62 58
     if own['actionTimer'] != 0 and transPlaying == False and isplaying == False:
63 59
         own['actionTimer'] = 0
64 60
         actionTimer = 0
65
-        #print('reset actionTimer')
66
-        #pass 
67 61
         
68 62
     if own['actionTimer'] != 0 and (own['actionState'] == 'reg_land' or own['actionState'] == 'fak_land') and own['requestAction'] not in reg_fliplist and own['requestAction'] not in fak_fliplist:
69
-#        requestAction = own['l_actionState'] 
70 63
         requestAction = 'empty'
71 64
         own['requestAction'] = 'empty'              
72 65
 #================
@@ -80,8 +73,6 @@ def main():
80 73
         requestAction = 'reg-fak_roll'
81 74
         own['requestAction'] = 'reg-fak_roll'
82 75
     
83
-    
84
-    
85 76
     if requestAction == 'reg_5050' and (l_actionState == 'fak_5050' or l_actionState == 'fak_air' or l_actionState in fak_fliplist) or (l_actionState == 'fak-reg_5050' and actionTimer > 1):
86 77
         print("fak-reg_5050")
87 78
         requestAction = 'fak-reg_5050'
@@ -96,16 +87,13 @@ def main():
96 87
     if (requestAction == 'reg_land' or requestAction == 'fak_land') and own['grindHit'] == True:
97 88
         if l_requestAction == 'reg_land' or l_requestAction == 'fak_land':
98 89
             pass
99
-            #print("landing action incorrect")
100
-        else: 
101
-            #print("using old requestAction")   
90
+        else:    
102 91
             requestAction = l_requestAction
103 92
             own['requestAction'] = requestAction
104 93
             own['l_actionState'] = requestAction
105 94
             actionState = requestAction
106 95
             own['actionTimer'] = 0
107
-            actionTimer = 0 
108
-    #if (own['l_requestAction'] == 'reg_air_nose' or own['l_requestAction'] == 'reg_air_tail' or own['l_requestAction'] == 'fak_air_nose' or own['l_requestAction'] == 'fak_air_tail') and ((requestAction == 'reg_land' or requestAction == 'fak_land') or (own['requestAction'] == 'reg_roll' or own['requestAction'] == 'fak_roll')):            
96
+            actionTimer = 0            
109 97
     if (own['l_requestAction'] == 'reg_air_nose' or own['l_requestAction'] == 'reg_air_tail' or own['l_requestAction'] == 'fak_air_nose' or own['l_requestAction'] == 'fak_air_tail') and (requestAction == 'reg_land' or requestAction == 'fak_land') and own['manual_v2_timer'] > 2:
110 98
         requestAction = own['l_requestAction']
111 99
         print("changing land")
@@ -121,7 +109,6 @@ def main():
121 109
     if l_actionState == 'fak_air_nose' and requestAction == 'fak_roll':
122 110
         requestAction = 'fak_air_nose'                
123 111
         
124
-        
125 112
     #dirt invert fix
126 113
     if 'invert' in requestAction:
127 114
         actionTimer = 0
@@ -139,7 +126,6 @@ def main():
139 126
             own['actionTimer'] = 0    
140 127
     #revert override
141 128
     if requestAction == 'revert1' or requestAction == 'revert2' or requestAction == 'revert3' or requestAction == 'revert4':
142
-        #print("@@@revert override")
143 129
         actionState = requestAction
144 130
         own['actionState'] = requestAction 
145 131
         if l_requestAction != 'revert1' and l_requestAction != 'revert2' and l_requestAction != 'revert3' and l_requestAction != 'revert4':   
@@ -151,8 +137,7 @@ def main():
151 137
             trucks.stopAction(trans_layer)
152 138
             deck.stopAction(trans_layer)                 
153 139
             
154
-    #check last actionState to see if an out action is needed
155
-    
140
+    #check last actionState to see if an out action is needed    
156 141
     if requestAction not in jump_overrideList:
157 142
         if l_actionState == 'reg_turnRight' and requestAction != 'reg_turnRight':
158 143
             requestAction = 'reg_turnRight_out'
@@ -180,26 +165,14 @@ def main():
180 165
             requestAction = 'fak_nopos_out'
181 166
             actionState = 'fak_nopos_out' 
182 167
             
183
-#        if l_actionState == 'reg_pump_out_hold' and requestAction != 'reg_pump' and requestAction not in pump_out_overList:
184
-#            requestAction = 'reg_pump_out'
185
-#            actionState = 'reg_pump_out' 
186
-            
187
-            
188 168
         if l_actionState == 'reg_pump' and requestAction != 'reg_pump' and requestAction not in pump_out_overList:
189 169
             requestAction = 'reg_pump_out'
190 170
             actionState = 'reg_pump_out' 
191 171
             
192
-            
193
-                        
194
-#        if l_actionState == 'fak_pump_out_hold' and requestAction != 'fak_pump' and requestAction not in pump_out_overList:
195
-#            requestAction = 'fak_pump_out'
196
-#            actionState = 'fak_pump_out'
197
-            
198 172
         if l_actionState == 'fak_pump' and requestAction != 'fak_pump' and requestAction not in pump_out_overList:
199 173
             requestAction = 'fak_pump_out'
200 174
             actionState = 'fak_pump_out'            
201 175
             
202
-            
203 176
         if l_actionState == 'reg_powerslide' and requestAction != 'reg_powerslide':
204 177
             requestAction = 'reg_powerslide_out'
205 178
             actionState = 'reg_powerslide_out' 
@@ -325,8 +298,7 @@ def main():
325 298
             actionState = 'fak_5050-roll' 
326 299
             print('************************')                                                                                                                  
327 300
     else:
328
-        print("action over ridden")
329
-        #own['actionState'] = requestAction                     
301
+        print("action over ridden")               
330 302
     def updateAction(requestAction, actionState):
331 303
         try:
332 304
             flip_start_frame = own['flip_start_lay']
@@ -335,7 +307,6 @@ def main():
335 307
         except:
336 308
             flip_start_frame = 1  
337 309
             flipspeed = .6  
338
-        #flipspeed = own['flipspeed'] 
339 310
 ###############################        
340 311
         #one shot actions
341 312
 ###############################
@@ -384,21 +355,17 @@ def main():
384 355
                 deck.playAction("a_fak_dropin", 60,80, layer=trans_layer, play_mode=0, speed=.75)
385 356
                 trucks.playAction("a_fak_dropin", 60,80, layer=trans_layer, play_mode=0, speed=.75)    
386 357
 
387
-
388
-
389 358
             if requestAction == 'reg_turnRight_out':
390 359
                 actionState = 'reg_turnRight_out'
391 360
                 own['actionTimer'] = 19
392 361
                 trans_playing = skater.isPlayingAction(trans_layer)
393 362
                 if trans_playing:
394 363
                     cur_frame = skater.getActionFrame(trans_layer)
395
-                    #cur_frame -= 2   
396 364
                                   
397 365
                 if trans_playing and cur_frame > .5:                
398 366
                     skater.playAction("nreg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
399 367
                     deck.playAction("a_reg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
400 368
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
401
-                    #own['actionTimer'] = cur_frame
402 369
                     own['actionTimer'] = (10 - cur_frame) *2
403 370
                 else:                      
404 371
                     skater.playAction("nreg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
@@ -410,13 +377,11 @@ def main():
410 377
                 own['actionTimer'] = 19
411 378
                 trans_playing = skater.isPlayingAction(trans_layer)
412 379
                 if trans_playing:
413
-                    cur_frame = skater.getActionFrame(trans_layer)
414
-                    #cur_frame -= 2                    
380
+                    cur_frame = skater.getActionFrame(trans_layer)        
415 381
                 if trans_playing and cur_frame > .5:                
416 382
                     skater.playAction("nreg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
417 383
                     deck.playAction("a_reg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
418 384
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
419
-                    #own['actionTimer'] = cur_frame
420 385
                     own['actionTimer'] = (10 - cur_frame) *2
421 386
                 else:                      
422 387
                     skater.playAction("nreg_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
@@ -428,13 +393,11 @@ def main():
428 393
                 own['actionTimer'] = 19
429 394
                 trans_playing = skater.isPlayingAction(trans_layer)
430 395
                 if trans_playing:
431
-                    cur_frame = skater.getActionFrame(trans_layer)
432
-                    #cur_frame -= 2                    
396
+                    cur_frame = skater.getActionFrame(trans_layer)          
433 397
                 if trans_playing and cur_frame > .5:                
434 398
                     skater.playAction("nfak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
435 399
                     deck.playAction("a_fak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
436 400
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
437
-                    #own['actionTimer'] = cur_frame
438 401
                     own['actionTimer'] = (10 - cur_frame) *2
439 402
                 else:                      
440 403
                     skater.playAction("nfak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
@@ -446,13 +409,11 @@ def main():
446 409
                 own['actionTimer'] = 19
447 410
                 trans_playing = skater.isPlayingAction(trans_layer)
448 411
                 if trans_playing:
449
-                    cur_frame = skater.getActionFrame(trans_layer)
450
-                    #cur_frame -= 2                    
412
+                    cur_frame = skater.getActionFrame(trans_layer)                   
451 413
                 if trans_playing and cur_frame > .5:                
452 414
                     skater.playAction("nfak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
453 415
                     deck.playAction("a_fak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
454 416
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
455
-                    #own['actionTimer'] = cur_frame
456 417
                     own['actionTimer'] = (10 - cur_frame) *2
457 418
                 else:                      
458 419
                     skater.playAction("nfak_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
@@ -465,9 +426,7 @@ def main():
465 426
                 own['actionTimer'] = 19
466 427
                 trans_playing = skater.isPlayingAction(trans_layer)
467 428
                 if trans_playing:
468
-                    cur_frame = skater.getActionFrame(trans_layer)
469
-                    print('opos_out: ', cur_frame)
470
-                    #cur_frame -= 2                    
429
+                    cur_frame = skater.getActionFrame(trans_layer)                
471 430
                 if trans_playing and cur_frame > .5:                
472 431
                     skater.playAction("noposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
473 432
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
@@ -483,8 +442,7 @@ def main():
483 442
                 own['actionTimer'] = 19
484 443
                 trans_playing = skater.isPlayingAction(trans_layer)
485 444
                 if trans_playing:
486
-                    cur_frame = skater.getActionFrame(trans_layer)
487
-                    #cur_frame -= 2                    
445
+                    cur_frame = skater.getActionFrame(trans_layer)                 
488 446
                 if trans_playing and cur_frame > .5:                
489 447
                     skater.playAction("fak_oposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
490 448
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
@@ -500,8 +458,7 @@ def main():
500 458
                 own['actionTimer'] = 19
501 459
                 trans_playing = skater.isPlayingAction(trans_layer)
502 460
                 if trans_playing:
503
-                    cur_frame = skater.getActionFrame(trans_layer)
504
-                    #cur_frame -= 2                    
461
+                    cur_frame = skater.getActionFrame(trans_layer)                   
505 462
                 if trans_playing and cur_frame > .5:                
506 463
                     skater.playAction("nnoposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
507 464
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
@@ -517,8 +474,7 @@ def main():
517 474
                 own['actionTimer'] = 19
518 475
                 trans_playing = skater.isPlayingAction(trans_layer)
519 476
                 if trans_playing:
520
-                    cur_frame = skater.getActionFrame(trans_layer)
521
-                    #cur_frame -= 2                    
477
+                    cur_frame = skater.getActionFrame(trans_layer)                  
522 478
                 if trans_playing and cur_frame > .5:                
523 479
                     skater.playAction("fak_noposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
524 480
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
@@ -534,8 +490,7 @@ def main():
534 490
                 own['actionTimer'] = 39
535 491
                 trans_playing = skater.isPlayingAction(trans_layer)
536 492
                 if trans_playing:
537
-                    cur_frame = skater.getActionFrame(trans_layer)
538
-                    #cur_frame -= 2                    
493
+                    cur_frame = skater.getActionFrame(trans_layer)              
539 494
                 if trans_playing and cur_frame > .5:                
540 495
                     skater.playAction("nreg_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
541 496
                     deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
@@ -545,14 +500,7 @@ def main():
545 500
                 else:                      
546 501
                     skater.playAction("nreg_pump_in", 20,1, layer=trans_layer, play_mode=0, speed=.5)
547 502
                     deck.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)
548
-                    trucks.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)
549
-                    
550
-#            if requestAction == 'reg_pump_out_hold':
551
-#                actionState = 'reg_pump_out_hold'
552
-#                own['actionTimer'] = 19
553
-#                skater.playAction("nreg_pump_in", 10,10, layer=trans_layer, play_mode=0, speed=.5)
554
-#                deck.playAction("a_reg", 10,10, layer=trans_layer, play_mode=1, speed=.5)
555
-#                trucks.playAction("a_reg", 10,10, layer=trans_layer, play_mode=1, speed=.5)                    
503
+                    trucks.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)                   
556 504
                     
557 505
             if requestAction == 'fak_pump_out':
558 506
                 actionState = 'fak_pump_out'
@@ -560,7 +508,7 @@ def main():
560 508
                 trans_playing = skater.isPlayingAction(trans_layer)
561 509
                 if trans_playing:
562 510
                     cur_frame = skater.getActionFrame(trans_layer)
563
-                    #cur_frame -= 2                    
511
+                
564 512
                 if trans_playing and cur_frame > .5:                
565 513
                     skater.playAction("nfak_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
566 514
                     deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
@@ -570,20 +518,13 @@ def main():
570 518
                     skater.playAction("nfak_pump_in", 20,1, layer=trans_layer, play_mode=0, speed=.5)
571 519
                     deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=1, speed=.5)
572 520
                     trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=1, speed=.5)
573
-#            if requestAction == 'fak_pump_out_hold':
574
-#                actionState = 'fak_pump_out_hold'
575
-#                own['actionTimer'] = 19
576
-#                skater.playAction("nfak_pump_in", 10,10, layer=trans_layer, play_mode=0, speed=.5)
577
-#                deck.playAction("a_reg", 10,10, layer=trans_layer, play_mode=1, speed=.5)
578
-#                trucks.playAction("a_reg", 10,10, layer=trans_layer, play_mode=1, speed=.5)                          
579 521
 
580 522
             if requestAction == 'reg_stop_out':
581 523
                 actionState = 'reg_stop_out'
582 524
                 own['actionTimer'] = 30
583 525
                 trans_playing = skater.isPlayingAction(trans_layer)
584 526
                 if trans_playing:
585
-                    cur_frame = skater.getActionFrame(trans_layer)
586
-                    #cur_frame -= 2                    
527
+                    cur_frame = skater.getActionFrame(trans_layer)              
587 528
                 if trans_playing and cur_frame > 1:                
588 529
                     skater.playAction("reg_stopin", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
589 530
                     deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
@@ -599,8 +540,7 @@ def main():
599 540
                 own['actionTimer'] = 30
600 541
                 trans_playing = skater.isPlayingAction(trans_layer)
601 542
                 if trans_playing:
602
-                    cur_frame = skater.getActionFrame(trans_layer)
603
-                    #cur_frame -= 2                    
543
+                    cur_frame = skater.getActionFrame(trans_layer)                   
604 544
                 if trans_playing and cur_frame > 1:                
605 545
                     skater.playAction("fak_stopin", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
606 546
                     deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
@@ -611,15 +551,12 @@ def main():
611 551
                     deck.playAction("a_reg", 15,1, layer=trans_layer, play_mode=0, speed=.5)
612 552
                     trucks.playAction("a_reg", 15,1, layer=trans_layer, play_mode=0, speed=.5)                           
613 553
                     
614
-
615
-
616 554
             if requestAction == 'reg_tailslide_out':
617 555
                 actionState = 'reg_tailslide_out'
618 556
                 own['actionTimer'] = 19
619 557
                 trans_playing = skater.isPlayingAction(trans_layer)
620 558
                 if trans_playing:
621
-                    cur_frame = skater.getActionFrame(trans_layer)
622
-                    #cur_frame -= 2                    
559
+                    cur_frame = skater.getActionFrame(trans_layer)                
623 560
                 if trans_playing and cur_frame > 1:                
624 561
                     skater.playAction("fak_noses", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
625 562
                     deck.playAction("a_fak_noses", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
@@ -634,8 +571,7 @@ def main():
634 571
                 own['actionTimer'] = 19
635 572
                 trans_playing = skater.isPlayingAction(trans_layer)
636 573
                 if trans_playing:
637
-                    cur_frame = skater.getActionFrame(trans_layer)
638
-                    #cur_frame -= 2                    
574
+                    cur_frame = skater.getActionFrame(trans_layer)                  
639 575
                 if trans_playing and cur_frame > 1:                
640 576
                     skater.playAction("reg_noses", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
641 577
                     deck.playAction("a_reg_noses", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
@@ -650,8 +586,7 @@ def main():
650 586
                 own['actionTimer'] = 19
651 587
                 trans_playing = skater.isPlayingAction(trans_layer)
652 588
                 if trans_playing:
653
-                    cur_frame = skater.getActionFrame(trans_layer)
654
-                    #cur_frame -= 2                    
589
+                    cur_frame = skater.getActionFrame(trans_layer)                   
655 590
                 if trans_playing and cur_frame > 1:                
656 591
                     skater.playAction("fak_tails", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
657 592
                     deck.playAction("a_fak_tails", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
@@ -667,7 +602,6 @@ def main():
667 602
                 trans_playing = skater.isPlayingAction(trans_layer)
668 603
                 if trans_playing:
669 604
                     cur_frame = skater.getActionFrame(trans_layer)
670
-                    #cur_frame -= 2                    
671 605
                 if trans_playing and cur_frame > 1:                
672 606
                     skater.playAction("reg_tails", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
673 607
                     deck.playAction("a_reg_tails", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
@@ -683,8 +617,7 @@ def main():
683 617
                 own['actionTimer'] = 5
684 618
                 trans_playing = skater.isPlayingAction(trans_layer)
685 619
                 if trans_playing:
686
-                    cur_frame = skater.getActionFrame(trans_layer)
687
-                    #cur_frame -= 2                    
620
+                    cur_frame = skater.getActionFrame(trans_layer)                    #cur_frame -= 2                    
688 621
                 if trans_playing and cur_frame > 1:                
689 622
                     skater.playAction("reg_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
690 623
                     deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
@@ -699,8 +632,7 @@ def main():
699 632
                 own['actionTimer'] = 5
700 633
                 trans_playing = skater.isPlayingAction(trans_layer)
701 634
                 if trans_playing:
702
-                    cur_frame = skater.getActionFrame(trans_layer)
703
-                    #cur_frame -= 2                    
635
+                    cur_frame = skater.getActionFrame(trans_layer)              
704 636
                 if trans_playing and cur_frame > 1:                
705 637
                     skater.playAction("fak_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
706 638
                     deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
@@ -717,8 +649,7 @@ def main():
717 649
                 own['actionTimer'] = 9
718 650
                 trans_playing = skater.isPlayingAction(trans_layer)
719 651
                 if trans_playing:
720
-                    cur_frame = skater.getActionFrame(trans_layer)
721
-                    #cur_frame -= 2                    
652
+                    cur_frame = skater.getActionFrame(trans_layer)              
722 653
                 if trans_playing and cur_frame > 1:                
723 654
                     skater.playAction("reg_noseg.002", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
724 655
                     deck.playAction("a_reg_noseg.002", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
@@ -734,8 +665,7 @@ def main():
734 665
                 own['requestAction'] = 'fak_noseg_out'
735 666
                 trans_playing = skater.isPlayingAction(trans_layer)
736 667
                 if trans_playing:
737
-                    cur_frame = skater.getActionFrame(trans_layer)
738
-                    #cur_frame -= 2                    
668
+                    cur_frame = skater.getActionFrame(trans_layer)               
739 669
                 if trans_playing and cur_frame > 1:                
740 670
                     skater.playAction("fak_noseg", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
741 671
                     deck.playAction("a_fak_noseg", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
@@ -752,8 +682,7 @@ def main():
752 682
                 own['actionTimer'] = 9
753 683
                 trans_playing = skater.isPlayingAction(trans_layer)
754 684
                 if trans_playing:
755
-                    cur_frame = skater.getActionFrame(trans_layer)
756
-                    #cur_frame -= 2                    
685
+                    cur_frame = skater.getActionFrame(trans_layer)                 
757 686
                 if trans_playing and cur_frame > 1:                
758 687
                     skater.playAction("reg_tailg.001", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
759 688
                     deck.playAction("a_reg_tailg.001", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
@@ -769,8 +698,7 @@ def main():
769 698
                 own['requestAction'] = 'fak_tailg_out'
770 699
                 trans_playing = skater.isPlayingAction(trans_layer)
771 700
                 if trans_playing:
772
-                    cur_frame = skater.getActionFrame(trans_layer)
773
-                    #cur_frame -= 2                    
701
+                    cur_frame = skater.getActionFrame(trans_layer)                   
774 702
                 if trans_playing and cur_frame > 1:                
775 703
                     skater.playAction("fak_tailg", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
776 704
                     deck.playAction("a_fak_tailg", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
@@ -804,8 +732,7 @@ def main():
804 732
                 own['requestAction'] = 'fak_nosegr_out'
805 733
                 trans_playing = skater.isPlayingAction(trans_layer)
806 734
                 if trans_playing:
807
-                    cur_frame = skater.getActionFrame(trans_layer)
808
-                    #cur_frame -= 2                    
735
+                    cur_frame = skater.getActionFrame(trans_layer)             
809 736
                 if trans_playing and cur_frame > 1:                
810 737
                     skater.playAction("fak_nosegR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
811 738
                     deck.playAction("a_fak_nosegR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
@@ -822,8 +749,7 @@ def main():
822 749
                 own['requestAction'] = 'reg_tailgr_out'
823 750
                 trans_playing = skater.isPlayingAction(trans_layer)
824 751
                 if trans_playing:
825
-                    cur_frame = skater.getActionFrame(trans_layer)
826
-                    #cur_frame -= 2                    
752
+                    cur_frame = skater.getActionFrame(trans_layer)                
827 753
                 if trans_playing and cur_frame > 1:                
828 754
                     skater.playAction("reg_tailgR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
829 755
                     deck.playAction("a_reg_tailgR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
@@ -839,8 +765,7 @@ def main():
839 765
                 own['requestAction'] = 'fak_tailgr_out'
840 766
                 trans_playing = skater.isPlayingAction(trans_layer)
841 767
                 if trans_playing:
842
-                    cur_frame = skater.getActionFrame(trans_layer)
843
-                    #cur_frame -= 2                    
768
+                    cur_frame = skater.getActionFrame(trans_layer)                 
844 769
                 if trans_playing and cur_frame > 1:                
845 770
                     skater.playAction("fak_tailgR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
846 771
                     deck.playAction("a_fak_tailgR", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
@@ -857,8 +782,7 @@ def main():
857 782
                 own['requestAction'] = 'reg_nosegl_out'
858 783
                 trans_playing = skater.isPlayingAction(trans_layer)
859 784
                 if trans_playing:
860
-                    cur_frame = skater.getActionFrame(trans_layer)
861
-                    #cur_frame -= 2                    
785
+                    cur_frame = skater.getActionFrame(trans_layer)                    
862 786
                 if trans_playing and cur_frame > 1:                
863 787
                     skater.playAction("reg_nosegL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
864 788
                     deck.playAction("a_reg_nosegL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
@@ -874,8 +798,7 @@ def main():
874 798
                 own['requestAction'] = 'fak_nosegl_out'
875 799
                 trans_playing = skater.isPlayingAction(trans_layer)
876 800
                 if trans_playing:
877
-                    cur_frame = skater.getActionFrame(trans_layer)
878
-                    #cur_frame -= 2                    
801
+                    cur_frame = skater.getActionFrame(trans_layer)                   
879 802
                 if trans_playing and cur_frame > 1:                
880 803
                     skater.playAction("fak_nosegL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
881 804
                     deck.playAction("a_fak_nosegL", cur_frame,40, layer=trans_layer, play_mode=0, speed=1)
@@ -919,8 +842,7 @@ def main():
919 842
                 else:                      
920 843
                     skater.playAction("fak_tailgL", 30,40, layer=trans_layer, play_mode=0, speed=1)
921 844
                     deck.playAction("a_fak_tailgL", 30,40, layer=trans_layer, play_mode=0, speed=1)
922
-                    trucks.playAction("a_fak_tailgL", 30,40, layer=trans_layer, play_mode=0, speed=1)                                         
923
-                    
845
+                    trucks.playAction("a_fak_tailgL", 30,40, layer=trans_layer, play_mode=0, speed=1)
924 846
                     
925 847
             if requestAction == 'reg_manual_out':
926 848
                 actionState = 'reg_manual_out'
@@ -986,9 +908,7 @@ def main():
986 908
                 else:                      
987 909
                     skater.playAction("fak_nmanual", 10,1, layer=trans_layer, play_mode=0, speed=1)
988 910
                     deck.playAction("a_reg_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)
989
-                    trucks.playAction("a_reg_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)                                           
990
-            
991
-            
911
+                    trucks.playAction("a_reg_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)
992 912
             
993 913
             if requestAction == 'reg-fak_nmanual':
994 914
                 own['actionTimer'] = 9
@@ -1009,12 +929,8 @@ def main():
1009 929
                 own['actionTimer'] = 9 
1010 930
                 skater.playAction("fak_nmanual", 70,80, layer=trans_layer, play_mode=0, speed=1)
1011 931
                 deck.playAction("a_reg_manual", 70,80, layer=trans_layer, play_mode=0, speed=1)
1012
-                trucks.playAction("a_reg_manual", 70,80, layer=trans_layer, play_mode=0, speed=1)                                                           
1013
-            
1014
-            
1015
-            
1016
-            
1017
-                    
932
+                trucks.playAction("a_reg_manual", 70,80, layer=trans_layer, play_mode=0, speed=1)
933
+
1018 934
             if requestAction == 'reg_brfoot':
1019 935
                 actionState = 'reg_brfoot'
1020 936
                 own['actionTimer'] = 40
@@ -1066,8 +982,6 @@ def main():
1066 982
                 deck.playAction("a_brfoot", 1, 30, layer=trans_layer, play_mode=0, speed=.75)
1067 983
                 trucks.playAction("a_brfoot", 1, 30, layer=trans_layer, play_mode=0, speed=.75)                
1068 984
 
1069
-                                      
1070
-                    
1071 985
             if requestAction == 'reg_push':
1072 986
                 own['actionTimer'] = 70
1073 987
                 skater.playAction("reg_push", 1,35, layer=trans_layer, play_mode=0, speed=.5)
@@ -1113,7 +1027,7 @@ def main():
1113 1027
                 own['actionState'] = 'fak_manual_revert_cw'
1114 1028
                 skater.playAction("fak_manual_revert_cw", 70,10, layer=trans_layer, priority=8, play_mode=0, speed=4)
1115 1029
                 deck.playAction("a_fak_manual_revert_cw", 70,10, layer=trans_layer, priority=1, play_mode=0, speed=4)
1116
-                trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=trans_layer, priority=0, play_mode=0, speed=4)                  
1030
+                trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=trans_layer, priority=0, play_mode=0, speed=4)           
1117 1031
                                       
1118 1032
             if requestAction == 'revert1':
1119 1033
                 own['actionTimer'] = 18
@@ -1416,7 +1330,6 @@ def main():
1416 1330
                 deck.playAction("a_fak_offboard", 30,1, layer=trans_layer, play_mode=0, speed=1.5)
1417 1331
                 trucks.playAction("a_fak_offboard", 30,1, layer=trans_layer, play_mode=0, speed=1.5)
1418 1332
                 
1419
-                
1420 1333
             if requestAction == 'reg_powerslide_out':
1421 1334
                 actionState = 'reg_powerslide_out'
1422 1335
                 own['actionTimer'] = 40  
@@ -1440,8 +1353,7 @@ def main():
1440 1353
                 own['actionTimer'] = 40  
1441 1354
                 skater.playAction("nfak_powerslide", 20,0, layer=trans_layer, play_mode=0, speed=1.5)
1442 1355
                 deck.playAction("a_fak_powerslide_d", 20,0, layer=trans_layer, play_mode=0, speed=1.5)
1443
-                trucks.playAction("a_fak_powerslide_t", 20,0, layer=trans_layer, play_mode=0, speed=1.5)  
1444
-                
1356
+                trucks.playAction("a_fak_powerslide_t", 20,0, layer=trans_layer, play_mode=0, speed=1.5)             
1445 1357
                 
1446 1358
             if requestAction == 'fak-reg_5050':
1447 1359
                 actionState = 'fak-reg_5050'
@@ -1534,8 +1446,7 @@ def main():
1534 1446
                 skater.playAction("fak_air", 30,40, layer=trans_layer, play_mode=0, speed=.5)
1535 1447
                 deck.playAction("a_reg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
1536 1448
                 trucks.playAction("a_reg", 30,40, layer=trans_layer, play_mode=0, speed=.5) 
1537
-                
1538
-                
1449
+                     
1539 1450
             if requestAction == 'reg_back_invert_out':
1540 1451
                 own['actionTimer'] = 60
1541 1452
                 actionState = 'reg_back_invert_out'
@@ -1656,8 +1567,7 @@ def main():
1656 1567
                 else:                           
1657 1568
                     skater.playAction("nfak_powerslide2", 20,80, layer=loop_layer, play_mode=1, speed=.5)
1658 1569
                     deck.playAction("a_fak_powerslide2_d", 20,80, layer=loop_layer, speed=.5)
1659
-                    trucks.playAction("a_fak_powerslide2_t", 20,80, layer=loop_layer, play_mode=1, speed=.5)                                                            
1660
-
1570
+                    trucks.playAction("a_fak_powerslide2_t", 20,80, layer=loop_layer, play_mode=1, speed=.5)
1661 1571
                     
1662 1572
             #reg_roll    
1663 1573
             if requestAction == 'reg_roll':
@@ -1693,16 +1603,11 @@ def main():
1693 1603
                     if flipping == 0:
1694 1604
                         trans_playing = skater.isPlayingAction(trans_layer)
1695 1605
                         if trans_playing:
1696
-                            cur_frame = skater.getActionFrame(trans_layer)
1697
-                            #cur_frame -= 2                    
1606
+                            cur_frame = skater.getActionFrame(trans_layer)                
1698 1607
                         if trans_playing and cur_frame > 1:
1699
-                            #skater.stopAction(trans_layer)
1700
-                            #deck.stopAction(trans_layer)
1701
-                            #trucks.stopAction(trans_layer)
1702 1608
                             skater.playAction("nnoposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1703 1609
                             deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1704 1610
                             trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1705
-                            #print(cur_frame)
1706 1611
                         else: 
1707 1612
                             own['actionTimer'] = 20   
1708 1613
                             skater.playAction("nnoposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
@@ -1741,8 +1646,7 @@ def main():
1741 1646
                     trans_playing = skater.isPlayingAction(trans_layer)
1742 1647
                     
1743 1648
                     if trans_playing:
1744
-                        cur_frame = skater.getActionFrame(trans_layer)
1745
-                        #cur_frame -= 2                    
1649
+                        cur_frame = skater.getActionFrame(trans_layer)             
1746 1650
                     if trans_playing and cur_frame > 1:                
1747 1651
                         skater.playAction("nreg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
1748 1652
                         deck.playAction("a_reg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
@@ -1755,11 +1659,9 @@ def main():
1755 1659
                         deck.playAction("a_reg_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
1756 1660
                         trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=0, speed=.5) 
1757 1661
                 if l_actionState == 'reg_Right':
1758
-                    #requestAction = 'reg_turnRight_out'
1759 1662
                     trans_playing = skater.isPlayingAction(trans_layer)
1760 1663
                     if trans_playing:
1761
-                        cur_frame = skater.getActionFrame(trans_layer)
1762
-                        #cur_frame -= 2                    
1664
+                        cur_frame = skater.getActionFrame(trans_layer)                   
1763 1665
                     if trans_playing and cur_frame > 1:                
1764 1666
                         skater.playAction("nreg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
1765 1667
                         deck.playAction("a_reg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
@@ -1776,22 +1678,16 @@ def main():
1776 1678
                     trucks.playAction("a_reg", 1,40, layer=loop_layer, play_mode=1, speed=.5)                           
1777 1679
 
1778 1680
                                                                                                                               
1779
-
1780 1681
             #fak_roll    
1781 1682
             if requestAction == 'fak_roll':
1782 1683
                 if l_actionState == 'fak_pump':
1783 1684
                     trans_playing = skater.isPlayingAction(trans_layer)
1784 1685
                     if trans_playing:
1785
-                        cur_frame = skater.getActionFrame(trans_layer)
1786
-                        #cur_frame -= 2                    
1686
+                        cur_frame = skater.getActionFrame(trans_layer)    
1787 1687
                     if trans_playing and cur_frame > 1:
1788
-                        #skater.stopAction(trans_layer)
1789
-                        #deck.stopAction(trans_layer)
1790
-                        #trucks.stopAction(trans_layer)
1791 1688
                         skater.playAction("nfak_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1792 1689
                         deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1793 1690
                         trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1794
-                        #print(cur_frame)
1795 1691
                     else:    
1796 1692
                         skater.playAction("nfak_pump_in", 20,1, layer=trans_layer, play_mode=0, speed=1)
1797 1693
                         deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=1)
@@ -1799,16 +1695,12 @@ def main():
1799 1695
                 if l_actionState == 'fak_opos':
1800 1696
                     trans_playing = skater.isPlayingAction(trans_layer)
1801 1697
                     if trans_playing:
1802
-                        cur_frame = skater.getActionFrame(trans_layer)
1803
-                        #cur_frame -= 2                    
1698
+                        cur_frame = skater.getActionFrame(trans_layer)    
1804 1699
                     if trans_playing and cur_frame > 1:
1805
-                        #skater.stopAction(trans_layer)
1806
-                        #deck.stopAction(trans_layer)
1807
-                        #trucks.stopAction(trans_layer)
1808 1700
                         skater.playAction("fak_oposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1809 1701
                         deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1810 1702
                         trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1811
-                        #print(cur_frame)
1703
+
1812 1704
                     else:
1813 1705
                         own['actionTimer'] = 20    
1814 1706
                         skater.playAction("fak_oposin", 20,1, layer=trans_layer, play_mode=0, speed=1) 
@@ -1817,16 +1709,11 @@ def main():
1817 1709
                 if l_actionState == 'fak_nopos':
1818 1710
                     trans_playing = skater.isPlayingAction(trans_layer)
1819 1711
                     if trans_playing:
1820
-                        cur_frame = skater.getActionFrame(trans_layer)
1821
-                        #cur_frame -= 2                    
1712
+                        cur_frame = skater.getActionFrame(trans_layer)    
1822 1713
                     if trans_playing and cur_frame > 1:
1823
-                        #skater.stopAction(trans_layer)
1824
-                        #deck.stopAction(trans_layer)
1825
-                        #trucks.stopAction(trans_layer)
1826 1714
                         skater.playAction("fak_noposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1827 1715
                         deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1828 1716
                         trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
1829
-                        #print(cur_frame)
1830 1717
                     else:    
1831 1718
                         own['actionTimer'] = 20
1832 1719
                         skater.playAction("fak_noposin", 20,1, layer=trans_layer, play_mode=0, speed=1)
@@ -1858,10 +1745,7 @@ def main():
1858 1745
                     else:
1859 1746
                         skater.playAction("fak_nmanual", 10,1, layer=trans_layer, play_mode=0, speed=1)                
1860 1747
                         deck.playAction("a_reg_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)
1861
-                        trucks.playAction("a_reg_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)
1862
-                        
1863
-                        
1864
-                        
1748
+                        trucks.playAction("a_reg_manual", 10,1, layer=trans_layer, play_mode=0, speed=1)  
1865 1749
                         
1866 1750
                 if l_actionState == 'fak_turnLeft':
1867 1751
                     trans_playing = skater.isPlayingAction(trans_layer)
@@ -2057,9 +1941,7 @@ def main():
2057 1941
                 else:
2058 1942
                     skater.playAction("reg_bsg2", 10,30, layer=loop_layer, play_mode=1, speed=.5)
2059 1943
                     deck.playAction("a_reg", 10,30, layer=loop_layer, play_mode=1, speed=.5)
2060
-                    trucks.playAction("a_reg", 10,30, layer=loop_layer, play_mode=1, speed=.5)
2061
-                    
2062
-                    
1944
+                    trucks.playAction("a_reg", 10,30, layer=loop_layer, play_mode=1, speed=.5)        
2063 1945
                     
2064 1946
             if requestAction == 'fak_frontside_grab':
2065 1947
                 actionState = 'fak_frontside_grab'
@@ -2122,7 +2004,6 @@ def main():
2122 2004
                     deck.playAction("a_reg", 10,30, layer=loop_layer, play_mode=1, speed=.5)
2123 2005
                     trucks.playAction("a_reg", 10,30, layer=loop_layer, play_mode=1, speed=.5)  
2124 2006
 
2125
-
2126 2007
             if requestAction == 'frontside_tail_grab':
2127 2008
                 actionState = 'frontside_tail_grab'
2128 2009
                 if l_actionState != 'frontside_tail_grab':
@@ -2172,17 +2053,11 @@ def main():
2172 2053
                     trucks.stopAction(flip_layer)
2173 2054
                     skater.playAction("reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
2174 2055
                     deck.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
2175
-                    trucks.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
2176
-                    #skater.playAction("reg_nmanual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                
2177
-                    #deck.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
2178
-                    #trucks.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                            
2056
+                    trucks.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)                           
2179 2057
                 else:
2180 2058
                     skater.playAction("reg_noseg.002", 11,40, layer=loop_layer, play_mode=1, speed=.5)
2181 2059
                     deck.playAction("a_reg_noseg.002", 11,40, layer=loop_layer, play_mode=1, speed=.5)
2182
-                    trucks.playAction("a_reg_noseg.002", 11,40, layer=loop_layer, play_mode=1, speed=.5)
2183
-                    #skater.playAction("reg_nmanual", 10,70, layer=loop_layer, play_mode=1, speed=.5) 
2184
-                    #deck.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
2185
-                    #trucks.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                    
2060
+                    trucks.playAction("a_reg_noseg.002", 11,40, layer=loop_layer, play_mode=1, speed=.5)                   
2186 2061
 
2187 2062
             if requestAction == 'fak_noseg':
2188 2063
                 actionState = 'fak_noseg'
@@ -2192,17 +2067,11 @@ def main():
2192 2067
                     trucks.stopAction(flip_layer)                    
2193 2068
                     skater.playAction("fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
2194 2069
                     deck.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
2195
-                    trucks.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)        
2196
-                    #skater.playAction("fak_nmanual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                
2197
-                    #deck.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
2198
-                    #trucks.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                    
2070
+                    trucks.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)                            
2199 2071
                 else:
2200 2072
                     skater.playAction("fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2201 2073
                     deck.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2202
-                    trucks.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2203
-                    #skater.playAction("fak_nmanual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                
2204
-                    #deck.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
2205
-                    #trucks.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                    
2074
+                    trucks.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)                    
2206 2075
             
2207 2076
             if requestAction == 'reg_tailg':
2208 2077
                 actionState = 'reg_tailg'
@@ -2213,16 +2082,11 @@ def main():
2213 2082
                     skater.playAction("reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
2214 2083
                     deck.playAction("a_reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
2215 2084
                     trucks.playAction("a_reg_tailg.001", 40,30, layer=trans_layer, play_mode=0, speed=1)
2216
-                    #skater.playAction("reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                
2217
-                    #deck.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
2218
-                    #trucks.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                            
2085
+                            
2219 2086
                 else:
2220 2087
                     skater.playAction("reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2221 2088
                     deck.playAction("a_reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2222
-                    trucks.playAction("a_reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2223
-                    #skater.playAction("reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                
2224
-                    #deck.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
2225
-                    #trucks.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                    
2089
+                    trucks.playAction("a_reg_tailg.001", 30,1, layer=loop_layer, play_mode=1, speed=.5)                   
2226 2090
 
2227 2091
             if requestAction == 'fak_tailg':
2228 2092
                 actionState = 'fak_tailg'
@@ -2232,17 +2096,12 @@ def main():
2232 2096
                     trucks.stopAction(flip_layer)                    
2233 2097
                     skater.playAction("fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)
2234 2098
                     deck.playAction("a_fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)
2235
-                    trucks.playAction("a_fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)        
2236
-                    #skater.playAction("fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                
2237
-                    #deck.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
2238
-                    #trucks.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                    
2099
+                    trucks.playAction("a_fak_tailg", 40,30, layer=trans_layer, play_mode=0, speed=1)                            
2239 2100
                 else:
2240 2101
                     skater.playAction("fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2241 2102
                     deck.playAction("a_fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2242 2103
                     trucks.playAction("a_fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2243
-                    #skater.playAction("fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                
2244
-                    #deck.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
2245
-                    #trucks.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                                           
2104
+                                                              
2246 2105
             if requestAction == 'reg_tailgr':
2247 2106
                 actionState = 'reg_tailgr'
2248 2107
                 if l_actionState != 'reg_tailgr' and l_actionState != 'reg_air_tail':
@@ -2377,8 +2236,7 @@ def main():
2377 2236
                 else:
2378 2237
                     skater.playAction("reg_nosegL", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2379 2238
                     deck.playAction("a_reg_nosegL", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2380
-                    trucks.playAction("a_reg_nosegL", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2381
-            #print("rA:", requestAction)        
2239
+                    trucks.playAction("a_reg_nosegL", 30,1, layer=loop_layer, play_mode=1, speed=.5)       
2382 2240
             if requestAction == 'fak_nosegl':
2383 2241
                 actionState = 'fak_nosegl'
2384 2242
                 print("fak_nosegl state")
@@ -2448,9 +2306,6 @@ def main():
2448 2306
                     deck.playAction("a_reg_tails", 30,1, layer=loop_layer, play_mode=1, speed=.5)
2449 2307
                     trucks.playAction("a_reg_tails", 30,1, layer=loop_layer, play_mode=1, speed=.5)                    
2450 2308
 
2451
-
2452
-
2453
-
2454 2309
             if requestAction == 'reg_5050':
2455 2310
                 actionState = 'reg_5050'
2456 2311
                 #own['actionTimer'] = 0
@@ -2462,7 +2317,7 @@ def main():
2462 2317
                 #own['actionTimer'] = 0
2463 2318
                 skater.playAction("fak_5050", 1,30, layer=loop_layer, play_mode=1, speed=.5)
2464 2319
                 deck.playAction("a_reg", 1,30, layer=loop_layer, play_mode=1, speed=.5)
2465
-                trucks.playAction("a_reg", 1,30, layer=loop_layer, play_mode=1, speed=.5)                                                                              
2320
+                trucks.playAction("a_reg", 1,30, layer=loop_layer, play_mode=1, speed=.5)
2466 2321
 
2467 2322
             if requestAction == 'reg_bsboard':
2468 2323
                 actionState = 'reg_bsboard'
@@ -2473,15 +2328,12 @@ def main():
2473 2328
                 actionState = 'fak_bsboard'
2474 2329
                 skater.playAction("fak_BS_Board2", 1,30, layer=loop_layer, play_mode=1, speed=.5)
2475 2330
                 deck.playAction("a_fak_BS_Board2", 1,30, layer=loop_layer, play_mode=1, speed=.5)
2476
-                trucks.playAction("a_fak_BS_Board2", 1,30, layer=loop_layer, play_mode=1, speed=.5)                                                                              
2477
-
2331
+                trucks.playAction("a_fak_BS_Board2", 1,30, layer=loop_layer, play_mode=1, speed=.5)
2478 2332
             if requestAction == 'reg_fsboard':
2479 2333
                 actionState = 'reg_fsboard'
2480 2334
                 skater.playAction("reg_FS_Board", 1,30, layer=loop_layer, play_mode=1, speed=.5)
2481 2335
                 deck.playAction("a_reg_FS_Board", 1,30, layer=loop_layer, play_mode=1, speed=.5)
2482
-                trucks.playAction("a_reg_FS_Board", 1,30, layer=loop_layer, play_mode=1, speed=.5)                                     
2483
-
2484
-
2336
+                trucks.playAction("a_reg_FS_Board", 1,30, layer=loop_layer, play_mode=1, speed=.5)
2485 2337
 
2486 2338
             if requestAction == 'reg_air_nose':
2487 2339
                 actionState = 'reg_air_nose'
@@ -2664,10 +2516,7 @@ def main():
2664 2516
                 else:
2665 2517
                     skater.playAction("fak_hippy", 10,10, layer=loop_layer, play_mode=1, speed=.5)
2666 2518
                     deck.playAction("a_reg", 10,10, layer=loop_layer, play_mode=1, speed=.5)
2667
-                    trucks.playAction("a_reg", 10,10, layer=loop_layer, play_mode=1, speed=.5)                                                              
2668
-                    
2669
-                    
2670
-                             
2519
+                    trucks.playAction("a_reg", 10,10, layer=loop_layer, play_mode=1, speed=.5)
2671 2520
 
2672 2521
     #$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
2673 2522
     #walk anims            
@@ -2903,17 +2752,9 @@ def main():
2903 2752
             own['actionState'] = actionState
2904 2753
         else:
2905 2754
             pass
2906
-        #actionTimer = 60
2907
-        #try:
2908
-        #own['actionTimer'] = 60
2909
-        #except: pass
2910
-        #print(actionState)
2911 2755
         own['actionState'] = actionState
2912 2756
         return actionState
2913 2757
             
2914
-    
2915
-    #if (l_actionState == 'reg_land' and own['actionState'] != 'reg_land') or (l_actionState == 'fak_land' and own['actionState'] != 'fak_land'):
2916
-    #if (own['actionState'] != 'reg_land') and (own['actionState'] != 'fak_land'):
2917 2758
     l_playing = skater.isPlayingAction(loop_layer)
2918 2759
     t_playing = skater.isPlayingAction(trans_layer)        
2919 2760
     if l_playing == 1 and t_playing == 1:
@@ -2924,21 +2765,14 @@ def main():
2924 2765
     ###
2925 2766
     if own['actionTimer'] > 0:
2926 2767
         own['actionTimer'] -= 1
2927
-        #requestAction = 'empty'
2928 2768
     
2929 2769
 ##############
2930 2770
     #turn off land for manuals
2931 2771
     if (requestAction == 'reg_manual' or requestAction == 'fak_manual' or requestAction == 'reg_nmanual' or requestAction == 'fak_nmanual') and (actionState == 'reg_land' or actionState == 'fak_land'):
2932 2772
         own['actionTimer'] = 0
2933
-        
2934
-    #turn off land for grinds
2935
-    #if requestAction == 'reg_noseg' or requestAction == 'reg_5050' or requestAction == 'fak_5050':
2936
-        #own['actionTimer'] = 0
2937 2773
                   
2938 2774
     if (own['actionTimer'] == 0 or requestAction == 'reg_land' or requestAction == 'fak_land') or requestAction in jump_overrideList:
2939 2775
         actionState = updateAction(requestAction, actionState)
2940
-        #own['actionState'] = actionState
2941
-        
2942 2776
         
2943 2777
     if (own['actionState'] == 'reg_land' or own['actionState'] == 'reg_land') and own['actionTimer'] > 0:
2944 2778
         own['clear_request'] = 1    
@@ -2985,7 +2819,6 @@ def main():
2985 2819
     #set last variables
2986 2820
     own['l_actionState'] = actionState
2987 2821
     own['l_requestAction'] = requestAction
2988
-    #own['actionTimer'] = actionTimer
2989 2822
     own['queueAction'] = queueAction
2990 2823
     
2991 2824
 main()

+ 29
- 255
controller2.py Wyświetl plik

@@ -1373,10 +1373,7 @@ def main():
1373 1373
         
1374 1374
         
1375 1375
         if GRAB_ON == True and r_ground.triggered == 0 and aBut == True:
1376
-            own['requestAction'] = 'reg_fp_rback'
1377
-            #skater.playAction("reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
1378
-            #deck.playAction("a_reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
1379
-            #trucks.playAction("a_reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)          
1376
+            own['requestAction'] = 'reg_fp_rback'          
1380 1377
         elif GRAB_ON == True and GRAB_PLAYED == False and r_ground.triggered == 0:
1381 1378
             own['requestAction'] = 'backside_grab'        
1382 1379
             GRAB_PLAYED = True
@@ -1389,10 +1386,7 @@ def main():
1389 1386
         GRAB_ON = own["GRAB_ON"]
1390 1387
 
1391 1388
         if GRAB_ON == True and r_ground.triggered == 0 and aBut == True:
1392
-            own['requestAction'] = 'fak_fp_rback'    
1393
-            #skater.playAction("fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
1394
-            #deck.playAction("a_fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
1395
-            #trucks.playAction("a_fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)     
1389
+            own['requestAction'] = 'fak_fp_rback'         
1396 1390
         
1397 1391
         if GRAB_ON == True and GRAB_PLAYED == False and r_ground.triggered == 0:           
1398 1392
             own['requestAction'] = 'fak_frontside_grab' 
@@ -1495,7 +1489,6 @@ def main():
1495 1489
         GRAB_PLAYED = own["GRAB_PLAYED"]
1496 1490
         GRAB_ON = own["GRAB_ON"]
1497 1491
         if GRAB_ON == True and GRAB_PLAYED == False and r_ground.triggered == 0:           
1498
-            #cont.activate(fak_backsidegrab)
1499 1492
             own['requestAction'] = 'fak_backside_tail_grab' 
1500 1493
             GRAB_PLAYED = True
1501 1494
             own["GRAB_PLAYED)"] = GRAB_PLAYED
@@ -1510,7 +1503,6 @@ def main():
1510 1503
             SWAG = own.getLinearVelocity(True)
1511 1504
             SWAG = SWAG[1]
1512 1505
             own["swag"] = SWAG
1513
-            #print(SWAG)
1514 1506
             if STANCE == True:
1515 1507
                 if SWAG > 1 and SWAG < 2:
1516 1508
                     rotation = [ 0.0, 0, (SWAG / 200)]
@@ -1575,7 +1567,6 @@ def main():
1575 1567
         if framenumber == 900000:
1576 1568
             framenumber = 0
1577 1569
         own["framenum"] = framenumber
1578
-        #print(framenumber)
1579 1570
         
1580 1571
     def push():
1581 1572
         local = True
@@ -1619,57 +1610,33 @@ def main():
1619 1610
         lay = grablay + 40
1620 1611
         if STANCE == 0:
1621 1612
             own['requestAction'] = 'reg_brfoot'
1622
-            # skater.playAction("brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1623
-            # deck.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1624
-            # trucks.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1613
+
1625 1614
         if STANCE == 1:
1626
-            own['requestAction'] = 'fak_brfoot'
1627
-            # skater.playAction("fak_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1628
-            # deck.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1629
-            # trucks.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED) 
1615
+            own['requestAction'] = 'fak_brfoot' 
1630 1616
         jump()    
1631 1617
     def frfoot():
1632 1618
         lay = grablay + 40
1633 1619
         killact(5)
1634 1620
         if STANCE == 0:
1635 1621
             own['requestAction'] = 'reg_frfoot'
1636
-            # skater.playAction("frfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1637
-            # deck.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1638
-            # trucks.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1639 1622
         if STANCE == 1:
1640 1623
             own['requestAction'] = 'fak_frfoot'
1641
-            # skater.playAction("fakbfrfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1642
-            # deck.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1643
-            # trucks.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1644 1624
         jump()          
1645 1625
     def blfoot():
1646 1626
         lay = grablay + 40
1647 1627
         killact(5)
1648 1628
         if STANCE == 0:
1649 1629
             own['requestAction'] = 'reg_blfoot'
1650
-            # skater.playAction("blfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1651
-            # deck.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1652
-            # trucks.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1653 1630
         if STANCE == 1:
1654 1631
             own['requestAction'] = 'fak_blfoot'
1655
-            # skater.playAction("fakfrfoot.001", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1656
-            # deck.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1657
-            # trucks.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1658 1632
         jump() 
1659 1633
     def flfoot():
1660 1634
         lay = grablay + 40
1661 1635
         killact(5)
1662 1636
         if STANCE == 0:
1663 1637
             own['requestAction'] = 'reg_flfoot'
1664
-            # skater.playAction("flfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1665
-            # deck.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1666
-            # trucks.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1667 1638
         if STANCE == 1:
1668 1639
             own['requestAction'] = 'fak_flfoot'
1669
-            # own['reuqestAction'] = 'fak_flfoot'
1670
-            # skater.playAction("fak_flfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1671
-            # deck.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1672
-            # trucks.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED) 
1673 1640
         jump()         
1674 1641
     def rollsound():
1675 1642
         #onground
@@ -2038,19 +2005,7 @@ def main():
2038 2005
                     own['grindType'] = "reg_bsboard"
2039 2006
                 else:
2040 2007
                     own['grindType'] = "fak_bsboard"    
2041
-    #            if jumpstance == 1:
2042
-    #                own['grindType'] = "fak_bsboard"
2043
-    #                own["stance"] = True
2044
-    #                STANCE = True
2045
-    #            elif jumpstance == 0:    
2046
-    #                own['grindType'] = "reg_bsboard"
2047
-    #                own["stance"] = False
2048
-    #                STANCE = False
2049
-    #            elif jumpstance == 3:
2050
-    #                if STANCE == True:
2051
-    #                    own['grindType'] = "fak_bsboard"
2052
-    #                else:
2053
-    #                    own['grindType'] = "reg_bsboard"        
2008
+        
2054 2009
             if STANCE == True:    
2055 2010
                 if own['grindType'] == "reg_bsboard":
2056 2011
                     own['grind_stance'] = 0
@@ -2099,24 +2054,13 @@ def main():
2099 2054
                     own['grind_stance'] = 0
2100 2055
                 elif own['grindType'] == "fak_noseslide":
2101 2056
                     own['requestAction'] = 'fak_noseslide'  
2102
-                    own['grind_stance'] = 1              
2103
-    #            elif own['grindType'] == "nose_stall":
2104
-    #                own['requestAction'] = 'nose_stall'
2105
-    #                skater.playAction("fak_nose_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5)
2106
-    #                deck.playAction("a_fak_nose_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5)
2107
-    #                trucks.playAction("a_fak_nose_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5)  
2108
-    #            elif own['grindType'] == "tail_stall":
2109
-    #                own['requestAction'] = 'tail_stall'
2110
-    #                skater.playAction("fak_tail_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5)
2111
-    #                deck.playAction("a_fak_tail_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5)
2112
-    #                trucks.playAction("a_fak_tail_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5) 
2057
+                    own['grind_stance'] = 1               
2113 2058
                 else:
2114 2059
                     if STANCE == 0:
2115 2060
                         own['requestAction'] = 'reg_5050'
2116 2061
                     if STANCE == 1:
2117 2062
                         own['requestAction'] = 'fak_5050'
2118 2063
                 
2119
-            #elif STANCE == False and LAST_GRIND == False:
2120 2064
             elif STANCE == False:
2121 2065
                 if own['grindType'] == "reg_bsboard":
2122 2066
                     own['grind_stance'] = 0
@@ -2153,28 +2097,13 @@ def main():
2153 2097
                     own['requestAction'] = 'reg_tailslide'
2154 2098
                 elif own['grindType'] == "fak_tailslide":
2155 2099
                     own['grind_stance'] = 1
2156
-                    #own['requestAction'] = 'fak_tailslide'
2157 2100
                     own['requestAction'] = 'reg_noseslide'
2158
-                    print('mod slide')
2159 2101
                 elif own['grindType'] == "reg_noseslide":
2160 2102
                     own['grind_stance'] = 0
2161 2103
                     own['requestAction'] = 'reg_noseslide'
2162 2104
                 elif own['grindType'] == "fak_noseslide":  
2163 2105
                     own['grind_stance'] = 1              
2164
-                    #own['requestAction'] = 'fak_noseslide'
2165
-                    own['requestAction'] = 'reg_tailslide'
2166
-                    
2167
-                    
2168
-    #            elif own['grindType'] == "nose_stall":
2169
-    #                skater.playAction("nose_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5) 
2170
-    #                deck.playAction("a_nose_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5)
2171
-    #                trucks.playAction("a_nose_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5) 
2172
-    #                #print("nose_stall") 
2173
-    #            elif own['grindType'] == "tail_stall":
2174
-    #                skater.playAction("reg_tail_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5)
2175
-    #                deck.playAction("a_reg_tail_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5)
2176
-    #                trucks.playAction("a_reg_tail_stall", 1,30, layer=700, blendin=gblend, play_mode=1, speed=.5)
2177
-                    #print("reg_tail_stall")                                 
2106
+                    own['requestAction'] = 'reg_tailslide'                                
2178 2107
                 else:
2179 2108
                     if STANCE == 0:
2180 2109
                         own['requestAction'] = 'reg_5050'
@@ -2246,7 +2175,6 @@ def main():
2246 2175
         else:
2247 2176
             own["coping"] = 0    
2248 2177
 
2249
-
2250 2178
     def onboard():
2251 2179
         if own['walk'] == 1:
2252 2180
             cont.deactivate(cam.actuators['replayCam'])
@@ -2310,7 +2238,6 @@ def main():
2310 2238
     def grass():
2311 2239
         try:
2312 2240
             if 'grass' in r_ground.hitObject:
2313
-                #print("grass")
2314 2241
                 linVel = own.getLinearVelocity(True)
2315 2242
                 linvelx = linVel.x * .98
2316 2243
                 own.setLinearVelocity((linvelx, linVel.y, linVel.z), 1)
@@ -2413,27 +2340,17 @@ def main():
2413 2340
         last_ground_frame = own['lF_ground_frame']
2414 2341
         lF_air_frame = own['lF_air_frame']
2415 2342
         frames_since_ground = framenum - lF_air_frame    
2416
-        #if frames_since_ground  > 20:
2417 2343
         if own['manual_v2_type'] == 'reg manual': 
2418 2344
             own['requestAction'] = 'reg_manual_revert_ccw'   
2419 2345
             print("reg")
2420 2346
         elif own['manual_v2_type'] == 'reg nose manual':
2421
-            own['requestAction'] = 'fak_manual_revert_ccw'    
2422
-            #skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2423
-            #deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2424
-            #trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2347
+            own['requestAction'] = 'fak_manual_revert_ccw'  
2425 2348
             print("reg nose manual revert")             
2426 2349
         elif own['manual_v2_type'] == 'fak manual': 
2427 2350
             own['requestAction'] = 'fak_manual_revert_ccw'   
2428
-            #skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2429
-            #deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2430
-            #trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2431 2351
             print("fak manual revert")
2432 2352
         elif own['manual_v2_type'] == 'fak nose manual': 
2433 2353
             own['requestAction'] = 'reg_manual_revert_ccw'   
2434
-            #skater.playAction("reg_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2435
-            #deck.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2436
-            #trucks.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2437 2354
             print("fak")           
2438 2355
         else:
2439 2356
             own['requestAction'] = 'revert1'            
@@ -2450,27 +2367,15 @@ def main():
2450 2367
         own.applyRotation(rot,local)
2451 2368
         if own['manual_v2_type'] == 'reg manual': 
2452 2369
             own['requestAction'] = 'reg_manual_revert_cw'   
2453
-            #skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2454
-            #deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2455
-            #trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2456 2370
             print("reg")
2457 2371
         elif own['manual_v2_type'] == 'reg nose manual':    
2458 2372
             own['requestAction'] = 'fak_manual_revert_cw'
2459
-            #skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2460
-            #deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2461
-            #trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2462 2373
             print("reg nose manual revert")             
2463 2374
         elif own['manual_v2_type'] == 'fak manual':    
2464 2375
             own['requestAction'] = 'fak_manual_revert_cw'
2465
-            #skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2466
-            #deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2467
-            #trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2468 2376
             print("fak manual revert")
2469 2377
         elif own['manual_v2_type'] == 'fak nose manual':    
2470 2378
             own['requestAction'] = 'reg_manual_revert_cw'
2471
-            #skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2472
-            #deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2473
-            #trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2474 2379
             print("fak")   
2475 2380
         else:     
2476 2381
             own['requestAction'] = 'revert2'       
@@ -2488,27 +2393,15 @@ def main():
2488 2393
         print("real revert 3")  
2489 2394
         if own['manual_v2_type'] == 'reg manual':  
2490 2395
             own['requestAction'] = 'reg_manual_revert_ccw'  
2491
-            #skater.playAction("reg_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2492
-            #deck.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2493
-            #trucks.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2494 2396
             print("reg")
2495 2397
         elif own['manual_v2_type'] == 'reg nose manual':    
2496 2398
             own['requestAction'] = 'fak_manual_revert_ccw'
2497
-            #skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2498
-            #deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2499
-            #trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2500 2399
             print("reg nose manual revert")             
2501 2400
         elif own['manual_v2_type'] == 'fak manual': 
2502 2401
             own['requestAction'] = 'fak_manual_revert_ccw'   
2503
-            #skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2504
-            #deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2505
-            #trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2506 2402
             print("fak manual revert")
2507 2403
         elif own['manual_v2_type'] == 'fak nose manual':
2508 2404
             own['requestAction'] = 'reg_manual_revert_ccw'    
2509
-            #skater.playAction("reg_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2510
-            #deck.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2511
-            #trucks.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2512 2405
             print("fak")   
2513 2406
         else:       
2514 2407
             own['requestAction'] = 'revert3' 
@@ -2525,29 +2418,15 @@ def main():
2525 2418
         own.applyRotation(rot,local)  
2526 2419
         if own['manual_v2_type'] == 'reg manual':    
2527 2420
             own['requestAction'] = 'reg_manual_revert_cw'
2528
-            #skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2529
-            #deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2530
-            #trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2531 2421
             print("reg")
2532
-        #elif own['reg_nmanual'] == 1:
2533 2422
         elif own['manual_v2_type'] == 'reg nose manual':    
2534 2423
             own['requestAction'] = 'fak_manual_revert_cw'
2535
-            #skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2536
-            #deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2537
-            #trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2538 2424
             print("reg nose manual revert")             
2539
-        #elif own['fak_manual'] == 1 or own['fak_nmanual'] == 1:
2540 2425
         elif own['manual_v2_type'] == 'fak manual':    
2541 2426
             own['requestAction'] = 'fak_manual_revert_cw'
2542
-            #skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2543
-            #deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2544
-            #trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2545 2427
             print("fak manual revert")
2546 2428
         elif own['manual_v2_type'] == 'fak nose manual':    
2547 2429
             own['requestAction'] = 'reg_manual_revert_cw'
2548
-            #skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2549
-            #deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2550
-            #trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2551 2430
             print("fak") 
2552 2431
         else:
2553 2432
             own['requestAction'] = 'revert4'
@@ -3072,9 +2951,6 @@ def main():
3072 2951
         nollie_varial_heelflip()
3073 2952
         reset_rtimers()   
3074 2953
 
3075
-
3076
-
3077
-
3078 2954
     #360 shovit
3079 2955
     if q3oncd > 0 and q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q7oncd > 0 and q7oncd >= q6oncd >= q5oncd >= q4oncd >= q3oncd:
3080 2956
     #    print("q4oncd: ", q4oncd, " q5oncd: ", q5oncd, " q6oncd: ", q6oncd)
@@ -3093,8 +2969,6 @@ def main():
3093 2969
         own["Q7oncd"] = q7oncd
3094 2970
     #360 fs shovit    
3095 2971
     if q3oncd > 0 and q4oncd > 0 and q5oncd > 0 and q6oncd >= 0 and q7oncd > 0 and q7oncd <= q6oncd <= q5oncd <= q4oncd <= q3oncd:
3096
-    #    print("q4oncd: ", q4oncd, " q5oncd: ", q5oncd, " q6oncd: ", q6oncd)
3097
-        #print ("______-------360 shovit")
3098 2972
         dict['trick_string'] = '360 Frontside Shovit'
3099 2973
         fsshovit360()
3100 2974
         q3oncd = 0
@@ -3174,7 +3048,6 @@ def main():
3174 3048
         own["Q1oncd"] = q1oncd
3175 3049
         own["Q4oncd"] = q4oncd    
3176 3050
 
3177
-
3178 3051
     #shovit
3179 3052
     if q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q4oncd <= q5oncd <= q6oncd and q3oncd < 1:
3180 3053
        shovit()
@@ -3199,8 +3072,6 @@ def main():
3199 3072
         
3200 3073
     #fsshovit
3201 3074
     if q4oncd > 0 and q5oncd > 0 and q6oncd > 0 and q6oncd <= q5oncd <= q4oncd and q7oncd < 1:
3202
-    #    print("q4oncd: ", q4oncd, " q5oncd: ", q5oncd, " q6oncd: ", q6oncd)
3203
-    #    print ("^%*^%*^%*^%fsshovit")
3204 3075
         fsshovit()
3205 3076
         q4oncd = 0
3206 3077
         q5oncd = 0
@@ -3211,10 +3082,8 @@ def main():
3211 3082
         
3212 3083
     #nollie_fsshovit
3213 3084
     if q8oncd > 0 and q1oncd > 0 and q2oncd > 0 and q8oncd <= q1oncd <= q2oncd and q7oncd == 0:
3214
-    #    print("q4oncd: ", q4oncd, " q5oncd: ", q5oncd, " q6oncd: ", q6oncd)
3215 3085
         print ("nollie fsshovit")
3216 3086
         nollie_fsshovit()
3217
-        #nollie_shovit()
3218 3087
         q8oncd = 0
3219 3088
         q1oncd = 0
3220 3089
         q2oncd = 0
@@ -3234,19 +3103,14 @@ def main():
3234 3103
         STANCE = own["stance"]
3235 3104
         if own['hippy'] == 1 and own['last_hippy'] == 0:
3236 3105
             if STANCE == 0:
3237
-                #own['requestAction'] = 'reg_hippy'
3238 3106
                 own['requestAction'] = 'reg_hippy_in'
3239
-                #skater.playAction("reg_hippy", 1,10, layer=1101, priority=1, layer_weight=0, play_mode=0, speed=.5)
3240 3107
             if STANCE == 1:
3241
-                own['requestAction'] = 'fak_hippy_in'
3242
-                #skater.playAction("fak_hippy", 1,10, layer=1101, priority=1, layer_weight=0, play_mode=0, speed=.5)            
3108
+                own['requestAction'] = 'fak_hippy_in'         
3243 3109
         if own['hippy'] == 1 and own['last_hippy'] == 1:
3244 3110
             if STANCE == 0:
3245 3111
                 own['requestAction'] = 'reg_hippy_in'
3246
-                #skater.playAction("reg_hippy", 10,10, layer=1100, priority=0, layer_weight=0, play_mode=1, speed=.5)
3247 3112
             if STANCE == 1:
3248 3113
                 own['requestAction'] = 'fak_hippy_in'
3249
-                #skater.playAction("fak_hippy", 10,10, layer=1100, priority=0, layer_weight=0, play_mode=1, speed=.5)
3250 3114
         if own['hippy'] == 0 and own['last_hippy'] == 1:
3251 3115
             killact(1100)
3252 3116
             if rLR > turnsens:
@@ -3256,11 +3120,9 @@ def main():
3256 3120
                 print("hippy turn")
3257 3121
                 if STANCE == 0:
3258 3122
                     own['requestAction'] = 'reg_hippy_ncw'
3259
-                    #skater.playAction("reg_hippy_ncw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)
3260 3123
                     print('%hip1')
3261 3124
                 if STANCE == 1:
3262
-                    own['requestAction'] = 'fak_hippy_ncw'
3263
-                    #skater.playAction("fak_hippy_ncw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)                
3125
+                    own['requestAction'] = 'fak_hippy_ncw'                
3264 3126
                     print('%hip2')
3265 3127
             elif rLR < -turnsens:
3266 3128
                 local = True
@@ -3268,21 +3130,17 @@ def main():
3268 3130
                 own.applyRotation(rot,local)
3269 3131
                 print("hippy turn neg")            
3270 3132
                 if STANCE == 0:
3271
-                    own['requestAction'] = 'fak_hippy_nccw'
3272
-                    #skater.playAction("fak_hippy_nccw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)  
3133
+                    own['requestAction'] = 'fak_hippy_nccw'  
3273 3134
                     print('%hip3')
3274 3135
                 if STANCE == 1:
3275 3136
                     own['requestAction'] = 'reg_hippy_nccw'
3276
-                    #skater.playAction("reg_hippy_nccw", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5) 
3277 3137
                     print('%hip4')
3278 3138
     ##straight        
3279 3139
             else:
3280 3140
                 if STANCE == 0:
3281
-                    #skater.playAction("reg_hippy", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)
3282 3141
                     own['requestAction'] = 'reg_hippy'
3283 3142
                 if STANCE == 1:
3284
-                    own['requestAction'] = 'fak_hippy'
3285
-                    #skater.playAction("fak_hippy", 10,40, layer=1102, priority=1, layer_weight=0, play_mode=0, speed=.5)                                        
3143
+                    own['requestAction'] = 'fak_hippy'                                       
3286 3144
 
3287 3145
     #pushing and hippy jumps
3288 3146
 
@@ -3291,22 +3149,17 @@ def main():
3291 3149
     cush = 10
3292 3150
     hippy = 0
3293 3151
     own['hippy'] = 0
3294
-    #print(since_a, "a", since_x, "x")
3295
-
3296
-    #if xBut == 1 and aBut == 1 and since_a <= cush and since_x <= cush and (lTrig < 0.02 and rTrig < 0.02): 
3152
+ 
3297 3153
     if xBut == 1 and aBut == 1 and (lTrig < 0.02 and rTrig < 0.02) and r_ground.triggered == True: 
3298 3154
         #F"hippy")
3299 3155
         hippy = 1
3300 3156
         own['hippy'] = 1
3301
-        #hippy_jump()
3302
-    #print(hippy)
3157
+
3303 3158
     hippy_jump()    
3304 3159
     if since_a > cush and aBut == 1 and lasta == 1 and (lTrig < 0.02 and rTrig < 0.02) and own['last_hippy'] == 0:
3305
-        #print("apush suckka", since_a)
3306 3160
         if xBut == 0 and hippy == 0 and lastaBut_ground == True:
3307 3161
             push()
3308 3162
     if since_x > cush and xBut == 1 and lastx == 1 and (lTrig < 0.02 and rTrig < 0.02) and own['last_hippy'] == 0:
3309
-        #print("push suckka", since_x)
3310 3163
         if aBut == 0 and hippy == 0 and lastxBut_ground == True:
3311 3164
             push_goof()      
3312 3165
     #cavemans 
@@ -3322,7 +3175,6 @@ def main():
3322 3175
         
3323 3176
     #push b button
3324 3177
     if bBut == 1:
3325
-        #print("push suckka")
3326 3178
         if linVelocity.x > .05 or linVelocity.x < -.05:
3327 3179
             stop()
3328 3180
         elif linVelocity.x < .05 or linVelocity.x > -.05:
@@ -3344,7 +3196,6 @@ def main():
3344 3196
         playing = skater.isPlayingAction(fliplay)
3345 3197
         if playing == 1:
3346 3198
             frame = skater.getActionFrame(fliplay)
3347
-            #print("Flipping frame: ", frame)
3348 3199
             if frame > 16:
3349 3200
                 skater.stopAction(fliplay)
3350 3201
     #frontside grab
@@ -3372,7 +3223,6 @@ def main():
3372 3223
             frontside_tail_grab_on()                
3373 3224
 
3374 3225
     #backside grab
3375
-    #if lTrig > 0.02 and GRAB_ON == False and r_ground.triggered == 0:
3376 3226
     if lTrig > 0.02 and r_ground.triggered == 0 and flipping == False:    
3377 3227
         GRAB_ON = True
3378 3228
         own["GRAB_ON"] = GRAB_ON
@@ -3402,7 +3252,6 @@ def main():
3402 3252
         own["GRAB_PLAYED"] = GRAB_PLAYED
3403 3253
 
3404 3254
     #frontside pump #backside pump
3405
-
3406 3255
     def footplant():    
3407 3256
         framenum = own['framenum']
3408 3257
         last_ground_frame = own['lF_ground_frame']
@@ -3418,39 +3267,29 @@ def main():
3418 3267
         if grindHit == False:
3419 3268
             own['footplant_on'] = 0 
3420 3269
         if own['footplant_on'] == True and rUD < turnsens and rUD > -turnsens:
3421
-            #own.setLinearVelocity([0,0,0],0)
3422 3270
             own.linearVelocity.x = 0
3423 3271
             own.linearVelocity.y = 0
3424 3272
         if own['footplant_on'] == 1 and own['last_footplant'] == True and own['jump_timer'] < 50:
3425 3273
             if skater.isPlayingAction(2925) == False:
3426 3274
                 if STANCE == 0:
3427
-                    own['requestAction'] = 'reg_fp_rback'
3428
-                    #print("requesting footplant0")               
3275
+                    own['requestAction'] = 'reg_fp_rback'              
3429 3276
                 if STANCE == 1:
3430 3277
                     own['requestAction'] = 'fak_fp_rback'
3431
-                    #print("requesting footplant1")
3432 3278
                
3433 3279
     def invert():    
3434
-        if grindHit == True and own['grindpos'] == 'reg_board':
3435
-        #if LAST_GRIND == False and grindHit == True and own['grindpos'] == 'reg_board':    
3436
-            if lBump == 1:
3437
-                #print("invert")
3438
-            #if coping_on ==1 and lBump == 1:
3439
-                #print("invert")   
3280
+        if grindHit == True and own['grindpos'] == 'reg_board':   
3281
+            if lBump == 1:   
3440 3282
                 own['invert_on'] = 1
3441
-                #invert_on = 1
3442 3283
                 own.linearVelocity.x = 0
3443 3284
                 own.linearVelocity.y = 0
3444 3285
         if own["coping"] == 1 and own['invert_on'] == 1:
3445 3286
             if own['invert_on'] == 1 and own['last_invert'] == False:
3446
-                #killall()
3447 3287
                 cont.activate(own.actuators['invertOn_sound'])
3448 3288
                 if STANCE == False:
3449 3289
                     own['invert_type'] = "reg_back_invert_in"
3450 3290
                 if STANCE == True:
3451 3291
                     own['invert_type'] = "fak_fr_invert"                         
3452 3292
         if own['invert_on'] == 0 and own['last_invert'] == True:
3453
-            #print("kill invert")
3454 3293
             own['last_invert_frame'] = frame
3455 3294
             cont.activate(own.actuators['invertOff_Sound'])
3456 3295
      
@@ -3487,43 +3326,26 @@ def main():
3487 3326
                 own.worldOrientation = [[1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [0.0, 0.0, 1.0]]           
3488 3327
             if own["spawn_stance"] == 1:
3489 3328
                 own.setLinearVelocity([.1,0,0], 1)
3490
-                #cam.worldPosition = (spawn_pos[0], spawn_pos[1], (spawn_pos[2] + .25))
3491
-                #cam.applyMovement([0,-1,0], True)
3492
-                #lx = cam.localPosition[1] 
3493
-                #lx = lx - 4
3494
-                #cam.worldOrientation = [[spawn_rot[0][0],spawn_rot[0][1],spawn_rot[0][2]], [spawn_rot[1][0],spawn_rot[1][1],spawn_rot[1][2]], [0.0, 0.0, 1.0]]
3495
-                #cam.localPosition[1] = lx
3496
-             
3329
+                
3497 3330
             else: 
3498 3331
                 own.setLinearVelocity([-.1,0,0], 1)         
3499
-                #cam.worldPosition = (spawn_pos[0], spawn_pos[1], (spawn_pos[2] + .25))
3500
-                #cam.applyMovement([0,1,0], True)            
3501
-                #lx = cam.localPosition[1]
3502
-                #lx = lx - 4
3503
-                #cam.worldOrientation = [[spawn_rot[0][0],spawn_rot[0][1],spawn_rot[0][2]], [spawn_rot[1][0],spawn_rot[1][1],spawn_rot[1][2]], [0.0, 0.0, 1.0]]
3504
-                #cam.localPosition[1] = lx
3332
+                
3505 3333
         if udPad == 1:
3506 3334
             own['spawn_pos'] = [own.worldPosition[0], own.worldPosition[1], own.worldPosition[2]] 
3507 3335
             own['spawn_rot'] = [[own.worldOrientation[0][0],own.worldOrientation[0][1],own.worldOrientation[0][2]], [own.worldOrientation[1][0],own.worldOrientation[1][1],own.worldOrientation[1][2]], own.worldOrientation[2][2]]
3508 3336
             stance = own["stance"]
3509 3337
             own["spawn_stance"] = stance
3510
-
3511
-
3512
-       
3513
-    #start button
3514
-    #print(own['last_stBut'])
3515
-    #print(own['pause_on'])    
3338
+     
3339
+    #start button   
3516 3340
     if stBut == True:
3517 3341
         own.actuators["sroll"].volume = .0001
3518 3342
         cont.deactivate(own.actuators["sroll"])
3519 3343
         own.actuators["sroll"].stopSound()
3520 3344
     if stBut == False and own['last_stBut'] == True:
3521 3345
         if own['pause_on'] == True:
3522
-            own['pause_on'] = False
3523
-            #own.restoreDynamics()     
3346
+            own['pause_on'] = False   
3524 3347
         else:
3525
-            own['pause_on'] = True
3526
-            #own.suspendDynamics()            
3348
+            own['pause_on'] = True           
3527 3349
         
3528 3350
     own['last_stBut'] = stBut
3529 3351
          
@@ -3676,14 +3498,12 @@ def main():
3676 3498
                     cont.deactivate(followcam.actuators["rotright"])                       
3677 3499
     def move_flycam():
3678 3500
         if own['camera'] == 1:
3679
-            #if rtsBut == False and own['lastrts'] == True:
3680 3501
             if own['lastbkBut'] == True and bkBut == False: 
3681 3502
                 if own['move_freecam'] == False:
3682 3503
                     own['move_freecam'] = True
3683 3504
                 else:
3684 3505
                     own['move_freecam'] = False                       
3685 3506
             if own['move_freecam'] == True:
3686
-                #act = freecam.actuators[
3687 3507
                 camspeed1 = .015
3688 3508
                 camspeed2 = .055
3689 3509
                 camrot1 = .005
@@ -3692,7 +3512,6 @@ def main():
3692 3512
                 if lUD < -0.080:
3693 3513
                     freecam.actuators["up"].dLoc = [ 0, 0, -camspeed2]
3694 3514
                     cont.activate(freecam.actuators["up"])
3695
-                    #print("fastup")
3696 3515
                 else:
3697 3516
                     cont.deactivate(freecam.actuators["up"])    
3698 3517
     #            #down    
@@ -3743,7 +3562,6 @@ def main():
3743 3562
                 if lUD > -0.080 and lUD < -0.030:
3744 3563
                     freecam.actuators["up"].dLoc = [ 0, 0, -camspeed1]
3745 3564
                     cont.activate(freecam.actuators["up"])
3746
-                    #print(lUD)
3747 3565
                 else:
3748 3566
                     cont.deactivate(freecam.actuators["up"])    
3749 3567
     #            #down    
@@ -3849,8 +3667,7 @@ def main():
3849 3667
         jumping = None
3850 3668
         gotcd = 25
3851 3669
         force = [0,0,0]
3852
-        grindHit = own['grindTouch'] 
3853
-        #print("grindHit: ", grindHit)     
3670
+        grindHit = own['grindTouch']   
3854 3671
         sincegrinding = own['framenum']  - own['grindstartFrame']
3855 3672
         STANCE = own['stance']
3856 3673
         if rUD > turnsens or rLR > turnsens or rUD < -turnsens or rLR < -turnsens:
@@ -3859,7 +3676,6 @@ def main():
3859 3676
             cont.deactivate(own.actuators['grindoutRight'])
3860 3677
             cont.deactivate(own.actuators['grindoutLeft'])   
3861 3678
         if (grindHit == True and jumping == None and sincegrinding > 20)or own['invert_on'] == True:
3862
-        #if grindHit == True and jumping == None:
3863 3679
             outloc = 0.022
3864 3680
             bsoutloc = .07
3865 3681
             bsoutvel = .1
@@ -3952,9 +3768,7 @@ def main():
3952 3768
                 if gt_cd == 0:
3953 3769
                     gt_cd = 30
3954 3770
                     own['gt_cd'] = gt_cd        
3955
-        #else:
3956
-
3957
-            #else:
3771
+        
3958 3772
             if own['grindoutturn'] == 0:    
3959 3773
                 cont.deactivate(own.actuators["grindoutRight"])
3960 3774
                 own["grindoutturn"] = 0  
@@ -4048,8 +3862,7 @@ def main():
4048 3862
     def air_height():
4049 3863
         height = own["air_height"]
4050 3864
         if lf_ground == True and r_ground.triggered == False:
4051
-            height = 0
4052
-        #if     
3865
+            height = 0    
4053 3866
         
4054 3867
     #wallride
4055 3868
     def wallride():
@@ -4057,34 +3870,26 @@ def main():
4057 3870
         distance = own.getDistanceTo(gray.hitPosition)
4058 3871
         upforce = 25
4059 3872
         sideforce = 15
4060
-        #distance = own["air_height"]
4061 3873
         try:
4062 3874
             obj = gray.hitObject
4063 3875
             objpos = obj.worldPosition
4064 3876
             ownpos = own.worldPosition
4065 3877
             distance = ownpos.z - objpos.z
4066
-            #print(distance)
4067 3878
         except:
4068 3879
             pass    
4069 3880
         if wallrideL.triggered and wallride_off == 0 and r_ground.triggered == False:
4070
-            #print("wallrideL", distance)
4071 3881
             own['jump_timer'] = 0
4072 3882
             if r_ground.triggered == False:
4073 3883
                 own["wallride"] = "L"
4074
-                #print(own["wallride"])
4075 3884
                 cont.activate(wallrideconstL)
4076 3885
                 force = [0,sideforce,upforce]
4077 3886
                 own.applyForce(force,1)            
4078
-                #own.alignAxisToVect(obj.worldPosition, 1, .9)
4079 3887
                 #align
4080 3888
                 if STANCE == 0:
4081 3889
                     own['requestAction'] = 'reg_wall_r'
4082
-                    #skater.playAction("reg_wall_r", 10,10, layer=3000, priority=8, play_mode=1, speed=.5)
4083 3890
                 else:
4084 3891
                     own['requestAction'] = 'fak_wall_l'
4085
-                    #skater.playAction("fak_wall_l", 10,10, layer=3000, priority=8, play_mode=1, speed=.5)
4086
-                #deck.playAction("a_reg_wall_r", 10,10, layer=3000, priority=8, play_mode=1, speed=.5)
4087
-                #trucks.playAction("a_reg_wall_r", 10,10, layer=3000, priority=8, play_mode=1, speed=.5)
3892
+
4088 3893
         else:
4089 3894
             if own["wallride"] != "R":
4090 3895
                 own["wallride"] = None
@@ -4094,7 +3899,6 @@ def main():
4094 3899
             killact(3002)       
4095 3900
         if wallrideR.triggered and wallride_off == 0:
4096 3901
             own['jump_timer'] = 0
4097
-            #print("wallrideR", distance) 
4098 3902
             if r_ground.triggered == False:
4099 3903
                 own["wallride"] = "R"
4100 3904
                 cont.activate(wallrideconstR)
@@ -4103,12 +3907,8 @@ def main():
4103 3907
                 #own.alignAxisToVect(obj.worldPosition, 1, .9)
4104 3908
                 if STANCE == 0: 
4105 3909
                     own['requestAction'] = 'reg_wall_l'
4106
-                    #skater.playAction("reg_wall_l", 10,10, layer=3000, priority=8, play_mode=1, speed=.5)
4107 3910
                 else:
4108
-                    own['requestAction'] = 'fak_wall_r'
4109
-                    #skater.playAction("fak_wall_r", 10,10, layer=3000, priority=8, play_mode=1, speed=.5)
4110
-                #deck.playAction("a_reg_wall_l2", 10,10, layer=3000, priority=8, play_mode=1, speed=.5)
4111
-                #trucks.playAction("a_reg_wall_l2", 10,10, layer=3000, priority=8, play_mode=1, speed=.5)              
3911
+                    own['requestAction'] = 'fak_wall_r'             
4112 3912
         else:
4113 3913
             if own["wallride"] != "L":
4114 3914
                 own["wallride"] = None
@@ -4157,31 +3957,24 @@ def main():
4157 3957
             try: 
4158 3958
                 delta = player_pos - jump_obj
4159 3959
             except:
4160
-                #print("delta broke: ", player_pos, grinder_pos)
4161 3960
                 pass 
4162 3961
             delta = delta.cross(vect) 
4163 3962
             deltamove = delta[1] * .25
4164 3963
             move = [deltamove, 0, 0]
4165
-            #print(deltamove)
4166 3964
             if abs(deltamove) < 1 and delta[1] < 1:
4167 3965
                 own.applyMovement(move, True)               
4168 3966
 
4169 3967
     def air_mover():
4170 3968
         if r_ground.triggered == False and jump_timer > 53 and frames_since_grinding > 50:
4171
-            #print(lUD)
4172 3969
             if lUD > 0.075:
4173
-                #print("air_mover", jump_timer)
4174 3970
                 if STANCE == 0:
4175 3971
                     force2 = [120, 0, 10]
4176 3972
                 if STANCE == 1:
4177 3973
                     force2 = [-120, 0, 10]            
4178 3974
                 
4179 3975
                 own.applyForce(force2, True)
4180
-                #own.applyForce([0,0,5], False)
4181 3976
                 own['no_grind_pull'] = 1
4182 3977
         if r_ground.triggered == False and jump_timer > 10 and lUD > 0.075 and frames_since_grinding > 50:
4183
-            #print(lUD)
4184
-            #print("air_mover", jump_timer)
4185 3978
             if STANCE == 0:
4186 3979
                 force2 = [7, 0, 10]
4187 3980
             if STANCE == 1:
@@ -4203,21 +3996,8 @@ def main():
4203 3996
     if framenum - lF_air_frame > 30:
4204 3997
         own['no_grind_pull'] = 0
4205 3998
 
4206
-                      
4207
-    #if grindHit == 1:
4208
-    #    skater.applyRotation([0,0,.05], False)
4209
-    #    deck.applyRotation([0,0,.05], False)
4210
-    #    trucks.applyRotation([0,0,.05], False)
4211
-    #else:
4212
-    #    skater.applyRotation([0,0,.0], False)            
4213
-    #    deck.applyRotation([0,0,.0], False)            
4214
-    #    trucks.applyRotation([0,0,.0], False)            
4215
-    #control_calib() #scene must be enabled in main                 
4216 3999
     jump_Timer()
4217 4000
     check_landing()
4218
-    #SWAG()
4219
-
4220
-    #isplaying()
4221 4001
     nextframe()
4222 4002
     wheelroll()
4223 4003
     rollsound()
@@ -4253,7 +4033,6 @@ def main():
4253 4033
     own['last_invert'] = invert_on
4254 4034
     own['lastbkBut'] = bkBut
4255 4035
     own['grab_type'] = grab_type
4256
-
4257 4036
     own['last_last_manual'] = own['last_manual']
4258 4037
     own['last_manual'] = own['manual']
4259 4038
     own['last_reg_manual'] = own['reg_manual']     
@@ -4278,10 +4057,5 @@ def main():
4278 4057
     if r_ground.triggered and own["jump_timer"] < 20:
4279 4058
         force2 = [0.0, 0, -10]
4280 4059
         own.applyForce(force2, True)
4281
-    #print('grindtouch = ',  own['grindTouch'])
4282 4060
     if (grindDar == False and r_ground.triggered and own['grindTouch'] == False) or own['jump_timer'] > 40:
4283
-        own['grindType'] = ''
4284
-        
4285
-    #print(own['grindType'])   
4286
-
4287
-     
4061
+        own['grindType'] = ''

+ 13
- 114
grindV2.py Wyświetl plik

@@ -61,11 +61,6 @@ def main():
61 61
     last_grindDar = 0
62 62
     last_manual = own["manual"]
63 63
     joinit = 0
64
-    #print(minus)
65
-#    if grindold == True and minus > 20:
66
-#        align_strength = .1
67
-#        print("slow align")
68
-
69 64
     rot = own.getAxisVect( [0.0, 0.0, 1.0])
70 65
     dropin = own['dropinTimer']
71 66
     nearestObject = None
@@ -78,9 +73,6 @@ def main():
78 73
     grindyvect = None
79 74
     skipcol = 0
80 75
     skipconst = 0
81
-    #print("--------frame: ", own['framenum'])
82
-    #inertia = player.linearVelocity
83
-    #print(rotz)
84 76
     try:
85 77
         no_grind_pull = own['no_grind_pull']
86 78
     except:    
@@ -92,13 +84,8 @@ def main():
92 84
         no_grind = 1
93 85
     
94 86
     #check manual
95
-
96 87
     manual = 0
97 88
     own["nogrindsound"] = 0
98
-    #print(frames_since_ground)
99
-    #print("grindold: ", grindold)
100
-    
101
-    
102 89
     
103 90
 #---------###########___###########-----------    
104 91
 #start new                     #######     
@@ -117,13 +104,13 @@ def main():
117 104
     ogrot = own.orientation
118 105
     ogrot = player_e
119 106
     
120
-    if (framenum - gsf) > 15:
121
-        velx = linVelocity2.x
122
-        vely = linVelocity2.y
123
-        #print("limit speed")
124
-    else:    
125
-        velx = linVelocity2.x
126
-        vely = linVelocity2.y     
107
+    # if (framenum - gsf) > 15:
108
+    #     velx = linVelocity2.x
109
+    #     vely = linVelocity2.y
110
+    #     #print("limit speed")
111
+    # else:    
112
+    #     velx = linVelocity2.x
113
+    #     vely = linVelocity2.y     
127 114
     if abs(own['pregrind_vely']) > abs(vely) and own['LAST_GRIND'] == 0:
128 115
         convely = own['pregrind_vely']
129 116
     else:
@@ -174,11 +161,9 @@ def main():
174 161
             grindyvect = "pos"
175 162
         if rot < -315: 
176 163
             grindvect = "pos"   
177
-        #                     
178
-        #print(grindvect, STANCE)
164
+
179 165
         rot = round((rot * .01), 1)
180 166
         rot *= 100
181
-        #print(rot)
182 167
 
183 168
         #print(own['inverting'])
184 169
         if frames_grinding > 20 and own['inverting'] == False: 
@@ -199,10 +184,8 @@ def main():
199 184
                 #print("-90 reg stance")                        
200 185
                 own['stance'] = 0
201 186
                 STANCE = 0
202
-        #print("stance: ", STANCE)
203 187
     def grindrotvel(obj):        
204
-        skipconst = 1
205
-        #print("set jumponinit")              
188
+        skipconst = 1              
206 189
         joinit = 0
207 190
         grinder_e = obj.worldOrientation.to_euler()
208 191
         grinder_rotz = math.degrees(grinder_e[2]) 
@@ -210,7 +193,6 @@ def main():
210 193
         grinder_vectz = obj.getAxisVect( [0, 0, 1]) 
211 194
         rot = player_rotz - grinder_rotz        
212 195
         rayhit = ray.hitObject
213
-        #print(round(rot,2), STANCE, " = rotation") 
214 196
         own['grind_rot'] = rot
215 197
         vect = obj.getAxisVect( [1.0, 0.0, 0.0])
216 198
         xyzb = obj.worldOrientation.to_euler()
@@ -223,8 +205,7 @@ def main():
223 205
         bsrot = [ 0.0, 0.0, 1.570796327]    
224 206
         negbsrot = [ 0.0, 0.0, -1.570796327]
225 207
         zvel = own.linearVelocity
226
-        zvel = zvel.z * .95      
227
-        #print(rot, "rot")
208
+        zvel = zvel.z * .95
228 209
         if grindold == 0:
229 210
             if rotz < 0:
230 211
                 rotz = rotz + 360
@@ -235,7 +216,6 @@ def main():
235 216
             if rotz < rotzb:
236 217
                 sub_converted = rotzb - rotz
237 218
 
238
-        #print("J grindvect: ", grindvect, "align: ", align)
239 219
         #z align
240 220
         #print("zalign") 
241 221
         player.alignAxisToVect(grinder_vectz, 2, .15)                                                  
@@ -425,8 +405,6 @@ def main():
425 405
                 
426 406
 #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@        
427 407
     def grind(obj):
428
-        #if (ray.triggered and grindold == False) or (touched == True and own['lastTouched'] == False):
429
-        #print("gt: ", gt_cd)
430 408
         try:
431 409
             grindyvect = own['grindyvect']
432 410
         except:
@@ -439,27 +417,20 @@ def main():
439 417
             own["grindSound"] = "concrete"
440 418
         own['lGobj'] = obj         
441 419
         
442
-        
443
-        #if 1 == 1:
444 420
         grinding = 1                
445 421
         
446 422
         framenum = own['framenum']
447 423
         lastairframe = own['lF_air_frame']
448 424
         jumpside = 0
449 425
         if (framenum - lastairframe) < 10:
450
-        #if lastGround == False:
451
-            player_pos = own['jumpPos']
452
-            #print("get side from jumpPos", framenum, lastairframe) 
426
+            player_pos = own['jumpPos'] 
453 427
             jumpside = 1   
454 428
         else:    
455 429
             player_pos = OG_PLAYER_POS
456 430
         player_pos = own.worldPosition    
457 431
         try:    
458 432
             if 1 == 1:       
459
-                
460 433
                 grinder_pos = obj.worldPosition 
461
-                    #print("touchObj", obj)     
462
-                #vectTo = player.getVectTo(grinder_pos)    
463 434
                 worldVect = [1, 0, 0]
464 435
                 vect = obj.getAxisVect(worldVect)      
465 436
                 go = obj.worldOrientation
@@ -470,12 +441,9 @@ def main():
470 441
                     #print("delta broke: ", player_pos, grinder_pos)
471 442
                     pass 
472 443
                 delta = delta.cross(vect)
473
-                #print(own["grindpos"], touched, "eval broken!!?!", delta[2])
474 444
                 if delta[2] >= 0:
475
-                    #print("right side", grindyvect, round(delta[2], 6))
476 445
                     grindside = "right"
477 446
                 else:
478
-                    #print("left side", grindyvect, round(delta[2], 6))
479 447
                     grindside = "left"
480 448
                 if (delta[2] > .00001 or delta[2] < -.00001) and (delta[2] < .8 or delta[2] < -.8):
481 449
                     rotation = own.worldOrientation[2] - obj.worldOrientation[2]
@@ -483,12 +451,8 @@ def main():
483 451
                     player_rotz = math.degrees(player_e[2])
484 452
                     grinder_e = obj.worldOrientation.to_euler()
485 453
                     grinder_rotz = math.degrees(grinder_e[2])
486
-                    #print("rotation =", player_rotz - grinder_rotz)
487
-                    #print( "rotating - grindvect: ", grindvect)
488 454
                     deltamove = delta[2] * .3#.25
489 455
                     #5050
490
-                    #print(own["grindpos"], jumpside)
491
-                    #print("delta move")
492 456
                     if own["grindpos"] == "reg_5050":
493 457
                         #print("missing delta")
494 458
                         if (jumpside == 1 or jumpside == 0) and grindvect == "pos":
@@ -500,7 +464,6 @@ def main():
500 464
                             #print("2deltamove -", deltamove)
501 465
                             own.applyMovement(move, True)  
502 466
                     #board
503
-                    #print("turnud: ", own["turnud"], "grindyvect: ", grindyvect)
504 467
                     if own["grindpos"] == "reg_board":
505 468
                         if grindvect == "neg":
506 469
                             if (jumpside == 1 or jumpside == 0) and grindyvect == "pos":
@@ -518,7 +481,6 @@ def main():
518 481
                                 own.applyMovement(move, True)        
519 482
                             if (jumpside == 1 or jumpside == 0) and grindyvect == "neg":
520 483
                                 move = [-deltamove, 0, 0]
521
-                                #print("6deltamove -", deltamove)
522 484
                                 own.applyMovement(move, True)                    
523 485
                 own['grindside'] = grindside    
524 486
         except:
@@ -530,14 +492,10 @@ def main():
530 492
             if 'rail' in touchobj:
531 493
                 newvelx = velo.x * grindspeed_rail   
532 494
                 newvely = velo.y * grindspeed_rail
533
-                #print("grindspeed limit rail")
534 495
             else:
535 496
                 newvelx = velo.x * grindspeed_cement  
536 497
                 newvely = velo.y * grindspeed_cement            
537
-            #print("grindspeed limit cement")
538
-            #print("setting newvely =", newvely)
539
-            player.setLinearVelocity([newvelx, newvely, velo.z], 1) 
540
-            #print("grindspeedlimit")  
498
+            player.setLinearVelocity([newvelx, newvely, velo.z], 1)   
541 499
             player_rot = own.worldOrientation[2]
542 500
             grinder_rot = touchobj.worldOrientation[2]
543 501
             player_rot = own.getAxisVect( [0.0, 0.0, 1.0])
@@ -559,14 +517,9 @@ def main():
559 517
             if (minDist is None or dist < minDist):
560 518
                 nearestObject = obj
561 519
                 minDist = dist
562
-        if nearestObject != None:        
563
-            #vect = nearestObject.getAxisVect( [1.0, 0.0, 0.0])
564
-        #own.alignAxisToVect(vect, 0, 0)
565
-            #own.worldPosition = [nearestObject.worldPosition.x, nearestObject.worldPosition.y, nearestObject.worldPosition.z + .2975]
566
-            #own.setLinearVelocity([0, 0.0, 0], 1)                    
520
+        if nearestObject != None:                            
567 521
             own.linearVelocity.x = 0
568 522
             own.linearVelocity.y = 0
569
-            #print("setting invertpos")
570 523
                
571 524
             
572 525
     
@@ -581,14 +534,12 @@ def main():
581 534
             if (minDist is None or dist < minDist):
582 535
                 nearestObject = obj
583 536
                 minDist = dist     
584
-        #print(dist, nearestObject, "grindDar")
585 537
         
586 538
 #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@        
587 539
         #init grind
588 540
         
589 541
         if invert_on:
590 542
             invertpos(detectedObjects)
591
-            #print('invertOn')
592 543
             own['inverting'] = True
593 544
         else:
594 545
             own['inverting'] = False
@@ -605,7 +556,6 @@ def main():
605 556
             hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
606 557
             if grindold == 0:
607 558
                 if grindTouch.positive:
608
-                    #print("set grind pos")
609 559
                     nearpos = nearestObject.worldPosition
610 560
                     if hitNormal != None:
611 561
                         own.alignAxisToVect(hitNormal, 2, .05) 
@@ -617,12 +567,8 @@ def main():
617 567
             own["grindHit"] = True
618 568
             #print("grinding")
619 569
             grind_height_dif = (own.worldPosition[2] - nearestObject.worldPosition[2]) - .287
620
-            #print(grind_height_dif)
621 570
             worldPos = own.worldPosition
622 571
             if grind_height_dif > -.05:#02:
623
-                #print("############################upping z")
624
-                #own.worldPosition = [worldPos.x, worldPos.y, worldPos.z + .1]
625
-
626 572
                 grindvect(nearestObject)          
627 573
                 grindrotvel(nearestObject)
628 574
                 grind(nearestObject)
@@ -695,22 +641,8 @@ def main():
695 641
         if own['grindOld'] == 0 and ray.triggered == 0:
696 642
             own['aligntimer'] = 0   
697 643
             
698
-#    def invertpos():
699
-#        minDist = None
700
-#        nearestObject = None
701
-#        for obj in invertObjs:
702
-#            dist = own.getDistanceTo(obj)
703
-#            if (minDist is None or dist < minDist):
704
-#                nearestObject = obj
705
-#                minDist = dist
706
-#        vect = nearestObject.getAxisVect( [1.0, 0.0, 0.0])
707
-#        #own.alignAxisToVect(vect, 0, 0)
708
-#        own.worldPosition = [nearestObject.worldPosition.x, nearestObject.worldPosition.y, nearestObject.worldPosition.z +.1]
709
-#        #own.setLinearVelocity([0, 0.0, 0], 1)                    
710
-
711 644
     def set_pregrind_vel():
712 645
         if grindDar.triggered == False and ray.triggered == False:
713
-            #print("set pregrind vel") 
714 646
             own['pregrind_velx'] = linVelocity2.x
715 647
             own['pregrind_vely'] = linVelocity2.y
716 648
             own['pregrind_velz'] = linVelocity2.z
@@ -718,38 +650,9 @@ def main():
718 650
     def stop_bounce():
719 651
         if grindTouch.triggered and no_grind == 0 and grind_jump == 0 and jump_timer < 30:
720 652
             linVelocity4 = own.getLinearVelocity(True)
721
-            #print(linVelocity4.z)
722 653
             if linVelocity4.z > 0:
723 654
                 own.setLinearVelocity([linVelocity4.x, linVelocity4.y, 0], 1)
724 655
                         
725
-#        last_posz = own['last_z']
726
-#        posz = own.worldPosition.z
727
-#        obj = None
728
-#        if ray.triggered:
729
-#            obj = ray.hitObject
730
-#        if grindTouch.triggered:
731
-#            obj = grindTouch.hitObject        
732
-#        #if last_posz < posz and grindold == True and obj != None:
733
-#        gsf = own['grind_start_frame']
734
-#        frame = own['framenum']
735
-#        sub = frame - gsf
736
-#        linVelocity4 = own.getLinearVelocity(True)
737
-#        avelx = linVelocity4.x
738
-#        avely = linVelocity4.y
739
-#        avelz = linVelocity4.z
740
-#        num = -.2
741
-#        num2 = -.1
742
-#        if avelz > 0:
743
-#            avelz = 0
744
-#        avelz = avelz + num
745
-#                
746
-#        #if obj != None and sub > 30 and jump_timer < 10:
747
-#            #own.setLinearVelocity([avelx, avely, num2], 1)
748
-#        if sub < 3: 
749
-#            pass
750
-#            #own.setLinearVelocity([avelx, avely, avelz], 1) 
751
-            
752
-              
753 656
     if jump_timer < 30 :
754 657
         own['grind_jump'] = 0 
755 658
     if grindold == False and ray.triggered:
@@ -758,7 +661,6 @@ def main():
758 661
     if grindDar_timer > 0:
759 662
         grindDar_timer -= 1
760 663
     if grindDar_timer > 0 and ray.triggered == False and touched == True  and own['footplant_on'] == False and manual == 0:
761
-        #print("timer but ground") 
762 664
         obj = grindTouch.hitObject 
763 665
         own.worlPosition = obj.worldPosition
764 666
     if ray.triggered == False:
@@ -776,11 +678,8 @@ def main():
776 678
     own["grindDar_timer"] = grindDar_timer
777 679
     own["last_grindDar"] = last_grindDar
778 680
     linVelocity3 = own.getLinearVelocity(True)
779
-    #print(linVelocity3.z)
780 681
     set_pregrind_vel()
781 682
     own['last_z'] = own.worldPosition.z
782 683
     own["manual"] = manual
783 684
 
784
-
785
-
786 685
 main()

Ładowanie…
Anuluj
Zapisz