3-12-18

Manager.py

@@ -126,6 +126,12 @@ def main():
             own["playbackBroken"] = False
             freecam.worldPosition = own.worldPosition
             followcam.worldPosition = own.worldPosition
+            cube['grindcement_vol'] = 0
+            cube['grindcement_pitch'] = 0
+            cube['grindrail_vol'] = 0
+            cube['grindrail_pitch'] = 0 
+            cube['sroll_vol'] = 0
+            cube['sroll_pitch'] = 0             
             
 
         if own["playback"]:

controller2.py

@@ -160,6 +160,7 @@ def main():
     if r_ground.triggered: own['wallride_off'] = 0
     own['pop_sound'] = 0
     own['land_sound'] = 0
+    own['revert_sound'] = 0
     #own['fall'] = 0 
 
     #joystick location timers
@@ -310,6 +311,10 @@ def main():
         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
             print("fall: ", playing_frame, own['jump_timer'])
+            if STANCE == 0:
+                own['requestAction'] = 'reg_fall1'
+            if STANCE == 1:
+                own['requestAction'] = 'fak_fall1'                
     check_fall()
     def check_landing():
         lf_ground = own["lF_ground"]
@@ -2416,7 +2421,8 @@ def main():
         else:
             own['requestAction'] = 'revert1'            
         own['revert_timer'] = 20 
-        cont.activate(own.actuators["revertSound"])      
+        cont.activate(own.actuators["revertSound"]) 
+        own['revert_sound'] = 1     
     def revert2():
         own["Q3oncdl"] = 0
         own["Q4oncdl"] = 0
@@ -2441,7 +2447,8 @@ def main():
         else:     
             own['requestAction'] = 'revert2'       
         own['revert_timer'] = 20 
-        cont.activate(own.actuators["revertSound"])         
+        cont.activate(own.actuators["revertSound"])   
+        own['revert_sound'] = 1      
     def revert3():
         own["Q7oncdl"] = 0
         own["Q8oncdl"] = 0
@@ -2467,7 +2474,8 @@ def main():
         else:       
             own['requestAction'] = 'revert3' 
         own['revert_timer'] = 20 
-        cont.activate(own.actuators["revertSound"])      
+        cont.activate(own.actuators["revertSound"]) 
+        own['revert_sound'] = 1     
     def revert4():
         own["Q7oncdl"] = 0
         own["Q8oncdl"] = 0
@@ -2493,7 +2501,8 @@ def main():
             own['requestAction'] = 'revert4'
             print("normal revert")        
         own['revert_timer'] = 20 
-        cont.activate(own.actuators["revertSound"])       
+        cont.activate(own.actuators["revertSound"]) 
+        own['revert_sound'] = 1      
 
     def powerslide():
         own['powerslide_counter'] = own['powerslide_counter'] + 1

walk.py

@@ -332,6 +332,12 @@ def onboard():
         fliplay = 301
         fliplay2 = 302 
         fliplay3 = 303
+        own['grindcement_vol'] = 0
+        own['grindcement_pitch'] = 0
+        own['grindrail_vol'] = 0
+        own['grindrail_pitch'] = 0 
+        own['sroll_vol'] = 0
+        own['sroll_pitch'] = 0                 
         try:
             vel = own['offboard_vel']
             vel = [velx, vel.y, vel.z]           
@@ -398,27 +404,7 @@ def getonboard():
         #camera.max = 1.25
         #cont.activate(cam.actuators['Camera']) 
         
-        deckact = deck.actuators["Visibility"]
-        trucksact = trucks.actuators["Visibility"]
-        wheel1act = wheel1.actuators["Visibility"]
-        wheel2act = wheel2.actuators["Visibility"]
-        wheel3act = wheel3.actuators["Visibility"]
-        wheel4act = wheel4.actuators["Visibility"]        
-        deckact.visibility = True
-        trucksact.visibility = True
-        wheel1act.visibility = True
-        wheel2act.visibility = True
-        wheel3act.visibility = True
-        wheel4act.visibility = True  
-        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']) 
-        own['throw_deck'] = False 
-        throw_deck_empty = scene.objects["throw_deck_empty"]
-        throw_deck_empty['kill_deck'] = 1 
+
         fliplay3 = fliplay2 + 1 
         if dropinCol.positive == True: 
                        
@@ -482,7 +468,30 @@ def getonboard():
         fliplay3 = 6000 
         onboard_speed = .1                                      
         own['getonboard'] = 0 
-    if yBut == False and lasty == True:
+    if (yBut == False and lasty == True) or yBut == True and dropinCol.positive:
+        
+        deckact = deck.actuators["Visibility"]
+        trucksact = trucks.actuators["Visibility"]
+        wheel1act = wheel1.actuators["Visibility"]
+        wheel2act = wheel2.actuators["Visibility"]
+        wheel3act = wheel3.actuators["Visibility"]
+        wheel4act = wheel4.actuators["Visibility"]        
+        deckact.visibility = True
+        trucksact.visibility = True
+        wheel1act.visibility = True
+        wheel2act.visibility = True
+        wheel3act.visibility = True
+        wheel4act.visibility = True  
+        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']) 
+        own['throw_deck'] = False 
+        throw_deck_empty = scene.objects["throw_deck_empty"]
+        throw_deck_empty['kill_deck'] = 1 
+    if (yBut == False and lasty == True):               
         own['getonboard'] = 1       
 
 def nextframe():
@@ -745,9 +754,12 @@ def throwdeck_trigger():
 def fall():
     if own['fall'] == True:
         falldeck()
+        
         if STANCE == 1:
+            own['requestAction'] = 'fak_fall1'
             own.setLinearVelocity([3,2,0], True)
         else:
+            own['requestAction'] = 'reg_fall1'
             own.setLinearVelocity([-3,-2,0], True)    
         own['fall'] = False
 
@@ -1078,6 +1090,13 @@ if deck.visible:
     own['deckvis'] = 1
 else:
     own['deckvis'] = 0       
+
+if own['requestAction'] == 'empty' or own['requestAction'] == None:
+    if STANCE == 0:
+        own['requestAction'] = 'reg_idle1'
+    if STANCE == 1:
+        own['requestAction'] = 'fak_idle1'        
+    
                     
 onboard() 
 jump()