prepre_v2

scripts/grindV2.py

@@ -11,14 +11,11 @@ def main():
     player = cont.owner
     scene = bge.logic.getCurrentScene()
     dict = bge.logic.globalDict
-    #grindDar = cont.sensors['grindDar']
     grindEmpty = scene.objects['grindEmpty']
     grindDar = grindEmpty.sensors['grindDar2']
     rGround = cont.sensors['r_Ground']
     control_bottom = scene.objects['control_bottom']
-    #grindCol_bottom
     grindTouch = control_bottom.sensors['grindCol_bottom']
-    #grindTouch = cont.sensors['grindCol']
     invertCol = cont.sensors['invertCol']
     invertObjs = invertCol.hitObjectList
     invert_on = own['invert_on']
@@ -26,13 +23,11 @@ def main():
     lastObject = own['grindTrackObj']
     nearestObject = None
     minDist = None
-    #act = cont.actuators["Target"]
     test = own["test"]
     grindold = own["grindOld"]
     lgobj = own["lGobj"]
     countdown = own['grindCountdown']
-    #print(lgobj)
-    ray = cont.sensors["GuardDuty"] # get the ray sensor attached to the controller named GuardDuty
+    ray = cont.sensors["gRay"] # get the ray sensor attached to the controller named GuardDuty
     gt_cd = own["gt_cd"]
     pos = ray.hitPosition # get position where the game object hit by ray
     linVelocity = own.getLinearVelocity(False)
@@ -45,7 +40,6 @@ def main():
     xyz = own.worldOrientation.to_euler()
     rotz = math.degrees(xyz[2])
     roty = math.degrees(xyz[1])
-    #print(roty)
     roty = abs(roty)
     sub = 0
     align_strength = .1#.3
@@ -92,13 +86,6 @@ def main():
         no_grind = 0
         own['no_grind_timer'] -= 1
 
-    
-
-    # if frames_since_ground > 30 or since_jumped < 120:
-    #     no_grind = 0
-    # if jump_timer > 50:
-    #     no_grind = 1
-
     if (own['fak_nmanual'] == 1 or own['reg_nmanual'] == 1 or own['fak_manual'] == 1 or own['reg_manual'] == 1):
         manual = 1
     else:
@@ -155,6 +142,7 @@ def main():
         convely = vely
     else:
         convely = vely
+
     def grindvect(obj):
         STANCE = own['stance']
         if obj != None:
@@ -224,6 +212,7 @@ def main():
                 #print("-90 reg stance")
                 own['stance'] = 0
                 STANCE = 0
+
     def grindrotvel(obj):
         joinit = 0
         grinder_e = obj.worldOrientation.to_euler()
@@ -245,6 +234,7 @@ def main():
         negbsrot = [0.0, 0.0, -1.570796327]
         zvel = own.linearVelocity
         zvel = zvel.z * .95
+
         if grindold == 0:
             if rotz < 0:
                 rotz = rotz + 360
@@ -256,7 +246,7 @@ def main():
                 sub_converted = rotzb - rotz
 
         #z align
-        #print("zalign")
+
         stre = .15#.075#.15
         player.alignAxisToVect(grinder_vectz, 2, stre)
 
@@ -276,7 +266,6 @@ def main():
             player.setLinearVelocity([0, convely, zvel], 1)
             grindpos = "reg_board"
             grindyvect = "pos"
-            #print("bs1, don't switch")
 
         elif rot >= 90 and rot < 135:
             grinder_vect = grinder_vect * -1
@@ -430,7 +419,6 @@ def main():
                 try:
                     delta = player_pos - grinder_pos
                 except:
-                    #print("delta broke: ", player_pos, grinder_pos)
                     pass
                 delta = delta.cross(vect)
                 if delta[2] >= 0:
@@ -449,7 +437,7 @@ def main():
                     grinder_e = obj.worldOrientation.to_euler()
                     grinder_rotz = math.degrees(grinder_e[2])
                     deltamove = delta[2] * .3
-                    #print(round(deltamove, 4), "deltamove")
+
                     #5050
                     if own["grindpos"] == "reg_5050":
                         #print("missing delta")
@@ -554,7 +542,7 @@ def main():
         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 or dict['rBump'] == 1 or dict['lBump'] == 1):
             #print("grinding")
             grind_height_dif = (own.worldPosition[2] - nearestObject.worldPosition[2]) - .287
-            #worldPos = own.worldPosition
+
             if grind_height_dif > -.05:#02:
 
                 if own['grinder_rot'] != None:
@@ -564,8 +552,6 @@ def main():
                         print('skipping grind, angle is', dif)
                         skipper = 1
 
-
-                    #print((grot - own['grinder_rot']), 'grinder_rot')
                 own['grinder_rot'] = nearestObject.getAxisVect([1, 0, 0]).x
                 if skipper != 1:
                     grindvect(nearestObject)
@@ -581,12 +567,9 @@ def main():
                             if hitNormal != None:
                                 stre = .15
                                 own.alignAxisToVect(hitNormal, 2, stre)
-                                #print("align")
-                            #own.worldPosition = [nearpos.x, nearpos.y, nearpos.z + .2975]
-                            print('new moving world')
+
 
     else:
-        #grindold = False
         own['grindold_timer'] += 1
         own["grindHit"] = False
         own['inverting'] = False
@@ -625,7 +608,6 @@ def main():
         lgobj = ray.hitObject
         own['lGobj'] = lgobj
         obj = ray.hitObject
-        #prop = obj.get("property", None)
         linVelocity3 = own.getLinearVelocity(True)
         grindpos2 = own["grindpos"]
         if obj is not None:
@@ -662,9 +644,7 @@ def main():
                 nearestObject = obj
                 minDist = dist
         vect = nearestObject.getAxisVect([1.0, 0.0, 0.0])
-        #own.alignAxisToVect(vect, 0, 0)
         own.worldPosition = [nearestObject.worldPosition.x, nearestObject.worldPosition.y, nearestObject.worldPosition.z +.1]
-       #own.setLinearVelocity([0, 0.0, 0], 1)
 
     def set_pregrind_vel():
         if grindDar.triggered == False and ray.triggered == False:
@@ -691,29 +671,18 @@ def main():
             nearpos = obj.worldPosition
         except:
             pass
-    #if ray.triggered == False:
-        #own["nogrindsound"] = 1
+
     def slow_roty():
-      #print(abs(roty - own['last_roty']))
-      #print(roty)
 
-      #if roted > 5:
-        #pass
-        #align slow
         constraint = cont.actuators['gConstraint']
         if (own['framenum'] - own['grind_start_frame'] < 40) and touched == 1:
-          #print('limit rot')
-          #constraint.damp = 80
-        #else:
-          #constraint.damp = 30
-        #constraint.rotDamp = 80
             cont.activate(constraint)
         else:
             cont.deactivate(constraint)
     timer()
     aligntimer()
     stop_bounce()
-    slow_roty()
+    #slow_roty()
 
 
     own['grindOld'] = grindold
@@ -729,5 +698,3 @@ def main():
     set_pregrind_vel()
     own['last_z'] = own.worldPosition.z
     own["manual"] = manual
-
-