Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added PaulGetsDiagonals.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added PaulGetsHops.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added PaulGetsSwamped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 16 additions & 8 deletions astar.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,13 @@ 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)
Expand Down Expand Up @@ -91,14 +96,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):
Expand Down Expand Up @@ -142,8 +149,8 @@ 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 = ''
COST_TO_DRAW = self.g_cost
#COST_TO_DRAW = self.h_cost
#COST_TO_DRAW = self.f_cost
line_width = 2
Expand All @@ -167,11 +174,12 @@ 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]
directions = [(1,0),(0,1),(-1,0),(0,-1),(1,1),(1,-1),(-1,-1),(-1,1),(2,0),(0,2),(-2,0),(0,-2)]
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)

in_bounds = [self.world._is_in_grid(c) and not self.world._is_occupied(c) and c not in self.closed_list for c in adj_coords]
adj_coords = [c for (idx,c) in enumerate(adj_coords) if in_bounds[idx]]
costs = [c for (idx,c) in enumerate(costs) if in_bounds[idx]]
Expand Down