Browse Source

walk cleanup2

shuvit 6 years ago
parent
commit
4387811b21
1 changed files with 0 additions and 54 deletions
  1. 0
    54
      walk.py

+ 0
- 54
walk.py View File

@@ -206,7 +206,6 @@ if walking == None:
206 206
     else:
207 207
         own.setLinearVelocity([0, 0, vel.z], True)
208 208
         #print("set 0 vel")    
209
-                
210 209
     
211 210
 #old walking
212 211
 if (lup == 1 and aBut == 0 and yBut == False and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0):
@@ -539,124 +538,75 @@ def idle_anim():
539 538
                     
540 539
                     if STANCE == 0 and own['throw_deck'] == 0:
541 540
                         own['requestAction'] = 'reg_idle1'
542
-                        #skater.playAction("reg_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
543
-                        #deck.playAction("a_reg_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
544
-                        #trucks.playAction("a_reg_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
545 541
                     elif STANCE == 0 and own['throw_deck'] == 1:
546 542
                         own['requestAction'] = 'reg_idle1'
547
-                        #skater.playAction("reg_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
548 543
                     elif STANCE == 1 and own['throw_deck'] == 0:
549 544
                         own['requestAction'] = 'fak_idle1'
550
-                        #skater.playAction("fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
551
-                        #deck.playAction("a_fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
552
-                        #trucks.playAction("a_fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
553 545
                     elif STANCE == 1 and own['throw_deck'] == 1:
554 546
                         own['requestAction'] = 'fak_idle1'
555
-                        #skater.playAction("fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
556 547
                                                                            
557 548
                 elif ran_num == 2:    
558 549
                     killact(3)
559 550
                     if STANCE == 0 and own['throw_deck'] == 0:
560 551
                         own['requestAction'] = 'reg_idle2'
561
-                        #skater.playAction("reg_idle2_", 1,120, layer=idle_lay, play_mode=0, speed=.5)
562
-                        #deck.playAction("a_reg_idle2", 1,120, layer=idle_lay, play_mode=0, speed=.5)
563
-                        #trucks.playAction("a_reg_idle2", 1,120, layer=idle_lay, play_mode=0, speed=.5)
564 552
                     elif STANCE == 0 and own['throw_deck'] == 1:
565 553
                         own['requestAction'] = 'reg_idle2_nb'
566
-                        #skater.playAction("reg_idle2_nb", 1,120, layer=idle_lay, play_mode=0, speed=.5)
567 554
                     elif STANCE == 1 and own['throw_deck'] == 0:
568 555
                         own['requestAction'] = 'fak_idle1'
569 556
                     elif STANCE == 1 and own['throw_deck'] == 1:
570 557
                         own['requestAction'] = 'fak_idle1'
571
-                        #skater.playAction("fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)  
572 558
                 elif ran_num == 3:    
573 559
                     killact(3)
574 560
                     if STANCE == 0 and own['throw_deck'] == 0:
575 561
                         own['requestAction'] = 'reg_idle3'
576
-#                        skater.playAction("reg_idle3", 1,240, layer=idle_lay, play_mode=0, speed=.5)
577
-#                        deck.playAction("a_reg_idle3", 1,240, layer=idle_lay, play_mode=0, speed=.5)
578
-#                        trucks.playAction("a_reg_idle3", 1,240, layer=idle_lay, play_mode=0, speed=.5)
579 562
                     elif STANCE == 0 and own['throw_deck'] == 1:
580 563
                         own['requestAction'] = 'reg_idle3'
581
-                        #skater.playAction("reg_idle3", 1,240, layer=idle_lay, play_mode=0, speed=.5)
582 564
                     elif STANCE == 1 and own['throw_deck'] == 0:
583 565
                         own['requestAction'] = 'fak_idle1'
584 566
                     elif STANCE == 1 and own['throw_deck'] == 1:
585
-                        #skater.playAction("fak_idle1", 1,240, layer=idle_lay, play_mode=0, speed=.5)
586 567
                         own['requestAction'] = 'fak_idle1'
587 568
                     own['idle_skipper'] = 2 
588 569
                 elif ran_num == 4:    
589 570
                     killact(3)
590 571
                     if STANCE == 0 and own['throw_deck'] == 0:
591 572
                         own['requestAction'] = 'reg_idle4'
592
-#                        skater.playAction("reg_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
593
-#                        deck.playAction("a_reg_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
594
-#                        trucks.playAction("a_reg_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
595 573
                     elif STANCE == 0 and own['throw_deck'] == 1:
596
-                        #skater.playAction("reg_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
597 574
                         own['requestAction'] = 'reg_idle4'
598 575
                     elif STANCE == 1 and own['throw_deck'] == 0:
599 576
                         own['requestAction'] = 'fak_idle4'
600
-#                        skater.playAction("fak_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
601
-#                        deck.playAction("a_fak_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
602
-#                        trucks.playAction("a_fak_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
603 577
                     elif STANCE == 1 and own['throw_deck'] == 1:
