|
@@ -1281,7 +1281,7 @@ def main():
|
1281
|
1281
|
jump()
|
1282
|
1282
|
elif (STANCE == True) or ((grindHit == True or wallride != None) and STANCE == True):
|
1283
|
1283
|
own["wallride_off"] = 1
|
1284
|
|
- own['requestAction'] = 'fak_shuvit'
|
|
1284
|
+ own['requestAction'] = 'fak_fsshuvit'
|
1285
|
1285
|
if onGround:
|
1286
|
1286
|
jump()
|
1287
|
1287
|
if not onGround and STANCE == False:
|
|
@@ -1370,7 +1370,7 @@ def main():
|
1370
|
1370
|
jump()
|
1371
|
1371
|
elif (STANCE == True) or ((grindHit == True or wallride != None) and STANCE == True):
|
1372
|
1372
|
own["wallride_off"] = 1
|
1373
|
|
- own['requestAction'] = 'fak_fsshuvit'
|
|
1373
|
+ own['requestAction'] = 'fak_shuvit'
|
1374
|
1374
|
if onGround:
|
1375
|
1375
|
jump()
|
1376
|
1376
|
if not onGround and STANCE == False:
|
|
@@ -3051,6 +3051,16 @@ def main():
|
3051
|
3051
|
nollie_inward_heelflip()
|
3052
|
3052
|
sr.reset()
|
3053
|
3053
|
|
|
3054
|
+ #360 shuvit
|
|
3055
|
+ if sr.q3 > 0 and sr.q4 > 0 and sr.q5 > 0 and sr.q6 > 0 and sr.q7 > 0 and sr.q7 <= sr.q6 <= sr.q5 <= sr.q4 <= sr.q3:
|
|
3056
|
+ fsshuvit360()
|
|
3057
|
+ sr.reset()
|
|
3058
|
+
|
|
3059
|
+ #360 fs shuvit
|
|
3060
|
+ if sr.q3 > 0 and sr.q4 > 0 and sr.q5 > 0 and sr.q6 > 0 and sr.q7 > 0 and sr.q7 >= sr.q6 >= sr.q5 >= sr.q4 >= sr.q3:
|
|
3061
|
+ shuvit360()
|
|
3062
|
+ sr.reset()
|
|
3063
|
+
|
3054
|
3064
|
#nollie 360 shuvit
|
3055
|
3065
|
if sr.q7 > 0 and sr.q8 > 0 and sr.q1 > 0 and sr.q2 > 0 and sr.q3 > 0 and sr.q7 <= sr.q8 <= sr.q1 <= sr.q2 <= sr.q3:
|
3056
|
3066
|
nollie_shuvit360()
|
|
@@ -3087,16 +3097,6 @@ def main():
|
3087
|
3097
|
nollie_varial_heelflip()
|
3088
|
3098
|
sr.reset()
|
3089
|
3099
|
|
3090
|
|
- #360 shuvit
|
3091
|
|
- if sr.q3 > 0 and sr.q4 > 0 and sr.q5 > 0 and sr.q6 > 0 and sr.q7 > 0 and sr.q7 <= sr.q6 <= sr.q5 <= sr.q4 <= sr.q3:
|
3092
|
|
- shuvit360()
|
3093
|
|
- sr.reset()
|
3094
|
|
-
|
3095
|
|
- #360 fs shuvit
|
3096
|
|
- if sr.q3 > 0 and sr.q4 > 0 and sr.q5 > 0 and sr.q6 > 0 and sr.q7 > 0 and sr.q7 <= sr.q6 <= sr.q5 <= sr.q4 <= sr.q3:
|
3097
|
|
- fsshuvit360()
|
3098
|
|
- sr.reset()
|
3099
|
|
-
|
3100
|
3100
|
#ollie
|
3101
|
3101
|
if sr.q5 > 0 and sr.q1 > 0 and sr.q5 < sr.q1:
|
3102
|
3102
|
aollie()
|
|
@@ -3129,6 +3129,7 @@ def main():
|
3129
|
3129
|
|
3130
|
3130
|
#shuvit
|
3131
|
3131
|
if sr.q7 > 0 and sr.q5 > 0 and sr.q6 > 0 and sr.q5 <= sr.q6 <= sr.q7:
|
|
3132
|
+ print(sr.q3, sr.q4, sr.q5, sr.q6, sr.q7)
|
3132
|
3133
|
shuvit()
|
3133
|
3134
|
sr.reset()
|
3134
|
3135
|
|
|
@@ -4301,37 +4302,25 @@ def main():
|
4301
|
4302
|
aligned = False
|
4302
|
4303
|
#if localRay[0] or grindRay[0]:
|
4303
|
4304
|
if localRay[0]:
|
4304
|
|
-
|
4305
|
|
- #if grindRay[0] and not localRay[0]:
|
4306
|
|
- #localRay = grindRay
|
4307
|
4305
|
if 'transition' in localRay[0]:
|
4308
|
4306
|
own['transition'] = True
|
4309
|
4307
|
own['last_transition_frame'] = own['framenum']
|
4310
|
|
- #print('transition')
|
4311
|
4308
|
localHitDist = (own.worldPosition - localRay[1]).length
|
4312
|
|
- #print('gh', localHitDist)
|
4313
|
4309
|
if localHitDist < .4:
|
4314
|
4310
|
if own['jump_timer'] < 30:
|
4315
|
4311
|
own.localLinearVelocity.z *= .9
|
4316
|
4312
|
|
4317
|
|
- #if localHitDist < .287:
|
4318
|
4313
|
if localHitDist < .295:
|
4319
|
4314
|
if own['jump_timer'] < 30:
|
4320
|
4315
|
own.localLinearVelocity.z = 0
|
4321
|
4316
|
own.applyMovement((0, 0, (.295 - (localHitDist))), True)
|
4322
|
|
- #own.applyMovement((0, 0, (.32 - (localHitDist))), True)
|
4323
|
|
- #own.applyMovement((0, 0, (.5 - localHitDist)), True)
|
4324
|
|
- #print('moving new ray a')
|
4325
|
|
- #if localRay[2] != [0, 0, -1] and grindHit == 0:
|
|
4317
|
+
|
4326
|
4318
|
if localRay[2] != [0, 0, -1]:
|
4327
|
|
- #own.alignAxisToVect(localRay[2], 2, .25)
|
4328
|
4319
|
own.alignAxisToVect(localRay[2], 2, .5)
|
4329
|
4320
|
aligned = True
|
4330
|
|
- #print('localRay')
|
4331
|
4321
|
|
4332
|
4322
|
if localHitDist > .31 and localHitDist < 2:
|
4333
|
4323
|
own.alignAxisToVect(localRay[2], 2, .05)
|
4334
|
|
- #print('new align')
|
4335
|
4324
|
#else:
|
4336
|
4325
|
#print('no localRay')
|
4337
|
4326
|
else:
|
|
@@ -4373,7 +4362,7 @@ def main():
|
4373
|
4362
|
if localRay_v[0] and own['LAST_GRIND'] == False and rBump == 0 and lBump == 0 and ((own['framenum'] - own['last_transition_frame'] < 10) or (own['framenum'] - own['last_vert_frame'] < 10)):
|
4374
|
4363
|
own['vert'] = 1
|
4375
|
4364
|
print('vert hit')
|
4376
|
|
-
|
|
4365
|
+ ud_sens = .04
|
4377
|
4366
|
if 'spine' in localRay_v[0] and lUD < -.04:
|
4378
|
4367
|
print('spine hit!!!!!', lUD)
|
4379
|
4368
|
|
|
@@ -4382,27 +4371,57 @@ def main():
|
4382
|
4371
|
own.applyRotation([0,.15,0], True)
|
4383
|
4372
|
else:
|
4384
|
4373
|
own.applyRotation([0,-.15,0], True)
|
4385
|
|
- own.linearVelocity.x *= .97
|
4386
|
|
- elif lUD > -.04:
|
|
4374
|
+ own.linearVelocity.x *= .97
|
|
4375
|
+
|
|
4376
|
+ elif lUD > -ud_sens:
|
4387
|
4377
|
own['last_vert_frame'] = own['framenum']
|
4388
|
4378
|
localHitDist = Vector.copy(Start - localRay_v[1]).length
|
4389
|
4379
|
own.linearVelocity.x *= .98
|
4390
|
4380
|
own.linearVelocity.z = .1
|
|
4381
|
+
|
|
4382
|
+
|
|
4383
|
+
|
4391
|
4384
|
#if localHitDist < .8 and (dict['lUD'] < .04 or dict['lUD'] > -.04):
|
4392
|
4385
|
#if localHitDist < .8:
|
4393
|
|
- if localHitDist < 1.5:
|
4394
|
|
- #own.applyMovement((0,0,((.4 - (localHitDist) * .1))), True)
|
4395
|
|
- #own.applyMovement((0, 0, (.3 - localHitDist)), True)
|
4396
|
|
- #if localHitDist < 1.0:
|
4397
|
|
- own.applyForce((0, 0, (.4 - localHitDist) *1000), True)
|
4398
|
|
-
|
4399
|
|
- print('moving vert ray')
|
4400
|
|
- if localRay_v[2] != [0, 0, -1] and grindHit == 0:
|
4401
|
|
- #if localRay_v[2] != [0,0,-1]:
|
4402
|
|
- #own.alignAxisToVect(localRay_v[2], 2, .4)
|
4403
|
|
- own.alignAxisToVect(localRay_v[2], 2, .05)
|
|
4386
|
+
|
|
4387
|
+
|
|
4388
|
+
|
|
4389
|
+
|
|
4390
|
+
|
|
4391
|
+
|
|
4392
|
+
|
|
4393
|
+ # if localHitDist < 1.5:
|
|
4394
|
+ # #own.applyMovement((0,0,((.4 - (localHitDist) * .1))), True)
|
|
4395
|
+ # #own.applyMovement((0, 0, (.3 - localHitDist)), True)
|
|
4396
|
+ # #if localHitDist < 1.0:
|
|
4397
|
+ # own.applyForce((0, 0, (.4 - localHitDist) *1000), True)
|
|
4398
|
+
|
|
4399
|
+ # print('moving vert ray')
|
|
4400
|
+ # if localRay_v[2] != [0, 0, -1] and grindHit == 0:
|
|
4401
|
+ # #if localRay_v[2] != [0,0,-1]:
|
|
4402
|
+ # #own.alignAxisToVect(localRay_v[2], 2, .4)
|
|
4403
|
+ # own.alignAxisToVect(localRay_v[2], 2, .05)
|
|
4404
|
+ # aligned = True
|
|
4405
|
+
|
|
4406
|
+
|
|
4407
|
+
|
|
4408
|
+ #f localHitDist < .295:
|
|
4409
|
+ if localHitDist < .4:
|
|
4410
|
+ if own['jump_timer'] < 30:
|
|
4411
|
+ own.localLinearVelocity.z = 0
|
|
4412
|
+ own.applyMovement((0, 0, (.295 - (localHitDist))), True)
|
|
4413
|
+ #own.applyMovement((0, 0, (.35 - (localHitDist))), True)
|
|
4414
|
+ if localRay_v[2] != [0, 0, -1]:
|
|
4415
|
+ own.alignAxisToVect(localRay_v[2], 2, .5)
|
4404
|
4416
|
aligned = True
|
|
4417
|
+
|
|
4418
|
+ #elif lUD >= -ud_sens:
|
|
4419
|
+
|
|
4420
|
+
|
|
4421
|
+
|
|
4422
|
+
|
4405
|
4423
|
else:
|
|
4424
|
+ own.alignAxisToVect([0,0,1], 2, .1)
|
4406
|
4425
|
print('doing nothing')
|
4407
|
4426
|
#print(own['lGobj'], 'lGobj')
|
4408
|
4427
|
|