Przycisk Marta, skasowanie niepotrzebnych funkcji bota
This commit is contained in:
Sara Kowalska
parent
c6ab27d6a3
commit
77cf6a7ebd
@ -234,96 +234,6 @@ class Waiter(object):
|
|||||||
self.rotate = "forward"
|
self.rotate = "forward"
|
||||||
self.rotationNumber = 0
|
self.rotationNumber = 0
|
||||||
|
|
||||||
def moveRandomly(self, noWalkable):
|
|
||||||
rand = random.randrange(1, 5, 1) #losuje w zakresie 1-4
|
|
||||||
#print(rand)
|
|
||||||
|
|
||||||
if rand == 1:
|
|
||||||
self.dirnx = -1
|
|
||||||
self.dirny = 0
|
|
||||||
self.direction = 'left'
|
|
||||||
if self.pos[0] == 0 or ([self.pos[0] + self.dirnx, self.pos[1] + self.dirny] in noWalkable): #zabezpieczenie przed wyjściem bota poza obszar okna w ruchu losowym
|
|
||||||
self.dirnx *= (-1) #oraz w miejsce, na ktore nie moze wejsc (stoły, kuchania)
|
|
||||||
self.direction = 'right'
|
|
||||||
self.pos = [self.pos[0] + self.dirnx, self.pos[1] + self.dirny]
|
|
||||||
|
|
||||||
elif rand == 2:
|
|
||||||
self.dirnx = 1
|
|
||||||
self.dirny = 0
|
|
||||||
self.direction = 'right'
|
|
||||||
if self.pos[0] == 14 or ([self.pos[0] + self.dirnx, self.pos[1] + self.dirny] in noWalkable):
|
|
||||||
self.dirnx *= (-1)
|
|
||||||
self.direction = 'left'
|
|
||||||
self.pos = [self.pos[0] + self.dirnx, self.pos[1] + self.dirny]
|
|
||||||
|
|
||||||
elif rand == 3:
|
|
||||||
self.dirnx = 0
|
|
||||||
self.dirny = -1
|
|
||||||
if self.pos[1] == 0 or ([self.pos[0] + self.dirnx, self.pos[1] + self.dirny] in noWalkable):
|
|
||||||
self.dirny *= (-1)
|
|
||||||
self.pos = [self.pos[0] + self.dirnx, self.pos[1] + self.dirny]
|
|
||||||
|
|
||||||
elif rand == 4:
|
|
||||||
self.dirnx = 0
|
|
||||||
self.dirny = 1
|
|
||||||
if self.pos[1] == 14 or ([self.pos[0] + self.dirnx, self.pos[1] + self.dirny] in noWalkable):
|
|
||||||
self.dirny *= (-1)
|
|
||||||
self.pos = [self.pos[0] + self.dirnx, self.pos[1] + self.dirny]
|
|
||||||
|
|
||||||
def moveWithKeyboard(self, noWalkable): #funkcja testowa - bot sterowany z klawiatury
|
|
||||||
for event in pygame.event.get():
|
|
||||||
if event.type == pygame.QUIT:
|
|
||||||
pygame.quit()
|
|
||||||
quit()
|
|
||||||
|
|
||||||
keys = pygame.key.get_pressed()
|
|
||||||
|
|
||||||
for key in keys:
|
|
||||||
if keys[pygame.K_LEFT]:
|
|
||||||
self.dirnx = -1
|
|
||||||
self.dirny = 0
|
|
||||||
self.direction = 'left'
|
|
||||||
if self.pos[0] == 0 or ([self.pos[0] + self.dirnx, self.pos[1] + self.dirny] in noWalkable): # zabezpieczenie przed wyjściem bota poza obszar okna w ruchu losowym
|
|
||||||
#self.dirnx *= (-1)
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
self.pos = [self.pos[0] + self.dirnx, self.pos[1] + self.dirny]
|
|
||||||
break
|
|
||||||
# te break musiałam dodać, bo w przeciwnym wypadku zamiast jednego kroku robił 303 - jeden za drugim
|
|
||||||
# nie wiem dlaczego tak było, po zmianie sterowania z klawiatury na bota samego w sobie nie powinno
|
|
||||||
# być z tym problemów, to jest na razie tylko, żeby pokazać, że ten ruch jest
|
|
||||||
|
|
||||||
elif keys[pygame.K_RIGHT]:
|
|
||||||
self.dirnx = 1
|
|
||||||
self.dirny = 0
|
|
||||||
self.direction = 'right'
|
|
||||||
if self.pos[0] == 14 or ([self.pos[0] + self.dirnx, self.pos[1] + self.dirny] in noWalkable):
|
|
||||||
#self.dirnx *= (-1)
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
self.pos = [self.pos[0] + self.dirnx, self.pos[1] + self.dirny]
|
|
||||||
break
|
|
||||||
|
|
||||||
elif keys[pygame.K_UP]:
|
|
||||||
self.dirnx = 0
|
|
||||||
self.dirny = -1
|
|
||||||
if self.pos[1] == 0 or ([self.pos[0] + self.dirnx, self.pos[1] + self.dirny] in noWalkable):
|
|
||||||
#self.dirny *= (-1)
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
self.pos = [self.pos[0] + self.dirnx, self.pos[1] + self.dirny]
|
|
||||||
break
|
|
||||||
|
|
||||||
elif keys[pygame.K_DOWN]:
|
|
||||||
self.dirnx = 0
|
|
||||||
self.dirny = 1
|
|
||||||
if self.pos[1] == 14 or ([self.pos[0] + self.dirnx, self.pos[1] + self.dirny] in noWalkable):
|
|
||||||
#self.dirny *= (-1)
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
self.pos = [self.pos[0] + self.dirnx, self.pos[1] + self.dirny]
|
|
||||||
break
|
|
||||||
|
|
||||||
def resetPosition(self, pos):
|
def resetPosition(self, pos):
|
||||||
self.pos = pos
|
self.pos = pos
|
||||||
|
|
||||||
@ -538,6 +448,7 @@ def redrawWindow(surface):
|
|||||||
|
|
||||||
drawGrid(width, rows, surface)
|
drawGrid(width, rows, surface)
|
||||||
button("Rozpoznawanie talerzy", 0, width + 1, 198, 48, light_beige, white)
|
button("Rozpoznawanie talerzy", 0, width + 1, 198, 48, light_beige, white)
|
||||||
|
button("Ciężkostrawność dań", 200, width + 1, 198, 48, light_beige, white)
|
||||||
|
|
||||||
pygame.display.update()
|
pygame.display.update()
|
||||||
|
|
||||||
@ -634,11 +545,8 @@ def main():
|
|||||||
pygame.quit()
|
pygame.quit()
|
||||||
quit()
|
quit()
|
||||||
button("Rozpoznawanie talerzy", 0, width + 1, 198, 48, light_beige, white, classify)
|
button("Rozpoznawanie talerzy", 0, width + 1, 198, 48, light_beige, white, classify)
|
||||||
|
button("Ciężkostrawność dań", 200, width + 1, 198, 48, light_beige, white, "nazwa_funkcji")
|
||||||
redrawWindow(window)
|
redrawWindow(window)
|
||||||
#bot.moveRandomly()
|
|
||||||
#goal = (1, 3)
|
|
||||||
#bot.goByAStar(goal)
|
|
||||||
|
|
||||||
|
|
||||||
pygame.quit()
|
pygame.quit()
|
||||||
exit()
|
exit()
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user