|
@ -43,9 +43,9 @@ def nextSquare(passenger, grid): |
|
|
candidati = [] |
|
|
candidati = [] |
|
|
for i in mooreNeighbourhood(passenger.curr): |
|
|
for i in mooreNeighbourhood(passenger.curr): |
|
|
if manhattanDistance(passenger.dest, i) < manhattanDistance(passenger.dest, passenger.curr): |
|
|
if manhattanDistance(passenger.dest, i) < manhattanDistance(passenger.dest, passenger.curr): |
|
|
if grid[passenger.curr[0]][passenger.curr[1]].typ == SquareType.SEAT: |
|
|
# if grid[passenger.curr[0]][passenger.curr[1]].typ == SquareType.SEAT and i[1] != passenger.curr[1] and False: |
|
|
candidati.append(passenger.curr[0], passenger.curr[1] + 1) |
|
|
if grid[passenger.curr[0]][passenger.curr[1]].typ == SquareType.SEAT and i[1] != passenger.curr[1]: |
|
|
candidati.append(passenger.curr[0], passenger.curr[1] - 1) |
|
|
pass |
|
|
else: |
|
|
else: |
|
|
candidati.append(i) |
|
|
candidati.append(i) |
|
|
for i in candidati: |
|
|
for i in candidati: |
|
@ -90,8 +90,8 @@ def tick(): |
|
|
print() |
|
|
print() |
|
|
print("---") |
|
|
print("---") |
|
|
if toad < len(passengers): |
|
|
if toad < len(passengers): |
|
|
grid[4][0].occupant = toad #added |
|
|
grid[3][0].occupant = toad #added |
|
|
passengers[toad].curr = (4, 0) |
|
|
passengers[toad].curr = (3, 0) |
|
|
toad += 1 |
|
|
toad += 1 |
|
|
for (i, man) in enumerate(passengers): |
|
|
for (i, man) in enumerate(passengers): |
|
|
if man.curr == man.dest: |
|
|
if man.curr == man.dest: |
|
|