Browse Source

fps and inverts1

shuvit 6 years ago
parent
commit
126be486eb
2 changed files with 121 additions and 74 deletions
  1. 47
    4
      co_ActionState.py
  2. 74
    70
      controller2.py

+ 47
- 4
co_ActionState.py
File diff suppressed because it is too large
View File


+ 74
- 70
controller2.py View File

@@ -3478,21 +3478,21 @@ def footplant():
3478 3478
     #print(frames_since_ground, "fsg")
3479 3479
     if LAST_GRIND == False and grindHit == True and aBut == True and frames_since_ground < 40 and touched:
3480 3480
         own.setLinearVelocity([0,0,0],0)
3481
-        killall()
3482
-        if STANCE == 0:
3483
-            skater.playAction("reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3484
-            deck.playAction("a_reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3485
-            trucks.playAction("a_reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3486
-            skater.playAction("reg_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)
3487
-            deck.playAction("a_reg_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)
3488
-            trucks.playAction("a_reg_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)
3489
-        if STANCE == 1:
3490
-            skater.playAction("fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3491
-            deck.playAction("a_fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3492
-            trucks.playAction("a_fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3493
-            skater.playAction("fak_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)
3494
-            deck.playAction("a_fak_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)
3495
-            trucks.playAction("a_fak_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)                            
3481
+        #killall()
3482
+        #if STANCE == 0:
3483
+            #skater.playAction("reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3484
+            #deck.playAction("a_reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3485
+            #trucks.playAction("a_reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3486
+            #skater.playAction("reg_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)
3487
+            #deck.playAction("a_reg_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)
3488
+            #trucks.playAction("a_reg_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)
3489
+        #if STANCE == 1:
3490
+            #skater.playAction("fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3491
+            #deck.playAction("a_fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3492
+            #trucks.playAction("a_fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3493
+            #skater.playAction("fak_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)
3494
+            #deck.playAction("a_fak_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)
3495
+            #trucks.playAction("a_fak_fp_rback", 1,10, layer=2928, priority=8, play_mode=0, speed=1)                            
3496 3496
         own['footplant_on'] = 1
3497 3497
     if grindHit == False:
3498 3498
         own['footplant_on'] = 0 
@@ -3501,23 +3501,25 @@ def footplant():
3501 3501
     if own['footplant_on'] == 1 and own['last_footplant'] == True:
3502 3502
         if skater.isPlayingAction(2925) == False:
3503 3503
             if STANCE == 0:
3504
-                skater.playAction("reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3505
-                deck.playAction("a_reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3506
-                trucks.playAction("a_reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)                
3504
+                own['requestAction'] = 'reg_fp_rback'
3505
+                #skater.playAction("reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3506
+                #deck.playAction("a_reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3507
+                #trucks.playAction("a_reg_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)                
3507 3508
             if STANCE == 1:
3508
-                skater.playAction("fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3509
-                deck.playAction("a_fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3510
-                trucks.playAction("a_fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)                        
3511
-    if own['last_footplant'] == True and own['footplant_on'] == 0:
3512
-        killall()
3513
-        if STANCE == 0:
3514
-            skater.playAction("reg_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)
3515
-            deck.playAction("a_reg_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)
3516
-            trucks.playAction("a_reg_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)  
3517
-        if STANCE == 1:
3518
-            skater.playAction("fak_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)
3519
-            deck.playAction("a_fak_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)
3520
-            trucks.playAction("a_fak_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)            
3509
+                own['requestAction'] = 'fak_fp_rback'
3510
+                #skater.playAction("fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3511
+                #deck.playAction("a_fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)
3512
+                #trucks.playAction("a_fak_fp_rback", 10,10, layer=2925, priority=8, play_mode=1, speed=.5)                        
3513
+    # if own['last_footplant'] == True and own['footplant_on'] == 0:
3514
+    #     #killall()
3515
+    #     if STANCE == 0:
3516
+    #         skater.playAction("reg_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)
3517
+    #         deck.playAction("a_reg_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)
3518
+    #         trucks.playAction("a_reg_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)  
3519
+    #     if STANCE == 1:
3520
+    #         skater.playAction("fak_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)
3521
+    #         deck.playAction("a_fak_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)
3522
+    #         trucks.playAction("a_fak_fp_rback", 10,20, layer=2928, priority=8, play_mode=0, speed=1)            
3521 3523
 def invert():    
3522 3524
     if LAST_GRIND == False and grindHit == True and own['grindpos'] == 'reg_board':
3523 3525
         if lBump == 1:
@@ -3527,57 +3529,59 @@ def invert():
3527 3529
             own['invert_on'] = 1
3528 3530
             own.setLinearVelocity([0,0,0],0)
3529 3531
     if own["coping"] == 1 and invert_on == 1:
3530
-        killact(25)
3531
-        killact(24)
3532
+        # killact(25)
3533
+        # killact(24)
3532 3534
         if own['invert_on'] == 1 and own['last_invert'] == False:
3533
-            killall()
3535
+            #killall()
3534 3536
             cont.activate(own.actuators['invertOn_sound'])
3535 3537
             
3536
-            if STANCE == False:
3537
-                own['invert_type'] = "reg_back_invert_in"
3538
-                skater.playAction("reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1) 
3539
-                deck.playAction("a_reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1)
3540
-                trucks.playAction("a_reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1) 
3541
-            if STANCE == True:
3542
-                own['invert_type'] = "fak_fr_invert"
3543
-                skater.playAction("fak_fr_invert", 10,30, layer=303, play_mode=0, speed=1) 
3544
-                deck.playAction("a_fak_fr_invert", 10,30, layer=303, play_mode=0, speed=1)
3545
-                trucks.playAction("a_fak_fr_invert", 10,30, layer=303, play_mode=0, speed=1)                           
3538
+            # if STANCE == False:
3539
+            #     own['invert_type'] = "reg_back_invert_in"
3540
+            #     skater.playAction("reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1) 
3541
+            #     deck.playAction("a_reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1)
3542
+            #     trucks.playAction("a_reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1) 
3543
+            # if STANCE == True:
3544
+            #     own['invert_type'] = "fak_fr_invert"
3545
+            #     skater.playAction("fak_fr_invert", 10,30, layer=303, play_mode=0, speed=1) 
3546
+            #     deck.playAction("a_fak_fr_invert", 10,30, layer=303, play_mode=0, speed=1)
3547
+            #     trucks.playAction("a_fak_fr_invert", 10,30, layer=303, play_mode=0, speed=1)                           
3546 3548
     if invert_on == 0 and own['last_invert'] == True:
3547 3549
         #print("kill invert")
3548 3550
         own['last_invert_frame'] = frame
3549 3551
         cont.activate(own.actuators['invertOff_Sound'])
3550 3552
         
3551
-        killact(300)
3552
-        killact(301)
3553
-        killact(302)    
3554
-        killact(303)
3555
-        killact(304)
3556
-        killact(305) 
3557
-        killact(700)
3558
-        killact(700)
3559
-        killact(700)
3560
-        killact(290)
3561
-        killact(291)
3562
-        killact(292)
3563
-        if own['invert_type'] == "reg_back_invert_in":
3564
-            skater.playAction("reg_back_invert_in", 20,0, layer=306, play_mode=0, speed=1) 
3565
-            deck.playAction("a_reg_back_invert_in", 20,0, layer=306, play_mode=0, speed=1)
3566
-            trucks.playAction("a_reg_back_invert_in", 20,0, layer=306, play_mode=0, speed=1)
3567
-        if own['invert_type'] == "fak_fr_invert":    
3568
-            skater.playAction("fak_fr_invert", 20,0, layer=306, play_mode=0, speed=1) 
3569
-            deck.playAction("a_fak_fr_invert", 20,0, layer=306, play_mode=0, speed=1)
3570
-            trucks.playAction("a_fak_fr_invert", 20,0, layer=306, play_mode=0, speed=1)             
3553
+        # killact(300)
3554
+        # killact(301)
3555
+        # killact(302)    
3556
+        # killact(303)
3557
+        # killact(304)
3558
+        # killact(305) 
3559
+        # killact(700)
3560
+        # killact(700)
3561
+        # killact(700)
3562
+        # killact(290)
3563
+        # killact(291)
3564
+        # killact(292)
3565
+        # if own['invert_type'] == "reg_back_invert_in":
3566
+        #     skater.playAction("reg_back_invert_in", 20,0, layer=306, play_mode=0, speed=1) 
3567
+        #     deck.playAction("a_reg_back_invert_in", 20,0, layer=306, play_mode=0, speed=1)
3568
+        #     trucks.playAction("a_reg_back_invert_in", 20,0, layer=306, play_mode=0, speed=1)
3569
+        # if own['invert_type'] == "fak_fr_invert":    
3570
+        #     skater.playAction("fak_fr_invert", 20,0, layer=306, play_mode=0, speed=1) 
3571
+        #     deck.playAction("a_fak_fr_invert", 20,0, layer=306, play_mode=0, speed=1)
3572
+        #     trucks.playAction("a_fak_fr_invert", 20,0, layer=306, play_mode=0, speed=1)             
3571 3573
     if invert_on == 1:
3572 3574
         if own['invert_type'] == "reg_back_invert_in":
3573
-            skater.playAction("reg_back_invert_in", 30,30, layer=290, play_mode=1, speed=1) 
3574
-            deck.playAction("a_reg_back_invert_in", 30,30, layer=290, play_mode=1, speed=1)
3575
-            trucks.playAction("a_reg_back_invert_in", 30,30, layer=290, play_mode=1, speed=1)
3575
+            own['requestAction'] = 'reg_back_invert'
3576
+            #skater.playAction("reg_back_invert_in", 30,30, layer=290, play_mode=1, speed=1) 
3577
+            #deck.playAction("a_reg_back_invert_in", 30,30, layer=290, play_mode=1, speed=1)
3578
+            #trucks.playAction("a_reg_back_invert_in", 30,30, layer=290, play_mode=1, speed=1)
3576 3579
             
3577 3580
         if own['invert_type'] == "fak_fr_invert":
3578
-                skater.playAction("fak_fr_invert", 30,30, layer=290, play_mode=1, speed=1) 
3579
-                deck.playAction("a_fak_fr_invert", 30,30, layer=290, play_mode=1, speed=1)
3580
-                trucks.playAction("a_fak_fr_invert", 30,30, layer=290, play_mode=1, speed=1)
3581
+            own['requestAction'] = 'fak_fr_invert'
3582
+                #skater.playAction("fak_fr_invert", 30,30, layer=290, play_mode=1, speed=1) 
3583
+                #deck.playAction("a_fak_fr_invert", 30,30, layer=290, play_mode=1, speed=1)
3584
+                #trucks.playAction("a_fak_fr_invert", 30,30, layer=290, play_mode=1, speed=1)
3581 3585
     lif = own['last_invert_frame'] 
3582 3586
     if frame - lif > 3 and invert_on == 0:
3583 3587
         own['invert_type'] = None

Loading…
Cancel
Save