judos

controller2.py

@@ -314,9 +314,11 @@ def main():
             own['fall'] = 1
             print("fall: ", playing_frame, own['jump_timer'])
             if STANCE == 0:
-                own['requestAction'] = 'reg_fall1'
+                #own['requestAction'] = 'reg_fall1'
+                own['requestAction'] = 'reg_air-walk_air'
             if STANCE == 1:
-                own['requestAction'] = 'fak_fall1'                
+                #own['requestAction'] = 'fak_fall1'                
+                own['requestAction'] = 'fak_air-walk_air'
     check_fall()
     def check_landing():
         lf_ground = own["lF_ground"]
@@ -1397,6 +1399,26 @@ def main():
             if own["wallride"] != None: 
                 jump()             
         
+    def reg_judo_grab_on():
+        GRAB_PLAYED = own["GRAB_PLAYED"]
+        GRAB_ON = own["GRAB_ON"]
+        dict['trick_string'] = 'Judo Grab'
+        if GRAB_ON == True and GRAB_PLAYED == False and r_ground.triggered == 0:         
+            own['requestAction'] = 'reg_judo'
+            grablay2 = grablay + 1
+            GRAB_PLAYED = True
+            own["GRAB_PLAYED)"] = GRAB_PLAYED
+    def fak_judo_grab_on():
+        GRAB_PLAYED = own["GRAB_PLAYED"]
+        GRAB_ON = own["GRAB_ON"]
+        dict['trick_string'] = 'Fak Judo Grab'
+        if GRAB_ON == True and GRAB_PLAYED == False and r_ground.triggered == 0:         
+            own['requestAction'] = 'fak_judo'
+            grablay2 = grablay + 1
+            GRAB_PLAYED = True
+            own["GRAB_PLAYED)"] = GRAB_PLAYED            
+                
+
     def frontside_grab_on():
         GRAB_PLAYED = own["GRAB_PLAYED"]
         GRAB_ON = own["GRAB_ON"]
@@ -1460,7 +1482,7 @@ def main():
             own["GRAB_PLAYED)"] = GRAB_PLAYED
         elif r_ground.triggered == 1:
             killact(400)
-        print("frontside nosegrab on")
+        #print("frontside nosegrab on")
     def frontside_tail_grab_on():
         GRAB_PLAYED = own["GRAB_PLAYED"]
         GRAB_ON = own["GRAB_ON"]
@@ -1470,7 +1492,7 @@ def main():
             own["GRAB_PLAYED)"] = GRAB_PLAYED
         elif r_ground.triggered == 1:
             killact(400)    
-        print("frontside tailgrab on")  
+        #print("frontside tailgrab on")  
     def backside_nose_grab_on():
         GRAB_PLAYED = own["GRAB_PLAYED"]
         GRAB_ON = own["GRAB_ON"]
@@ -1488,7 +1510,7 @@ def main():
             own["GRAB_PLAYED)"] = GRAB_PLAYED
         elif r_ground.triggered == 1:
             killact(405)    
-        print("backside nosegrab on")
+        #print("backside nosegrab on")
     def backside_tail_grab_on():
         GRAB_PLAYED = own["GRAB_PLAYED"]
         GRAB_ON = own["GRAB_ON"]
@@ -1498,7 +1520,7 @@ def main():
             own["GRAB_PLAYED)"] = GRAB_PLAYED
         elif r_ground.triggered == 1:
             killact(411)    
-        print("backside tailgrab on")
+        #print("backside tailgrab on")
     #switch    
     def fak_frontside_nose_grab_on():
         GRAB_PLAYED = own["GRAB_PLAYED"]
@@ -1509,7 +1531,7 @@ def main():
             own["GRAB_PLAYED)"] = GRAB_PLAYED
         elif r_ground.triggered == 1:
             killact(406)      
-        print("fak frontside nosegrab on")
+        #print("fak frontside nosegrab on")
     def fak_frontside_tail_grab_on():
         GRAB_PLAYED = own["GRAB_PLAYED"]
         GRAB_ON = own["GRAB_ON"]
@@ -1519,7 +1541,7 @@ def main():
             own["GRAB_PLAYED)"] = GRAB_PLAYED
         elif r_ground.triggered == 1:
             killact(412)    
-        print("fak frontside tailgrab on")  
+        #print("fak frontside tailgrab on")  
     def fak_backside_nose_grab_on():
         GRAB_PLAYED = own["GRAB_PLAYED"]
         GRAB_ON = own["GRAB_ON"]
@@ -1529,7 +1551,7 @@ def main():
             own["GRAB_PLAYED)"] = GRAB_PLAYED
         elif r_ground.triggered == 1:
             killact(408)         
-        print("fak backside nosegrab on")
+        #print("fak backside nosegrab on")
     def fak_backside_tail_grab_on():
         GRAB_PLAYED = own["GRAB_PLAYED"]
         GRAB_ON = own["GRAB_ON"]
@@ -1539,7 +1561,7 @@ def main():
             own["GRAB_PLAYED)"] = GRAB_PLAYED
         elif r_ground.triggered == 1:
             killact(410)    
-        print("fak backside tailgrab on")         
+        #print("fak backside tailgrab on")         
     #--------------------
             
     def SWAG():
@@ -3364,22 +3386,29 @@ def main():
         GRAB_ON = True
         own["GRAB_ON"] = GRAB_ON
         #print(rTrig)
-        if STANCE == False and rUD >= -.07 and rUD <= .07:
-            backside_grab_on()
-        elif STANCE == True and rUD >= -.07 and rUD <= .07:
-            fakfrontside_grab_on()
-        #front_nose    
-        if STANCE == True and rUD < -0.070:
-            fak_frontside_nose_grab_on()
-        #front_tail    
-        elif STANCE == True and rUD > 0.07:
-            fak_frontside_tail_grab_on() 
-        #front_nose    
-        if STANCE == False and rUD < -0.070:
-            backside_nose_grab_on()
-        #front_tail    
-        elif STANCE == False and rUD > 0.07:
-            backside_tail_grab_on()                  
+        if aBut == False and xBut == False:
+            if STANCE == False and rUD >= -.07 and rUD <= .07:
+                backside_grab_on()
+            elif STANCE == True and rUD >= -.07 and rUD <= .07:
+                fakfrontside_grab_on()
+            #front_nose    
+            if STANCE == True and rUD < -0.070:
+                fak_frontside_nose_grab_on()
+            #front_tail    
+            elif STANCE == True and rUD > 0.07:
+                fak_frontside_tail_grab_on() 
+            #front_nose    
+            if STANCE == False and rUD < -0.070:
+                backside_nose_grab_on()
+            #front_tail    
+            elif STANCE == False and rUD > 0.07:
+                backside_tail_grab_on()  
+        else:
+            if STANCE == False:
+                reg_judo_grab_on()
+            elif STANCE == True:
+                fak_judo_grab_on()            
+                                            
             
     #kill grabs        
     if lTrig <= 0.02 and GRAB_ON == True and lTrig >= -.02 and rTrig <= .02 and rTrig >= -.2:
@@ -3455,12 +3484,17 @@ def main():
         if ddPad == 1:   
             spawn_pos = own['spawn_pos']
             spawn_rot = own['spawn_rot']
+            spawn_cam_pos = own['spawn_cam_pos']
+            spawn_cam_rot = own['spawn_cam_rot']            
             try:
                 own.worldPosition = (spawn_pos[0], spawn_pos[1], (spawn_pos[2] + .1))
                 own.worldOrientation = [[spawn_rot[0][0],spawn_rot[0][1],spawn_rot[0][2]], [spawn_rot[1][0],spawn_rot[1][1],spawn_rot[1][2]], [0.0, 0.0, 1.0]]
+                cam.worldPosition = (spawn_cam_pos[0], spawn_cam_pos[1], (spawn_cam_pos[2]))
+                cam.worldOrientation = [[spawn_cam_rot[0][0],spawn_cam_rot[0][1],spawn_cam_rot[0][2]], [spawn_cam_rot[1][0],spawn_cam_rot[1][1],spawn_cam_rot[1][2]], [0.0, 0.0, 1.0]]            
             except:    
                 own.worldPosition = (0, 0, .1)
-                own.worldOrientation = [[1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [0.0, 0.0, 1.0]]           
+                own.worldOrientation = [[1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [0.0, 0.0, 1.0]] 
+                                      
             if own["spawn_stance"] == 1:
                 own.setLinearVelocity([.1,0,0], 1)
                 
@@ -3468,8 +3502,11 @@ def main():
                 own.setLinearVelocity([-.1,0,0], 1)         
                 
         if udPad == 1:
+            
             own['spawn_pos'] = [own.worldPosition[0], own.worldPosition[1], own.worldPosition[2]] 
             own['spawn_rot'] = [[own.worldOrientation[0][0],own.worldOrientation[0][1],own.worldOrientation[0][2]], [own.worldOrientation[1][0],own.worldOrientation[1][1],own.worldOrientation[1][2]], own.worldOrientation[2][2]]
+            own['spawn_cam_pos'] = [cam.worldPosition[0], cam.worldPosition[1], cam.worldPosition[2]] 
+            own['spawn_cam_rot'] = [[cam.worldOrientation[0][0],cam.worldOrientation[0][1],cam.worldOrientation[0][2]], [cam.worldOrientation[1][0],cam.worldOrientation[1][1],cam.worldOrientation[1][2]], cam.worldOrientation[2][2]]            
             stance = own["stance"]
             own["spawn_stance"] = stance
      
@@ -3816,7 +3853,7 @@ def main():
             outloc = 0.022
             bsoutloc = .07
             bsoutvel = .1
-            outrot = .02 #0.012
+            outrot = .06#2 #0.012
             outrot2 = .24
             outact = own.actuators["grindoutRight"]
             STANCE = own['grind_stance'] 
@@ -3923,49 +3960,52 @@ def main():
                 own['gt_cd'] = 0 
     #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
         reg_move = .05
-        reg_rot = 0.02
+        reg_rot = 0.02#2
         reg_rot2 = .26
         reg_move2 = .13
         bsforce = 50
         bs_dloc = .03
         outvel = own.linearVelocity
+        if own["coping"] == 1:
+            reg_rot = reg_rot *3
+            print('coping on')
         if own['gt_cd2'] > 50 and own['jump_timer'] < 20:
             if own['grind_out_type'] == 'reg right':
-                #print("do reg right")
+                print("do reg right")
                 own.applyMovement([0,reg_move,0], True)
-                own.applyRotation([0,0,reg_rot],True)
+                own.applyRotation([0,0,-reg_rot],True)
             if own['grind_out_type'] == 'fak right':
                 own.applyMovement([0,-reg_move,0], True)
                 own.applyRotation([0,0,-reg_rot],True)
-                #print("do fak right") 
+                print("do fak right") 
             if own['grind_out_type'] == 'reg left':
-                #print("do reg left")
+                print("do reg left")
                 own.applyMovement([0,-reg_move,0], True)
                 own.applyRotation([0,0,reg_rot],True)           
             if own['grind_out_type'] == 'fak left':
                 own.applyMovement([0,reg_move,0], True)
-                own.applyRotation([0,0,-reg_rot],True)
-                #print("do fak left") 
+                own.applyRotation([0,0,reg_rot],True)
+                print("do fak left") 
             if own['grind_out_type'] == 'reg fak right':
                 if own['gt_cd2'] > 55:
                     own.applyMovement([0,reg_move2,0], True)
                 own.applyRotation([0,0,reg_rot2],True)            
-                #print("do reg fak right")
+                print("do reg fak right")
             if own['grind_out_type'] == 'fak fak right':
                 if own['gt_cd2'] > 55:
                     own.applyMovement([0,-reg_move2,0], True)
                 own.applyRotation([0,0,reg_rot2],True)            
-                #print("do fak fak right") 
+                print("do fak fak right") 
             if own['grind_out_type'] == 'reg fak left':
                 if own['gt_cd2'] > 55:
                     own.applyMovement([0,-reg_move2,0], True)
                 own.applyRotation([0,0,-reg_rot2],True)             
-                #print("do reg fak left")                        
+                print("do reg fak left")                        
             if own['grind_out_type'] == 'fak fak left':
                 if own['gt_cd2'] > 55:
                     own.applyMovement([0,reg_move2,0], True)
                 own.applyRotation([0,0,-reg_rot2],True)            
-                #print("do fak fak left")
+                print("do fak fak left")
             if own['grind_out_type'] == 'reg right' or own['grind_out_type'] == 'reg left' or own['grind_out_type'] == 'fak right' or own['grind_out_type'] == 'fak left':   
                 own.setLinearVelocity([outvel.x * 1.01, outvel.y, outvel.z], True)
             if own['grind_out_type'] == 'reg fak right' or own['grind_out_type'] == 'reg fak left' or own['grind_out_type'] == 'fak fak right' or own['grind_out_type'] == 'fak fak left':

walk.py

@@ -621,39 +621,38 @@ def idle_anim():
                     elif STANCE == 1 and own['throw_deck'] == 1:
                         own['requestAction'] = 'fak_idle6'
 
+
 def reset_pos():
     #reset
-    if ddPad == 1:
-        
+    if ddPad == 1:   
         spawn_pos = own['spawn_pos']
         spawn_rot = own['spawn_rot']
-        #spawnz = spawn_pos[2] + .1
+        spawn_cam_pos = own['spawn_cam_pos']
+        spawn_cam_rot = own['spawn_cam_rot']            
         try:
-            own.worldPosition = (spawn_pos[0], spawn_pos[1], spawnz)
+            own.worldPosition = (spawn_pos[0], spawn_pos[1], (spawn_pos[2] + .1))
             own.worldOrientation = [[spawn_rot[0][0],spawn_rot[0][1],spawn_rot[0][2]], [spawn_rot[1][0],spawn_rot[1][1],spawn_rot[1][2]], [0.0, 0.0, 1.0]]
+            cam.worldPosition = (spawn_cam_pos[0], spawn_cam_pos[1], (spawn_cam_pos[2]))
+            cam.worldOrientation = [[spawn_cam_rot[0][0],spawn_cam_rot[0][1],spawn_cam_rot[0][2]], [spawn_cam_rot[1][0],spawn_cam_rot[1][1],spawn_cam_rot[1][2]], [0.0, 0.0, 1.0]]            
         except:    
             own.worldPosition = (0, 0, .1)
-            own.worldOrientation = [[1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [0.0, 0.0, 1.0]]    
+            own.worldOrientation = [[1.0, 0.0, 0.0], [ 0.0, 1.0, 0.0], [0.0, 0.0, 1.0]] 
+        own['stance'] = own['spawn_stance']                          
         if own["spawn_stance"] == 1:
             own.setLinearVelocity([.1,0,0], 1)
-            #cam.worldPosition = (spawn_pos[0], spawn_pos[1], (spawn_pos[2] + .25))
-            #lx = cam.localPosition[1] 
-            #lx = lx - 4
-            #cam.worldOrientation = [[spawn_rot[0][0],spawn_rot[0][1],spawn_rot[0][2]], [spawn_rot[1][0],spawn_rot[1][1],spawn_rot[1][2]], [0.0, 0.0, 1.0]]
-            #cam.localPosition[1] = lx
-         
+            
+            
         else: 
             own.setLinearVelocity([-.1,0,0], 1)         
-            #cam.worldPosition = (spawn_pos[0], spawn_pos[1], (spawn_pos[2] + .25))
-            #lx = cam.localPosition[1]
-            #lx = lx - 4
-            #cam.worldOrientation = [[spawn_rot[0][0],spawn_rot[0][1],spawn_rot[0][2]], [spawn_rot[1][0],spawn_rot[1][1],spawn_rot[1][2]], [0.0, 0.0, 1.0]]
-            #cam.localPosition[1] = lx
+            
     if udPad == 1:
+        
         own['spawn_pos'] = [own.worldPosition[0], own.worldPosition[1], own.worldPosition[2]] 
         own['spawn_rot'] = [[own.worldOrientation[0][0],own.worldOrientation[0][1],own.worldOrientation[0][2]], [own.worldOrientation[1][0],own.worldOrientation[1][1],own.worldOrientation[1][2]], own.worldOrientation[2][2]]
+        own['spawn_cam_pos'] = [cam.worldPosition[0], cam.worldPosition[1], cam.worldPosition[2]] 
+        own['spawn_cam_rot'] = [[cam.worldOrientation[0][0],cam.worldOrientation[0][1],cam.worldOrientation[0][2]], [cam.worldOrientation[1][0],cam.worldOrientation[1][1],cam.worldOrientation[1][2]], cam.worldOrientation[2][2]]            
         stance = own["stance"]
-        own["spawn_stance"] = stance    
+        own["spawn_stance"] = stance   
 def falldeck():
     #print("falldeck")
     throw_deck_empty = scene.objects["throw_deck_empty"]
@@ -760,10 +759,12 @@ def fall():
         falldeck()
         
         if STANCE == 1:
-            own['requestAction'] = 'fak_fall1'
+#            own['requestAction'] = 'fak_fall1'
+            own['requestAction'] = 'fak_air-walk_air'            
             own.setLinearVelocity([3,2,0], True)
         else:
-            own['requestAction'] = 'reg_fall1'
+#            own['requestAction'] = 'reg_fall1'
+            own['requestAction'] = 'reg_air-walk_air'
             own.setLinearVelocity([-3,-2,0], True)    
         own['fall'] = False
 
@@ -1082,6 +1083,11 @@ if yBut == True:
     own["walk_idle_frame"] = 0
 
 
+
+if own['stair_counter'] > 5 and r_ground.triggered == False:
+    own.applyForce([0,0,-200], True) 
+    print("applying ground force")
+
 #if own['requestAction'] == None:
 #    if own['throw_deck'] == False:
 #        if STANCE == 1:
@@ -1105,6 +1111,28 @@ if own['requestAction'] == 'empty' or own['requestAction'] == None:
     if STANCE == 1:
         own['requestAction'] = 'fak_idle1'        
     
+    
+    
+def onground():
+    if r_ground.positive:
+        #print('on ground')
+        own['lF_ground_frame'] = own['framenum']
+        if 'grind' in r_ground.hitObject:
+            own.applyForce([0,100,0], True)
+            print('moving away from rail')
+
+    else:
+        #print('in air')    
+        
+        if  own['framenum'] - own['lF_ground_frame'] > 10:
+            if STANCE == 0:            
+                own['requestAction'] = 'reg_walk_air'
+            else:
+                own['requestAction'] = 'fak_walk_air' 
+                
+
+           
+            
                     
 onboard() 
 jump()
@@ -1121,6 +1149,7 @@ move_followcam()
 fall()
 idle_anim()
 sit()
+onground()
 #cont.activate(cam.actuators['Camera'])
 #printplaying()