diff --git a/astar.py b/astar.py index 802abe5..7780202 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) @@ -91,14 +95,17 @@ 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): @@ -123,7 +130,7 @@ def draw(self): class ObstacleTile(Actor): def __init__(self, cell_coordinates, world, image_loc, terrain_cost=0, is_unpassable = True): - super(ObstacleTile, self).__init__(cell_coordinates, world, image_loc, unremovable = False, is_obstacle = is_unpassable) + super(ObstacleTile, self).__init__(cell_coordinates, world, image_loc, unremovable = False, is_obstacle = True) self.terrain_cost = terrain_cost class Cell(): @@ -143,9 +150,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 +174,8 @@ 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),(1,1),(0,1),(-1,1),(-1,0),(-1,-1),(0,-1),(1,-1),(2,0),(0,2),(-2,0),(0,-2)] + costs = [1,3,1,3,1,3,1,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/explaning_scores.md b/explaning_scores.md new file mode 100644 index 0000000..307be92 --- /dev/null +++ b/explaning_scores.md @@ -0,0 +1,4 @@ +g-scores is how many costs it take for Paul to get to a square. +h-score is how many cost it will take from that square to the cake. +f-score is the sum of g and h, and f-score is 18 if it's the shortest path. We can see from the f-score screenshot +that there are many shortest routes that Paul can choose from. diff --git a/f-score.png b/f-score.png new file mode 100644 index 0000000..d86c66d Binary files /dev/null and b/f-score.png differ diff --git a/g-score.png b/g-score.png new file mode 100644 index 0000000..21f0d9b Binary files /dev/null and b/g-score.png differ diff --git a/h-score.png b/h-score.png new file mode 100644 index 0000000..c430030 Binary files /dev/null and b/h-score.png differ