Browse Source

math is hard

shuvit 6 years ago
parent
commit
70fd1bb060
2 changed files with 23 additions and 17 deletions
  1. 16
    11
      co_ActionState.py
  2. 7
    6
      controller2.py

+ 16
- 11
co_ActionState.py View File

394
                     cur_frame = skater.getActionFrame(trans_layer)
394
                     cur_frame = skater.getActionFrame(trans_layer)
395
                     #cur_frame -= 2   
395
                     #cur_frame -= 2   
396
                                   
396
                                   
397
-                if trans_playing and cur_frame > 1:                
397
+                if trans_playing and cur_frame > .5:                
398
                     skater.playAction("nreg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
398
                     skater.playAction("nreg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
399
                     deck.playAction("a_reg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
399
                     deck.playAction("a_reg_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
400
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
400
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
412
                 if trans_playing:
412
                 if trans_playing:
413
                     cur_frame = skater.getActionFrame(trans_layer)
413
                     cur_frame = skater.getActionFrame(trans_layer)
414
                     #cur_frame -= 2                    
414
                     #cur_frame -= 2                    
415
-                if trans_playing and cur_frame > 1:                
415
+                if trans_playing and cur_frame > .5:                
416
                     skater.playAction("nreg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
416
                     skater.playAction("nreg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
417
                     deck.playAction("a_reg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
417
                     deck.playAction("a_reg_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
418
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
418
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
430
                 if trans_playing:
430
                 if trans_playing:
431
                     cur_frame = skater.getActionFrame(trans_layer)
431
                     cur_frame = skater.getActionFrame(trans_layer)
432
                     #cur_frame -= 2                    
432
                     #cur_frame -= 2                    
433
-                if trans_playing and cur_frame > 1:                
433
+                if trans_playing and cur_frame > .5:                
434
                     skater.playAction("nfak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
434
                     skater.playAction("nfak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
435
                     deck.playAction("a_fak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
435
                     deck.playAction("a_fak_right", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
436
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
436
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
448
                 if trans_playing:
448
                 if trans_playing:
449
                     cur_frame = skater.getActionFrame(trans_layer)
449
                     cur_frame = skater.getActionFrame(trans_layer)
450
                     #cur_frame -= 2                    
450
                     #cur_frame -= 2                    
451
-                if trans_playing and cur_frame > 1:                
451
+                if trans_playing and cur_frame > .5:                
452
                     skater.playAction("nfak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
452
                     skater.playAction("nfak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
453
                     deck.playAction("a_fak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
453
                     deck.playAction("a_fak_left", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
454
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
454
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
468
                     cur_frame = skater.getActionFrame(trans_layer)
468
                     cur_frame = skater.getActionFrame(trans_layer)
469
                     print('opos_out: ', cur_frame)
469
                     print('opos_out: ', cur_frame)
470
                     #cur_frame -= 2                    
470
                     #cur_frame -= 2                    
471
-                if trans_playing and cur_frame > 1:                
471
+                if trans_playing and cur_frame > .5:                
472
                     skater.playAction("noposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
472
                     skater.playAction("noposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
473
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
473
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
474
                     trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
474
                     trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
485
                 if trans_playing:
485
                 if trans_playing:
486
                     cur_frame = skater.getActionFrame(trans_layer)
486
                     cur_frame = skater.getActionFrame(trans_layer)
487
                     #cur_frame -= 2                    
487
                     #cur_frame -= 2                    
488
-                if trans_playing and cur_frame > 1:                
488
+                if trans_playing and cur_frame > .5:                
489
                     skater.playAction("fak_oposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
489
                     skater.playAction("fak_oposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
490
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
490
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
491
                     trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
491
                     trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
502
                 if trans_playing:
502
                 if trans_playing:
503
                     cur_frame = skater.getActionFrame(trans_layer)
503
                     cur_frame = skater.getActionFrame(trans_layer)
504
                     #cur_frame -= 2                    
504
                     #cur_frame -= 2                    
505
-                if trans_playing and cur_frame > 1:                
505
+                if trans_playing and cur_frame > .5:                
506
                     skater.playAction("nnoposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
506
                     skater.playAction("nnoposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
507
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
507
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
508
                     trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
508
                     trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
519
                 if trans_playing:
519
                 if trans_playing:
520
                     cur_frame = skater.getActionFrame(trans_layer)
520
                     cur_frame = skater.getActionFrame(trans_layer)
521
                     #cur_frame -= 2                    
521
                     #cur_frame -= 2                    
522
-                if trans_playing and cur_frame > 1:                
522
+                if trans_playing and cur_frame > .5:                
523
                     skater.playAction("fak_noposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
523
                     skater.playAction("fak_noposin", cur_frame,1, layer=trans_layer, play_mode=0, speed=1)
524
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
524
                     deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
525
                     trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
525
                     trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
536
                 if trans_playing:
536
                 if trans_playing:
537
                     cur_frame = skater.getActionFrame(trans_layer)
537
                     cur_frame = skater.getActionFrame(trans_layer)
538
                     #cur_frame -= 2                    
538
                     #cur_frame -= 2                    
539
-                if trans_playing and cur_frame > 1:                
539
+                if trans_playing and cur_frame > .5:                
540
                     skater.playAction("nreg_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
540
                     skater.playAction("nreg_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
541
                     deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
541
                     deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
542
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
542
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
561
                 if trans_playing:
561
                 if trans_playing:
562
                     cur_frame = skater.getActionFrame(trans_layer)
562
                     cur_frame = skater.getActionFrame(trans_layer)
563
                     #cur_frame -= 2                    
563
                     #cur_frame -= 2                    
564
-                if trans_playing and cur_frame > 1:                
564
+                if trans_playing and cur_frame > .5:                
565
                     skater.playAction("nfak_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
565
                     skater.playAction("nfak_pump_in", cur_frame,1, layer=trans_layer, play_mode=0, speed=.5)
566
                     deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
566
                     deck.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
567
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
567
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
2946
 ###################  
2946
 ###################  
2947
     
2947
     
2948
     #debug
2948
     #debug
2949
-    #print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'])
2949
+    
2950
+    cur_frame = -1
2951
+    trans_playing = skater.isPlayingAction(trans_layer)
2952
+    if trans_playing:
2953
+        cur_frame = skater.getActionFrame(trans_layer)       
2954
+    print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'], 'cf', cur_frame)
2950
     cur_frame = skater.getActionFrame(trans_layer)
2955
     cur_frame = skater.getActionFrame(trans_layer)
2951
     #print(cur_frame)
2956
     #print(cur_frame)
2952
     def printplaying():
2957
     def printplaying():

+ 7
- 6
controller2.py View File

88
     lgf = own['last_grind_frame']
88
     lgf = own['last_grind_frame']
89
     frame = own['framenum']
89
     frame = own['framenum']
90
     frames_since_grinding = frame - lgf
90
     frames_since_grinding = frame - lgf
91
+    ground_since = own["framenum"] - own['lF_air_frame']
91
     own['last_footplant'] = own['footplant_on']
92
     own['last_footplant'] = own['footplant_on']
92
     lastaBut_ground = own['lastaBut_ground'] 
93
     lastaBut_ground = own['lastaBut_ground'] 
93
     lastxBut_ground = own['lastxBut_ground'] 
94
     lastxBut_ground = own['lastxBut_ground'] 
607
         
608
         
608
                     
609
                     
609
     def reg_stance_left_on():
610
     def reg_stance_left_on():
610
-        if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1:
611
+        if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1 and ground_since > 30:
611
             own['requestAction'] = 'reg_turnLeft'    
612
             own['requestAction'] = 'reg_turnLeft'    
612
             LAST_LEFT = own["LAST_LEFT"]
613
             LAST_LEFT = own["LAST_LEFT"]
613
             playing_action_frame = skater.getActionFrame(LAND_LAYER)
614
             playing_action_frame = skater.getActionFrame(LAND_LAYER)
617
                             
618
                             
618
              
619
              
619
     def reg_stance_right_on():
620
     def reg_stance_right_on():
620
-        if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1:
621
+        if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1 and ground_since > 30:
621
             own['requestAction'] = 'reg_turnRight' 
622
             own['requestAction'] = 'reg_turnRight' 
622
             LAST_RIGHT = own["LAST_RIGHT"]
623
             LAST_RIGHT = own["LAST_RIGHT"]
623
             playing_action_frame = skater.getActionFrame(LAND_LAYER)
624
             playing_action_frame = skater.getActionFrame(LAND_LAYER)
634
         killact(3)
635
         killact(3)
635
         
636
         
636
     def fak_stance_left_on():
637
     def fak_stance_left_on():
637
-        if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1:
638
+        if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1 and ground_since > 30:
638
             own['requestAction'] = 'fak_turnLeft'     
639
             own['requestAction'] = 'fak_turnLeft'     
639
             LAST_LEFT_FAK = own["LAST_LEFT_FAK"]
640
             LAST_LEFT_FAK = own["LAST_LEFT_FAK"]
640
             playing_action_frame = skater.getActionFrame(LAND_LAYER)
641
             playing_action_frame = skater.getActionFrame(LAND_LAYER)
648
         own["LAST_LEFT_FAK"] = 0
649
         own["LAST_LEFT_FAK"] = 0
649
         
650
         
650
     def fak_stance_right_on():
651
     def fak_stance_right_on():
651
-        if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1:
652
+        if own['manual_v2'] == 0 and own["revert_timer"] < 1 and own['gt_cd2'] < 1 and ground_since > 30:
652
             own['requestAction'] = 'fak_turnRight' 
653
             own['requestAction'] = 'fak_turnRight' 
653
             LAST_RIGHT_FAK = own["LAST_RIGHT_FAK"]
654
             LAST_RIGHT_FAK = own["LAST_RIGHT_FAK"]
654
             own["LAST_RIGHT_FAK"] = 1        
655
             own["LAST_RIGHT_FAK"] = 1        
898
         lF_air_frame = own['lF_air_frame']
899
         lF_air_frame = own['lF_air_frame']
899
         frames_since_ground = own['framenum'] - own['lF_air_frame']     
900
         frames_since_ground = own['framenum'] - own['lF_air_frame']     
900
 
901
 
901
-        if linVelocity.x < MAX_VEL and linVelocity.x >= -0 and STANCE == 1 and grindHit == False and frames_since_ground > 10:            
902
+        if linVelocity.x < MAX_VEL and linVelocity.x >= -0 and STANCE == 1 and grindHit == False and frames_since_ground > 30:            
902
             countdown = COUNTDOWN
903
             countdown = COUNTDOWN
903
             yvel = linVelocity.x + SPEEDPUMP
904
             yvel = linVelocity.x + SPEEDPUMP
904
             yvel2 = linVelocity.x + SPEEDPUMPFAST
905
             yvel2 = linVelocity.x + SPEEDPUMPFAST
911
                 own.setLinearVelocity(force2, local)
912
                 own.setLinearVelocity(force2, local)
912
             own['requestAction'] = 'fak_pump'
913
             own['requestAction'] = 'fak_pump'
913
         #switch
914
         #switch
914
-        if linVelocity.x > -MAX_VEL and linVelocity.x <= 0 and STANCE == 0 and grindHit == False and frames_since_ground > 10:
915
+        if linVelocity.x > -MAX_VEL and linVelocity.x <= 0 and STANCE == 0 and grindHit == False and frames_since_ground > 30:
915
             countdown = COUNTDOWN
916
             countdown = COUNTDOWN
916
             yvel = linVelocity.x - SPEEDPUMP
917
             yvel = linVelocity.x - SPEEDPUMP
917
             yvel2 = linVelocity.x - SPEEDPUMPFAST
918
             yvel2 = linVelocity.x - SPEEDPUMPFAST

Loading…
Cancel
Save