Browse Source

grindouts

shuvit 6 years ago
parent
commit
a7df9d377e
1 changed files with 48 additions and 42 deletions
  1. 48
    42
      co_ActionState.py

+ 48
- 42
co_ActionState.py View File

295
             actionState = 'fak_air-roll' 
295
             actionState = 'fak_air-roll' 
296
             
296
             
297
             
297
             
298
-        if l_actionState == 'reg_5050_out' and requestAction == 'reg_roll':
298
+        if (l_actionState == 'reg_5050_out' and requestAction == 'reg_roll') or ((l_actionState == 'reg_noseg_out' or l_actionState == 'reg_nosegL_out' or l_actionState == 'reg_nosegR_out' or l_actionState == 'reg_tailg_out' or l_actionState == 'reg_tailgL_out' or l_actionState == 'reg_tailgR_out') and actionTimer < 10):
299
             requestAction = 'reg_5050-roll'
299
             requestAction = 'reg_5050-roll'
300
             actionState = 'reg_5050-roll'
300
             actionState = 'reg_5050-roll'
301
             print('************************')  
301
             print('************************')  
302
-        if l_actionState == 'fak_5050_out' and requestAction == 'fak_roll':
302
+        if (l_actionState == 'fak_5050_out' and requestAction == 'fak_roll') or ((l_actionState == 'fak_noseg_out' or l_actionState == 'fak_nosegL_out' or l_actionState == 'fak_nosegR_out' or l_actionState == 'fak_tailg_out' or l_actionState == 'fak_tailgL_out' or l_actionState == 'fak_tailgR_out') and actionTimer < 10):
303
             requestAction = 'fak_5050-roll'
303
             requestAction = 'fak_5050-roll'
304
             actionState = 'fak_5050-roll' 
304
             actionState = 'fak_5050-roll' 
305
             print('************************')
305
             print('************************')
373
                 trans_playing = skater.isPlayingAction(trans_layer)
373
                 trans_playing = skater.isPlayingAction(trans_layer)
374
                 if trans_playing:
374
                 if trans_playing:
375
                     cur_frame = skater.getActionFrame(trans_layer)
375
                     cur_frame = skater.getActionFrame(trans_layer)
376
-                    #cur_frame -= 2                    
376
+                    #cur_frame -= 2   
377
+                                  
377
                 if trans_playing and cur_frame > 1:                
378
                 if trans_playing and cur_frame > 1:                
378
                     skater.playAction("nreg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
379
                     skater.playAction("nreg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
379
                     deck.playAction("a_reg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
380
                     deck.playAction("a_reg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
380
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
381
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
381
-                    own['actionTimer'] = cur_frame
382
+                    #own['actionTimer'] = cur_frame
383
+                    own['actionTimer'] = (10 - cur_frame) *2
382
                 else:                      
384
                 else:                      
383
                     skater.playAction("nreg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
385
                     skater.playAction("nreg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
384
                     deck.playAction("a_reg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
386
                     deck.playAction("a_reg_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
395
                     skater.playAction("nreg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
397
                     skater.playAction("nreg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
396
                     deck.playAction("a_reg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
398
                     deck.playAction("a_reg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
397
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
399
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
398
-                    own['actionTimer'] = cur_frame
400
+                    #own['actionTimer'] = cur_frame
401
+                    own['actionTimer'] = (10 - cur_frame) *2
399
                 else:                      
402
                 else:                      
400
                     skater.playAction("nreg_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
403
                     skater.playAction("nreg_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
401
                     deck.playAction("a_reg_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
404
                     deck.playAction("a_reg_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
412
                     skater.playAction("nfak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
415
                     skater.playAction("nfak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
413
                     deck.playAction("a_fak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
416
                     deck.playAction("a_fak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
414
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
417
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
415
-                    own['actionTimer'] = cur_frame
418
+                    #own['actionTimer'] = cur_frame
419
+                    own['actionTimer'] = (10 - cur_frame) *2
416
                 else:                      
420
                 else:                      
417
                     skater.playAction("nfak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
421
                     skater.playAction("nfak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
418
                     deck.playAction("a_fak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
422
                     deck.playAction("a_fak_right", 10,1, layer=trans_layer, play_mode=0, speed=.5)
429
                     skater.playAction("nfak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
433
                     skater.playAction("nfak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
430
                     deck.playAction("a_fak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
434
                     deck.playAction("a_fak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
431
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
435
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
432
-                    own['actionTimer'] = cur_frame
436
+                    #own['actionTimer'] = cur_frame
437
+                    own['actionTimer'] = (10 - cur_frame) *2
433
                 else:                      
438
                 else:                      
434
                     skater.playAction("nfak_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
439
                     skater.playAction("nfak_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)
435
                     deck.playAction("a_fak_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)  
440
                     deck.playAction("a_fak_left", 10,1, layer=trans_layer, play_mode=0, speed=.5)  
688
 
693
 
689
             if requestAction == 'reg_noseg_out':
694
             if requestAction == 'reg_noseg_out':
690
                 actionState = 'reg_noseg_out'
695
                 actionState = 'reg_noseg_out'
691
-                own['actionTimer'] = 5
696
+                #own['requestAction'] = 'reg_noseg_out'
697
+                own['actionTimer'] = 19
692
                 trans_playing = skater.isPlayingAction(trans_layer)
698
                 trans_playing = skater.isPlayingAction(trans_layer)
693
                 if trans_playing:
699
                 if trans_playing:
694
                     cur_frame = skater.getActionFrame(trans_layer)
700
                     cur_frame = skater.getActionFrame(trans_layer)
695
                     #cur_frame -= 2                    
701
                     #cur_frame -= 2                    
696
                 if trans_playing and cur_frame > 1:                
702
                 if trans_playing and cur_frame > 1:                
697
-                    skater.playAction("reg_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
698
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
699
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
703
+                    skater.playAction("reg_noseg.002", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
704
+                    deck.playAction("a_reg_noseg.002", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
705
+                    trucks.playAction("a_reg_noseg.002", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
700
                     own['actionTimer'] = cur_frame
706
                     own['actionTimer'] = cur_frame
701
                 else:                      
707
                 else:                      
702
-                    skater.playAction("reg_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
703
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
704
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
708
+                    skater.playAction("reg_noseg.002", 10,1, layer=trans_layer, play_mode=0, speed=.5)
709
+                    deck.playAction("a_reg_noseg.002", 10,1, layer=trans_layer, play_mode=0, speed=.5)
710
+                    trucks.playAction("a_reg_noseg.002", 10,1, layer=trans_layer, play_mode=0, speed=.5)
705
             if requestAction == 'fak_noseg_out':
711
             if requestAction == 'fak_noseg_out':
706
                 actionState = 'fak_noseg_out'
712
                 actionState = 'fak_noseg_out'
707
-                own['actionTimer'] = 5
713
+                own['actionTimer'] = 19
708
                 trans_playing = skater.isPlayingAction(trans_layer)
714
                 trans_playing = skater.isPlayingAction(trans_layer)
709
                 if trans_playing:
715
                 if trans_playing:
710
                     cur_frame = skater.getActionFrame(trans_layer)
716
                     cur_frame = skater.getActionFrame(trans_layer)
711
                     #cur_frame -= 2                    
717
                     #cur_frame -= 2                    
712
                 if trans_playing and cur_frame > 1:                
718
                 if trans_playing and cur_frame > 1:                
713
-                    skater.playAction("fak_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
714
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
715
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
719
+                    skater.playAction("fak_noseg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
720
+                    deck.playAction("a_fak_noseg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
721
+                    trucks.playAction("a_fak_noseg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
716
                     own['actionTimer'] = cur_frame
722
                     own['actionTimer'] = cur_frame
717
                 else:                      
723
                 else:                      
718
-                    skater.playAction("fak_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
719
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
720
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)        
724
+                    skater.playAction("fak_noseg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
725
+                    deck.playAction("a_fak_noseg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
726
+                    trucks.playAction("a_fak_noseg", 30,40, layer=trans_layer, play_mode=0, speed=.5)        
721
 
727
 
722
             if requestAction == 'reg_tailg_out':
728
             if requestAction == 'reg_tailg_out':
723
                 actionState = 'reg_tailg_out'
729
                 actionState = 'reg_tailg_out'
724
-                own['actionTimer'] = 5
730
+                own['actionTimer'] = 19
725
                 trans_playing = skater.isPlayingAction(trans_layer)
731
                 trans_playing = skater.isPlayingAction(trans_layer)
726
                 if trans_playing:
732
                 if trans_playing:
727
                     cur_frame = skater.getActionFrame(trans_layer)
733
                     cur_frame = skater.getActionFrame(trans_layer)
728
                     #cur_frame -= 2                    
734
                     #cur_frame -= 2                    
729
                 if trans_playing and cur_frame > 1:                
735
                 if trans_playing and cur_frame > 1:                
730
-                    skater.playAction("reg_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
731
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
732
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
736
+                    skater.playAction("reg_tailg.001", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
737
+                    deck.playAction("a_reg_tailg.001", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
738
+                    trucks.playAction("a_reg_tailg.001", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
733
                     own['actionTimer'] = cur_frame
739
                     own['actionTimer'] = cur_frame
734
                 else:                      
740
                 else:                      
735
-                    skater.playAction("reg_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
736
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
737
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
741
+                    skater.playAction("reg_tailg.001", 30,40, layer=trans_layer, play_mode=0, speed=.5)
742
+                    deck.playAction("a_reg_tailg.001", 30,40, layer=trans_layer, play_mode=0, speed=.5)
743
+                    trucks.playAction("a_reg_tailg.001", 30,40, layer=trans_layer, play_mode=0, speed=.5)
738
             if requestAction == 'fak_tailg_out':
744
             if requestAction == 'fak_tailg_out':
739
                 actionState = 'fak_tailg_out'
745
                 actionState = 'fak_tailg_out'
740
-                own['actionTimer'] = 5
746
+                own['actionTimer'] = 19
741
                 trans_playing = skater.isPlayingAction(trans_layer)
747
                 trans_playing = skater.isPlayingAction(trans_layer)
742
                 if trans_playing:
748
                 if trans_playing:
743
                     cur_frame = skater.getActionFrame(trans_layer)
749
                     cur_frame = skater.getActionFrame(trans_layer)
744
                     #cur_frame -= 2                    
750
                     #cur_frame -= 2                    
745
                 if trans_playing and cur_frame > 1:                
751
                 if trans_playing and cur_frame > 1:                
746
-                    skater.playAction("fak_5050", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
747
-                    deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
748
-                    trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
752
+                    skater.playAction("fak_tailg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
753
+                    deck.playAction("a_fak_tailg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
754
+                    trucks.playAction("a_fak_tailg", cur_frame,40, layer=trans_layer, play_mode=0, speed=.5)
749
                     own['actionTimer'] = cur_frame
755
                     own['actionTimer'] = cur_frame
750
                 else:                      
756
                 else:                      
751
-                    skater.playAction("fak_5050", 20,1, layer=trans_layer, play_mode=0, speed=.5)
752
-                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
753
-                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=0, speed=.5)
757
+                    skater.playAction("fak_tailg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
758
+                    deck.playAction("a_fak_tailg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
759
+                    trucks.playAction("a_fak_tailg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
754
                     
760
                     
755
             if requestAction == 'reg_nosegr_out':
761
             if requestAction == 'reg_nosegr_out':
756
                 actionState = 'reg_nosegr_out'
762
                 actionState = 'reg_nosegr_out'
1496
                 own['actionTimer'] = 10
1502
                 own['actionTimer'] = 10
1497
                 skater.playAction("fak_air", 30,40, layer=trans_layer, play_mode=0, speed=.5)
1503
                 skater.playAction("fak_air", 30,40, layer=trans_layer, play_mode=0, speed=.5)
1498
                 deck.playAction("a_reg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
1504
                 deck.playAction("a_reg", 30,40, layer=trans_layer, play_mode=0, speed=.5)
1499
-                trucks.playAction("a_reg", 30,40, layer=trans_layer, play_mode=0, speed=.5)                                        
1500
-
1501
-
1505
+                trucks.playAction("a_reg", 30,40, layer=trans_layer, play_mode=0, speed=.5) 
1506
+        #own['actionState'] = actionState
1507
+        #own['requestAction'] = requestAction
1502
 
1508
 
1503
    
1509
    
1504
 #######################################        
1510
 #######################################        
2126
                     #deck.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
2132
                     #deck.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
2127
                     #trucks.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                            
2133
                     #trucks.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                            
2128
                 else:
2134
                 else:
2129
-                    skater.playAction("reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
2130
-                    deck.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
2131
-                    trucks.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
2135
+                    skater.playAction("reg_noseg.002", 11,40, layer=loop_layer, play_mode=1, speed=.5)
2136
+                    deck.playAction("a_reg_noseg.002", 11,40, layer=loop_layer, play_mode=1, speed=.5)
2137
+                    trucks.playAction("a_reg_noseg.002", 11,40, layer=loop_layer, play_mode=1, speed=.5)
2132
                     #skater.playAction("reg_nmanual", 10,70, layer=loop_layer, play_mode=1, speed=.5) 
2138
                     #skater.playAction("reg_nmanual", 10,70, layer=loop_layer, play_mode=1, speed=.5) 
2133
                     #deck.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
2139
                     #deck.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
2134
                     #trucks.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                    
2140
                     #trucks.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                    
2895
 ###################  
2901
 ###################  
2896
     
2902
     
2897
     #debug
2903
     #debug
2898
-    print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'])
2904
+    #print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'])
2899
     cur_frame = skater.getActionFrame(trans_layer)
2905
     cur_frame = skater.getActionFrame(trans_layer)
2900
     #print(cur_frame)
2906
     #print(cur_frame)
2901
     def printplaying():
2907
     def printplaying():

Loading…
Cancel
Save