Skip to content

Commit 5883b32

Browse files
committed
game_handler: add move_data for move message
1 parent 5e4a5ae commit 5883b32

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

zulip_bots/zulip_bots/bots/connect_four/connect_four.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def parse_board(self, board: Any) -> str:
2525
def get_player_color(self, turn: int) -> str:
2626
return self.tokens[turn]
2727

28-
def alert_move_message(self, original_player: str, move_info: str) -> str:
28+
def alert_move_message(self, original_player: str, move_info: str, move_data: Any=None) -> str:
2929
column_number = move_info.replace('move ', '')
3030
return original_player + ' moved in column ' + column_number
3131

zulip_bots/zulip_bots/bots/game_handler_bot/game_handler_bot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def parse_board(self, board: Any) -> str:
1111
def get_player_color(self, turn: int) -> str:
1212
return self.tokens[turn]
1313

14-
def alert_move_message(self, original_player: str, move_info: str) -> str:
14+
def alert_move_message(self, original_player: str, move_info: str, move_data: Any=None) -> str:
1515
column_number = move_info.replace('move ', '')
1616
return original_player + ' moved in column ' + column_number
1717

zulip_bots/zulip_bots/bots/game_of_fifteen/game_of_fifteen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def parse_board(self, board: Any) -> str:
108108
board_str += self.tiles[str(board[row][column])]
109109
return board_str
110110

111-
def alert_move_message(self, original_player: str, move_info: str) -> str:
111+
def alert_move_message(self, original_player: str, move_info: str, move_data: Any=None) -> str:
112112
tile = move_info.replace('move ', '')
113113
return original_player + ' moved ' + tile
114114

zulip_bots/zulip_bots/bots/merels/merels.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def parse_board(self, board: Any) -> str:
6363
def get_player_color(self, turn: int) -> str:
6464
return self.tokens[turn]
6565

66-
def alert_move_message(self, original_player: str, move_info: str) -> str:
66+
def alert_move_message(self, original_player: str, move_info: str, move_data: Any=None) -> str:
6767
return original_player + " :" + move_info
6868

6969
def game_start_message(self) -> str:

zulip_bots/zulip_bots/bots/tictactoe/tictactoe.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ def parse_board(self, board: Any) -> str:
230230
def get_player_color(self, turn: int) -> str:
231231
return self.tokens[turn]
232232

233-
def alert_move_message(self, original_player: str, move_info: str) -> str:
233+
def alert_move_message(self, original_player: str, move_info: str, move_data: Any=None) -> str:
234234
move_info = move_info.replace('move ', '')
235235
return '{} put a token at {}'.format(original_player, move_info)
236236

zulip_bots/zulip_bots/game_handler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ def handle_current_player_command(self, content: str) -> None:
868868

869869
def make_move(self, content: str, is_computer: bool) -> None:
870870
try:
871-
board = self.model.make_move(content, self.turn, is_computer)
871+
move_data = self.model.make_move(content, self.turn, is_computer)
872872
# Keep the turn of the same player
873873
except SamePlayerMove as smp:
874874
self.same_player_turn(content, smp.message, is_computer)
@@ -883,7 +883,7 @@ def make_move(self, content: str, is_computer: bool) -> None:
883883
return
884884
if not is_computer:
885885
self.current_messages.append(self.gameAdapter.gameMessageHandler.alert_move_message(
886-
'**{}**'.format(self.gameAdapter.get_username_by_email(self.players[self.turn])), content))
886+
'**{}**'.format(self.gameAdapter.get_username_by_email(self.players[self.turn])), content, move_data))
887887
self.current_messages.append(self.parse_current_board())
888888
game_over = self.model.determine_game_over(self.players)
889889
if game_over:

0 commit comments

Comments
 (0)