Browse Source

cleanup1_working

shuvit 6 years ago
parent
commit
ad50360088
2 changed files with 1825 additions and 2 deletions
  1. 1819
    0
      co_ActionState.py
  2. 6
    2
      controller2.py

+ 1819
- 0
co_ActionState.py
File diff suppressed because it is too large
View File


+ 6
- 2
controller2.py View File

@@ -1707,7 +1707,7 @@ def push_goof():
1707 1707
 def brfoot():
1708 1708
     lay = grablay + 40
1709 1709
     if STANCE == 0:
1710
-	skater.playAction("brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1710
+        skater.playAction("brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1711 1711
         deck.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1712 1712
         trucks.playAction("a_brfoot", 1, 30, layer=lay, blendin=2, play_mode=0, speed=CAVEMAN_SPEED)
1713 1713
     if STANCE == 1:
@@ -2151,7 +2151,7 @@ def grind():
2151 2151
             elif own['grindType'] == "fak_nosegR": 
2152 2152
                 own['requestAction'] = 'fak_nosegr'               
2153 2153
             elif own['grindType'] == "fak_nosegL":
2154
-                own['requestAction'] = 'reg_nosegl'                
2154
+                own['requestAction'] = 'fak_nosegl'                
2155 2155
             elif own['grindType'] == "fak_tailg":
2156 2156
                 own['requestAction'] = 'fak_tailg' 
2157 2157
             elif own['grindType'] == "fak_tailgR": 
@@ -2221,6 +2221,7 @@ def grind():
2221 2221
             elif own['grindType'] == "fak_tailgL":
2222 2222
                 own['requestAction'] = 'fak_tailgl' 
2223 2223
             elif own['grindType'] == "reg_tailslide":
2224
+                own['requestAction'] = 'reg_tailslide'
2224 2225
             elif own['grindType'] == "fak_tailslide":
2225 2226
                 own['grind_stance'] = 1
2226 2227
                 own['requestAction'] = 'fak_tailslide'
@@ -4329,4 +4330,7 @@ if r_ground.triggered and own["jump_timer"] < 20:
4329 4330
     force2 = [0.0, 0, -10]
4330 4331
     own.applyForce(force2, True)
4331 4332
 
4333
+if grindDar == False:
4334
+    own['grindType'] = ''
4332 4335
 
4336
+#print(own['grindType'])

Loading…
Cancel
Save