Merge branch 'physics_updates_2018' of Shuvit-Org/shuvit into dev

tis what it tis

.gitignore

@@ -40,5 +40,5 @@ Thumbs.db
 ######################
 *.blend1
 shuvit_working.blend
-.pyc
-replay.dat
+*.pyc
+*replay.dat

assets/ground_tiles.blend

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5722ddc1fd5506ed0edf2a1eaebff9235ce1e0f6d493083b6d7978a48d57cfa0
-size 362010796
+oid sha256:9a2e2a33d6ac41ce916e90fb32558ccd8731ba489fbdb8d09ca0d0451cca5914
+size 244357568

assets/sc.blend

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:991b78d9292032bb795a33fe3a753a09b3469acb608e80fe1e9e0f9eb83a17f9
-size 8618540
+oid sha256:b435dd53ddd57602bd250de6ea3d4539a372c5ba88df92cf4c33d340e2c8067a
+size 8596056

config.ini

@@ -20,7 +20,7 @@ music_player = 1
 
 #level
 ######
-level = user1
+level = user2
 #------------
 
 #replay recorder
@@ -48,41 +48,41 @@ walk_focal_length = 14
 #character settings
 ###################
 
-character = becky
+character = annie
 
-shirt_logo = 3
+shirt_logo = 5
 
-shirt_color_r = 0.61
-shirt_color_g = 0.61
-shirt_color_b = 0.61
+shirt_color_r = 0
+shirt_color_g = 0.16
+shirt_color_b = 0
 
-shoe_color_r = 0.16
-shoe_color_g = 0.02
+shoe_color_r = 0.08
+shoe_color_g = 0.05
 shoe_color_b = 0.02
 #-----------------
 
 #deck settings
 ##############
-deck_index = 2
-deck_color_r = 1
-deck_color_g = 1.0
-deck_color_b = 1
-trucks_r = 0.95
-trucks_g = 1.0
-trucks_b = 1
-
-wheel1_r = 0.4
-wheel1_g = 0.08
-wheel1_b = 0.08
-wheel2_r = 0.08
-wheel2_g = 0.34
-wheel2_b = 0.08
-wheel3_r = 0.08
-wheel3_g = 0.08
-wheel3_b = 0.54
-wheel4_r = 0.4
-wheel4_g = 0.37
-wheel4_b = 0.08
+deck_index = 7
+deck_color_r = 0.28
+deck_color_g = 0.1
+deck_color_b = 0
+trucks_r = 0
+trucks_g = 0.41
+trucks_b = 0
+
+wheel1_r = 0.31
+wheel1_g = 0.16
+wheel1_b = 0
+wheel2_r = 0.31
+wheel2_g = 0.16
+wheel2_b = 0
+wheel3_r = 0.31
+wheel3_g = 0.16
+wheel3_b = 0
+wheel4_r = 0.31
+wheel4_g = 0.16
+wheel4_b = 0
 #-------------------
 
 #2d filter settings
@@ -90,7 +90,7 @@ wheel4_b = 0.08
 
 #brightness / contrast
 bc = 1
-BC_BRIGHTNESS = 1.0
+BC_BRIGHTNESS = 1.05
 BC_CONTRAST = 1.0
 
 #HDR
@@ -117,8 +117,8 @@ FXAA_SPAN_MAX = 8.0
 
 #sun settings
 #############
-sun_strength = 0.15
-ambient_strength = 1.25
+sun_strength = 1.05
+ambient_strength = 0.35
 sun_rot_x = -0.05
 sun_rot_y = -0.05
 shadow_on = 0

scripts/controller2.py

@@ -1811,11 +1811,6 @@ def main():
             wheel3.playAction("roll2.001", 20,1, layer=2, play_mode=1, speed=2)
             wheel4.playAction("roll3.001", 20,1, layer=2, play_mode=1, speed=2)
             wheel1.playAction("roll4.001", 20,1, layer=2, play_mode=1, speed=2) 
-
-    def transspeed():
-        num1 = .1
-        num2 = .4
-        speed = 20
         
     def turn():   
         #rotamt = .02
@@ -1837,7 +1832,9 @@ def main():
         if lUD > turnsens or lUD < -turnsens:
             own["turnud"] = 1
         else:
-            own["turnud"] = 0        
+            own["turnud"] = 0
+
+        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)):       
@@ -1876,9 +1873,9 @@ def main():
             if r_ground.triggered == True:
                 #print("med turn")
                 if STANCE == 0:   
-                    own.setLinearVelocity([linVelocity2.x - speed, linVelocity2.y, linVelocity2.z], 1)
+                    own.setLinearVelocity([linVelocity2.x - speed, linVelocity2.y - turnVel, linVelocity2.z], 1)
                 if STANCE == 1:   
