Skip to content

now correctly counting player targets beyond the scope of the game as invalid moves #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cvcassady wants to merge 1 commit into
base: master
Choose a base branch
from
Open

now correctly counting player targets beyond the scope of the game as invalid moves #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions loveletter/game.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,10 @@ def is_action_valid(self, action):
if player.hand_card == Card.noCard:
return PlayerActionTools.is_blank(action)

# cannot target an invalid player
if not self._is_valid_player_target(action.player_target):
return False

target_player = self._players[action.player_target]
player_hand = [player.hand_card, self._deck[0]]

Expand All @@ -282,10 +286,6 @@ def is_action_valid(self, action):
(action.discard == Card.prince or action.discard == Card.king):
return False

# cannot target an invalid player
if not self._is_valid_player_target(action.player_target):
return False

# cannot mis-target a card
if self.player_turn() == action.player_target and action.discard in Card.only_other:
return False
Expand All @@ -304,6 +304,9 @@ def is_action_valid(self, action):

def _is_valid_player_target(self, player_target):
"""True iff the player can be targeted by an action"""
if player_target < 0 or player_target >= len(self._players):
return False

return PlayerTools.is_playing(self._players[player_target])

def _invalid_input(self, throw):
Expand Down