Browse Source

z123 - wallrides2

shuvit 6 years ago
parent
commit
524c73496e
2 changed files with 21 additions and 20 deletions
  1. 13
    13
      co_ActionState.py
  2. 8
    7
      controller2.py

+ 13
- 13
co_ActionState.py View File

@@ -1792,9 +1792,9 @@ def main():
1792 1792
             if requestAction == 'reg_wall_r':
1793 1793
                 actionState = 'reg_wall_r'
1794 1794
                 if l_actionState != 'reg_wall_r':
1795
-                    skater.playAction("reg_wall_r", 1,10, layer=trans_layer, play_mode=0, speed=.5)                    
1796
-                    deck.playAction("a_reg_wall_r", 1,10, layer=trans_layer, play_mode=0, speed=.5)
1797
-                    trucks.playAction("a_reg_wall_r", 1,10, layer=trans_layer, play_mode=0, speed=.5)
1795
+                    skater.playAction("reg_wall_r", 10,10, layer=trans_layer, play_mode=0, speed=.5)                    
1796
+                    deck.playAction("a_reg_wall_r", 10,10, layer=trans_layer, play_mode=0, speed=.5)
1797
+                    trucks.playAction("a_reg_wall_r", 10,10, layer=trans_layer, play_mode=0, speed=.5)
1798 1798
                 else:
1799 1799
                     skater.playAction("reg_wall_r", 10,10, layer=loop_layer, play_mode=1, speed=.5)
1800 1800
                     deck.playAction("a_reg_wall_r", 10,10, layer=loop_layer, play_mode=1, speed=.5)
@@ -1802,9 +1802,9 @@ def main():
1802 1802
             if requestAction == 'reg_wall_l':
1803 1803
                 actionState = 'reg_wall_l'
1804 1804
                 if l_actionState != 'reg_wall_l':
1805
-                    skater.playAction("reg_wall_l", 1,10, layer=trans_layer, play_mode=0, speed=.5)                    
1806
-                    deck.playAction("a_reg_wall_l2", 1,10, layer=trans_layer, play_mode=0, speed=.5)
1807
-                    trucks.playAction("a_reg_wall_l2", 1,10, layer=trans_layer, play_mode=0, speed=.5)
1805
+                    skater.playAction("reg_wall_l", 10,10, layer=trans_layer, play_mode=0, speed=.5)                    
1806
+                    deck.playAction("a_reg_wall_l2", 10,10, layer=trans_layer, play_mode=0, speed=.5)
1807
+                    trucks.playAction("a_reg_wall_l2", 10,10, layer=trans_layer, play_mode=0, speed=.5)
1808 1808
                 else:
1809 1809
                     skater.playAction("reg_wall_l", 10,10, layer=loop_layer, play_mode=1, speed=.5)
1810 1810
                     deck.playAction("a_reg_wall_l2", 10,10, layer=loop_layer, play_mode=1, speed=.5)
@@ -1812,9 +1812,9 @@ def main():
1812 1812
             if requestAction == 'fak_wall_r':
1813 1813
                 actionState = 'fak_wall_r'
1814 1814
                 if l_actionState != 'fak_wall_r':
1815
-                    skater.playAction("fak_wall_r", 1,10, layer=trans_layer, play_mode=0, speed=.5)                    
1816
-                    deck.playAction("a_reg_wall_l2", 1,10, layer=trans_layer, play_mode=0, speed=.5)
1817
-                    trucks.playAction("a_reg_wall_l2", 1,10, layer=trans_layer, play_mode=0, speed=.5)
1815
+                    skater.playAction("fak_wall_r", 10,10, layer=trans_layer, play_mode=0, speed=.5)                    
1816
+                    deck.playAction("a_reg_wall_l2", 10,10, layer=trans_layer, play_mode=0, speed=.5)
1817
+                    trucks.playAction("a_reg_wall_l2", 10,10, layer=trans_layer, play_mode=0, speed=.5)
1818 1818
                 else:
1819 1819
                     skater.playAction("fak_wall_r", 10,10, layer=loop_layer, play_mode=1, speed=.5)
