boneless

controller2.py

         else:
             #print("flip stance")
             if own['jump_stance'] == 0:
-                print('flipstance 0')
+                #print('flipstance 0')
                 if own['manual_v2_type'] == 'fak manual':
                     own['manual_v2_type'] = 'reg nose manual'
                 if own['manual_v2_type'] == 'fak nose manual':
                     print('---requesting reg nose manual')
                     own['manual_v2_type'] = 'reg manual'                                          
             if own['jump_stance'] == 1:
-                print('flipstance 1')
+                #print('flipstance 1')
                 if own['manual_v2_type'] == 'reg manual':
                     own['manual_v2_type'] = 'fak nose manual'
                 if own['manual_v2_type'] == 'reg nose manual':
             edge = 0
             try:
                 if 'edge' in grindTouch.hitObject:
-                    print('Edge')
+                    #print('Edge')
                     edge = 1
             except:
                 pass               
     #34567
     own['set_revert_timer'] = 0
     ground_since = own["framenum"] - own['lF_air_frame']
-    if ground_since > 20 and frames_since_grinding > 20:
+    if ground_since > 40 and frames_since_grinding > 40:
 
         if q3oncdl < q4oncdl < q5oncdl < q6oncdl < q7oncdl:
             if r_ground.triggered == True:
             frame = skater.getActionFrame(fliplay)
             if frame > 16:
                 skater.stopAction(fliplay)
-    #frontside grab
+    
     flipping = skater.isPlayingAction(fliplay) 
+    
+    #reg_ollie_north
+    if rTrig < .02 and lTrig <.02 and r_ground.triggered == 0 and flipping == False and aBut == True:
+        if STANCE == 0:
+            own['requestAction'] = 'reg_ollie_south'
+        else:
+            own['requestAction'] = 'fak_ollie_north'  
+    if rTrig < .02 and lTrig <.02 and r_ground.triggered == 0 and flipping == False and xBut == True:
+        if STANCE == 0:
+            own['requestAction'] = 'reg_ollie_north'
+        else:
+            own['requestAction'] = 'fak_ollie_south'                
+    
+    #frontside grab
     if rTrig > 0.02 and r_ground.triggered == 0 and flipping == False:    
         GRAB_ON = True
         own["GRAB_ON"] = GRAB_ON