Pathfinding for the hero is quite perfect now!

cheeseboys.py

@@ -263,7 +263,7 @@ def game():
         # BBB: can I check this in the enemy update method?
         if cblocals.global_controlsEnabled:
             for enemy in enemies.sprites():
-                if enemy.physical_rect.collidepoint(pygame.mouse.get_pos()):
+                if enemy.physical_rect.collidepoint(pygame.mouse.get_pos()) and hero.can_see_list.get(enemy.UID(),False):
                     hero.seeking = enemy
                     utils.changeMouseCursor(cblocals.IMAGE_CURSOR_ATTACK_TYPE)
                     break

cheeseboys/cblocals.py

@@ -84,5 +84,5 @@
 PATHFINDING_GRID_SIZE = (24,32) # as TILE_IMAGE_SIZE
 SHOW_FPS = True
 
-DEBUG = False
+DEBUG = True
 

cheeseboys/character/character.py

@@ -256,7 +256,7 @@ def hasNoFreeMovementTo(self, target, source=None):
         else:
             # I need a collide_rect traslated to the new source
             rx, ry = position_int[0]-int(source[0]), position_int[1]-int(source[1])
-            collide_rect = collide_rect.move(rx, ry)
+            collide_rect.move_ip(rx, ry)
         v = Vector2.from_points(source, target)
         magnitude = v.get_magnitude()
         heading = v.normalize()

cheeseboys/character/navpoint.py

@@ -64,21 +64,25 @@ def compute_path(self, target=None):
             target = self.get()
         if target:
             target_tuple = target.as_tuple()
+            target_is_free_point = level.checkPointIsFree(target_tuple)
+            target_is_free_slot = level.isPointOnFreeSlot(target_tuple)
             # Checking for a free slot to on the grid, to be the target of the pathfinding
-            free_near_slot = level.getFreeNearSlot(level.toGridCoord(target_tuple))
-            if free_near_slot:
-                target_tuple = level.fromGridCoord(free_near_slot)
-            if not level.checkPointIsFree(target_tuple) or not level.isPointOnFreeSlot(target_tuple):
-                # The character wanna move on a non free point, or onto a free point but in a non free gridmap slot: no path computed!
+            free_near_slot = None
+            if target_is_free_point and not target_is_free_slot:
+                free_near_slot = level.getFreeNearSlot(level.toGridCoord(target_tuple))
+            if not target_is_free_point or not target_is_free_slot and not free_near_slot:
+                # The character wanna move on a non-free point, or onto a free point but in a non free gridmap slot: no path computed!
                 self.computed_path = [target_tuple,]
                 return self.computed_path
             fromGridCoord = level.fromGridCoord
-            goal = level.toGridCoord(target_tuple)
+            if free_near_slot:
+                goal = free_near_slot
+            else:
+                goal = level.toGridCoord(target_tuple)
             temp_computed_path = [fromGridCoord(x) for x in character.pathfinder.compute_path(character.position_grid, goal)]
             # For a better animation I like to cut the last pathfinding step before the real navPoint;
             # this can lead to collision sometimes.
             if len(temp_computed_path)>2 and character.hasNoFreeMovementTo(target_tuple, source=temp_computed_path[-2]):
-                # BBB: fixme!
                 self.computed_path = temp_computed_path[1:] + [target_tuple,]
             else:
                 self.computed_path = temp_computed_path[1:-1] + [target_tuple,]

cheeseboys/level/grid_map_support.py

@@ -34,7 +34,7 @@ def fromGridCoord(self, coord):
         """Transforms a grid coordinate to a level absolute ones"""
         tile_size_x, tile_size_y = cblocals.PATHFINDING_GRID_SIZE
         x, y = coord
-        return x*tile_size_x+tile_size_x/2, y*tile_size_y+tile_size_y-1
+        return int(x*tile_size_x+tile_size_x/2), int(y*tile_size_y+tile_size_y/2)
 
     def drawGridMapSquares(self, surface):
         """Draw on a surface the gridmap areas, for debug purposes"""
@@ -59,16 +59,19 @@ def getFreeNearSlot(self, point):
         @return: The free slot coord, or None if no free slot is found.
         """
         grid_map = self.grid_map
-        if not grid_map.isBlocked(point):
-            return point
+        try:
+            if not grid_map.isBlocked(point):
+                return point
+        except IndexError:
+            blocked = True
         px, py = point
         for y,x in ( (-1,0), (0,1), (1,0), (0,-1),):
             try:
                 blocked = grid_map.isBlocked( (px+x,py+y) )
             except IndexError:
                 blocked = True
             if not blocked:
-                return (px+x,py+y)
+                return (px+x, py+y)
         return None
 
     # ******* methods needed to init a PathFinder object *******
@@ -98,7 +101,7 @@ def grid_map_successors(self, point):
                 blocked = True
             if not blocked:
                 # must check near non-diag points also
-                if (0,x) not in successors and (y,0) not in successors:
+                if (0,x) in successors and (y,0) in successors:
                     successors.append( (px+x,py+y) )
         return successors
 

cheeseboys/level/levels_database/the_south_bridge.py

@@ -46,9 +46,9 @@ def load(name, hero):
     level.addPhysicalBackground( (118,1338), (235, 1130) )
     level.addPhysicalBackground( (642,1338), (310, 1130) )
 
-    crate1 = Crate( (433, 788), 1, 0, physical, visual_obstacles)
+    crate1 = Crate( (433, 785), 1, 0, physical, visual_obstacles)
     level.addSprite(crate1)
-    crate2 = Crate( (370, 768), 1, 1, physical, visual_obstacles)
+    crate2 = Crate( (370, 765), 1, 1, physical, visual_obstacles)
     level.addSprite(crate2)
 
     level.addAnimations(((110,980),(623, 1284),(704, 1149),(30, 1299),(610, 869),(157, 527),(642, 357),(5, 363)), 'water-wave')