throws

co_ActionState.py

@@ -151,7 +151,18 @@ def main():
             deck.stopAction(loop_layer)
             skater.stopAction(trans_layer)
             trucks.stopAction(trans_layer)
-            deck.stopAction(trans_layer)                 
+            deck.stopAction(trans_layer)  
+            
+    if 'wall' in requestAction and actionTimer < 10:
+        actionTimer = 0
+        own['actionTimer'] = 0
+        skater.stopAction(flip_layer)
+        trucks.stopAction(flip_layer)
+        deck.stopAction(flip_layer)
+        skater.stopAction(trans_layer)
+        trucks.stopAction(trans_layer)
+        deck.stopAction(trans_layer)        
+                                   
             
     #check last actionState to see if an out action is needed    
     if requestAction not in jump_overrideList:

controller2.py

@@ -4081,6 +4081,14 @@ def main():
     if framenum - lF_air_frame > 30:
         own['no_grind_pull'] = 0
 
+    def wallhit():
+        linvelx = linVelocity.x
+        lastx = own["linvelx"]
+        if frames_since_ground > 20 and (abs(lastx) - abs(linvelx)) > .5:
+            print('::::::wallhit')
+            force = (linVelocity.x * -.7, linVelocity.y, linVelocity.z )                    
+            own.setLinearVelocity(force, True)        
+
     jump_Timer()
     check_landing()
     nextframe()
@@ -4100,7 +4108,8 @@ def main():
     grindout_cleanup()
     air_mover()
     dropinRotate()    
-    onboard()    
+    onboard()   
+    #wallhit() 
     linvelx = own.getLinearVelocity(True)
 
     own["linvelx"] = linvelx.x

walk.py

@@ -251,15 +251,15 @@ elif lup == 1 and aBut == 1 and yBut == False and (r_ground.positive or own['sta
 else:
     vel = own.getLinearVelocity(True)
     cont.deactivate(own.actuators["walkondirt"])
-    if stance == 0:
-        cont.deactivate(skater.actuators['aWalk'])
-        cont.deactivate(deck.actuators['a_reg_walk'])
-        cont.deactivate(trucks.actuators['a_reg_walk'])        
+#    if stance == 0:
+#        cont.deactivate(skater.actuators['aWalk'])
+#        cont.deactivate(deck.actuators['a_reg_walk'])
+#        cont.deactivate(trucks.actuators['a_reg_walk'])        
 
-    if stance == 1:
-        cont.deactivate(skater.actuators['aWalk_fak'])
-        cont.deactivate(deck.actuators['a_fak_walk'])
-        cont.deactivate(trucks.actuators['a_fak_walk'])        
+#    if stance == 1:
+#        cont.deactivate(skater.actuators['aWalk_fak'])
+#        cont.deactivate(deck.actuators['a_fak_walk'])
+#        cont.deactivate(trucks.actuators['a_fak_walk'])        
 
 #in air        
 if lup == 1 and r_ground.positive == False:
@@ -267,7 +267,7 @@ if lup == 1 and r_ground.positive == False:
     if stance == 0:
         cont.deactivate(own.actuators['forward'])
         cont.deactivate(own.actuators['forward2'])
-        cont.deactivate(skater.actuators['aWalk'])
+        #cont.deactivate(skater.actuators['aWalk'])
         killact(4)
         killact(5)
         killact(6)
@@ -277,7 +277,7 @@ if lup == 1 and r_ground.positive == False:
     if stance == 1:    
         cont.deactivate(own.actuators['backward'])
         cont.deactivate(own.actuators['backward2'])
-        cont.deactivate(skater.actuators['aWalk_fak'])
+        #cont.deactivate(skater.actuators['aWalk_fak'])
         killact(4)
         killact(5)
         killact(6)
@@ -682,7 +682,7 @@ def falldeck():
     cont.activate(wheel3.actuators['Visibility'])
     cont.activate(wheel4.actuators['Visibility']) 
 
-def throwdeck():
+def throwdeck(strength, ud):
     throw_deck_empty = scene.objects["throw_deck_empty"]
     deckact = deck.actuators["Visibility"]
     trucksact = trucks.actuators["Visibility"]
@@ -700,12 +700,19 @@ def throwdeck():
         wheel3act.visibility = False
         wheel4act.visibility = False
         act = throw_deck_empty.actuators['throw_dec_act']
+        hard = strength * .08
+
+        if hard > 9:
+            hard = 9
+        ud = ud * 4
+
+        own['bbut_timer'] = 0
         if STANCE == True:
             own['requestAction'] = 'fak_throw'
-            act.linearVelocity = [0.0, 5.0, 5.0]
+            act.linearVelocity = [0.0, ud, hard]
         if STANCE == False:
             own['requestAction'] = 'fak_throw'
-            act.linearVelocity = [0.0, 5.0, -5.0]  
+            act.linearVelocity = [0.0, ud, -hard]  
         cont.activate(act)
     else:
         own['throw_deck'] = False    
@@ -715,23 +722,25 @@ def throwdeck():
         wheel2act.visibility = True
         wheel3act.visibility = True
         wheel4act.visibility = True
-        throw_deck_empty['kill_deck'] = 1 
-        #print("trying to kill deck")     
+        throw_deck_empty['kill_deck'] = 1     
     cont.activate(deck.actuators['Visibility'])
     cont.activate(trucks.actuators['Visibility'])
     cont.activate(wheel1.actuators['Visibility'])
     cont.activate(wheel2.actuators['Visibility'])
     cont.activate(wheel3.actuators['Visibility'])
-    cont.activate(wheel4.actuators['Visibility'])    
-        
+    cont.activate(wheel4.actuators['Visibility'])            
 def throwdeck_trigger():
     lastb = own['lastb']
     throw_deck_empty = scene.objects["throw_deck_empty"]
+    if bBut == True:
+        own['bbut_timer'] += 1
+        ud = (rUD * 10) +1
     if bBut == False:
         throw_deck_empty['kill_deck'] = 0
     if bBut == False and own['lastb'] == True:        
-        #print("throw deck")
-        throwdeck()        
+        strength = own['bbut_timer']
+        ud = (rUD * 10) +1
+        throwdeck(strength, ud)        
               
 def fall():
     if own['fall'] == True: