crap

co_ActionState.py

@@ -492,9 +492,9 @@ def main():
             requestAction = 'fak_land'  
 
         if l_actionState in ('reg_air_tail', 'reg_air_nose') and requestAction in ('fak_opos', 'fak_nopos'):
-            requestAction = 'fak_land'
+            requestAction = 'reg_land'
         if l_actionState in ('fak_air_tail', 'fak_air_nose') and requestAction in ('reg_opos', 'reg_nopos'):
-            requestAction = 'reg_land'            
+            requestAction = 'fak_land'            
                                                                                                                                                                                         
     else:
         print("action over written")               
@@ -1187,21 +1187,25 @@ def main():
 
             if requestAction == 'reg_push' and own['actionTimer'] == 0:
                 own['actionTimer'] = 70
+                actionState = 'reg_push'
                 skater.playAction("reg_push", 1,35, 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)
             if requestAction == 'reg_push_goof' and own['actionTimer'] == 0:
                 own['actionTimer'] = 70
+                actionState = 'reg_push_goof'
                 skater.playAction("reg_push_goof", 1,35, 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)
             if requestAction == 'fak_push' and own['actionTimer'] == 0:
                 own['actionTimer'] = 70
+                actionState = 'fak_push'
                 skater.playAction("fak_push", 1,35, 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)
             if requestAction == 'fak_push_goof' and own['actionTimer'] == 0:
                 own['actionTimer'] = 70
+                actionState = 'fak_push_goof'
                 skater.playAction("fak_push_goof", 1,35, 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)

controller2.py

@@ -312,6 +312,7 @@ def main():
             playing_frame = skater.getActionFrame(fliplay)
         if r_ground.triggered == True and skater.isPlayingAction(fliplay) and own['jump_timer'] < 40 and playing_frame < 14 and playing_frame > 3:
             own['fall'] = 1
+            own['last_fall_frame'] = frame
             print("fall: ", playing_frame, own['jump_timer'])
             if STANCE == 0:
                 #own['requestAction'] = 'reg_fall1'
@@ -997,41 +998,26 @@ def main():
         if linVelocity.x < .05 and linVelocity.x > -.05 and own["lastStop"] == True:
             own["lastStop"] == False       
 
-    def oposin():
-        if skater.isPlayingAction(30) or skater.isPlayingAction(31):
-            landing = 1
-        else:
-            landing = 0     
-        if (r_ground.triggered == 1) and STANCE == False and landing == 0 and own['manual'] == 0:
-            if grindold == 0:
-                own['requestAction'] = 'reg_opos'
-        elif (r_ground.triggered == 1) and STANCE == True and own['manual'] == 0:
-            if grindold == 0:
-                own['requestAction'] = 'fak_opos'
-        else:
-            killact(65)
-            killact(66)
-            killact(67)
-            killact(68)          
-        own["last_Opos"] = True
+    def oposin(): 
+        if ground_since > 30:       
+            if (r_ground.triggered == 1) and STANCE == False and own['manual'] == 0:
+                if grindold == 0:
+                    own['requestAction'] = 'reg_opos'
+            elif (r_ground.triggered == 1) and STANCE == True and own['manual'] == 0:
+                if grindold == 0:
+                    own['requestAction'] = 'fak_opos'
+         
+            own["last_Opos"] = True
         
-    def noposin():
-        if skater.isPlayingAction(30) or skater.isPlayingAction(31):
-            landing = 1
-        else:
-            landing = 0    
-        if (r_ground.triggered == 1) and STANCE == False and landing == 0 and own['manual'] == 0:
-            if grindold == 0:
-                own['requestAction'] = 'reg_nopos'
-        elif (r_ground.triggered == 1) and STANCE == True and own['manual'] == 0:
-            if grindold == 0:
-                own['requestAction'] = 'fak_nopos'
-        else:        
-            killact(71)
-            killact(72)
-            killact(73)
-            killact(74)         
-        own["last_nOpos"] = True    
+    def noposin():  
+        if ground_since > 30:
+            if (r_ground.triggered == 1) and STANCE == False and own['manual'] == 0:
+                if grindold == 0:
+                    own['requestAction'] = 'reg_nopos'
+            elif (r_ground.triggered == 1) and STANCE == True and own['manual'] == 0:
+                if grindold == 0:
+                    own['requestAction'] = 'fak_nopos'      
+            own["last_nOpos"] = True    
                 
     def aollie():
         print("ollie")

walk.py

@@ -77,6 +77,9 @@ cam = scene.objects["Camera.003"]
 freecam = scene.objects["freecam"]
 followcam = scene.objects["followcam"]
 
+control_bottom = scene.objects['control_bottom']
+cb = control_bottom.sensors['grindCol_bottom']
+
 noidle = 0
 
 if skater.isPlayingAction(460):  
@@ -1004,17 +1007,23 @@ def onground():
     if r_ground.positive:
         own['lF_ground_frame'] = own['framenum']
         if 'grind' in r_ground.hitObject:
-            own.applyForce([0,100,0], True)
-            print('moving away from rail')
+            if own['framenum'] - own['last_fall_frame'] < 60:
+                own.applyForce([0,100,0], True)
+                print('moving away from rail')
 
     else:
-        #print('in air')    
+        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' 
+    #if control bottom is touching ground object, turn ground on            
+    if cb.positive:
+        if own['framenum'] - own['lF_ground_frame'] > 30:
+            own['lF_ground_frame'] = own['framenum']
+                                    
                 
 onboard() 
 jump()