sadpmpk
/
pyFloatingBridge
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug in determining score and Vbot

master
En Yi 2019-06-15 14:59:32 +01:00
parent d7c9069192
commit 026ad41904
3 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ai_comp/ai.py
View File

@ -119,6 +119,10 @@ class VivianAI(RandomAI):
self.weigh2 = 0.002 self.weigh2 = 0.002
self.bid_weigh = 0.3 self.bid_weigh = 0.3
self.high_card_factor = 1.2
self.low_suit_factor = 0.5
self.trumping_factor = 2
self.low_suit_factor = 0.5
self.unplayed_cards = [] self.unplayed_cards = []
[self.unplayed_cards.append([i+2 for i in range(13)]) for _ in range(4)] [self.unplayed_cards.append([i+2 for i in range(13)]) for _ in range(4)]
@ -196,14 +200,14 @@ class VivianAI(RandomAI):
# Get valid plays # Get valid plays
if sub_state == 0: if sub_state == 0:
valid_plays = self.get_valid_plays(True) card_values = self.get_valid_plays(True)
else: else:
valid_plays = self.get_valid_plays(False) card_values = self.get_valid_plays(False)
n_cards = len(valid_plays) n_cards = len(card_values)
card_viability = [1] * n_cards card_viability = [1] * n_cards
card_nums = [cards.get_card_number(play) for play in valid_plays] card_nums = [cards.get_card_number(play) for play in card_values]
card_suits = [cards.get_card_suit(play) for play in valid_plays] card_suits = [cards.get_card_suit(play) for play in card_values]
high_cards = [max(card_set) + (i+1)*100 if card_set else 0 for i, card_set in enumerate(self.unplayed_cards)] high_cards = [max(card_set) + (i+1)*100 if card_set else 0 for i, card_set in enumerate(self.unplayed_cards)]
suit_counts = [0] * 4 suit_counts = [0] * 4
@ -217,12 +221,12 @@ class VivianAI(RandomAI):
low_suits = [suit for suit, counts in zip(non_empty_suits, suit_counts) if counts == min_suit_count] low_suits = [suit for suit, counts in zip(non_empty_suits, suit_counts) if counts == min_suit_count]
for i in range(n_cards): for i in range(n_cards):
card_viability[i] += any([card_suits[i] == s for s in low_suits]) / min_suit_count card_viability[i] += any([card_suits[i] == s for s in low_suits]) / min_suit_count * self.low_suit_factor
# Leading-specific viability # Leading-specific viability
if sub_state == 0: if sub_state == 0:
for i in range(n_cards): for i in range(n_cards):
card_viability[i] += any([valid_plays[i] == card for card in high_cards]) * 1.2 card_viability[i] += any([card_values[i] == card for card in high_cards]) * self.high_card_factor
else: else:
# Get the played cards # Get the played cards
played_cards = [card.value if card else None for card in self.table_status["played cards"]] played_cards = [card.value if card else None for card in self.table_status["played cards"]]
@ -232,7 +236,7 @@ class VivianAI(RandomAI):
leading_suit = leading_card.suit() leading_suit = leading_card.suit()
# Find any trump cards # Find any trump cards
trumped = any([suit == self.table_status['trump suit'] for suit in played_suits]) #trumped = any([suit == self.table_status['trump suit'] for suit in played_suits])
# Find the highest number played, # Find the highest number played,
max_played_num = max([num for num, suit in zip(played_nums, played_suits) if suit == leading_suit]) max_played_num = max([num for num, suit in zip(played_nums, played_suits) if suit == leading_suit])
@ -241,14 +245,15 @@ class VivianAI(RandomAI):
if max_trump_played: if max_trump_played:
max_trump_played = max(max_trump_played) max_trump_played = max(max_trump_played)
else: else:
max_trump_played = 1 max_trump_played = 0
for i in range(n_cards): for i in range(n_cards):
# Favour highest cards # Favour highest cards
card_viability[i] += (card_suits[i] == leading_suit & card_nums[i] == high_cards[leading_suit-1]) * 1.2 card_viability[i] += (card_suits[i] == leading_suit and card_values[i] == high_cards[leading_suit-1]) \
* self.high_card_factor
# Favour low cards if trumped # Favour low cards if trumped
if trumped: if max_trump_played > 0:
card_viability[i] -= card_nums[i]/7 * (card_suits[i] != self.table_status['trump suit']) card_viability[i] -= card_nums[i]/7 * (card_suits[i] != self.table_status['trump suit'])
# Favour low cards if cannot higher # Favour low cards if cannot higher
@ -258,13 +263,14 @@ class VivianAI(RandomAI):
# Favour low trump cards which wins if trumping is possible # Favour low trump cards which wins if trumping is possible
if card_suits[i] == self.table_status['trump suit'] and\ if card_suits[i] == self.table_status['trump suit'] and\
card_nums[i] > max_trump_played: card_nums[i] > max_trump_played:
card_viability[i] *= 2 / card_nums[i] card_viability[i] += 1 / card_nums[i] * self.trumping_factor
if self.table_status["partner reveal"]: if self.table_status["partner reveal"]:
# Not implemented as original
pass pass
best_viability = max(card_viability) best_viability = max(card_viability)
best_cards = [play for viability, play in zip(card_viability, valid_plays) if viability == best_viability] best_cards = [play for viability, play in zip(card_viability, card_values) if viability == best_viability]
return random.choice(best_cards) return random.choice(best_cards)
def update_memory(self): def update_memory(self):

6
main.py
View File

@ -36,9 +36,9 @@ if __name__ == '__main__':
with open('last_game_rng.rng', 'wb') as f: with open('last_game_rng.rng', 'wb') as f:
pickle.dump(rng_state, f) pickle.dump(rng_state, f)
#with open('seeds/test_seed.rng', 'rb') as f: with open('seeds/test_seed.rng', 'rb') as f:
# rng_state = pickle.load(f) rng_state = pickle.load(f)
#random.setstate(rng_state) random.setstate(rng_state)
main_view = game.GameScreen(800, 600, clear_colour=(255, 0, 0), main_view = game.GameScreen(800, 600, clear_colour=(255, 0, 0),
autoplay=AUTOPLAY, view_all_cards=VIEW_ALL_CARDS, terminal=TERMINAL) autoplay=AUTOPLAY, view_all_cards=VIEW_ALL_CARDS, terminal=TERMINAL)

17
table.py
View File

@ -425,7 +425,7 @@ class Table:
elif self.game_state == GameState.PLAYING: elif self.game_state == GameState.PLAYING:
self.play_a_round(game_events) self.play_a_round(game_events)
if self.current_round == 13: if self.current_round == 13:
self.write_message("Game Set! Press P to play again!") self.declare_winner()
self.ongoing = False self.ongoing = False
self.game_state = GameState.ENDING self.game_state = GameState.ENDING
else: else:
@ -668,8 +668,11 @@ class Table:
trumps = [suit == self.table_status['trump suit'] for suit in card_suits] trumps = [suit == self.table_status['trump suit'] for suit in card_suits]
# Determine which players to check for winner, and determine winner # Determine which players to check for winner, and determine winner
valid_nums = [card_nums[i] * ((follow_suits[i] and not self.table_status['trump broken']) or trumps[i]) if any(trumps):
for i in range(NUM_OF_PLAYERS)] valid_nums = [card_nums[i] * trumps[i] for i in range(NUM_OF_PLAYERS)]
else:
valid_nums = [card_nums[i] * follow_suits[i] for i in range(NUM_OF_PLAYERS)]
winning_player = valid_nums.index(max(valid_nums)) winning_player = valid_nums.index(max(valid_nums))
self.write_message("Player {0:d} wins!\n".format(winning_player), delay_time=1) self.write_message("Player {0:d} wins!\n".format(winning_player), delay_time=1)
self.players[winning_player].score += 1 self.players[winning_player].score += 1
@ -702,7 +705,7 @@ class Table:
trump_played = card.suit() == self.table_status['trump suit'] trump_played = card.suit() == self.table_status['trump suit']
if trump_played: if trump_played:
self.table_status['trump broken'] = True self.table_status['trump broken'] = True
self.write_message("Trump Broken!", delay_time=1.5) self.write_message("Trump Broken!", delay_time=1)
if not self.table_status['partner reveal']: if not self.table_status['partner reveal']:
if card.value == self.table_status['partner']: if card.value == self.table_status['partner']:
@ -731,6 +734,12 @@ class Table:
self.players[i].role = PlayerRole.ATTACKER self.players[i].role = PlayerRole.ATTACKER
self.table_status['attacker']['wins'] += self.players[i].score self.table_status['attacker']['wins'] += self.players[i].score
def declare_winner(self):
if self.table_status['attacker']['wins'] >= self.table_status['attacker']['target']:
self.write_message("Attacker wins! Press P to play again!")
if self.table_status['defender']['wins'] >= self.table_status['defender']['target']:
self.write_message("Declarer wins! Press P to play again!")
def reset_game(self): def reset_game(self):
""" """
Reset all variables for the next game Reset all variables for the next game