turn tweaks

config.ini

@@ -54,9 +54,9 @@ character = annie
 
 shirt_logo = 2
 
-shirt_color_r = 0.69
-shirt_color_g = 0.05
-shirt_color_b = 0
+shirt_color_r = 0.29
+shirt_color_g = 0.31
+shirt_color_b = 0.28
 
 shoe_color_r = 0.73
 shoe_color_g = 0.73
@@ -143,7 +143,7 @@ pump_downforce = -0.0
 man_sens_l = 0.03
 man_sens_r = 0.08
 man_sens_side = 0.035
-turn_rotation = 0.02
+turn_rotation = 0.0175
 turn_addx = 0.004
 turn_air_rotation = 0.07
 grass_mult = 0.98

scripts/actionPlayer.py

@@ -198,7 +198,7 @@ def check_exit(aState, rA, timer, ac):
 	fe = getattr(ac, 'fef')
 	rv = ''
 	
-	print('rA, aState', rA, aState, force, fe, timer)
+	#print('rA, aState', rA, aState, force, fe, timer)
 	if rA in exits:
 		rv = rA
 	#

scripts/controller2.py

@@ -1920,6 +1920,9 @@ def main():
         #speed = .004
         speed = dict['turn_addx']
         manual = 0
+        multer = abs(round(((round(lLR, 2) * 100) / 8), 1))
+        if dict['kb_ra'] == 2 or dict['kb_la'] == 2:
+            multer = 1
         if own['manual_v2'] == 1:
             manual = 1
             if abs(linVelocity.x) < 2:
@@ -1938,55 +1941,63 @@ def main():
         turnVel = .01
     #light
     #if manual and grindhit = true
-        if lLR > turnsens and lLR < (turnsens * 1.3) and (grindHit == False or (manual == 1 and grindHit == True)):
-            rotation = [0.0, 0.0, (-rotamt)]
-            local = False # use world axis
-            own.applyRotation( rotation, local)
-
-            if onGround:
-                #print("light turn")
-                if STANCE == 0:
-                    own.setLinearVelocity([linVelocity2.x - speed, linVelocity2.y, linVelocity2.z], 1)
-                if STANCE == 1:
-                    own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 1)
-        if lLR < -turnsens and lLR > (turnsens * -1.3) and (grindHit == False or (manual == 1 and grindHit == True)):
-            rotation = [0.0, 0.0, rotamt]
-            local = False # use world axis
-            own.applyRotation( rotation, local)
-
-            if onGround:
-                #print("light turn")
-                if STANCE == 0:
-                    own.setLinearVelocity([linVelocity2.x - speed, linVelocity2.y, linVelocity2.z], 1)
-                if STANCE == 1:
-                    own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 1)
+        # if lLR > turnsens and lLR < (turnsens * 1.3) and (grindHit == False or (manual == 1 and grindHit == True)):
+        #     rotation = [0.0, 0.0, (-rotamt)]
+        #     local = False # use world axis
+        #     #own.applyRotation( rotation, local)
+
+        #     if onGround:
+        #         #print("light turn")
+        #         if STANCE == 0:
+        #             own.setLinearVelocity([linVelocity2.x - speed, linVelocity2.y, linVelocity2.z], 1)
+        #         if STANCE == 1:
+        #             own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 1)
+        # if lLR < -turnsens and lLR > (turnsens * -1.3) and (grindHit == False or (manual == 1 and grindHit == True)):
+        #     rotation = [0.0, 0.0, rotamt]
+        #     local = False # use world axis
+        #     #own.applyRotation( rotation, local)
+
+        #     if onGround:
+        #         #print("light turn")
+        #         if STANCE == 0:
+        #             own.setLinearVelocity([linVelocity2.x - speed, linVelocity2.y, linVelocity2.z], 1)
+        #         if STANCE == 1:
+        #             own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 1)
     #medium
-        if (lLR > (turnsens * 1.3) or dict['kb_ra'] == 2) and (grindHit == False or (manual == 1 and grindHit == True)):
+        max_amt = 3
+        if (lLR > (turnsens * 1) or dict['kb_ra'] == 2) and (grindHit == False or (manual == 1 and grindHit == True)):
             #turn left
             if rot.z < .4:
-                rotation = [0.0, 0.0, (-rotamt * 5)]
+                rotation = [0.0, 0.0, ((-rotamt * 5) * multer)]
             if rot.z < .6 and rot.z > .4:
-                rotation = [0.0, 0.0, (-rotamt * 2)]
+                rotation = [0.0, 0.0, ((-rotamt * 2) * multer)]
             else:
-                rotation = [0.0, 0.0, (-rotamt * 1.6)]
+                rotation = [0.0, 0.0, ((-rotamt * 1.6) * multer)]
             local = True # use world axis
             own.applyRotation( rotation, local)
+            print('rotation = ', rotation)
             if onGround:
                 #print("med turn")
                 if STANCE == 0:
                     own.setLinearVelocity([linVelocity2.x - speed, linVelocity2.y - turnVel, linVelocity2.z], 1)
                 if STANCE == 1:
                     own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y - turnVel, linVelocity2.z], 1)
-        if (lLR < (-turnsens * 1.3) or dict['kb_la'] == 2) and (grindHit == False or (manual == 1 and grindHit == True)):
-            #turn right
+        elif (lLR < (-turnsens * 1) or dict['kb_la'] == 2) and (grindHit == False or (manual == 1 and grindHit == True)):
+            #turn right                     
+            #vert     
             if rot.z < .4:
-                rotation = [0.0, 0.0, (rotamt * 5)]
+                rotation = [0.0, 0.0, ((rotamt * 5) * multer)]
+            #near vert    
             if rot.z < .6 and rot.z > .4:
-                rotation = [0.0, 0.0, (rotamt * 2)]
+                rotation = [0.0, 0.0, ((rotamt * 2) * multer)]
+                
+            #normal    
             else:
-                rotation = [0.0, 0.0, (rotamt * 1.6)]
+                rotation = [0.0, 0.0, ((rotamt * 1.6) * multer)]
+    
             local = True # use world axis
             own.applyRotation( rotation, local)
+            print('rotation = ', rotation)
             if onGround:
                 #print("med turn")
                 if STANCE == 0:

scripts/grindV2.py

@@ -716,7 +716,7 @@ def main():
                                 stre = .15
                                 #own.alignAxisToVect(hitNormal, 2, stre)
                             #own.worldPosition = [nearpos.x, nearpos.y, nearpos.z + .2975]
-                            own.worldPosition.lerp(own.worldPosition, nearpos, .1)
+                            own.worldPosition.lerp(own.worldPosition, nearpos, .025)
                             print('new moving world')
                     
     else: