shuvit 6 years ago
parent
commit
de2987a6d5
3 changed files with 219 additions and 74 deletions
  1. 77
    2
      co_ActionState.py
  2. 51
    4
      controller2.py
  3. 91
    68
      walk.py

+ 77
- 2
co_ActionState.py
File diff suppressed because it is too large
View File


+ 51
- 4
controller2.py View File

@@ -2054,12 +2054,21 @@ def main():
2054 2054
                 elif own['grindType'] == "fak_tailgR": 
2055 2055
                     own['requestAction'] = 'fak_tailgr'
2056 2056
                 elif own['grindType'] == "fak_tailgL":
2057
-                    own['requestAction'] = 'fak_tailgl' 
2057
+                    own['requestAction'] = 'fak_tailgl'
2058
+                    
2059
+                elif own['grindType'] == "reg_tailslide":
2060
+                    own['requestAction'] = 'reg_tailslide'
2061
+                elif own['grindType'] == "reg_noseslide":
2062
+                    own['requestAction'] = 'reg_noseslide' 
2063
+                elif own['grindType'] == "fak_tailslide":
2064
+                    own['requestAction'] = 'fak_tailslide'
2065
+                elif own['grindType'] == "fak_noseslide":
2066
+                    own['requestAction'] = 'fak_noseslide'                     
2058 2067
                 
2059 2068
                 elif own['grindType'] == "reg_tailslide" and edge == 1:
2060 2069
                     #own['requestAction'] = 'reg_tailslide'
2061 2070
                     own['requestAction'] = 'fak_noseslide'  
2062
-                    own['grind_stance'] = 0                
2071
+                    STANCE = 0                
2063 2072
                 elif own['grindType'] == "fak_tailslide":
2064 2073
                     own['requestAction'] = 'fak_tailslide'                
2065 2074
                     own['grind_stance'] = 1
@@ -2110,6 +2119,12 @@ def main():
2110 2119
                     own['requestAction'] = 'fak_tailgl' 
2111 2120
                 elif own['grindType'] == "reg_tailslide":
2112 2121
                     own['requestAction'] = 'reg_tailslide'
2122
+                elif own['grindType'] == "reg_noseslide":
2123
+                    own['requestAction'] = 'reg_noseslide' 
2124
+                elif own['grindType'] == "fak_tailslide":
2125
+                    own['requestAction'] = 'fak_tailslide'
2126
+                elif own['grindType'] == "fak_noseslide":
2127
+                    own['requestAction'] = 'fak_noseslide'                                        
2113 2128
                     
2114 2129
                 elif own['grindType'] == "fak_tailslide" and edge == 1:
2115 2130
                     own['grind_stance'] = 1
@@ -2125,6 +2140,19 @@ def main():
2125 2140
                         own['requestAction'] = 'reg_5050'
2126 2141
                     if STANCE == 1:
2127 2142
                         own['requestAction'] = 'fak_5050'
2143
+                        
2144
+                        
2145
+            if 'fak' in own['l_actionState']:
2146
+                STANCE = 1
2147
+                own['lg_stance'] = 1
2148
+                lg_stance = 1
2149
+                #print('changing stance 1')
2150
+            if 'reg' in own['l_actionState']:
2151
+                STANCE = 0 
2152
+                own['lg_stance'] = 0
2153
+                lg_stance = 0
2154
+                #print('changing stance 0') 
2155
+            own['stance'] = STANCE                         
2128 2156
                       
2129 2157
     def rotmult():
2130 2158
         if r_ground.triggered:
@@ -2267,11 +2295,23 @@ def main():
2267 2295
     def grindoutair():
2268 2296
         skippy = 0
2269 2297
         linVel = own.getLinearVelocity(True)
2298
+        STANCE = own['stance']
2270 2299
         if own['LAST_GRIND'] == True and grindHit == True:
2271 2300
             own['lg_stance'] = STANCE
2272 2301
         lg_stance = own['lg_stance']
2273 2302
         own.actuators["grindoutair"].useLocalLinV = True        
2274
-        if own['grindjumpturn'] == True and own['grindCountdown'] > 12 and skippy == 0:           
2303
+        if own['grindjumpturn'] == True and own['grindCountdown'] > 12 and skippy == 0: 
2304
+            if 'fak' in own['l_actionState']:
2305
+                STANCE = 1
2306
+                own['lg_stance'] = 1
2307
+                lg_stance = 1
2308
+                #print('changing stance 1')
2309
+            if 'reg' in own['l_actionState']:
2310
+                STANCE = 0 
2311
+                own['lg_stance'] = 0
2312
+                lg_stance = 0
2313
+                #print('changing stance 0') 
2314
+            own['stance'] = STANCE                                        
2275 2315
             grindoutspeed = .1  
2276 2316
             grindoutspeed2 = 5.4  
2277 2317
             if lLR > turnsens:
@@ -2316,7 +2356,7 @@ def main():
2316 2356
         
2317 2357
         if own['grindjumpturn'] == False or own['grindCountdown'] < 19:
2318 2358
             cont.deactivate(own.actuators["grindoutair"])
2319
-
2359
+    #print(STANCE)
2320 2360
     def set_last_grindpos():
2321 2361
         if own['grindpos'] != None:
2322 2362
             own['last_grindpos'] = own['grindpos']
@@ -3704,6 +3744,13 @@ def main():
3704 3744
             outrot = .02 #0.012
3705 3745
             outrot2 = .24
3706 3746
             outact = own.actuators["grindoutRight"]
3747
+            STANCE = own['grind_stance'] 
3748
+            if 'fak' in own['l_actionState']:
3749
+                STANCE = 1
3750
+                #print('changing stance 1')
3751
+            if 'reg' in own['l_actionState']:
3752
+                STANCE = 0
3753
+                #print('changing stance 0')                
3707 3754
             if own['grindpos'] == 'reg_5050':
3708 3755
                 if lq3on == 1 or lq2on:
3709 3756
                     if own['gt_cd2'] == 0:

+ 91
- 68
walk.py View File

@@ -529,111 +529,134 @@ def idle_anim():
529 529
             if own['idle_skipper'] > 0:
530 530
                own['idle_skipper'] -= 1 
531 531
             ran_num = random.randint(1, 8)
532
-            #print(ran_num, "modding")
532
+            print(ran_num, "modding")
533 533
             if own['last_idle_num'] == ran_num:
534 534
                 ran_num = 1
535 535
             if own['idle_skipper'] == 0:
536 536
                 own['last_idle_num'] = ran_num
537 537
                 if ran_num == 1 or ran_num > 7:    
538 538
                     killact(3)
539
+                    
539 540
                     if STANCE == 0 and own['throw_deck'] == 0:
