diff --git a/Findings.pdf b/Findings.pdf new file mode 100644 index 0000000..e33a343 Binary files /dev/null and b/Findings.pdf differ diff --git a/README.md b/README.md index 12ba001..c528776 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # ToolBox-AI -Al and Algorithms Project Toolbox starter code +Al and Algorithms Project Toolbox starter code, modified for assignment completion by Duncan Hall. Findings.pdf contains the rest of the assignment. Full instructions at https://sites.google.com/site/sd16spring/home/project-toolbox/home-project-toolbox-algorithms-and-ai diff --git a/astar.py b/astar.py index 802abe5..ede70b1 100644 --- a/astar.py +++ b/astar.py @@ -58,7 +58,14 @@ def _is_occupied(self,cell_coord): 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) @@ -91,14 +98,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 + elif 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): @@ -143,9 +152,9 @@ def f_cost(self): 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 = 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 +176,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] + directions = [ + (1,0),(0,1),(-1,0),(0,-1), # walking + (1,1),(-1,1),(1,-1),(-1,-1), # diagonal walking + (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)