misc stuff

co_ActionState.py

@@ -33,16 +33,17 @@ def main():
         queueAction = own['queueAction']
         actionTimer = own['actionTimer']
     except:
-        print("init")
-        own['actionState'] = 'empty'
+        #print("init")
+        own['actionState'] = 'reg_walk'
         own['l_actionState'] = 'empty'        
-        own['requestAction'] = 'empty'    
+        own['requestAction'] = 'reg_walk'    
         own['l_requestAction'] = 'empty'
         own['queueAction'] = 'empty'
         own['actionTimer'] = 0
+        own['clear_request'] = 0
         actionTimer = 0
         queueAction = 'empty'
-        requestAction = 'empty'
+        requestAction = 'reg_walk'
         actionState = 'empty'
         l_actionState = 'empty'
         l_requestAction = 'empty'
@@ -54,6 +55,10 @@ def main():
     transPlaying = skater.isPlayingAction(trans_layer)
     #if isplaying  == False:    
         #own['actionTimer'] = 0
+        
+    if own['clear_request'] == 1:
+        requestAction = 'empty'
+        own['clear_request'] = 0    
     if own['actionTimer'] != 0 and transPlaying == False and isplaying == False:
         own['actionTimer'] = 0
         actionTimer = 0
@@ -133,7 +138,7 @@ def main():
             
     #check last actionState to see if an out action is needed
     
-    elif requestAction not in jump_overrideList:
+    if requestAction not in jump_overrideList:
         if l_actionState == 'reg_turnRight' and requestAction != 'reg_turnRight':
             requestAction = 'reg_turnRight_out'
             actionState = 'reg_turnRight_out'
@@ -160,12 +165,26 @@ def main():
             requestAction = 'fak_nopos_out'
             actionState = 'fak_nopos_out' 
             
+#        if l_actionState == 'reg_pump_out_hold' and requestAction != 'reg_pump' and requestAction not in pump_out_overList:
+#            requestAction = 'reg_pump_out'
+#            actionState = 'reg_pump_out' 
+            
+            
         if l_actionState == 'reg_pump' and requestAction != 'reg_pump' and requestAction not in pump_out_overList:
             requestAction = 'reg_pump_out'
             actionState = 'reg_pump_out' 
+            
+            
+                        
+#        if l_actionState == 'fak_pump_out_hold' and requestAction != 'fak_pump' and requestAction not in pump_out_overList:
+#            requestAction = 'fak_pump_out'
+#            actionState = 'fak_pump_out'
+            
         if l_actionState == 'fak_pump' and requestAction != 'fak_pump' and requestAction not in pump_out_overList:
             requestAction = 'fak_pump_out'
-            actionState = 'fak_pump_out'
+            actionState = 'fak_pump_out'            
+            
+            
         if l_actionState == 'reg_powerslide' and requestAction != 'reg_powerslide':
             requestAction = 'reg_powerslide_out'
             actionState = 'reg_powerslide_out' 
@@ -478,9 +497,16 @@ def main():
                     
                     own['actionTimer'] = cur_frame
                 else:                      
-                    skater.playAction("nreg_pump_in", 10,1, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
-                    trucks.playAction("a_reg", 1,40, layer=trans_layer, play_mode=1, speed=.5)
+                    skater.playAction("nreg_pump_in", 20,1, layer=trans_layer, play_mode=0, speed=.5)
+                    deck.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)
+                    trucks.playAction("a_reg", 1,20, layer=trans_layer, play_mode=1, speed=.5)
+                    
+#            if requestAction == 'reg_pump_out_hold':
+#                actionState = 'reg_pump_out_hold'
+#                own['actionTimer'] = 19
+#                skater.playAction("nreg_pump_in", 10,10, layer=trans_layer, play_mode=0, speed=.5)
+#                deck.playAction("a_reg", 10,10, layer=trans_layer, play_mode=1, speed=.5)
+#                trucks.playAction("a_reg", 10,10, layer=trans_layer, play_mode=1, speed=.5)                    
                     
             if requestAction == 'fak_pump_out':
                 actionState = 'fak_pump_out'
@@ -495,9 +521,15 @@ def main():
                     trucks.playAction("a_reg", cur_frame,1, layer=trans_layer, play_mode=1, speed=.5)
                     own['actionTimer'] = cur_frame
                 else:                      
-                    skater.playAction("nfak_pump_in", 10,1, layer=trans_layer, play_mode=0, speed=.5)
-                    deck.playAction("a_reg", 10,1, layer=trans_layer, play_mode=1, speed=.5)
-                    trucks.playAction("a_reg", 10,1, layer=trans_layer, play_mode=1, speed=.5)
+                    skater.playAction("nfak_pump_in", 20,1, layer=trans_layer, play_mode=0, speed=.5)
+                    deck.playAction("a_reg", 20,1, layer=trans_layer, play_mode=1, speed=.5)
+                    trucks.playAction("a_reg", 20,1, layer=trans_layer, play_mode=1, speed=.5)
+#            if requestAction == 'fak_pump_out_hold':
+#                actionState = 'fak_pump_out_hold'
+#                own['actionTimer'] = 19
+#                skater.playAction("nfak_pump_in", 10,10, layer=trans_layer, play_mode=0, speed=.5)
+#                deck.playAction("a_reg", 10,10, layer=trans_layer, play_mode=1, speed=.5)
+#                trucks.playAction("a_reg", 10,10, layer=trans_layer, play_mode=1, speed=.5)                          
 
             if requestAction == 'reg_stop_out':
                 actionState = 'reg_stop_out'
@@ -2367,17 +2399,17 @@ def main():
                     # skater.playAction("reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
                     # deck.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)
                     # trucks.playAction("a_reg_noseg.002", 1,10, layer=trans_layer, play_mode=0, speed=1)        
