Browse Source

manual reverts

shuvit 6 years ago
parent
commit
1360f3e6c8
2 changed files with 89 additions and 54 deletions
  1. 22
    2
      co_ActionState.py
  2. 67
    52
      controller2.py

+ 22
- 2
co_ActionState.py
File diff suppressed because it is too large
View File


+ 67
- 52
controller2.py View File

@@ -2481,20 +2481,23 @@ def revert():
2481 2481
     if own['manual_v2_type'] == 'reg manual': 
2482 2482
         own['requestAction'] = 'reg_manual_revert_ccw'   
2483 2483
         print("reg")
2484
-    elif own['manual_v2_type'] == 'reg nose manual':    
2485
-        skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2486
-        deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2487
-        trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2484
+    elif own['manual_v2_type'] == 'reg nose manual':
2485
+        own['requestAction'] = 'fak_manual_revert_ccw'    
2486
+        #skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2487
+        #deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2488
+        #trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2488 2489
         print("reg nose manual revert")             
2489
-    elif own['manual_v2_type'] == 'fak manual':    
2490
-        skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2491
-        deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2492
-        trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2490
+    elif own['manual_v2_type'] == 'fak manual': 
2491
+        own['requestAction'] = 'fak_manual_revert_ccw'   
2492
+        #skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2493
+        #deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2494
+        #trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2493 2495
         print("fak manual revert")
2494
-    elif own['manual_v2_type'] == 'fak nose manual':    
2495
-        skater.playAction("reg_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2496
-        deck.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2497
-        trucks.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2496
+    elif own['manual_v2_type'] == 'fak nose manual': 
2497
+        own['requestAction'] = 'reg_manual_revert_ccw'   
2498
+        #skater.playAction("reg_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2499
+        #deck.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2500
+        #trucks.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2498 2501
         print("fak")           
2499 2502
     else:
2500 2503
         own['requestAction'] = 'revert1'            
@@ -2509,25 +2512,29 @@ def revert2():
2509 2512
     local = True
2510 2513
     rot = [ 0.0, 0.0, -3.14]
2511 2514
     own.applyRotation(rot,local)
2512
-    if own['manual_v2_type'] == 'reg manual':    
2513
-        skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2514
-        deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2515
-        trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2515
+    if own['manual_v2_type'] == 'reg manual': 
2516
+        own['requestAction'] = 'reg_manual_revert_cw'   
2517
+        #skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2518
+        #deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2519
+        #trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2516 2520
         print("reg")
2517 2521
     elif own['manual_v2_type'] == 'reg nose manual':    
2518
-        skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2519
-        deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2520
-        trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2522
+        own['requestAction'] = 'fak_manual_revert_cw'
2523
+        #skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2524
+        #deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2525
+        #trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2521 2526
         print("reg nose manual revert")             
2522 2527
     elif own['manual_v2_type'] == 'fak manual':    
2523
-        skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2524
-        deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2525
-        trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2528
+        own['requestAction'] = 'fak_manual_revert_cw'
2529
+        #skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2530
+        #deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2531
+        #trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2526 2532
         print("fak manual revert")
2527 2533
     elif own['manual_v2_type'] == 'fak nose manual':    
2528
-        skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2529
-        deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2530
-        trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2534
+        own['requestAction'] = 'reg_manual_revert_cw'
2535
+        #skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2536
+        #deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2537
+        #trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2531 2538
         print("fak")   
2532 2539
     else:     
2533 2540
         own['requestAction'] = 'revert2'       
@@ -2543,25 +2550,29 @@ def revert3():
2543 2550
     rot = [ 0.0, 0.0, 3.14]
2544 2551
     own.applyRotation(rot,local) 
2545 2552
     print("real revert 3")  
2546
-    if own['manual_v2_type'] == 'reg manual':    
2547
-        skater.playAction("reg_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2548
-        deck.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2549
-        trucks.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2553
+    if own['manual_v2_type'] == 'reg manual':  
2554
+        own['requestAction'] = 'reg_manual_revert_ccw'  
2555
+        #skater.playAction("reg_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2556
+        #deck.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2557
+        #trucks.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2550 2558
         print("reg")
2551 2559
     elif own['manual_v2_type'] == 'reg nose manual':    
2552
-        skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2553
-        deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2554
-        trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2560
+        own['requestAction'] = 'fak_manual_revert_ccw'
2561
+        #skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2562
+        #deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2563
+        #trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2555 2564
         print("reg nose manual revert")             
2556
-    elif own['manual_v2_type'] == 'fak manual':    
2557
-        skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2558
-        deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2559
-        trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2565
+    elif own['manual_v2_type'] == 'fak manual': 
2566
+        own['requestAction'] = 'fak_manual_revert_ccw'   
2567
+        #skater.playAction("fak_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2568
+        #deck.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2569
+        #trucks.playAction("a_fak_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2560 2570
         print("fak manual revert")
2561
-    elif own['manual_v2_type'] == 'fak nose manual':    
2562
-        skater.playAction("reg_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2563
-        deck.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2564
-        trucks.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2571
+    elif own['manual_v2_type'] == 'fak nose manual':
2572
+        own['requestAction'] = 'reg_manual_revert_ccw'    
2573
+        #skater.playAction("reg_manual_revert_ccw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2574
+        #deck.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2575
+        #trucks.playAction("a_reg_manual_revert_ccw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2565 2576
         print("fak")   
2566 2577
     else:       
2567 2578
         own['requestAction'] = 'revert3' 
@@ -2577,26 +2588,30 @@ def revert4():
2577 2588
     rot = [ 0.0, 0.0, 3.14]
2578 2589
     own.applyRotation(rot,local)  
2579 2590
     if own['manual_v2_type'] == 'reg manual':    
2580
-        skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2581
-        deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2582
-        trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2591
+        own['requestAction'] = 'reg_manual_revert_cw'
2592
+        #skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2593
+        #deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2594
+        #trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2583 2595
         print("reg")
2584 2596
     #elif own['reg_nmanual'] == 1:
2585 2597
     elif own['manual_v2_type'] == 'reg nose manual':    
2586
-        skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2587
-        deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2588
-        trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2598
+        own['requestAction'] = 'fak_manual_revert_cw'
2599
+        #skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2600
+        #deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2601
+        #trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2589 2602
         print("reg nose manual revert")             
2590 2603
     #elif own['fak_manual'] == 1 or own['fak_nmanual'] == 1:
2591 2604
     elif own['manual_v2_type'] == 'fak manual':    
2592
-        skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2593
-        deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2594
-        trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2605
+        own['requestAction'] = 'fak_manual_revert_cw'
2606
+        #skater.playAction("fak_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2607
+        #deck.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2608
+        #trucks.playAction("a_fak_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2595 2609
         print("fak manual revert")
2596 2610
     elif own['manual_v2_type'] == 'fak nose manual':    
2597
-        skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2598
-        deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2599
-        trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2611
+        own['requestAction'] = 'reg_manual_revert_cw'
2612
+        #skater.playAction("reg_manual_revert_cw", 70,10, layer=400, priority=8, play_mode=0, speed=4)
2613
+        #deck.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=1, play_mode=0, speed=4)
2614
+        #trucks.playAction("a_reg_manual_revert_cw", 70,10, layer=400, priority=0, play_mode=0, speed=4)
2600 2615
         print("fak") 
2601 2616
     else:
2602 2617
         own['requestAction'] = 'revert4'

Loading…
Cancel
Save