shuvit 6 years ago
parent
commit
a96234a646
2 changed files with 99 additions and 82 deletions
  1. 80
    77
      co_ActionState.py
  2. 19
    5
      controller2.py

+ 80
- 77
co_ActionState.py
File diff suppressed because it is too large
View File


+ 19
- 5
controller2.py View File

@@ -409,7 +409,7 @@ def main():
409 409
         else:
410 410
             #print("flip stance")
411 411
             if own['jump_stance'] == 0:
412
-                print('flipstance 0')
412
+                #print('flipstance 0')
413 413
                 if own['manual_v2_type'] == 'fak manual':
414 414
                     own['manual_v2_type'] = 'reg nose manual'
415 415
                 if own['manual_v2_type'] == 'fak nose manual':
@@ -421,7 +421,7 @@ def main():
421 421
                     print('---requesting reg nose manual')
422 422
                     own['manual_v2_type'] = 'reg manual'                                          
423 423
             if own['jump_stance'] == 1:
424
-                print('flipstance 1')
424
+                #print('flipstance 1')
425 425
                 if own['manual_v2_type'] == 'reg manual':
426 426
                     own['manual_v2_type'] = 'fak nose manual'
427 427
                 if own['manual_v2_type'] == 'reg nose manual':
@@ -2043,7 +2043,7 @@ def main():
2043 2043
             edge = 0
2044 2044
             try:
2045 2045
                 if 'edge' in grindTouch.hitObject:
2046
-                    print('Edge')
2046
+                    #print('Edge')
2047 2047
                     edge = 1
2048 2048
             except:
2049 2049
                 pass               
@@ -2767,7 +2767,7 @@ def main():
2767 2767
     #34567
2768 2768
     own['set_revert_timer'] = 0
2769 2769
     ground_since = own["framenum"] - own['lF_air_frame']
2770
-    if ground_since > 20 and frames_since_grinding > 20:
2770
+    if ground_since > 40 and frames_since_grinding > 40:
2771 2771
 
2772 2772
         if q3oncdl < q4oncdl < q5oncdl < q6oncdl < q7oncdl:
2773 2773
             if r_ground.triggered == True:
@@ -3321,8 +3321,22 @@ def main():
3321 3321
             frame = skater.getActionFrame(fliplay)
3322 3322
             if frame > 16:
3323 3323
                 skater.stopAction(fliplay)
3324
-    #frontside grab
3324
+    
3325 3325
     flipping = skater.isPlayingAction(fliplay) 
3326
+    
3327
+    #reg_ollie_north
3328
+    if rTrig < .02 and lTrig <.02 and r_ground.triggered == 0 and flipping == False and aBut == True:
3329
+        if STANCE == 0:
3330
+            own['requestAction'] = 'reg_ollie_south'
3331
+        else:
3332
+            own['requestAction'] = 'fak_ollie_north'  
3333
+    if rTrig < .02 and lTrig <.02 and r_ground.triggered == 0 and flipping == False and xBut == True:
3334
+        if STANCE == 0:
3335
+            own['requestAction'] = 'reg_ollie_north'
3336
+        else:
3337
+            own['requestAction'] = 'fak_ollie_south'                
3338
+    
3339
+    #frontside grab
3326 3340
     if rTrig > 0.02 and r_ground.triggered == 0 and flipping == False:    
3327 3341
         GRAB_ON = True
3328 3342
         own["GRAB_ON"] = GRAB_ON

Loading…
Cancel
Save