Browse Source

stop rewrite_anims2

shuvit 6 years ago
parent
commit
c438514993
3 changed files with 24 additions and 20 deletions
  1. 21
    1
      co_ActionState.py
  2. 2
    15
      controller2.py
  3. 1
    4
      walk.py

+ 21
- 1
co_ActionState.py View File

@@ -1655,7 +1655,27 @@ def main():
1655 1655
                     skater.playAction("fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
1656 1656
                     deck.playAction("a_fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
1657 1657
                     trucks.playAction("a_fak_tailg", 30,1, layer=loop_layer, play_mode=1, speed=.5)                     
1658
-                    
1658
+            
1659
+            if requestAction == 'reg_stop':
1660
+                actionState = 'reg_stop'
1661
+                if l_actionState != 'reg_stop'
1662
+                    skater.playAction("reg_stop", 1,30, layer=trans_layer, play_mode=0, speed=.5)
1663
+                    deck.playAction("a_reg", 1,30, layer=trans_layer, play_mode=0, speed=.5)
1664
+                    trucks.playAction("a_reg", 1,30, layer=trans_layer, play_mode=0, speed=.5)        
1665
+                else:
1666
+                    skater.playAction("reg_stop", 30,30, layer=loop_layer, play_mode=1, speed=.5)
1667
+                    deck.playAction("a_reg", 30,30, layer=loop_layer, play_mode=1, speed=.5)
1668
+                    trucks.playAction("a_reg", 30,30, layer=loop_layer, play_mode=1, speed=.5)
1669
+            if requestAction == 'fak_stop':
1670
+                actionState = 'fak_stop'
1671
+                if l_actionState != 'fak_stop'
1672
+                    skater.playAction("fak_stop", 1,30, layer=trans_layer, play_mode=0, speed=.5)
1673
+                    deck.playAction("a_reg", 1,30, layer=trans_layer, play_mode=0, speed=.5)
1674
+                    trucks.playAction("a_reg", 1,30, layer=trans_layer, play_mode=0, speed=.5)        
1675
+                else:
1676
+                    skater.playAction("fak_stop", 30,30, layer=loop_layer, play_mode=1, speed=.5)
1677
+                    deck.playAction("a_reg", 30,30, layer=loop_layer, play_mode=1, speed=.5)
1678
+                    trucks.playAction("a_reg", 30,30, layer=loop_layer, play_mode=1, speed=.5)                        
1659 1679
                                          
1660 1680
     #$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
1661 1681
     #walk anims            

+ 2
- 15
controller2.py View File

@@ -1023,30 +1023,17 @@ def stop():
1023 1023
         can_stop = 0    
1024 1024
     if r_ground.triggered == 1 and STANCE == False and can_stop == 1:
1025 1025
         own['requestAction'] = 'reg_stop'        
1026
-        #skater.playAction("reg_stop", 1,30, layer=18, priority=59, blendin=10, play_mode=1, speed=.5)
1027 1026
         yvel = linVelocity.x * .985
1028 1027
         force = [(yvel), 0, linVelocity.z]
1029 1028
         own.setLinearVelocity(force, True)
1030
-        #if lastStop == False:
1031
-            #skater.playAction("reg_stopin", 1,15, layer=61, priority=3, blendin=10, play_mode=0, speed=.5)
1032 1029
     elif r_ground.triggered == 1 and STANCE == True and can_stop == 1:
1033 1030
         own['requestAction'] = 'fak_stop'
1034
-        #skater.playAction("fak_stop", 1,30, layer=19, priority=7, blendin=10, play_mode=1, speed=.5)
1035 1031
         yvel = linVelocity.x * .985
1036 1032
         force = [(yvel), 0, linVelocity.z]
1037
-        own.setLinearVelocity(force, True)
1038
-        #if lastStop == False:
1039
-            #skater.playAction("fak_stopin", 1,15, layer=62, priority=3, blendin=10, play_mode=0, speed=.5)
1040
-    
1033
+        own.setLinearVelocity(force, True)    
1041 1034
     
1042 1035
     if linVelocity.x < .05 and linVelocity.x > -.05 and own["lastStop"] == True:
1043
-        own["lastStop"] == False   
1044
-        #skater.stopAction(7)
1045
-        #skater.stopAction(1) 
1046
-        #if STANCE == True:
1047
-            #skater.playAction("fak_stopin", 15,1, layer=63, priority=3, blendin=10, play_mode=0, speed=.5)
1048
-        #elif STANCE == False:
1049
-            #skater.playAction("reg_stopin", 15,1, layer=64, priority=3, blendin=10, play_mode=0, speed=.5)    
1036
+        own["lastStop"] == False       
1050 1037
 
1051 1038
 def oposin():
1052 1039
     if skater.isPlayingAction(30) or skater.isPlayingAction(31):

+ 1
- 4
walk.py View File

@@ -810,10 +810,7 @@ def idle_anim():
810 810
                         deck.playAction("a_fak_idle6", 1,120, layer=3, play_mode=0, speed=.5)
811 811
                         trucks.playAction("a_fak_idle6", 1,120, layer=3, play_mode=0, speed=.5) 
812 812
                     elif STANCE == 1 and own['throw_deck'] == 1:
813
-                        skater.playAction("fak_idle6", 1,120, layer=3, play_mode=0, speed=.5)                                                                                                                 
814
-        #deck.playAction("a_reg_idle1", 1,120, layer=3, play_mode=1)
815
-        #trucks.playAction("a_reg_idle1", 1,120, layer=3, play_mode=1) 
816
-                
813
+                        skater.playAction("fak_idle6", 1,120, layer=3, play_mode=0, speed=.5)                                                                                                                                 
817 814
 
818 815
 def reset_pos():
819 816
     #reset

Loading…
Cancel
Save