Skip to content

Commit

Permalink
shorten var names
Browse files Browse the repository at this point in the history
  • Loading branch information
@pranavmodx
pranavmodx committed Apr 21, 2020
1 parent d468c64 commit 861649e
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 19 deletions.
16 changes: 10 additions & 6 deletions src/pieces/bishop.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,17 @@ def move_through(board, req_pos, dist_x, dist_y):
return False

def move_checks_king(self, board, sq2_pos):
if board.king_pos[board.get_next_turn()] in self.valid_moves() and \
opp_king_pos = board.king_pos[board.get_next_turn()]

if opp_king_pos in self.valid_moves() and \
not self.move_through(
board,
sq2_pos,
board.king_pos[board.get_next_turn()][0] - sq2_pos[0],
board.king_pos[board.get_next_turn()][1] - sq2_pos[1]
opp_king_pos[0] - sq2_pos[0],
opp_king_pos[1] - sq2_pos[1]
) or \
board.is_controlled_sq(
board.king_pos[board.get_next_turn()],
opp_king_pos,
board.turn,
):
return True
Expand All @@ -90,6 +92,8 @@ def handle_move(self, board, sq1_pos, sq2_pos):

dist_x, dist_y = board.calc_sq_dist(sq1_pos, sq2_pos)

own_king_pos = board.king_pos[board.turn]

# If piece is present in b/w the 2 sqs
if self.move_through(board, sq1_pos, dist_x, dist_y):
return 0
Expand All @@ -102,7 +106,7 @@ def handle_move(self, board, sq1_pos, sq2_pos):
# Undo move if own king comes under attack by the move
if board.under_check and \
board.is_controlled_sq(
board.king_pos[board.turn], board.get_next_turn(),
own_king_pos, board.get_next_turn(),
):
piece2.captured = False
self.move(sq1_pos)
Expand All @@ -113,7 +117,7 @@ def handle_move(self, board, sq1_pos, sq2_pos):
self.move(sq2_pos)

# Undo move...
if board.is_controlled_sq(board.king_pos[board.turn], board.get_next_turn()):
if board.is_controlled_sq(own_king_pos, board.get_next_turn()):
self.move(sq1_pos)
return 0

Expand Down
3 changes: 2 additions & 1 deletion src/pieces/king.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ def castle(self, board, sq1_pos, sq2_pos):
rook2.start_pos = False

def move_checks_king(self, board):
if board.is_controlled_sq(board.king_pos[board.get_next_turn()], board.turn):
opp_king_pos = board.king_pos[board.get_next_turn()]
if board.is_controlled_sq(opp_king_pos, board.turn):
return True

def handle_move(self, board, sq1_pos, sq2_pos):
Expand Down
12 changes: 8 additions & 4 deletions src/pieces/knight.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,27 +65,31 @@ def valid_moves(self):
return valids

def move_checks_king(self, board):
if board.king_pos[board.get_next_turn()] in self.valid_moves() or \
board.is_controlled_sq(board.king_pos[board.get_next_turn()], board.turn):
opp_king_pos = board.king_pos[board.get_next_turn()]

if opp_king_pos in self.valid_moves() or \
board.is_controlled_sq(opp_king_pos, board.turn):
return True

def handle_move(self, board, sq1_pos, sq2_pos):
piece2 = board.fetch_piece(sq2_pos)

own_king_pos = board.king_pos[board.turn]

if piece2:
if board.turn != piece2.colour:
piece2.captured = True
self.move(sq2_pos)

if board.is_controlled_sq(board.king_pos[board.turn], board.get_next_turn()):
if board.is_controlled_sq(own_king_pos, board.get_next_turn()):
piece2.captured = False
self.move(sq1_pos)
return 0

else:
self.move(sq2_pos)

if board.is_controlled_sq(board.king_pos[board.turn], board.get_next_turn()):
if board.is_controlled_sq(own_king_pos, board.get_next_turn()):
self.move(sq1_pos)
return 0

Expand Down
10 changes: 6 additions & 4 deletions src/pieces/pawn.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ def handle_move(self, board, sq1_pos, sq2_pos):

dist_x, dist_y = board.calc_sq_dist(sq1_pos, sq2_pos)

own_king_pos = board.king_pos[board.turn]

if piece2:
# If there's a piece directly in front of self
# 1 or 2 squares (2 if at start pos)
Expand All @@ -71,7 +73,7 @@ def handle_move(self, board, sq1_pos, sq2_pos):
piece2.captured = True
self.move(sq2_pos)

if board.is_controlled_sq(board.king_pos[board.turn], board.get_next_turn()):
if board.is_controlled_sq(own_king_pos, board.get_next_turn()):
piece2.captured = False
self.move(sq1_pos)
return 0
Expand All @@ -86,7 +88,7 @@ def handle_move(self, board, sq1_pos, sq2_pos):
if dist_x == 0:
self.move(sq2_pos)

if board.is_controlled_sq(board.king_pos[board.turn], board.get_next_turn()):
if board.is_controlled_sq(own_king_pos, board.get_next_turn()):
self.move(sq1_pos)
return 0

Expand All @@ -96,8 +98,8 @@ def handle_move(self, board, sq1_pos, sq2_pos):
return 1
return 0

if board.king_pos[board.turn] in self.valid_moves(board.is_flipped) or \
board.is_controlled_sq(board.king_pos[board.turn], board.get_next_turn()):
if own_king_pos in self.valid_moves(board.is_flipped) or \
board.is_controlled_sq(own_king_pos, board.get_next_turn()):
board.under_check = True
else:
board.under_check = False
Expand Down
12 changes: 8 additions & 4 deletions src/pieces/rook.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ def move_through(board, sq1_pos, dist_x, dist_y):
return False

def move_checks_king(self, board, sq2_pos):
if board.king_pos[board.get_next_turn()] in self.valid_moves() or \
opp_king_pos = board.king_pos[board.get_next_turn()]

if opp_king_pos in self.valid_moves() or \
board.is_controlled_sq(
board.king_pos[board.get_next_turn()],
opp_king_pos,
board.turn,
):
return True
Expand All @@ -85,6 +87,8 @@ def handle_move(self, board, sq1_pos, sq2_pos):

dist_x, dist_y = board.calc_sq_dist(sq1_pos, sq2_pos)

own_king_pos = board.king_pos[board.turn]

if self.move_through(board, sq1_pos, dist_x, dist_y):
return 0

Expand All @@ -93,15 +97,15 @@ def handle_move(self, board, sq1_pos, sq2_pos):
piece2.captured = True
self.move(sq2_pos)

if board.is_controlled_sq(board.king_pos[board.turn], board.get_next_turn()):
if board.is_controlled_sq(own_king_pos, board.get_next_turn()):
piece2.captured = False
self.move(sq1_pos)
return 0

else:
self.move(sq2_pos)

if board.is_controlled_sq(board.king_pos[board.turn], board.get_next_turn()):
if board.is_controlled_sq(own_king_pos, board.get_next_turn()):
self.move(sq1_pos)
return 0

Expand Down

0 comments on commit 861649e

Please sign in to comment.