shuvit 6 years ago
parent
commit
69a89de440
2 changed files with 50 additions and 2 deletions
  1. 46
    1
      co_ActionState.py
  2. 4
    1
      controller2.py

+ 46
- 1
co_ActionState.py View File

@@ -1374,7 +1374,52 @@ def main():
1374 1374
                 own['actionTimer'] = 10  
1375 1375
                 skater.playAction("nreg", 60,70, layer=trans_layer, play_mode=0, speed=1)
1376 1376
                 deck.playAction("a_reg", 10,0, layer=trans_layer, play_mode=0, speed=1)
1377
-                trucks.playAction("a_reg", 10,0, layer=trans_layer, play_mode=0, speed=1)                                                    
1377
+                trucks.playAction("a_reg", 10,0, layer=trans_layer, play_mode=0, speed=1)
1378
+
1379
+            if requestAction == 'reg_hippy':
1380
+                actionState = 'reg_hippy'
1381
+                own['actionTimer'] = 14  
1382
+                skater.playAction("reg_hippy", 10,40, layer=trans_layer, play_mode=0, speed=1)
1383
+                deck.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1)
1384
+                trucks.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1)
1385
+
1386
+            if requestAction == 'fak_hippy':
1387
+                actionState = 'fak_hippy'
1388
+                own['actionTimer'] = 14  
1389
+                skater.playAction("fak_hippy", 10,40, layer=trans_layer, play_mode=0, speed=1)
1390
+                deck.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1)
1391
+                trucks.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1)                  
1392
+
1393
+            if requestAction == 'reg_hippy_ncw':
1394
+                actionState = 'reg_hippy_ncw'
1395
+                own['actionTimer'] = 14  
1396
+                skater.playAction("reg_hippy_ncw", 10,40, layer=trans_layer, play_mode=0, speed=1)
1397
+                deck.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1)
1398
+                trucks.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1)
1399
+            if requestAction == 'reg_hippy_nccw':
1400
+                actionState = 'reg_hippy_nccw'
1401
+                own['actionTimer'] = 14  
1402
+                skater.playAction("reg_hippy_nccw", 10,40, layer=trans_layer, play_mode=0, speed=1)
1403
+                deck.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1)
1404
+                trucks.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1) 
1405
+            if requestAction == 'fak_hippy_ncw':
1406
+                actionState = 'fak_hippy_ncw'
1407
+                own['actionTimer'] = 14  
1408
+                skater.playAction("fak_hippy_ncw", 10,40, layer=trans_layer, play_mode=0, speed=1)
1409
+                deck.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1)
1410
+                trucks.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1)                               
1411
+
1412
+            if requestAction == 'fak_hippy_nccw':
1413
+                actionState = 'fak_hippy_nccw'
1414
+                own['actionTimer'] = 14  
1415
+                skater.playAction("fak_hippy_nccw", 10,40, layer=trans_layer, play_mode=0, speed=1)
1416
+                deck.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1)
1417
+                trucks.playAction("a_reg", 30,0, layer=trans_layer, play_mode=0, speed=1)                               
1418
+
1419
+
1420
+
1421
+
1422
+
1378 1423
    
1379 1424
 #######################################        
1380 1425
         #loop actions 

+ 4
- 1
controller2.py View File

@@ -3209,14 +3209,17 @@ def hippy_jump():
3209 3209
     if own['hippy'] == 1 and own['last_hippy'] == 0:
3210 3210
         if STANCE == 0:
3211 3211
             #own['requestAction'] = 'reg_hippy'
3212
+            own['requestAction'] = 'reg_hippy'
3212 3213
             skater.playAction("reg_hippy", 1,10, layer=1101, priority=1, layer_weight=0, play_mode=0, speed=.5)
3213 3214
         if STANCE == 1:
3214
-            
3215
+            own['requestAction'] = 'fak_hippy'
3215 3216
             skater.playAction("fak_hippy", 1,10, layer=1101, priority=1, layer_weight=0, play_mode=0, speed=.5)            
3216 3217
     if own['hippy'] == 1 and own['last_hippy'] == 1:
3217 3218
         if STANCE == 0:
3219
+            own['requestAction'] = 'reg_hippy'
3218 3220
             skater.playAction("reg_hippy", 10,10, layer=1100, priority=0, layer_weight=0, play_mode=1, speed=.5)
3219 3221
         if STANCE == 1:
3222
+            own['requestAction'] = 'fak_hippy'
3220 3223
             skater.playAction("fak_hippy", 10,10, layer=1100, priority=0, layer_weight=0, play_mode=1, speed=.5)
3221 3224
     if own['hippy'] == 0 and own['last_hippy'] == 1:
3222 3225
         killact(1100)

Loading…
Cancel
Save