diff --git a/main.py b/main.py index 54f9b77..d5a7e64 100644 --- a/main.py +++ b/main.py @@ -43,9 +43,9 @@ def nextSquare(passenger, grid): candidati = [] for i in mooreNeighbourhood(passenger.curr): if manhattanDistance(passenger.dest, i) < manhattanDistance(passenger.dest, passenger.curr): - if grid[passenger.curr[0]][passenger.curr[1]].typ == SquareType.SEAT: - candidati.append(passenger.curr[0], passenger.curr[1] + 1) - 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] and False: + if grid[passenger.curr[0]][passenger.curr[1]].typ == SquareType.SEAT and i[1] != passenger.curr[1]: + pass else: candidati.append(i) for i in candidati: @@ -90,8 +90,8 @@ def tick(): print() print("---") if toad < len(passengers): - grid[4][0].occupant = toad #added - passengers[toad].curr = (4, 0) + grid[3][0].occupant = toad #added + passengers[toad].curr = (3, 0) toad += 1 for (i, man) in enumerate(passengers): if man.curr == man.dest: