|
@@ -243,10 +243,10 @@ def main():
|
243
|
243
|
balance = 0
|
244
|
244
|
#print(balance)
|
245
|
245
|
#if ground_since > 0 and ground_since < 5 and jump_timer < 30:
|
246
|
|
- if ground_since > -1 and ground_since < 2000000:
|
|
246
|
+ if ground_since > -1 and ground_since < 200:
|
247
|
247
|
#print(balance, 'balance')
|
248
|
|
- sens = 2
|
249
|
|
- sens2 = .6
|
|
248
|
+ sens = 1.8
|
|
249
|
+ sens2 = .2
|
250
|
250
|
sens3 = 1.2
|
251
|
251
|
if balance > sens or balance < - sens:
|
252
|
252
|
#fall
|
|
@@ -4579,17 +4579,19 @@ def main():
|
4579
|
4579
|
Distance = -2
|
4580
|
4580
|
End = Vector.copy(own.worldPosition + (own.worldOrientation.col[Axis]*Distance))
|
4581
|
4581
|
Start = Vector.copy(own.worldPosition)
|
4582
|
|
- localRay_v = own.rayCast(End, Start, 0, 'vert', 1, 0, 0)
|
|
4582
|
+ localRay_v = own.rayCast(End, Start, 0, 'vert', 1, 0, 0, 61439)
|
4583
|
4583
|
if localRay_v[0] and own['LAST_GRIND'] == False and rBump == 0 and ((own['framenum'] - own['last_transition_frame'] < 10) or (own['framenum'] - own['last_vert_frame'] < 10)):
|
4584
|
4584
|
own['vert'] = 1
|
|
4585
|
+ print('vert hit')
|
4585
|
4586
|
own['last_vert_frame'] = own['framenum']
|
4586
|
4587
|
localHitDist = Vector.copy(Start - localRay_v[1]).length
|
4587
|
4588
|
own.linearVelocity.x *= .98
|
4588
|
4589
|
own.linearVelocity.z = .1
|
4589
|
4590
|
#if localHitDist < .8 and (dict['lUD'] < .04 or dict['lUD'] > -.04):
|
4590
|
|
- if localHitDist < .8:
|
|
4591
|
+ #if localHitDist < .8:
|
|
4592
|
+ if localHitDist < 1.5:
|
4591
|
4593
|
#own.applyMovement((0,0,((.4 - (localHitDist) * .1))), True)
|
4592
|
|
- own.applyMovement((0, 0, (.4 - localHitDist)), True)
|
|
4594
|
+ own.applyMovement((0, 0, (.3 - localHitDist)), True)
|
4593
|
4595
|
#print('moving vert ray')
|
4594
|
4596
|
if localRay_v[2] != [0, 0, -1] and grindHit == 0:
|
4595
|
4597
|
#if localRay_v[2] != [0,0,-1]:
|
|
@@ -4621,10 +4623,9 @@ def main():
|
4621
|
4623
|
aligned = True
|
4622
|
4624
|
print('rayb hit')
|
4623
|
4625
|
|
4624
|
|
- #print(raytof, raytob)
|
4625
|
4626
|
|
4626
|
4627
|
if not aligned:
|
4627
|
|
- own.alignAxisToVect([0.0, 0.0, 1.0], 2, .03)
|
|
4628
|
+ own.alignAxisToVect([0.0, 0.0, 1.0], 2, .00003)
|
4628
|
4629
|
|
4629
|
4630
|
if own.linearVelocity.x > 12:
|
4630
|
4631
|
own.linearVelocity.x = 12
|
|
@@ -4664,3 +4665,5 @@ def main():
|
4664
|
4665
|
elif land_overRideRb == True:
|
4665
|
4666
|
own['requestAction'] = 'fak_landRb'
|
4666
|
4667
|
print('requesting unbalanced land2b')
|
|
4668
|
+ if own['requestAction'] in ['fak_land', 'reg_land', 'fak_landL', 'reg_landR', 'fak_landRb', 'reg_landLb']:
|
|
4669
|
+ own['lland'] = own['requestAction']
|