-                    skater.playAction("reg_nmanual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                
-                    deck.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_fak_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                        
+                    skater.playAction("reg_noseg.002", 5,5, layer=trans_layer, play_mode=0, speed=.5)                
+                    deck.playAction("a_reg_noseg.002", 5,5, layer=trans_layer, play_mode=0, speed=.5)
+                    trucks.playAction("a_reg_noseg.002", 5,5, layer=trans_layer, play_mode=0, speed=.5)                        
                 else:
                     #pass
                     # skater.playAction("reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
                     # deck.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
                     # trucks.playAction("a_reg_noseg.002", 11,30, layer=loop_layer, play_mode=1, speed=.5)
-                    skater.playAction("reg_nmanual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                
-                    deck.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
-                    trucks.playAction("a_fak_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                     
+                    skater.playAction("reg_noseg.002", 5,5, layer=loop_layer, play_mode=1, speed=.5)                
+                    deck.playAction("a_reg_noseg.002", 5,5, layer=loop_layer, play_mode=1, speed=.5)
+                    trucks.playAction("a_reg_noseg.002", 5,5, layer=loop_layer, play_mode=1, speed=.5)                     
             if requestAction == 'fak_air_nose':
                 actionState = 'fak_air_nose'
                 if l_actionState != 'fak_air_nose':
@@ -2387,20 +2419,20 @@ def main():
                     skater.stopAction(flip_layer)
                     deck.stopAction(flip_layer)
                     trucks.stopAction(flip_layer)                    
-                    # skater.playAction("fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
-                    # deck.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)
-                    # trucks.playAction("a_fak_noseg", 40,30, layer=trans_layer, play_mode=0, speed=1)        
-                    skater.playAction("fak_nmanual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                
-                    deck.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
-                    trucks.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                    
+                    skater.playAction("fak_noseg", 40,35, layer=trans_layer, play_mode=0, speed=1)
+                    deck.playAction("a_fak_noseg", 40,35, layer=trans_layer, play_mode=0, speed=1)
+                    trucks.playAction("a_fak_noseg", 40,35, layer=trans_layer, play_mode=0, speed=1)        
+                    #skater.playAction("fak_nmanual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                
+                    #deck.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)
+                    #trucks.playAction("a_reg_manual", 1,10, layer=trans_layer, play_mode=0, speed=.5)                    
                 else:
                     #pass
-                    # skater.playAction("fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    # deck.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    # trucks.playAction("a_fak_noseg", 30,1, layer=loop_layer, play_mode=1, speed=.5)
-                    skater.playAction("fak_nmanual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                
-                    deck.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
-                    trucks.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                    
+                    skater.playAction("fak_noseg", 35,35, layer=loop_layer, play_mode=1, speed=.5)
+                    deck.playAction("a_fak_noseg", 35,35, layer=loop_layer, play_mode=1, speed=.5)
+                    trucks.playAction("a_fak_noseg", 35,35, layer=loop_layer, play_mode=1, speed=.5)
+                    #skater.playAction("fak_nmanual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                
+                    #deck.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)
+                    #trucks.playAction("a_reg_manual", 10,70, layer=loop_layer, play_mode=1, speed=.5)                    
                     
             if requestAction == 'reg_air_tail':
                 actionState = 'reg_air_tail'
@@ -2811,11 +2843,14 @@ def main():
         actionState = updateAction(requestAction, actionState)
         #own['actionState'] = actionState
         
+        
+    if (own['actionState'] == 'reg_land' or own['actionState'] == 'reg_land') and own['actionTimer'] > 0:
+        own['clear_request'] = 1    
   
 ###################  
     
     #debug
-    #print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'])
+    print("rA:", requestAction, "|aS:", own['actionState'], "q", queueAction, own['actionTimer'])
     cur_frame = skater.getActionFrame(trans_layer)
     #print(cur_frame)
     def printplaying():

controller2.py

@@ -828,7 +828,7 @@ def jump():
         if grindHit == True:
             linvelloc = own.getLinearVelocity(True)
             own.applyForce(force, True)
-            force2 = [0.0, 0, 150]
+            force2 = [0.0, 0, 150]            
             own.applyForce(force2, True) 
             linvelloc2 = own.getLinearVelocity(True)
             force = (linvelloc.x, linvelloc.y, linvelloc2.z)
@@ -3494,10 +3494,10 @@ if stBut == True:
 if stBut == False and own['last_stBut'] == True:
     if own['pause_on'] == True:
         own['pause_on'] = False
-        own.restoreDynamics()     
+        #own.restoreDynamics()     
     else:
         own['pause_on'] = True
-        own.suspendDynamics()            
+        #own.suspendDynamics()            
     
 own['last_stBut'] = stBut
      
@@ -4139,7 +4139,41 @@ def trans_jump():
         #print(deltamove)
         if abs(deltamove) < 1 and delta[1] < 1:
             own.applyMovement(move, True)               
+
+def air_mover():
+    if r_ground.triggered == False and jump_timer > 53:
+        #print(lUD)
+        if lUD > 0.075:
+            print("air_mover", jump_timer)
+            if STANCE == 0:
+                force2 = [120, 0, 10]
+            if STANCE == 1:
+                force2 = [-120, 0, 10]            
+            
+            own.applyForce(force2, True)
+            #own.applyForce([0,0,5], False)
+    if r_ground.triggered == False and jump_timer > 10 and lUD > 0.075:
+        #print(lUD)
+        print("air_mover", jump_timer)
+        if STANCE == 0:
+            force2 = [7, 0, 10]
+        if STANCE == 1:
+            force2 = [-7, 0, 10]            
+        
+        own.applyForce(force2, True)
+        own.applyForce([0,0,5], False)
+        own['air_mover'] = True
+    else:
+        own['air_mover'] = False        
         
+#if grindHit == 1:
+#    skater.applyRotation([0,0,.05], False)
+#    deck.applyRotation([0,0,.05], False)
+#    trucks.applyRotation([0,0,.05], False)
+#else:
+#    skater.applyRotation([0,0,.0], False)            
+#    deck.applyRotation([0,0,.0], False)            
+#    trucks.applyRotation([0,0,.0], False)            
 #control_calib() #scene must be enabled in main                 
 jump_Timer()
 check_landing()
@@ -4161,7 +4195,7 @@ wallride()
 wallride_sound()
 shutoff_timers()
 grindout_cleanup()
-
+air_mover()
 linvelx = own.getLinearVelocity(True)
 
 own["linvelx"] = linvelx.x

grindV2.py

@@ -543,7 +543,7 @@ def main():
                
             
     
-    if grindDar.positive == False and grindTouch.positive and grindold == 0 and dropin == 0 and grind_jump == 0 and own["grindoutturn"] == 0 and gt_cd == 0 and manual == 0 and no_grind == 0 and nearestObject != lastObject and own['grindjumpturn'] == 0 and own['gt_cd2'] == 0:
+    if grindDar.positive == False and grindTouch.positive and grindold == 0 and dropin == 0 and grind_jump == 0 and own["grindoutturn"] == 0 and gt_cd == 0 and manual == 0 and no_grind == 0 and nearestObject != lastObject and own['grindjumpturn'] == 0 and own['gt_cd2'] == 0 and own['air_mover'] == False:
         print("touching, no dar")
     #print(grindold, "grindold")        
     if grindDar.positive:
@@ -564,7 +564,7 @@ def main():
             #print('invertOn')
 
         grind_dist = .8#.6
-        if dist < grind_dist and grindold == 0 and dropin == 0 and grind_jump == 0 and own["grindoutturn"] == 0 and gt_cd == 0 and manual == 0 and no_grind == 0 and nearestObject != lastObject and own['grindjumpturn'] == 0 and own['gt_cd2'] == 0 and invert_on == False:
+        if dist < grind_dist and grindold == 0 and dropin == 0 and grind_jump == 0 and own["grindoutturn"] == 0 and gt_cd == 0 and manual == 0 and no_grind == 0 and nearestObject != lastObject and own['grindjumpturn'] == 0 and own['gt_cd2'] == 0 and invert_on == False and own['air_mover'] == False:
         #if grindold == 0 and dropin == 0 and grind_jump == 0 and manual == 0 and no_grind == 0 and nearestObject != lastObject:    
             print("new grind trigger")           
             npos = nearestObject.worldPosition
@@ -582,7 +582,7 @@ def main():
 
         #grind
         #print(dist)
-        if dist < grind_dist and dropin == 0 and grind_jump == 0 and manual == 0 and no_grind == 0 and own['airup'] == 0 and own['grindoutturn'] == 0 and own['grindjumpturn'] == 0 and own['manual'] == 0 and own['gt_cd2'] < 50 and invert_on == False:
+        if dist < grind_dist and dropin == 0 and grind_jump == 0 and manual == 0 and no_grind == 0 and own['airup'] == 0 and own['grindoutturn'] == 0 and own['grindjumpturn'] == 0 and own['manual'] == 0 and own['gt_cd2'] < 50 and invert_on == False and own['air_mover'] == False:
             #print("grind")    
             hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
             if grindold == 0:

pause.py

@@ -101,9 +101,11 @@ def main():
     #aBut = cont.sensors["aBut"]
     pstate = own["pstate"]
     scene = bge.logic.getCurrentScene()
+    dict = bge.logic.globalDict
     resume = scene.objects["resume"]
     settings = scene.objects["settings"]
     level = scene.objects["level"]
+    dict['level'] = level
     levelselect = scene.objects["levelselect"]
     restart = scene.objects["restart"]
     exit = scene.objects["exit"]