|
@@ -187,14 +187,14 @@ def main():
|
187
|
187
|
|
188
|
188
|
#setable
|
189
|
189
|
MAX_VEL = dict['MAX_VEL']
|
190
|
|
- SPEEDUP = .055
|
191
|
|
- SPEEDPUMP = .14 #.09
|
192
|
|
- SPEEDPUMPFAST = .16 #.13
|
193
|
|
- PUMP_SPEED_SENS = .4
|
194
|
|
- PUMP_SENS = .98
|
195
|
|
- ACCEL = 10
|
196
|
|
- CRUISE = 9
|
197
|
|
- COUNTDOWN = 20 #pump and speed stuff
|
|
190
|
+ SPEEDUP = dict['SPEEDUP']
|
|
191
|
+ SPEEDPUMP = dict['SPEEDPUMP']
|
|
192
|
+ SPEEDPUMPFAST = dict['SPEEDPUMPFAST']
|
|
193
|
+ PUMP_SPEED_SENS = dict['PUMP_SPEED_SENS']
|
|
194
|
+ PUMP_SENS = dict['PUMP_SENS']
|
|
195
|
+ ACCEL = dict['ACCEL']
|
|
196
|
+ CRUISE = dict['CRUISE']
|
|
197
|
+ COUNTDOWN = dict['COUNTDOWN'] #pump and speed stuff
|
198
|
198
|
JUMPHEIGHT = dict['JUMPHEIGHT'] #775#750
|
199
|
199
|
JUMPSTRENGTH = 0
|
200
|
200
|
own['flip_manual_stance'] = 0
|
|
@@ -832,7 +832,7 @@ def main():
|
832
|
832
|
velocity = own['velocity']
|
833
|
833
|
#switch
|
834
|
834
|
local = True
|
835
|
|
- downforce = -.1
|
|
835
|
+ downforce = dict['pump_downforce']
|
836
|
836
|
lF_air_frame = own['lF_air_frame']
|
837
|
837
|
frames_since_ground = own['framenum'] - own['lF_air_frame']
|
838
|
838
|
if linVelocity.x < MAX_VEL and linVelocity.x >= -0 and STANCE == 1 and grindHit == False and frames_since_ground > 30 and own['last_manual_v2'] == 0:
|
|
@@ -1588,6 +1588,7 @@ def main():
|
1588
|
1588
|
distance = own.getDistanceTo(gray.hitPosition)
|
1589
|
1589
|
since_grind_buf = 3
|
1590
|
1590
|
if gray.hitObject != None and grindDar2.triggered == False and (frame - lgf) > since_grind_buf:
|
|
1591
|
+ #add or colliding
|
1591
|
1592
|
if distance < .5:
|
1592
|
1593
|
own.alignAxisToVect(gray.hitNormal, 2, .1)
|
1593
|
1594
|
elif distance >= .5 and distance < 1.75:
|