[Balder-cvs] balder2d/bin/scripts/balderutil entity.py,1.2,1.3 probe.py,1.2,1.3

[Bjorn H. <hol...@us...>]

Update of /cvsroot/balder/balder2d/bin/scripts/balderutil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26152/bin/scripts/balderutil

Modified Files:
	entity.py probe.py 
Log Message:
fixed 
Probe-probe collisions to ignore exploding probes. added some more AI functionality, and made the ArtificialController::py_IsLineOfSight work better

Index: probe.py
===================================================================
RCS file: /cvsroot/balder/balder2d/bin/scripts/balderutil/probe.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** probe.py	20 Mar 2006 17:58:26 -0000	1.2
--- probe.py	21 Mar 2006 20:47:19 -0000	1.3
***************
*** 9,16 ****
    psyco.full()
  
! def AimAt(xloc, yloc, aiming, xtarget, ytarget):
      """ figure out how to turn to aim at the given target coordinates
      """
      # need these to be floats so that later divisions don't do integer division
      xaim = float(xtarget - xloc)
      yaim = float(ytarget - yloc)
--- 9,19 ----
    psyco.full()
  
! def AimProbeAt(probeToAim, xtarget, ytarget):
      """ figure out how to turn to aim at the given target coordinates
      """
      # need these to be floats so that later divisions don't do integer division
+     xloc = probeToAim['x']
+     yloc = probeToAim['y']
+     aiming = probeToAim['rotation_angle']
      xaim = float(xtarget - xloc)
      yaim = float(ytarget - yloc)

Index: entity.py
===================================================================
RCS file: /cvsroot/balder/balder2d/bin/scripts/balderutil/entity.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** entity.py	20 Mar 2006 06:40:30 -0000	1.2
--- entity.py	21 Mar 2006 20:47:19 -0000	1.3
***************
*** 35,42 ****
      for entity in entity_list:
          xtarget = math.fabs(x - entity['x'])
!         ytarget = math.fabs(y - entitp['y'])
          distance = xtarget**2 + ytarget**2
          if distance < closest_distance:
              closest_distance = distance
!             xent, yent = xtarget, ytarget
      return xent, yent
--- 35,50 ----
      for entity in entity_list:
          xtarget = math.fabs(x - entity['x'])
!         ytarget = math.fabs(y - entity['y'])
          distance = xtarget**2 + ytarget**2
          if distance < closest_distance:
              closest_distance = distance
!             xent, yent = entity['x'], entity['y']
      return xent, yent
+ 
+ def DistanceTo(x, y, entity):
+     """ returns the distance from the entity to the given point
+     """
+     xent = entity['x']
+     yent = entity['y']
+     return int(math.sqrt((x - xent)**2 + (y - yent)**2))
+  
\ No newline at end of file