|
@@ -2093,7 +2093,7 @@ def grind():
|
2093
|
2093
|
lif = frame - own['last_invert_frame']
|
2094
|
2094
|
if own['LAST_GRIND'] == False and grindHit == True:
|
2095
|
2095
|
own['grindstartFrame'] = own['framenum']
|
2096
|
|
- print(own['grindstartFrame'])
|
|
2096
|
+ #print(own['grindstartFrame'])
|
2097
|
2097
|
if grindHit == True and own['invert_on'] == 0 and own['footplant_on'] == False and own['manual'] == 0 and lif > 40 and own['dropinTimer'] < 30:
|
2098
|
2098
|
gblend = 1
|
2099
|
2099
|
if LAST_GRIND == 0:
|
|
@@ -2877,7 +2877,7 @@ if (rTrig > 0.02 and GRAB_ON == False and r_ground.triggered == 1) or (lTrig > 0
|
2877
|
2877
|
else:
|
2878
|
2878
|
own["lastPump"] = False
|
2879
|
2879
|
own["Pump"] = False
|
2880
|
|
-
|
|
2880
|
+own['jump_stance'] = STANCE
|
2881
|
2881
|
if rUD > .02:
|
2882
|
2882
|
grindpos = own['grindpos']
|
2883
|
2883
|
jumpstance = own["jump_stance"]
|
|
@@ -2932,19 +2932,15 @@ if rUD > .02:
|
2932
|
2932
|
grindtype("fak_tailg")
|
2933
|
2933
|
|
2934
|
2934
|
|
2935
|
|
-elif q5oncd > 0:
|
|
2935
|
+if q5oncd > 0:
|
2936
|
2936
|
q5on = 0
|
2937
|
2937
|
q5oncd = q5oncd - 1
|
2938
|
|
- own["Q5oncd"] = q5oncd
|
2939
|
|
- killact(65)
|
2940
|
|
- killact(66)
|
2941
|
|
- killact(67)
|
2942
|
|
- killact(68)
|
|
2938
|
+ own["Q5oncd"] = q5oncd
|
2943
|
2939
|
own["last_Opos"] = False
|
2944
|
2940
|
#q1
|
2945
|
2941
|
if rUD < -0.070:
|
2946
|
2942
|
if q2on == 0 and q8on == 0:
|
2947
|
|
- #print("q1on")
|
|
2943
|
+ print("q1on")
|
2948
|
2944
|
q1on = 1
|
2949
|
2945
|
q1oncd = countdown
|
2950
|
2946
|
own["Q1oncd"] = q1oncd
|
|
@@ -3000,17 +2996,21 @@ if rUD < -0.020:
|
3000
|
2996
|
grindtype("reg_noseslide")
|
3001
|
2997
|
if STANCE == 1:
|
3002
|
2998
|
grindtype("fak_noseslide")
|
|
2999
|
+
|
|
3000
|
+if rUD > -0.020 and rUD <= .020 and LAST_GRIND == False:
|
|
3001
|
+ if own['grindpos'] == 'reg_5050':
|
|
3002
|
+ grindtype("reg_5050")
|
|
3003
|
+ if own['grindpos'] == 'fak_5050':
|
|
3004
|
+ grindtype("fak_5050")
|
|
3005
|
+
|
|
3006
|
+
|
3003
|
3007
|
|
3004
|
|
-elif q1oncd > 0:
|
|
3008
|
+if q1oncd > 0:
|
3005
|
3009
|
q1on = 0
|
3006
|
3010
|
q1oncd = q1oncd - 1
|
3007
|
3011
|
own["Q1oncd"] = q1oncd
|
3008
|
|
- killact(73)
|
3009
|
|
- killact(74)
|
3010
|
|
- killact(71)
|
3011
|
|
- killact(72)
|
3012
|
3012
|
own["last_nOpos"] = False
|
3013
|
|
-
|
|
3013
|
+#print(q1oncd)
|
3014
|
3014
|
#q7
|
3015
|
3015
|
if rLR < -0.070:
|
3016
|
3016
|
if q8on == 0 and q6on == 0:
|
|
@@ -3926,6 +3926,7 @@ def grind_turn():
|
3926
|
3926
|
cont.deactivate(own.actuators['grindoutRight'])
|
3927
|
3927
|
cont.deactivate(own.actuators['grindoutLeft'])
|
3928
|
3928
|
if grindHit == True and jumping == None and sincegrinding > 20:
|
|
3929
|
+ #if grindHit == True and jumping == None:
|
3929
|
3930
|
outloc = 0.022
|
3930
|
3931
|
bsoutloc = .07
|
3931
|
3932
|
bsoutvel = .1
|
|
@@ -4313,8 +4314,13 @@ own["sel"] = bkBut
|
4313
|
4314
|
if r_ground.triggered and own["jump_timer"] < 20:
|
4314
|
4315
|
force2 = [0.0, 0, -10]
|
4315
|
4316
|
own.applyForce(force2, True)
|
4316
|
|
-
|
4317
|
|
-if grindDar == False:
|
|
4317
|
+#print('grindtouch = ', own['grindTouch'])
|
|
4318
|
+if grindDar == False and r_ground.triggered and own['grindTouch'] == False:
|
4318
|
4319
|
own['grindType'] = ''
|
|
4320
|
+<<<<<<< HEAD
|
4319
|
4321
|
print('hello gogs')
|
4320
|
|
-#print(own['grindType'])
|
|
4322
|
+#print(own['grindType'])
|
|
4323
|
+=======
|
|
4324
|
+
|
|
4325
|
+
|
|
4326
|
+>>>>>>> f88ff84d3eadbe0637efc182134be268550e7644
|