1820 1820
                     deck.playAction("a_reg_wall_l2", 10,10, layer=loop_layer, play_mode=1, speed=.5)
@@ -1822,9 +1822,9 @@ def main():
1822 1822
             if requestAction == 'fak_wall_l':
1823 1823
                 actionState = 'fak_wall_l'
1824 1824
                 if l_actionState != 'reg_wall_r':
1825
-                    skater.playAction("fak_wall_l", 1,10, layer=trans_layer, play_mode=0, speed=.5)                    
1826
-                    deck.playAction("a_reg_wall_r", 1,10, layer=trans_layer, play_mode=0, speed=.5)
1827
-                    trucks.playAction("a_reg_wall_r", 1,10, layer=trans_layer, play_mode=0, speed=.5)
1825
+                    skater.playAction("fak_wall_l", 10,10, layer=trans_layer, play_mode=0, speed=.5)                    
1826
+                    deck.playAction("a_reg_wall_r", 10,10, layer=trans_layer, play_mode=0, speed=.5)
1827
+                    trucks.playAction("a_reg_wall_r", 10,10, layer=trans_layer, play_mode=0, speed=.5)
1828 1828
                 else:
1829 1829
                     skater.playAction("fak_wall_l", 10,10, layer=loop_layer, play_mode=1, speed=.5)
1830 1830
                     deck.playAction("a_reg_wall_r", 10,10, layer=loop_layer, play_mode=1, speed=.5)
@@ -2407,7 +2407,7 @@ def main():
2407 2407
 ###################  
2408 2408
     
2409 2409
     #debug
2410
-    print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'])
2410
+    #print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'])
2411 2411
     cur_frame = skater.getActionFrame(trans_layer)
2412 2412
     #print(cur_frame)
2413 2413
     def printplaying():

+ 8
- 7
controller2.py View File

@@ -3907,6 +3907,7 @@ def grind_turn():
3907 3907
     force = [0,0,0]
3908 3908
     grindHit = own['grindTouch']      
3909 3909
     sincegrinding = own['framenum']  - own['grindstartFrame']
3910
+    STANCE = own['stance']
3910 3911
     if rUD > turnsens or rLR > turnsens or rUD < -turnsens or rLR < -turnsens:
3911 3912
        jumping = True
3912 3913
     if grindHit == False:
@@ -4067,14 +4068,14 @@ def grind_turn():
4067 4068
         if own['grind_out_type'] == 'reg fak right' or own['grind_out_type'] == 'reg fak left' or own['grind_out_type'] == 'fak fak right' or own['grind_out_type'] == 'fak fak left':
4068 4069
             if own['gt_cd2'] == 51:
4069 4070
                 #print('outforce')
4070
-                if STANCE == 0:
4071
+                if STANCE == False:
4071 4072
                     own.applyForce([-200, 0, 0], True)
4072
-                    own['stance'] = 1
4073
-                    STANCE = 1
4074
-                if STANCE == 1:
4073
+                    own['stance'] = True
4074
+                    STANCE = True
4075
+                if STANCE == True:
4075 4076
                     own.applyForce([200, 0, 0], True)
4076
-                    own['stance'] = 0
4077
-                    STANCE = 0
4077
+                    own['stance'] = False
4078
+                    STANCE = False
4078 4079
         if own['grind_out_type'] == 'bs reg back' or own['grind_out_type'] == 'bs fak forward':
4079 4080
             if own['gt_cd2'] > 50:
4080 4081
                 if STANCE == True:
@@ -4174,7 +4175,7 @@ def wallride():
4174 4175
 def wallride_sound():
4175 4176
     
4176 4177
     sact = own.actuators["wallSound"]
4177
-    if own["wallride"] != None:
4178
+    if own["wallride"] != None and (own['actionState'] == 'reg_wall_r' or own['actionState'] == 'reg_wall_l' or own['actionState'] == 'fak_wall_r' or own['actionState'] == 'fak_wall_l'):
4178 4179
         sact.volume = .2
4179 4180
         cont.activate(own.actuators["wallSound"])
4180 4181
     else:

Loading…
Cancel
Save