z123 - sat stuff

controller2.py

@@ -3483,12 +3483,12 @@ def invert():
         if own['invert_on'] == 1 and own['last_invert'] == False:
             #killall()
             cont.activate(own.actuators['invertOn_sound'])
-            if STANCE == False:
+            if STANCE == True:
                 own['invert_type'] = "reg_back_invert_in"
             #     skater.playAction("reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1) 
             #     deck.playAction("a_reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1)
             #     trucks.playAction("a_reg_back_invert_in", 10,30, layer=303, play_mode=0, speed=1) 
-            if STANCE == True:
+            if STANCE == False:
                 own['invert_type'] = "fak_fr_invert"
             #     skater.playAction("fak_fr_invert", 10,30, layer=303, play_mode=0, speed=1) 
             #     deck.playAction("a_fak_fr_invert", 10,30, layer=303, play_mode=0, speed=1)
@@ -3533,6 +3533,9 @@ def invert():
     lif = own['last_invert_frame'] 
     if frame - lif > 3 and invert_on == 0:
         own['invert_type'] = None
+        
+    if grindHit == False:
+        own['invert_on'] = False    
 invert() 
 footplant()
     
@@ -3577,11 +3580,22 @@ def reset_pos():
 
 
    
-#start button    
+#start button
+#print(own['last_stBut'])
+#print(own['pause_on'])    
 if stBut == True:
     own.actuators["sroll"].volume = .0001
     cont.deactivate(own.actuators["sroll"])
     own.actuators["sroll"].stopSound()
+if stBut == False and own['last_stBut'] == True:
+    if own['pause_on'] == True:
+        own['pause_on'] = False
+        own.restoreDynamics()     
+    else:
+        own['pause_on'] = True
+        own.suspendDynamics()            
+    
+own['last_stBut'] = stBut
      
 def ylimit():
     lgf = own['last_grind_frame']
@@ -3905,7 +3919,8 @@ def grind_turn():
     jumping = None
     gotcd = 25
     force = [0,0,0]
-    grindHit = own['grindTouch']      
+    grindHit = own['grindTouch'] 
+    #print("grindHit: ", grindHit)     
     sincegrinding = own['framenum']  - own['grindstartFrame']
     STANCE = own['stance']
     if rUD > turnsens or rLR > turnsens or rUD < -turnsens or rLR < -turnsens:
@@ -3913,7 +3928,7 @@ def grind_turn():
     if grindHit == False:
         cont.deactivate(own.actuators['grindoutRight'])
         cont.deactivate(own.actuators['grindoutLeft'])   
-    if grindHit == True and jumping == None and sincegrinding > 20:
+    if (grindHit == True and jumping == None and sincegrinding > 20)or own['invert_on'] == True:
     #if grindHit == True and jumping == None:
         outloc = 0.022
         bsoutloc = .07
@@ -3971,13 +3986,13 @@ def grind_turn():
             if lq5on == 1:
                 if own['gt_cd2'] == 0:
                     own['gt_cd2'] = 60                 
-                if own['grind_stance'] == True:
+                if STANCE == True:
                     if own['footplant_on'] == True:
                         own.setLinearVelocity([(outvel.x + -bsoutvel), outvel.y, outvel.z], 1)
                         cont.activate(own.actuators["grindoutRight"])                   
                     if own['grind_out_type'] == None:
                          own['grind_out_type'] = 'bs fak back'                     
-                if own['grind_stance'] == False:
+                if STANCE == False:
                     if own['footplant_on'] == True:
                         own.setLinearVelocity([(outvel.x + bsoutvel), outvel.y, outvel.z], 1)
                         cont.activate(own.actuators["grindoutRight"]) 
@@ -3988,13 +4003,13 @@ def grind_turn():
             if lq1on == 1:
                 if own['gt_cd2'] == 0:
                     own['gt_cd2'] = 60                 
-                if own['grind_stance'] == True:
+                if STANCE == True:
                     if own['footplant_on'] == True:                   
                         own.setLinearVelocity([(outvel.x + bsoutvel), outvel.y, outvel.z], 1)
                         cont.activate(own.actuators["grindoutRight"])
                     if own['grind_out_type'] == None:
                          own['grind_out_type'] = 'bs fak forward'                                            
-                if own['grind_stance'] == False:
+                if STANCE == False:
                     if own['footplant_on'] == True:                    
                         own.setLinearVelocity([(outvel.x + -bsoutvel), outvel.y, outvel.z], 1)
                         cont.activate(own.actuators["grindoutRight"])

grindV2.py

@@ -16,6 +16,7 @@ def main():
     #grindTouch = cont.sensors['grindCol']
     invertCol = cont.sensors['invertCol']
     invertObjs = invertCol.hitObjectList
+    invert_on = own['invert_on']
     detectedObjects = grindDar.hitObjectList
     lastObject = own['grindTrackObj']
     nearestObject = None
@@ -217,7 +218,7 @@ def main():
 
 
         if rot >= 45 and rot < 90:  
-                             
+            #90 degrees CW about z-axis: (x, y, z) -> (y, -x, z)                 
             player.alignAxisToVect(grinder_vect, 0, align_strength) 
             grindvect = "pos"
             player.applyRotation(bsrot, 1)
@@ -507,6 +508,21 @@ def main():
             
     #else:
         #own['grind_rot'] = None 
+        
+    def invertpos(detectedObjects):
+        minDist = None
+        nearestObject = None
+        for obj in detectedObjects:
+            dist = own.getDistanceTo(obj)
+            if (minDist is None or dist < minDist):
+                nearestObject = obj
+                minDist = dist
+        if nearestObject != None:        
+            vect = nearestObject.getAxisVect( [1.0, 0.0, 0.0])
+        #own.alignAxisToVect(vect, 0, 0)
+            own.worldPosition = [nearestObject.worldPosition.x, nearestObject.worldPosition.y, nearestObject.worldPosition.z +.1]
+            #own.setLinearVelocity([0, 0.0, 0], 1)                    
+        
                
             
     
@@ -525,9 +541,13 @@ def main():
         
 #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@        
         #init grind
+        
+        if invert_on:
+            invertpos(detectedObjects)
+            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:
+        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 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
@@ -545,7 +565,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:
+        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:
             #print("grind")    
             hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
             if grindold == 0: