bs

co_ActionState.py

@@ -85,6 +85,12 @@ def main():
     if requestAction in ['reg_offboard', 'fak_offboard', 'reg_onboard', 'fak_onboard']:
         own['actionTimer'] = 0
         actionTimer = 0
+    if l_actionState == 'reg_dropin_pos' and requestAction != 'reg_dropin_pos':
+        own['requestAction'] = 'reg_dropin'
+        requestAction = 'reg_dropin'
+    if l_actionState == 'fak_dropin_pos' and requestAction != 'fak_dropin_pos':
+        own['requestAction'] = 'fak_dropin'
+        requestAction = 'fak_dropin'        
 
 #===============        
     #land action over ride
@@ -311,14 +317,14 @@ def main():
         if (l_actionState == 'reg_5050_out' and requestAction == 'reg_roll') or (l_actionState in {'reg_noseg_out', 'reg_nosegr_out', 'reg_nosegl_out', 'reg_tailg_out', 'reg_tailgr_out', 'reg_tailgl_out'} and actionTimer < 10):    
             requestAction = 'reg_5050-roll'
             actionState = 'reg_5050-roll'
-            print('************************')  
+            #print('************************')  
         
         if (l_actionState == 'fak_5050_out' and requestAction == 'fak_roll') or (l_actionState in {'fak_noseg_out', 'fak_nosegr_out', 'fak_nosegl_out', 'fak_tailg_out', 'fak_tailgr_out', 'fak_tailgl_out'} and actionTimer < 10): 
             requestAction = 'fak_5050-roll'
             actionState = 'fak_5050-roll' 
-            print('************************')                                                                                                                  
+            #print('************************')                                                                                                                  
     else:
-        print("action over ridden")               
+        print("action over written")               
     def updateAction(requestAction, actionState):
         try:
             flip_start_frame = own['flip_start_lay']

controller2.py

@@ -1568,6 +1568,7 @@ def main():
         if framenumber == 900000:
             framenumber = 0
         own["framenum"] = framenumber
+        own['last_roll_frame'] = framenumber
         
     def push():
         local = True
@@ -2177,7 +2178,7 @@ def main():
             own["coping"] = 0    
     #print(own['dropinTimer'], 'dtimer')
     def onboard():
-        if own['walk'] == 1 and own['lasty'] == False:
+        if own['walk'] == 1 and own['lasty'] == False and own['requestAction'] not in ['reg_dropin', 'fak_dropin']:
             cont.deactivate(cam.actuators['replayCam'])
             cont.activate(cam.actuators['Camera'])
             killall()

grindV2.py

@@ -139,8 +139,8 @@ def main():
         if rot >= 270 and rot < 315: 
             grindvect = "pos" 
             grindyvect = "neg"
-        if rot >= 315: grindvect = "pos"
-        
+        if rot >= 315: 
+            grindvect = "pos"
         if rot < 0 and rot >= -45: 
             grindvect = "pos"
         if rot < -45 and rot >= -90: 
@@ -218,7 +218,8 @@ def main():
 
         #z align
         #print("zalign") 
-        player.alignAxisToVect(grinder_vectz, 2, .15)                                                  
+        stre = .15
+        player.alignAxisToVect(grinder_vectz, 2, stre)                                                  
         
         if rot >= 0 and rot < 45:
             player.alignAxisToVect(grinder_vect, 0, align_strength)
@@ -226,173 +227,126 @@ def main():
             #player.applyForce([0, 0, 0], True)            
             player.setLinearVelocity([velxb, 0.0, zvel], 1)  
             grindpos = "reg_5050"
+            print("50-1")
 
 
-        if rot >= 45 and rot < 90:  
-            #90 degrees CW about z-axis: (x, y, z) -> (y, -x, z)
-            #90 degrees CCW about z-axis: (x, y, z) -> (-y, x, z) 
-            #grinder_vect2 =                 
-            player.alignAxisToVect([-grinder_vect.y, grinder_vect.x, grinder_vect.z], 0, align_strength)
-            #print("1") 
+        elif rot >= 45 and rot < 90:  
+            player.alignAxisToVect([-grinder_vect.y, grinder_vect.x, 0], 0, align_strength)
             grindvect = "pos"
-            #player.applyRotation(bsrot, 1)
-            align = "pos"
-            #player.applyForce([0, 0, 0], True)
+            align = "pos"            
             player.setLinearVelocity([0, convely, zvel], 1)   
             grindpos = "reg_board"     
             grindyvect = "pos"
             #print("bs1, don't switch")       
-            #print("boardslide")
                            
-        if rot >= 90 and rot < 135:  
-            #print(STANCE, "2") 
+        elif rot >= 90 and rot < 135:  
             grinder_vect = grinder_vect * -1                
-            player.alignAxisToVect([grinder_vect.y, -grinder_vect.x, grinder_vect.z], 0, align_strength) 
+            player.alignAxisToVect([grinder_vect.y, -grinder_vect.x, 0], 0, align_strength) 
             grindvect = "neg"