604
-                        #skater.playAction("fak_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
605 578
                         own['requestAction'] = 'fak_idle4' 
606 579
                 elif ran_num == 5:    
607 580
                     killact(3)
608 581
                     if STANCE == 0 and own['throw_deck'] == 0:
609 582
                         own['requestAction'] = 'reg_idle5'
610
-#                        skater.playAction("reg_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
611
-#                        deck.playAction("a_reg_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
612
-#                        trucks.playAction("a_reg_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
613 583
                     elif STANCE == 0 and own['throw_deck'] == 1:
614
-                        #skater.playAction("reg_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
615 584
                         own['requestAction'] = 'reg_idle5'
616 585
                     elif STANCE == 1 and own['throw_deck'] == 0:
617 586
                         own['requestAction'] = 'fak_idle5'
618
-#                        skater.playAction("fak_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
619
-#                        deck.playAction("a_fak_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
620
-#                        trucks.playAction("a_fak_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
621 587
                     elif STANCE == 1 and own['throw_deck'] == 1:
622 588
                         own['requestAction'] = 'fak_idle5'
623
-                        #skater.playAction("fak_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
624 589
                 elif ran_num == 6:    
625 590
                     killact(3)
626 591
                     if STANCE == 0 and own['throw_deck'] == 0:
627 592
                         own['requestAction'] = 'reg_idle6'
628
-#                        skater.playAction("reg_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
629
-#                        deck.playAction("a_reg_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
630
-#                        trucks.playAction("a_reg_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
631 593
                     elif STANCE == 0 and own['throw_deck'] == 1:
632 594
                         own['requestAction'] = 'reg_idle6'
633 595
                         #skater.playAction("reg_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
634 596
                     elif STANCE == 1 and own['throw_deck'] == 0:
635 597
                         own['requestAction'] = 'fak_idle6'
636
-#                        skater.playAction("fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
637
-#                        deck.playAction("a_fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
638
-#                        trucks.playAction("a_fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
639 598
                     elif STANCE == 1 and own['throw_deck'] == 1:
640
-                        #skater.playAction("fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
641 599
                         own['requestAction'] = 'fak_idle6'
642 600
                 elif ran_num == 7:    
643 601
                     killact(3)
644 602
                     if STANCE == 0 and own['throw_deck'] == 0:
645 603
                         own['requestAction'] = 'reg_idle7'
646
-#                        skater.playAction("reg_idle7", 1,120, layer=idle_lay, play_mode=0, speed=.5)
647
-#                        deck.playAction("a_reg_idle7", 1,120, layer=idle_lay, play_mode=0, speed=.5)
648
-#                        trucks.playAction("a_reg_idle7", 1,120, layer=idle_lay, play_mode=0, speed=.5)
649 604
                     elif STANCE == 0 and own['throw_deck'] == 1:
650
-                        #skater.playAction("reg_idle7", 1,120, layer=idle_lay, play_mode=0, speed=.5)
651 605
                         own['requestAction'] = 'reg_idle7'
652 606
                     elif STANCE == 1 and own['throw_deck'] == 0:
653 607
                         own['requestAction'] = 'fak_idle6'
654
-#                        skater.playAction("fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
655
-#                        deck.playAction("a_fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
656
-#                        trucks.playAction("a_fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
657 608
                     elif STANCE == 1 and own['throw_deck'] == 1:
658 609
                         own['requestAction'] = 'fak_idle6'
659
-                        #skater.playAction("fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)                                                                                                                                 
660 610
 
661 611
 def reset_pos():
662 612
     #reset
@@ -711,10 +661,8 @@ def falldeck():
711 661
         wheel4act.visibility = False
712 662
         act = throw_deck_empty.actuators['throw_dec_act']
713 663
         if STANCE == True:
714
-            #skater.playAction("fak_throw", 10,30, layer=29, priority=0, play_mode=0, speed=.5)
715 664
             act.linearVelocity = [0.0, 1.0, 1.0]
716 665
         if STANCE == False:
717
-            #skater.playAction("reg_throw", 10,30, layer=29, priority=0, play_mode=0, speed=.5)  
718 666
             act.linearVelocity = [0.0, 1.0, -1.0]  
719 667
         cont.activate(act)
720 668
     else:
@@ -753,11 +701,9 @@ def throwdeck():
753 701
         wheel4act.visibility = False
754 702
         act = throw_deck_empty.actuators['throw_dec_act']
755 703
         if STANCE == True:
756
-            #skater.playAction("fak_throw", 10,30, layer=29, priority=0, play_mode=0, speed=.5)
757 704
             own['requestAction'] = 'fak_throw'
758 705
             act.linearVelocity = [0.0, 5.0, 5.0]
759 706
         if STANCE == False:
760
-            #skater.playAction("reg_throw", 10,30, layer=29, priority=0, play_mode=0, speed=.5)  
761 707
             own['requestAction'] = 'fak_throw'
762 708
             act.linearVelocity = [0.0, 5.0, -5.0]  
763 709
         cont.activate(act)

Loading…
Cancel
Save