540
-                        skater.playAction("reg_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
541
-                        deck.playAction("a_reg_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
542
-                        trucks.playAction("a_reg_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
541
+                        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)
543 545
                     elif STANCE == 0 and own['throw_deck'] == 1:
544
-                        skater.playAction("reg_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
546
+                        own['requestAction'] = 'reg_idle1'
547
+                        #skater.playAction("reg_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
545 548
                     elif STANCE == 1 and own['throw_deck'] == 0:
546
-                        skater.playAction("fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
547
-                        deck.playAction("a_fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
548
-                        trucks.playAction("a_fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
549
+                        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) 
549 553
                     elif STANCE == 1 and own['throw_deck'] == 1:
550
-                        skater.playAction("fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
554
+                        own['requestAction'] = 'fak_idle1'
555
+                        #skater.playAction("fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
551 556
                                                                            
552 557
                 elif ran_num == 2:    
553 558
                     killact(3)
554 559
                     if STANCE == 0 and own['throw_deck'] == 0:
555
-                        skater.playAction("reg_idle2_", 1,120, layer=idle_lay, play_mode=0, speed=.5)
556
-                        deck.playAction("a_reg_idle2", 1,120, layer=idle_lay, play_mode=0, speed=.5)
557
-                        trucks.playAction("a_reg_idle2", 1,120, layer=idle_lay, play_mode=0, speed=.5)
560
+                        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)
558 564
                     elif STANCE == 0 and own['throw_deck'] == 1:
559
-                        skater.playAction("reg_idle2_nb", 1,120, layer=idle_lay, play_mode=0, speed=.5)
565
+                        own['requestAction'] = 'reg_idle2_nb'
566
+                        #skater.playAction("reg_idle2_nb", 1,120, layer=idle_lay, play_mode=0, speed=.5)
560 567
                     elif STANCE == 1 and own['throw_deck'] == 0:
561
-                        skater.playAction("fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
562
-                        deck.playAction("a_fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)
563
-                        trucks.playAction("a_fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
568
+                        own['requestAction'] = 'fak_idle1'
564 569
                     elif STANCE == 1 and own['throw_deck'] == 1:
565
-                        skater.playAction("fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)  
570
+                        own['requestAction'] = 'fak_idle1'
571
+                        #skater.playAction("fak_idle1", 1,120, layer=idle_lay, play_mode=0, speed=.5)  
566 572
                 elif ran_num == 3:    
567 573
                     killact(3)
568 574
                     if STANCE == 0 and own['throw_deck'] == 0:
569
-                        skater.playAction("reg_idle3", 1,240, layer=idle_lay, play_mode=0, speed=.5)
570
-                        deck.playAction("a_reg_idle3", 1,240, layer=idle_lay, play_mode=0, speed=.5)
571
-                        trucks.playAction("a_reg_idle3", 1,240, layer=idle_lay, play_mode=0, speed=.5)
575
+                        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)
572 579
                     elif STANCE == 0 and own['throw_deck'] == 1:
573
-                        skater.playAction("reg_idle3", 1,240, layer=idle_lay, play_mode=0, speed=.5)
580
+                        own['requestAction'] = 'reg_idle3'
581
+                        #skater.playAction("reg_idle3", 1,240, layer=idle_lay, play_mode=0, speed=.5)
574 582
                     elif STANCE == 1 and own['throw_deck'] == 0:
575
-                        skater.playAction("fak_idle1", 1,240, layer=idle_lay, play_mode=0, speed=.5)
576
-                        deck.playAction("a_fak_idle1", 1,240, layer=idle_lay, play_mode=0, speed=.5)
577
-                        trucks.playAction("a_fak_idle1", 1,240, layer=idle_lay, play_mode=0, speed=.5) 
583
+                        own['requestAction'] = 'fak_idle1'
578 584
                     elif STANCE == 1 and own['throw_deck'] == 1:
579
-                        skater.playAction("fak_idle1", 1,240, layer=idle_lay, play_mode=0, speed=.5)
585
+                        #skater.playAction("fak_idle1", 1,240, layer=idle_lay, play_mode=0, speed=.5)
586
+                        own['requestAction'] = 'fak_idle1'
580 587
                     own['idle_skipper'] = 2 
581 588
                 elif ran_num == 4:    
582 589
                     killact(3)
583 590
                     if STANCE == 0 and own['throw_deck'] == 0:
584
-                        skater.playAction("reg_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
585
-                        deck.playAction("a_reg_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
586
-                        trucks.playAction("a_reg_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
591
+                        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)
587 595
                     elif STANCE == 0 and own['throw_deck'] == 1:
588
-                        skater.playAction("reg_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
596
+                        #skater.playAction("reg_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
597
+                        own['requestAction'] = 'reg_idle4'
589 598
                     elif STANCE == 1 and own['throw_deck'] == 0:
590
-                        skater.playAction("fak_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
591
-                        deck.playAction("a_fak_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
592
-                        trucks.playAction("a_fak_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
599
+                        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) 
593 603
                     elif STANCE == 1 and own['throw_deck'] == 1:
594
-                        skater.playAction("fak_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
604
+                        #skater.playAction("fak_idle4", 1,120, layer=idle_lay, play_mode=0, speed=.5)
605
+                        own['requestAction'] = 'fak_idle4' 
595 606
                 elif ran_num == 5:    
596 607
                     killact(3)
597 608
                     if STANCE == 0 and own['throw_deck'] == 0:
598
-                        skater.playAction("reg_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
599
-                        deck.playAction("a_reg_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
600
-                        trucks.playAction("a_reg_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
609
+                        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)
601 613
                     elif STANCE == 0 and own['throw_deck'] == 1:
602
-                        skater.playAction("reg_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
614
+                        #skater.playAction("reg_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
615
+                        own['requestAction'] = 'reg_idle5'
603 616
                     elif STANCE == 1 and own['throw_deck'] == 0:
604
-                        skater.playAction("fak_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
605
-                        deck.playAction("a_fak_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
606
-                        trucks.playAction("a_fak_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
617
+                        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) 
607 621
                     elif STANCE == 1 and own['throw_deck'] == 1:
608
-                        skater.playAction("fak_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
622
+                        own['requestAction'] = 'fak_idle5'
623
+                        #skater.playAction("fak_idle5", 1,120, layer=idle_lay, play_mode=0, speed=.5)
609 624
                 elif ran_num == 6:    
610 625
                     killact(3)
611 626
                     if STANCE == 0 and own['throw_deck'] == 0:
612
-                        skater.playAction("reg_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
613
-                        deck.playAction("a_reg_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
614
-                        trucks.playAction("a_reg_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
627
+                        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)
615 631
                     elif STANCE == 0 and own['throw_deck'] == 1:
616
-                        skater.playAction("reg_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
632
+                        own['requestAction'] = 'reg_idle6'
633
+                        #skater.playAction("reg_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
617 634
                     elif STANCE == 1 and own['throw_deck'] == 0:
618
-                        skater.playAction("fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
619
-                        deck.playAction("a_fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
620
-                        trucks.playAction("a_fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
635
+                        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) 
621 639
                     elif STANCE == 1 and own['throw_deck'] == 1:
622
-                        skater.playAction("fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
640
+                        #skater.playAction("fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
641
+                        own['requestAction'] = 'fak_idle6'
623 642
                 elif ran_num == 7:    
624 643
                     killact(3)
625 644
                     if STANCE == 0 and own['throw_deck'] == 0:
626
-                        skater.playAction("reg_idle7", 1,120, layer=idle_lay, play_mode=0, speed=.5)
627
-                        deck.playAction("a_reg_idle7", 1,120, layer=idle_lay, play_mode=0, speed=.5)
628
-                        trucks.playAction("a_reg_idle7", 1,120, layer=idle_lay, play_mode=0, speed=.5)
645
+                        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)
629 649
                     elif STANCE == 0 and own['throw_deck'] == 1:
630
-                        skater.playAction("reg_idle7", 1,120, layer=idle_lay, play_mode=0, speed=.5)
650
+                        #skater.playAction("reg_idle7", 1,120, layer=idle_lay, play_mode=0, speed=.5)
651
+                        own['requestAction'] = 'reg_idle7'
631 652
                     elif STANCE == 1 and own['throw_deck'] == 0:
632
-                        skater.playAction("fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
633
-                        deck.playAction("a_fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)
634
-                        trucks.playAction("a_fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5) 
653
+                        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) 
635 657
                     elif STANCE == 1 and own['throw_deck'] == 1:
636
-                        skater.playAction("fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)                                                                                                                                 
658
+                        own['requestAction'] = 'fak_idle6'
659
+                        #skater.playAction("fak_idle6", 1,120, layer=idle_lay, play_mode=0, speed=.5)                                                                                                                                 
637 660
 
638 661
 def reset_pos():
639 662
     #reset
@@ -1084,17 +1107,17 @@ if yBut == True:
1084 1107
     own["walk_idle_frame"] = 0
1085 1108
 
1086 1109
 
1087
-if own['requestAction'] == None:
1088
-    if own['throw_deck'] == False:
1089
-        if STANCE == 1:
1090
-            own['requestAction'] = reg_idle
1091
-        else:
1092
-            own['requestAction'] = fak_idle        
1093
-    else:
1094
-        if STANCE == 1:
1095
-            own['requestAction'] = reg_idle_nb
1096
-        else:
1097
-            own['requestAction'] = fak_idle_nb                            
1110
+#if own['requestAction'] == None:
1111
+#    if own['throw_deck'] == False:
1112
+#        if STANCE == 1:
1113
+#            own['requestAction'] = reg_idle
1114
+#        else:
1115
+#            own['requestAction'] = fak_idle        
1116
+#    else:
1117
+#        if STANCE == 1:
1118
+#            own['requestAction'] = reg_idle_nb
1119
+#        else:
1120
+#            own['requestAction'] = fak_idle_nb                            
1098 1121
    
1099 1122
 if deck.visible:
1100 1123
     own['deckvis'] = 1

Loading…
Cancel
Save