Skip to content

Commit 8c321da

Browse files
committed
Merge pull request #40 from d-Rickyy-b/dev
FIX: Missing deck class
2 parents 15e59a5 + df72840 commit 8c321da

File tree

2 files changed

+37
-1
lines changed

2 files changed

+37
-1
lines changed

game/blackJack.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from telegram.replykeyboardmarkup import ReplyKeyboardMarkup
77

88
from database.statistics import add_game_played, set_game_won
9-
from game.cardDeck import CardDeck
9+
from game.deck import CardDeck
1010
from game.dealer import Dealer
1111
from game.message import Message
1212
from game.player import Player

game/deck.py

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# -*- coding: utf-8 -*-
2+
3+
from lang.language import translate
4+
5+
__author__ = 'Rico'
6+
7+
8+
class CardDeck(object):
9+
symbols = ["♥", "♦", "♣", "♠"]
10+
valueInt = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 10, 10, 10]
11+
12+
@staticmethod
13+
def create_deck():
14+
from random import shuffle
15+
deck = list(range(1, 52))
16+
shuffle(deck)
17+
return deck[:]
18+
19+
def pick_one_card(self):
20+
card = self.deck[0]
21+
self.deck.pop(0)
22+
return card
23+
24+
def get_card_name(self, card):
25+
symbol = self.symbols[card // 13]
26+
value = self.value_str[card % 13]
27+
card_name = "|" + symbol + " " + value + "|"
28+
return card_name
29+
30+
def get_card_value(self, card):
31+
return self.valueInt[card % 13]
32+
33+
def __init__(self, lang_id):
34+
self.deck = self.create_deck()
35+
self.value_str = [translate("ace", lang_id), "2", "3", "4", "5", "6", "7", "8", "9", "10",
36+
translate("jack", lang_id), translate("queen", lang_id), translate("king", lang_id)]

0 commit comments

Comments
 (0)