diff --git a/src/classes/Engines.py b/src/classes/Engines.py index 305a199..1c9afed 100644 --- a/src/classes/Engines.py +++ b/src/classes/Engines.py @@ -32,16 +32,17 @@ class HumanPlayerEngine(PlayerEngine): super() move = None while move is None: - user_input = input("Please enter player {} move, `print` to display board and `help` possible moves : ".format( + user_input = input("Please enter player {} move: ".format( self.get_player_name(board._nextPlayer) )) - move = self.validate_input(user_input, board) + move = self.validate_input(user_input, board, player) + print("{}".format(move)) return move @staticmethod def validate_input(input, board): if input == 'print': - print(board.show_board()) + print("\n{}".format(board.__str__)) return None if input == 'help': @@ -53,7 +54,7 @@ class HumanPlayerEngine(PlayerEngine): x = int(input[0]) y = int(input[1]) - if not board.is_valid_move(board._nextPlayer, x, y): + if not board.is_valid_move(int(player), x, y): return None return [board._nextPlayer, x, y] diff --git a/src/classes/Reversi.py b/src/classes/Reversi.py index 208dbcc..0d4d72d 100644 --- a/src/classes/Reversi.py +++ b/src/classes/Reversi.py @@ -216,18 +216,6 @@ class Board: else: return '.' - def show_board(self): - display = " |" - for x in range(self.get_board_size()): - display += "{}|".format(str(x)) - display += "\n" - for x in range(self.get_board_size()): - display += "{}|".format(str(x)) - for y in range(self.get_board_size()): - display += "{}|".format(self._piece2str(self._board[x][y])) - display += "\n" - return display - def __str__(self): toreturn="" for l in self._board: