diff --git a/ai_comp/ai.py b/ai_comp/ai.py index b93930d..d520f2f 100644 --- a/ai_comp/ai.py +++ b/ai_comp/ai.py @@ -31,9 +31,9 @@ class RandomAI: current_round_bid = self.table_status["bid"] // 10 current_suit_bid = self.table_status["bid"] % 10 bid_threshold = int(current_round_bid*1.5 + current_suit_bid*0.5) - gen_bid = random.randint(1, bid_threshold) + gen_bid = random.randint(0, bid_threshold) print(gen_bid) - if gen_bid == 1: + if gen_bid <= 1: if current_suit_bid == 5: return (current_round_bid+1)*10 + 1 else: diff --git a/cards.py b/cards.py index 1545b28..0cdaf47 100644 --- a/cards.py +++ b/cards.py @@ -292,7 +292,7 @@ class PlayerDeck(Deck): pass -DATA_FOLDER = "data" +DATA_FOLDER = "resource" def prepare_playing_cards(display_w, display_h): @@ -307,7 +307,7 @@ def prepare_playing_cards(display_w, display_h): # card_img = pygame.image.load(os.path.join(DATA_FOLDER, 'diamond.jpg')) #except: # raise Exception("Cannot load image") # print error message and exit program - card_sprites = SpriteSheet(os.path.join(DATA_FOLDER, 'card_spritesheet_3.png')) + card_sprites = SpriteSheet(os.path.join(DATA_FOLDER, 'card_spritesheet.png')) all_cards = [] offset = 0 spacing = 0 @@ -373,6 +373,7 @@ class test_screen(view.PygView): super().__init__(*args, **kwargs) all_cards = prepare_playing_cards(50, 75) + self.test_card = all_cards[15] self.test_deck = Deck(100, 100, 200, 100, 25) self.test_deck.add_card(all_cards[0]) self.test_deck.add_card(all_cards[13]) @@ -380,7 +381,7 @@ class test_screen(view.PygView): self.test_deck.add_card(all_cards[51]) def draw_function(self): - #self.screen.blit(self.test_card.image, self.test_card.get_pos()) + self.screen.blit(self.test_card.image, self.test_card.get_pos()) self.screen.blit(self.test_deck.deck_surface, self.test_deck.get_pos()) def run(self): @@ -413,7 +414,6 @@ class test_screen(view.PygView): pygame.quit() - if __name__ == '__main__': test_view = test_screen(640, 400, clear_colour=(0, 0, 0)) test_view.run() diff --git a/players.py b/players.py index 1a93665..af22873 100644 --- a/players.py +++ b/players.py @@ -352,9 +352,9 @@ class Table: msg = "Current Bid: {0:d} {1:s}".format(self.table_status["bid"] // 10, cards.get_suit_string(self.table_status["bid"] % 10)) self.write_message(msg, line=1, delay_time=0) - msg = 'Bid Leader: Player {0:d}'.format((current_player - passes - 1 * (not first_player)) % 4) - self.write_message(msg, line=2) self.display_current_player(current_player) + msg = 'Bid Leader: Player {0:d}'.format((current_player - passes - 1 * (not first_player)) % 4) + self.write_message(msg, line=2, delay_time=1) while passes < NUM_OF_PLAYERS - 1: player_bid = self.players[current_player].make_decision(self.game_state, 0) @@ -377,7 +377,7 @@ class Table: msg = 'Bid Leader: Player {0:d}'.format((current_player - passes - 1 * (not first_player)) % 4) self.write_message(msg, line=2, update_now=False) self.display_current_player(current_player) - time.sleep(1) + time.sleep(0.5) self.write_message("Player {0:d} is the bid winner!".format(current_player), delay_time=1.5) diff --git a/resource/card_spritesheet.png b/resource/card_spritesheet.png new file mode 100644 index 0000000..506c2e9 Binary files /dev/null and b/resource/card_spritesheet.png differ