Browse Source

stop rewrite_anims1

shuvit 6 years ago
parent
commit
269dac8743
1 changed files with 23 additions and 31 deletions
  1. 23
    31
      controller2.py

+ 23
- 31
controller2.py View File

@@ -1016,29 +1016,37 @@ def roll():
1016 1016
     if r_ground.triggered == 1:  
1017 1017
         pass      
1018 1018
 def stop():
1019
-    if r_ground.triggered == 1 and STANCE == False:        
1020
-        skater.playAction("reg_stop", 1,30, layer=18, priority=59, blendin=10, play_mode=1, speed=.5)
1019
+    if linVelocity.x < .05 and linVelocity.x > -.05:
1020
+        can_stop = 1
1021
+        own["lastStop"] = True
1022
+    else:
1023
+        can_stop = 0    
1024
+    if r_ground.triggered == 1 and STANCE == False and can_stop == 1:
1025
+        own['requestAction'] = 'reg_stop'        
1026
+        #skater.playAction("reg_stop", 1,30, layer=18, priority=59, blendin=10, play_mode=1, speed=.5)
1021 1027
         yvel = linVelocity.x * .985
1022 1028
         force = [(yvel), 0, linVelocity.z]
1023 1029
         own.setLinearVelocity(force, True)
1024
-        if lastStop == False:
1025
-            skater.playAction("reg_stopin", 1,15, layer=61, priority=3, blendin=10, play_mode=0, speed=.5)
1026
-    elif r_ground.triggered == 1 and STANCE == True:
1027
-        skater.playAction("fak_stop", 1,30, layer=19, priority=7, blendin=10, play_mode=1, speed=.5)
1030
+        #if lastStop == False:
1031
+            #skater.playAction("reg_stopin", 1,15, layer=61, priority=3, blendin=10, play_mode=0, speed=.5)
1032
+    elif r_ground.triggered == 1 and STANCE == True and can_stop == 1:
1033
+        own['requestAction'] = 'fak_stop'
1034
+        #skater.playAction("fak_stop", 1,30, layer=19, priority=7, blendin=10, play_mode=1, speed=.5)
1028 1035
         yvel = linVelocity.x * .985
1029 1036
         force = [(yvel), 0, linVelocity.z]
1030 1037
         own.setLinearVelocity(force, True)
1031
-        if lastStop == False:
1032
-            skater.playAction("fak_stopin", 1,15, layer=62, priority=3, blendin=10, play_mode=0, speed=.5)
1033
-    own["lastStop"] = True
1038
+        #if lastStop == False:
1039
+            #skater.playAction("fak_stopin", 1,15, layer=62, priority=3, blendin=10, play_mode=0, speed=.5)
1040
+    
1041
+    
1034 1042
     if linVelocity.x < .05 and linVelocity.x > -.05 and own["lastStop"] == True:
1035 1043
         own["lastStop"] == False   
1036
-        skater.stopAction(7)
1037
-        skater.stopAction(1) 
1038
-        if STANCE == True:
1039
-            skater.playAction("fak_stopin", 15,1, layer=63, priority=3, blendin=10, play_mode=0, speed=.5)
1040
-        elif STANCE == False:
1041
-            skater.playAction("reg_stopin", 15,1, layer=64, priority=3, blendin=10, play_mode=0, speed=.5)    
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)    
1042 1050
 
1043 1051
 def oposin():
1044 1052
     if skater.isPlayingAction(30) or skater.isPlayingAction(31):
@@ -3348,28 +3356,12 @@ if LAST_GRIND == False and grindHit == False and r_ground.triggered:
3348 3356
         flfoot()              
3349 3357
     
3350 3358
 #push b button
3351
-if (bBut == 0 and own["lastStop"] == True) or (bBut == 1 and own["lastStop"] == False):
3352
-        skater.stopAction(7)
3353
-        skater.stopAction(1)
3354
-        killact(18)
3355
-        killact(19)
3356
-        
3357
-if bBut == 0 and own["lastStop"] == True:
3358
-    if STANCE == True:
3359
-        skater.playAction("fak_stopin", 15,1, layer=6, priority=3, blendin=10, play_mode=0, speed=.5)    
3360
-    elif STANCE == False:
3361
-        skater.playAction("reg_stopin", 15,1, layer=7, priority=3, blendin=10, play_mode=0, speed=.5)
3362
-
3363 3359
 if bBut == 1:
3364 3360
     #print("push suckka")
3365 3361
     if linVelocity.x > .05 or linVelocity.x < -.05:
3366 3362
         stop()
3367 3363
     elif linVelocity.x < .05 or linVelocity.x > -.05:
3368 3364
         if own["lastStop"] == True:
3369
-            if STANCE == True:
3370
-                skater.playAction("fak_stopin", 15,1, layer=8, priority=3, blendin=10, play_mode=0, speed=.5)    
3371
-            elif STANCE == False:
3372
-                skater.playAction("reg_stopin", 15,1, layer=9, priority=3, blendin=10, play_mode=0, speed=.5)
3373 3365
             own["lastStop"] = False
3374 3366
 elif bBut ==0:
3375 3367
         own["lastStop"] = False

Loading…
Cancel
Save