Add resource file, small timing change
parent
75604d6f0d
commit
6b8c4d73d4
|
@ -31,9 +31,9 @@ class RandomAI:
|
||||||
current_round_bid = self.table_status["bid"] // 10
|
current_round_bid = self.table_status["bid"] // 10
|
||||||
current_suit_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)
|
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)
|
print(gen_bid)
|
||||||
if gen_bid == 1:
|
if gen_bid <= 1:
|
||||||
if current_suit_bid == 5:
|
if current_suit_bid == 5:
|
||||||
return (current_round_bid+1)*10 + 1
|
return (current_round_bid+1)*10 + 1
|
||||||
else:
|
else:
|
||||||
|
|
8
cards.py
8
cards.py
|
@ -292,7 +292,7 @@ class PlayerDeck(Deck):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
DATA_FOLDER = "data"
|
DATA_FOLDER = "resource"
|
||||||
|
|
||||||
|
|
||||||
def prepare_playing_cards(display_w, display_h):
|
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'))
|
# card_img = pygame.image.load(os.path.join(DATA_FOLDER, 'diamond.jpg'))
|
||||||
#except:
|
#except:
|
||||||
# raise Exception("Cannot load image") # print error message and exit program
|
# 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 = []
|
all_cards = []
|
||||||
offset = 0
|
offset = 0
|
||||||
spacing = 0
|
spacing = 0
|
||||||
|
@ -373,6 +373,7 @@ class test_screen(view.PygView):
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
|
|
||||||
all_cards = prepare_playing_cards(50, 75)
|
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 = Deck(100, 100, 200, 100, 25)
|
||||||
self.test_deck.add_card(all_cards[0])
|
self.test_deck.add_card(all_cards[0])
|
||||||
self.test_deck.add_card(all_cards[13])
|
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])
|
self.test_deck.add_card(all_cards[51])
|
||||||
|
|
||||||
def draw_function(self):
|
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())
|
self.screen.blit(self.test_deck.deck_surface, self.test_deck.get_pos())
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
|
@ -413,7 +414,6 @@ class test_screen(view.PygView):
|
||||||
pygame.quit()
|
pygame.quit()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
test_view = test_screen(640, 400, clear_colour=(0, 0, 0))
|
test_view = test_screen(640, 400, clear_colour=(0, 0, 0))
|
||||||
test_view.run()
|
test_view.run()
|
||||||
|
|
|
@ -352,9 +352,9 @@ class Table:
|
||||||
msg = "Current Bid: {0:d} {1:s}".format(self.table_status["bid"] // 10,
|
msg = "Current Bid: {0:d} {1:s}".format(self.table_status["bid"] // 10,
|
||||||
cards.get_suit_string(self.table_status["bid"] % 10))
|
cards.get_suit_string(self.table_status["bid"] % 10))
|
||||||
self.write_message(msg, line=1, delay_time=0)
|
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)
|
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:
|
while passes < NUM_OF_PLAYERS - 1:
|
||||||
player_bid = self.players[current_player].make_decision(self.game_state, 0)
|
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)
|
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.write_message(msg, line=2, update_now=False)
|
||||||
self.display_current_player(current_player)
|
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)
|
self.write_message("Player {0:d} is the bid winner!".format(current_player), delay_time=1.5)
|
||||||
|
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 84 KiB |
Loading…
Reference in New Issue