dropins2

co_ActionState.py

@@ -281,7 +281,7 @@ def main():
                 requestAction = 'fak_nmanual_out'
                 actionState = 'fak_nmanual_out'  
                 
-        if l_actionState == 'reg_air' and requestAction == 'reg_roll':
+        if (l_actionState == 'reg_air' or l_actionState == 'reg_dropin') and requestAction == 'reg_roll'and actionTimer == 0:
             requestAction = 'reg_air-roll'
             actionState = 'reg_air-roll'  
         if l_actionState == 'fak_air' and requestAction == 'fak_roll':
@@ -351,13 +351,13 @@ def main():
 
             if requestAction == 'reg_dropin':
                 actionState = 'reg_dropin'
-                own['actionTimer'] = 9
-                skater.playAction("nreg_dropin", 60,80, layer=trans_layer, play_mode=0, speed=.75)
-                deck.playAction("a_reg_dropin", 60,80, layer=trans_layer, play_mode=0, speed=.75)
-                trucks.playAction("a_reg_dropin", 60,80, layer=trans_layer, play_mode=0, speed=.75)    
+                own['actionTimer'] = 28
+                skater.playAction("reg_dropin3", 60,80, layer=trans_layer, play_mode=0, speed=.75)
+                deck.playAction("a_reg_dropin3", 60,80, layer=trans_layer, play_mode=0, speed=.75)
+                trucks.playAction("a_reg_dropin3", 60,80, layer=trans_layer, play_mode=0, speed=.75)    
             if requestAction == 'fak_dropin':
                 actionState = 'fak_dropin'
-                own['actionTimer'] = 9
+                own['actionTimer'] = 28
                 skater.playAction("nfak_dropin", 60,80, layer=trans_layer, play_mode=0, speed=.75)
                 deck.playAction("a_fak_dropin", 60,80, layer=trans_layer, play_mode=0, speed=.75)
                 trucks.playAction("a_fak_dropin", 60,80, layer=trans_layer, play_mode=0, speed=.75)    
@@ -2782,13 +2782,13 @@ def main():
                 actionState = 'reg_dropin_pos'
                 #own['actionTimer'] = 10
                 if l_actionState != 'reg_dropin_pos':
-                    skater.playAction("nreg_dropin", 30,50, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_reg_dropin", 30,50, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_reg_dropin", 30,50, layer=trans_layer, play_mode=0, speed=.5)        
+                    skater.playAction("reg_dropin3", 30,50, layer=trans_layer, play_mode=0, speed=.5)
+                    deck.playAction("a_reg_dropin3", 30,50, layer=trans_layer, play_mode=0, speed=.5)
+                    trucks.playAction("a_reg_dropin3", 30,50, layer=trans_layer, play_mode=0, speed=.5)        
                 else:
-                    skater.playAction("nreg_dropin", 50,60, layer=loop_layer, play_mode=1, speed=.75)
-                    deck.playAction("a_reg_dropin", 50,60, layer=loop_layer, play_mode=1, speed=.75)
-                    trucks.playAction("a_reg_dropin", 50,60, layer=loop_layer, play_mode=1, speed=.75) 
+                    skater.playAction("reg_dropin3", 50,60, layer=loop_layer, play_mode=1, speed=.75)
+                    deck.playAction("a_reg_dropin3", 50,60, layer=loop_layer, play_mode=1, speed=.75)
+                    trucks.playAction("a_reg_dropin3", 50,60, layer=loop_layer, play_mode=1, speed=.75) 
                     
                     
             if requestAction == 'fak_dropin_pos':
@@ -2818,6 +2818,10 @@ def main():
             pass
         own['actionState'] = actionState
         return actionState
+    
+    #if (own['actionState'] == 'reg_dropin' and own['requestAction'] == 'reg_roll':
+        #own['requestAction'] = 'reg_dropin'
+    
             
     l_playing = skater.isPlayingAction(loop_layer)
     t_playing = skater.isPlayingAction(trans_layer)        

walk.py

@@ -9,6 +9,7 @@ import GameLogic
 import ctypes
 #import bpy
 import random
+import math
 
 #build global dict (move this to separate script that runs once)
 scene = bge.logic.getCurrentScene()
@@ -617,40 +618,62 @@ def getonboard():
         own['throw_deck'] = False 
         throw_deck_empty = scene.objects["throw_deck_empty"]
         throw_deck_empty['kill_deck'] = 1 
-        fliplay3 = fliplay2 + 1  
-        if STANCE == 0 and dropinCol.positive == True: 
-            cont.deactivate(skater.actuators['aRest'])
-            cont.deactivate(skater.actuators['aRest_fak'])
-            killact(4)
-            killact(5)
-            killact(6)
-            killact(7) 
-            own['requestAction'] ='reg_dropin_pos' 
-            own['dropinTimer'] = 60                      
-#            skater.playAction("nreg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-#            deck.playAction("a_reg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-#            trucks.playAction("a_reg_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-#            if lasty == False:
-#                skater.playAction("nreg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
-#                deck.playAction("a_reg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
-#                trucks.playAction("a_reg_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)                
-                
-        if STANCE == 1 and dropinCol.positive == True: 
-            cont.deactivate(skater.actuators['aRest'])
-            cont.deactivate(skater.actuators['aRest_fak'])
-            killact(4)
-            killact(5)
-            killact(6)
-            killact(7)                        
-            own['requestAction'] ='fak_dropin_pos'  
-            own['dropinTimer'] = 60                                 
-#            skater.playAction("nfak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-#            deck.playAction("a_fak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-#            trucks.playAction("a_fak_dropin", 50,60, layer=fliplay2, priority=0, play_mode=1, speed=.5)
-#            if lasty == False:
-#                skater.playAction("nfak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
-#                deck.playAction("a_fak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)
-#                trucks.playAction("a_fak_dropin", 30,50, layer=fliplay3, priority=0, play_mode=0, speed=.75)                      
+        fliplay3 = fliplay2 + 1 
+        if dropinCol.positive == True: 
+                       
+#            nearestObject = None
+#            grindEmpty = scene.objects['grindEmpty']
+#            grindDar = grindEmpty.sensors['grindDar2']
+#            minDist = None             
+#            if grindDar.positive:
+#                detectedObjects = grindDar.hitObjectList
+#                dist = 0
+#                for obj in detectedObjects:
+#                    dist = own.getDistanceTo(obj)
+#                    if (minDist is None or dist < minDist):
+#                        nearestObject = obj
+#                        minDist = dist
+#            if nearestObject != None:
+#                print(nearestObject)
+#                obj = nearestObject
+#                player_e = own.worldOrientation.to_euler()
+#                player_pos = own.worldPosition
+#                player_rotz = math.degrees(player_e[2])                
+#                grinder_e = obj.worldOrientation.to_euler()
+#                grinder_rotz = math.degrees(grinder_e[2])            
+#                rot = player_rotz - grinder_rotz  
+#                
+#                
+#                grinder_pos = obj.worldPosition 
+#                worldVect = [1, 0, 0]
+#                vect = obj.getAxisVect(worldVect)      
+#                go = obj.worldOrientation
+#                grinder_axis = [1,0,0] 
+#                try: 
+#                    delta = player_pos - grinder_pos
+#                    
+#                    delta = delta.cross(vect)
+#                    if delta[2] >= 0:
+#                        grindside = "right"
+#                    else:
+#                        grindside = "left"                    
+#                    deltamove = delta[2] * .1#.25
+#                    move = [0, deltamove, 0]
+#                    print("1deltamove", deltamove)
+#                    own.applyMovement(move, True)                    
+#                except:
+#                    print("delta broke: ", player_pos, grinder_pos)
+#                    #pass 
+         
+            if STANCE == 0: 
+                own['requestAction'] ='reg_dropin_pos' 
+                own['dropinTimer'] = 60                                     
+                    
+            if STANCE == 1: 
+                    
+                own['requestAction'] ='fak_dropin_pos'  
+                own['dropinTimer'] = 60                                 
+                                     
     if getonboard == 1:
         fliplay3 = 6000 
         onboard_speed = .1