-            #print("2")
-            #player.applyRotation(negbsrot, 1)
             align = "neg"
             grindyvect = "neg"
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([0, convely, zvel], 1)
             grindpos = "reg_board"  
             #print("-bs2, don't switch?")          
-            #print("boardslide") 
                      
-        if rot >= 135 and rot < 180:
+        elif rot >= 135 and rot < 180:
             player.alignAxisToVect(-grinder_vect, 0, align_strength)
             grindvect = "neg"
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([velxb, 0.0, zvel], 1) 
             grindpos = "reg_5050"
+            #print("50-2")
            
-        if rot >= 180 and rot < 225:
+        elif rot >= 180 and rot < 225:
             player.alignAxisToVect(-grinder_vect, 0, align_strength)
             grindvect = "neg"
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([velxb, 0.0, zvel], 1)
             grindpos = "reg_5050" 
+            #print("50-3")
             
-        if rot >= 225 and rot < 270:
-            #print(STANCE, "3")
-            #grinder_vect = grinder_vect * -1
-            player.alignAxisToVect([grinder_vect.y, -grinder_vect.x, grinder_vect.z], 0, align_strength)
-            #print("3")
+        elif rot >= 225 and rot < 270:
+            player.alignAxisToVect([grinder_vect.y, -grinder_vect.x, 0], 0, align_strength)
             grindvect = "neg"
-            #player.applyRotation(bsrot, 1)
             align = "pos"
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([0, convely, zvel], 1)
             grindpos = "reg_board"
             grindyvect = "pos"
-            print("bs3")             
-            #print("boardslide")
+            #print("bs3")             
            
-        if rot >= 270 and rot < 315:
-            #print(STANCE, "4")
-            player.alignAxisToVect([grinder_vect.y, -grinder_vect.x, grinder_vect.z], 0, align_strength) 
-            grindvect = "pos"
-            #player.applyRotation(negbsrot, 1)
-            #print("4")  
+        elif rot >= 270 and rot < 315:
+            player.alignAxisToVect([grinder_vect.y, -grinder_vect.x, 0], 0, align_strength) 
+            grindvect = "pos" 
             align = "neg"
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([0, convely, zvel], 1)
             grindpos = "reg_board"   
             grindyvect = "neg"
-            #print("-bs4")              
-            #print("boardslide")
+            #print("-bs4")          
             
-        if rot >= 315:
+        elif rot >= 315:
             player.alignAxisToVect(grinder_vect, 0, align_strength)
             grindvect = "pos"
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([velxb, 0.0, zvel], 1)
             grindpos = "reg_5050"
+            #print("50-4")
                          
 #-------------------------------------------------------------            
-        if rot < 0 and rot >= -45:
+        elif rot < 0 and rot >= -45:
             player.alignAxisToVect(grinder_vect, 0, align_strength)
             grindvect = "pos"
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([velxb, 0.0, zvel], 1)  
-            grindpos = "reg_5050"   
-                                  
-        if rot < -45 and rot >= -90:
-            #print(STANCE, "5")
+            grindpos = "reg_5050" 
+            #print("50-5")                    
+        elif rot < -45 and rot >= -90:
             grinder_vect = grinder_vect * -1
-            player.alignAxisToVect([-grinder_vect.y, grinder_vect.x, grinder_vect.z], 0, align_strength)
+            player.alignAxisToVect([-grinder_vect.y, grinder_vect.x, 0], 0, align_strength)
             grindvect = "pos"
-            #player.applyRotation(negbsrot, 1)
-            #print("5")
             align = "neg"
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([0, convely, zvel], 1)
             grindpos = "reg_board"   
             #print("-bs5")           
-            #print("boardslide")
-            
             grindyvect = "neg"
-        if rot < -90 and rot >= -135:
-            #print(STANCE, "6")
-            #grinder_vect = grinder_vect * -1
-            player.alignAxisToVect([grinder_vect.y, -grinder_vect.x, grinder_vect.z], 0, align_strength) 
+        elif rot < -90 and rot >= -135:
+            player.alignAxisToVect([grinder_vect.y, -grinder_vect.x, 0], 0, align_strength)
             grindvect = "neg"
-            #print("6")
-            #player.applyRotation(bsrot, 1)
             align = "pos"
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([0, convely, zvel], 1)
             grindpos = "reg_board"  
             grindyvect = "pos"
-            #print("bs6")           
-            #print("boardslide") 
-                                           
-        if rot < -135 and rot >= -180:
+            #print("bs6")                   
+        elif rot < -135 and rot >= -180:
             player.alignAxisToVect(-grinder_vect, 0, align_strength)
             grindvect = "neg"   
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([velxb, 0.0, zvel], 1)  
             grindpos = "reg_5050" 
-                       
-        if rot < -180 and rot >= -225:
+            #print("50-6")       
+        elif rot < -180 and rot >= -225:
             player.alignAxisToVect(-grinder_vect, 0, align_strength) 
             grindvect = "neg"           
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([velxb, 0.0, zvel], 1)  
             grindpos = "reg_5050" 
-        if rot < -225 and rot >= -270:
-            #print(STANCE, "7")
+            #print("50-7")
+        elif rot < -225 and rot >= -270:
             grinder_vect = grinder_vect * -1
-            player.alignAxisToVect([grinder_vect.y, -grinder_vect.x, grinder_vect.z], 0, align_strength) 
+            player.alignAxisToVect([grinder_vect.y, -grinder_vect.x, 0], 0, align_strength) 
             grindvect = "neg"
-            #player.applyRotation(negbsrot, 1)
-            #print("7")
             align = "neg"
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([0, convely, zvel], 1)
             grindpos = "reg_board"   
             grindyvect = "neg"
-            #print("-bs7")          
-            #print("boardslide")            
-        if rot < -270 and rot >= -315:
-            #print(STANCE, "8")
-            player.alignAxisToVect([-grinder_vect.y, grinder_vect.x, grinder_vect.z], 0, align_strength) 
+            #print("-bs7")              
+        elif rot < -270 and rot >= -315:
+            player.alignAxisToVect([-grinder_vect.y, grinder_vect.x, 0], 0, align_strength) 
             grindvect = "pos"
-            #player.applyRotation(bsrot, 1)
-            #print("8")
             align = "pos"
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([0, convely, zvel], 1)
             grindpos = "reg_board"    
             grindyvect = "pos"
-            #print("bs8")        
-            #print("boardslide")                                
-        if rot < -315:
+            #print("bs8")                                   
+        elif rot < -315:
             player.alignAxisToVect(grinder_vect, 0, align_strength) 
             grindvect = "pos"                     
-            #player.applyForce([0, 0, 0], True)
             player.setLinearVelocity([velxb, 0.0, zvel], 1)  
             grindpos = "reg_5050"  
+            #print("50-8")
 
         own['grindpos'] = grindpos
         own['grindvect'] = grindvect
@@ -451,7 +405,8 @@ def main():
                     player_rotz = math.degrees(player_e[2])
                     grinder_e = obj.worldOrientation.to_euler()
                     grinder_rotz = math.degrees(grinder_e[2])
-                    deltamove = delta[2] * .3#.25
+                    deltamove = delta[2] * .3
+                    #print(round(deltamove, 4), "deltamove")
                     #5050
                     if own["grindpos"] == "reg_5050":
                         #print("missing delta")
@@ -558,9 +513,11 @@ def main():
                 if grindTouch.positive:
                     nearpos = nearestObject.worldPosition
                     if hitNormal != None:
-                        own.alignAxisToVect(hitNormal, 2, .05) 
+                        stre = .05
+                        own.alignAxisToVect(hitNormal, 2, stre) 
                         print("align")                   
                     own.worldPosition = [nearpos.x, nearpos.y, nearpos.z + .2975]
+                    print('moving world')
 
             grindold = True
             own['grindold_timer'] = 0

scene_init.py

@@ -23,6 +23,7 @@ def main():
     dict['overlay_fadeout'] = 1
     scenes = bge.logic.getSceneList()
     own['pre_pause_linvel'] = 0.0
+    #own['last_roll_frame'] = 0
     for i in scenes:
         if i.name == "main":
             main = i

stance.py

@@ -3,6 +3,18 @@ from bge import logic
 cont = bge.logic.getCurrentController()
 own = cont.owner
 
+
+#scene = bge.logic.getCurrentScene()
+#control_bottom = scene.objects['control_bottom']
+#grindTouch = control_bottom.sensors['grindCol_bottom']
+#edge = 0
+#try:
+#    if 'edge' in grindTouch.hitObject:
+#        print('Edge')
+#        edge = 1
+#except:
+#    pass        
+
 #constants
 STANCE_SENS = 0.05
 STANCE = own["stance"]
@@ -22,14 +34,14 @@ try:
             STANCE = 0
 except:
     print("no stance")
-if jumpstance == 3:
-    if own["grindOld"] == 0:
-        own["stance"] = STANCE
-else:
-    if grindpos == "reg_5050":
-        own["stance"] = STANCE
-    else:
-        STANCE = jumpstance
+#if jumpstance == 3:
+#    if own["grindOld"] == 0:
+#        own["stance"] = STANCE
+#else:
+#    if grindpos == "reg_5050":
+#        own["stance"] = STANCE
+#    else:
+#        STANCE = jumpstance
 own["stance"] = STANCE           
 dict = bge.logic.globalDict #Get the global dictionary
 dict['stance'] = STANCE #Store the new score

walk.py

@@ -262,10 +262,14 @@ else:
     own.setLinearVelocity([0, 0, vel.z], True)
     #print("set 0 vel")
     
-if (lup == 1 and aBut == 0 and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0):    
+wf = 1
+if own['last_walk_frame'] - own['last_roll_frame'] > 55:
+    wf = 0
+   
+if (lup == 1 and aBut == 0 and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0) and wf == 0:    
     own['walking'] = "regular"
     walking = "regular"
-elif lup == 1 and aBut == 1 and yBut == False and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0:
+elif lup == 1 and aBut == 1 and yBut == False and (r_ground.positive or own['stair_counter'] > 0) and xBut == 0 and wf == 0:
     own['walking'] = "fast"
     walking = "fast"
 else: