Merge AStar

This commit is contained in:
s450026 2020-04-29 20:56:54 +02:00
parent 6b6d7fc792
commit 8f80df7ce0
7 changed files with 14 additions and 15 deletions

Binary file not shown.

View File

@ -4,25 +4,25 @@ import pygame
class Graphics: class Graphics:
def __init__(self): def __init__(self):
self.image = { self.image = {
'floor': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/floor.jpg'), 'floor': pygame.image.load('./../resources/images/floor.jpg'),
# #
'wall': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/wall.png'), 'wall': pygame.image.load('./../resources/images/wall.png'),
# #
'bar': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/table3.png'), 'bar': pygame.image.load('./../resources/images/table3.png'),
'bar_floor': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/waiter-up.png'), 'bar_floor': pygame.image.load('./../resources/images/waiter-up.png'),
'table': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/table3.png'), 'table': pygame.image.load('./../resources/images/table3.png'),
'waiter_N': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/waiter-up.png'), 'waiter_N': pygame.image.load('./../resources/images/waiter-up.png'),
'waiter_S': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/waiter-down.png'), 'waiter_S': pygame.image.load('./../resources/images/waiter-down.png'),
'waiter_E': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/waiter-right.png'), 'waiter_E': pygame.image.load('./../resources/images/waiter-right.png'),
'waiter_W': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/waiter-left.png'), 'waiter_W': pygame.image.load('./../resources/images/waiter-left.png'),
# #
'chair_front': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/chair-front.png'), 'chair_front': pygame.image.load('./../resources/images/chair-front.png'),
# #
'chair_back': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/chair-back.png'), 'chair_back': pygame.image.load('./../resources/images/chair-back.png'),
# #
'chair_left': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/chair-left.png'), 'chair_left': pygame.image.load('./../resources/images/chair-left.png'),
# #
'chair_right': pygame.image.load('/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/images/chair-right.png') 'chair_right': pygame.image.load('./../resources/images/chair-right.png')
} }
self.block_size = 50 self.block_size = 50
self.height = 15 self.height = 15

View File

@ -17,7 +17,7 @@ class Matrix:
def set_default_restaurant(self, graphics): def set_default_restaurant(self, graphics):
lines = [line.rstrip('\n') for line in open( lines = [line.rstrip('\n') for line in open(
'/Users/marcindobrowolski/Desktop/Python/Sztuczna_Inteligencja_2020/resources/simulations/simulation_1.txt')] './../resources/simulations/simulation_1.txt')]
symbols = { symbols = {
'_': 'floor', '_': 'floor',
'W': 'wall', 'W': 'wall',

View File

@ -243,6 +243,5 @@ class Waiter(pygame.sprite.Sprite):
self.update('L', graphics) self.update('L', graphics)
graphics.update(self) graphics.update(self)
def getTotalCost(tile): def getTotalCost(tile):
return tile.totalCost return tile.totalCost