-                    own.setLinearVelocity([linVelocity2.x + speed, linVelocity2.y, linVelocity2.z], 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
             if rot.z < .4:
@@ -2628,10 +2625,10 @@ def main():
     air() 
     stance()
     turn()
-    rotmult()
+    #rotmult()
     airup()
     onramp()
-    speedmult()
+    #speedmult()
     coping()
     resetjumpstance()
     grass()
@@ -3603,7 +3600,7 @@ def main():
             if STANCE == 0:
                 yvel *= -1
             try:    
-                dist = r_ground.hitObject.worldPosition - own.worldPosition
+                #dist = r_ground.hitObject.worldPosition - own.worldPosition
                 #print('ground dist', dist)
                 if own.linearVelocity.y > .01 or own.linearVelocity.y < -.01:
                     own.applyRotation([0,0,yvel], True)
@@ -3614,10 +3611,21 @@ def main():
                 pass       
         else:    
             if r_ground.triggered and touched == False and grindHit == 0 and frames_since_grinding > 20:    
-                linVelocity4 = own.getLinearVelocity(True)
-                newy = linVelocity4.y * ylimit   
-                force = [linVelocity4.x, newy, linVelocity4.z]
-                own.setLinearVelocity(force, True) 
+            #     linVelocity4 = own.getLinearVelocity(True)
+            #     newy = linVelocity4.y * ylimit   
+            #     force = [linVelocity4.x, newy, linVelocity4.z]
+            #     own.setLinearVelocity(force, True) 
+                yvel = own.linearVelocity.y
+                yvel = yvel *.03
+                if STANCE == 0:
+                    yvel *= -1
+                try:    
+                    if own.linearVelocity.y > .01 or own.linearVelocity.y < -.01:
+                        own.applyRotation([0,0,yvel], True)
+                    
+                except:
+                    pass 
+
         #print(ylimit, 'ylimit')       
 
     def getoffboard():
@@ -3934,6 +3942,9 @@ def main():
             cont.deactivate(own.actuators['grindoutRight'])
             cont.deactivate(own.actuators['grindoutLeft'])  
         if (LAST_GRIND == True and jumping == None and sincegrinding > 20 and ground_since > 20) or own['invert_on'] == True and LAST_GRIND == 1:
+
+        #own['grindTouch']      
+
             outloc = 0.022
             bsoutloc = .07
             bsoutvel = .1
@@ -4304,7 +4315,7 @@ def main():
     onboard()   
     #wallhit() 
     linvelx = own.getLinearVelocity(True)
-    land_boost()
+    #land_boost()
     own["linvelx"] = linvelx.x
     LAST_STANCE = STANCE
     LAST_STANCE = own["stance"]
@@ -4342,10 +4353,52 @@ def main():
     own["last_sel"] = own["sel"]
     own["sel"] = bkBut  
 
-    if r_ground.triggered and own["jump_timer"] < 20:
+    if r_ground.triggered and own["jump_timer"] < 20 and own['rotz'] > .65:
         force2 = [0.0, 0, dict['antibounce']]
-        own.applyForce(force2, True)
+        #own.applyForce(force2, True)
+
+        gdist = ((own.worldPosition.z - r_ground.hitPosition[2]))  
+        #print(gdist)
+        if gdist < .2875 and gdist > .1:
+            #move = 2.875 - gdist
+            move = (.2875 - gdist)*.33
+            #move = (own.worldPosition.z + gdist)
+            if move > 0:
+                own.worldPosition.z = own.worldPosition.z + move
+            else:
+                own.worldPosition.z = own.worldPosition.z - move    
+            own.linearVelocity.z = 0
+           
+
+    Axis = 2 
+    Distance = -10
+    # X axis is zero
+    # Y is 1
+    # Z is 2
+    End = own.worldPosition + (own.worldOrientation.col[Axis]*Distance)
+    Start = own.worldPosition
+    localRay = own.rayCast(End,Start,0,'ground',1,0,0)
+    #print(localRay)
+    if localRay[0]:
+        localHitDist = (own.worldPosition - localRay[1]).length
+        #print(localHitDist)
+        #print(localRay[2])
+        if localHitDist < .287:
+            own.localPosition[2] += (.287 - localHitDist)
+            if localRay[2] != [0,0,-1] and grindHit == 0:
+                own.alignAxisToVect(localRay[2], 2, .5)
+                #print('moving local')
+
+
+    #rend = bge.render
+    #rend.drawLine(Start, End, [1,0,0,1])
+    #print(own['rotz'])
+
+    if own.linearVelocity.x > 10:
+        own.linearVelocity.x = 10
     if (grindDar == False and r_ground.triggered and own['grindTouch'] == False) or own['jump_timer'] > 40:
         own['grindType'] = ''
     
-    dict['walk'] = 0  
+    dict['walk'] = 0  
+
+    print(own["LAST_GRIND"])

scripts/grindV2.py

@@ -540,15 +540,15 @@ def main():
         #print(lastobj.worldPosition)
         if dist < grind_dist and dropin == 0 and manual == 0 and no_grind == 0 and own['grindoutturn'] == 0 and own['manual'] == 0 and own['gt_cd2'] < 40 and invert_on == False and own['air_mover'] == False and no_grind_pull == 0 and own['last_invert'] == False and own['grindjumpturn'] == 0 and grind_jump == 0 and own['airup'] == 0:
             #print('grind')      
-            hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
-            if grindold == 0:     
-                if grindTouch.triggered:
-                    nearpos = nearestObject.worldPosition
-                    if hitNormal != None:
-                        stre = .45
-                        own.alignAxisToVect(hitNormal, 2, stre) 
+            # hitObject, hitPoint, hitNormal = own.rayCast(nearestObject.worldPosition, own.worldPosition, .0, 'grind')
+            # if grindold == 0:     
+            #     if grindTouch.triggered:
+            #         nearpos = nearestObject.worldPosition
+            #         if hitNormal != None:
+            #             stre = .45
+            #             own.alignAxisToVect(hitNormal, 2, stre) 
                         #print("align")                   
-                    own.worldPosition = [nearpos.x, nearpos.y, nearpos.z + .2975]
+                    #own.worldPosition = [nearpos.x, nearpos.y, nearpos.z + .2975]
                     #print('moving world')
             #print("grinding")
             grind_height_dif = (own.worldPosition[2] - nearestObject.worldPosition[2]) - .287

scripts/walk.py

@@ -667,6 +667,8 @@ def main(cont):
             own["spawn_stance"] = stance   
     def falldeck():
         throw_deck_empty = scene.objects["throw_deck_empty"]
+        throw_deck_empty.worldPosition.y += .5
+        throw_deck_empty.worldPosition.x += .5
         deckact = deck.actuators["Visibility"]
         trucksact = trucks.actuators["Visibility"]
         wheel1act = wheel1.actuators["Visibility"]
@@ -788,11 +790,12 @@ def main(cont):
             falldeck()        
             if STANCE == 1:
                 own['requestAction'] = 'fak_air-walk_air'            
-                own.setLinearVelocity([3,2,0], True)
+                #own.setLinearVelocity([3,2,0], True)
             else:
                 own['requestAction'] = 'reg_air-walk_air'
-                own.setLinearVelocity([-3,-2,0], True)    
+                #own.setLinearVelocity([-3,-2,0], True)    
             own['fall'] = False
+            own.worldPosition.z += .3
 
     def sit():
         #turn off sit
@@ -1105,7 +1108,8 @@ def main(cont):
             own['lF_ground_frame'] = own['framenum']
             if 'grind' in r_ground.hitObject:
                 if own['framenum'] - own['last_fall_frame'] < 90:
-                    own.applyForce([0,100,0], True)
+                    #own.applyForce([0,100,0], True)
+                    pass
                     #print('moving away from rail')
                     
             yvel = own.linearVelocity.y
@@ -1216,7 +1220,25 @@ def main(cont):
     if own['requestAction'] == 'reg_walkFast_nb' and own.linearVelocity.x > (wts * -1):
         own['requestAction'] = 'reg_walk_nb' 
     if own['requestAction'] == 'fak_walkFast_nb' and own.linearVelocity.x < wts:
-        own['requestAction'] = 'fak_walk_nb'                         
+        own['requestAction'] = 'fak_walk_nb'   
+
+
+    if r_ground.triggered:
+        #force2 = [0.0, 0, dict['antibounce']]
+        #own.applyForce(force2, True)
+
+        gdist = ((own.worldPosition.z - r_ground.hitPosition[2]))  
+        #print(gdist)
+        if gdist < .3 and gdist > .1:
+            #move = 2.875 - gdist
+            move = (.3 - gdist)*.5
+            #move = (own.worldPosition.z + gdist)
+            if move > 0:
+                own.worldPosition.z = own.worldPosition.z + move
+            else:
+                own.worldPosition.z = own.worldPosition.z - move    
+            own.linearVelocity.z = 0        
+
     onboard() 
     jump()
     dropin()

shuvit.blend

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2a6cee59049ae4f760ee3d6ca3d0270335b6ed7422cf02346bbf3729cf009e5d
-size 180312212
+oid sha256:89a7916e8f873d5e06151821952acee98d9265847c3e5feb48fb0791cf129373
+size 180306096