diff --git a/astar.py b/astar.py index 802abe5..d506962 100644 --- a/astar.py +++ b/astar.py @@ -57,8 +57,12 @@ def _is_occupied(self,cell_coord): return False def _add_swamp(self, mouse_pos): - #insert swamp code here. - pass + swamp_coord = (mouse_pos[0]/50, mouse_pos[1]/50) + if self._is_occupied(swamp_coord): + if self.actors[swamp_coord].unremovable == False: + self.actors.pop(swamp_coord, None) + else: + self.actors[swamp_coord] = ObstacleTile( swamp_coord, self, './images/swamp.jpg', is_unpassable=False, terrain_cost=3) def _add_lava(self, mouse_pos): lava_coord = (mouse_pos[0]/50, mouse_pos[1]/50) @@ -66,7 +70,7 @@ def _add_lava(self, mouse_pos): if self.actors[lava_coord].unremovable == False: self.actors.pop(lava_coord, None) else: - self.actors[lava_coord] = ObstacleTile( lava_coord, self, './images/lava.jpg', is_unpassable = True, terrain_cost = 0) + self.actors[lava_coord] = ObstacleTile( lava_coord, self, './images/lava.jpg', is_unpassable=True, terrain_cost=0) def get_terrain_cost(self, cell_coord): try: @@ -91,14 +95,16 @@ def main_loop(self): elif event.type is pygame.MOUSEBUTTONDOWN: if self.add_tile_type == 'lava': self._add_lava(event.pos) - #insert swamp code here + if self.add_tile_type == 'swamp': + self._add_swamp(event.pos) elif event.type is pygame.KEYDOWN: if event.key == pygame.K_SPACE: self.paul.run_astar(self.cake.cell_coordinates, self) self.paul.get_path() elif event.key == pygame.K_l: self.add_tile_type = 'lava' - #insert swamp code here + elif event.key == pygame.K_s: + self.add_tile_type = 'swamp' class Actor(object): def __init__(self, cell_coordinates, world, image_loc, unremovable = False, is_obstacle = True): @@ -142,10 +148,10 @@ def f_cost(self): return self.g_cost + self.h_cost def draw(self): - COST_TO_DRAW = '' - #COST_TO_DRAW = self.g_cost - #COST_TO_DRAW = self.h_cost - #COST_TO_DRAW = self.f_cost + # COST_TO_DRAW = '' + # COST_TO_DRAW = self.g_cost + # COST_TO_DRAW = self.h_cost + COST_TO_DRAW = self.f_cost line_width = 2 rect = pygame.Rect((self.coordinates[0],self.coordinates[1]),(self.dimensions[0],self.dimensions[1])) pygame.draw.rect(self.draw_screen, self.color, rect, line_width) @@ -167,8 +173,11 @@ def get_h_cost(self, coord_a,coord_b): def get_open_adj_coords(self, coords): """returns list of valid coords that are adjacent to the argument, open, and not in the closed list.""" #modify directions and costs as needed - directions = [(1,0),(0,1),(-1,0),(0,-1)] - costs = [1,1,1,1] + straight_directions = [(1,0),(0,1),(-1,0),(0,-1)] + diagonal_directions = [(1,1),(-1,1),(1,-1),(-1,-1)] + jump_directions = [(2,0),(0,2),(-2,0),(0,-2)] + directions = straight_directions + diagonal_directions + jump_directions + costs = [1,1,1,1,3,3,3,3,8,8,8,8] adj_coords = map(lambda d: self.world._add_coords(coords,d), directions) for i, coord in enumerate(adj_coords): costs[i] += self.world.get_terrain_cost(coord) diff --git a/screenshots/diagonals.png b/screenshots/diagonals.png new file mode 100644 index 0000000..0b58377 Binary files /dev/null and b/screenshots/diagonals.png differ diff --git a/screenshots/f.png b/screenshots/f.png new file mode 100644 index 0000000..3e1ab13 Binary files /dev/null and b/screenshots/f.png differ diff --git a/screenshots/g.png b/screenshots/g.png new file mode 100644 index 0000000..7fece82 Binary files /dev/null and b/screenshots/g.png differ diff --git a/screenshots/h.png b/screenshots/h.png new file mode 100644 index 0000000..1a29f57 Binary files /dev/null and b/screenshots/h.png differ diff --git a/screenshots/hops.png b/screenshots/hops.png new file mode 100644 index 0000000..aa8b6e5 Binary files /dev/null and b/screenshots/hops.png differ diff --git a/screenshots/swamps.png b/screenshots/swamps.png new file mode 100644 index 0000000..726d9db Binary files /dev/null and b/screenshots/swamps.png differ