Merge pull request #39 from d-Rickyy-b/dev

Merge dev branch into master

Author: devcarron

.gitignore

@@ -93,4 +93,5 @@ ENV/
 .svn
 .git
 __pycache__
-*.db
+*.db
+.vs

database/db_wrapper.py

@@ -17,7 +17,7 @@ def __init__(self):
                 try:
                     self.create_database(database_path)
                 except:
-                    print("An error has occured while creating the database!")
+                    print("An error has occurred while creating the database!")
 
             self.connection = sqlite3.connect(database_path)
             self.connection.text_factory = lambda x: str(x, 'utf-8', "ignore")
@@ -73,6 +73,14 @@ def get_all_users(self):
             self.cursor.execute("SELECT rowid, * FROM users;")
             return self.cursor.fetchall()
 
+        def get_admins(self):
+            self.cursor.execute("SELECT userID from admins;")
+            admins = self.cursor.fetchall()
+            admin_list = []
+            for admin in admins:
+                admin_list.append(admin[0])
+            return admin_list
+
         def get_lang_id(self, user_id):
             self.cursor.execute("SELECT languageID FROM users WHERE userID=?;", [str(user_id)])
             result = self.cursor.fetchone()
@@ -86,7 +94,6 @@ def add_user(self, user_id, lang_id, first_name, last_name, username):
                 self.cursor.execute("INSERT INTO users VALUES (?, ?, ?, ?, ?, 0, 0, 0, 0);", (str(user_id), str(lang_id), str(first_name), str(last_name), str(username)))
                 self.connection.commit()
             except sqlite3.IntegrityError:
-                # print("User already exists")
                 pass
 
         def insert(self, column_name, value, user_id):

database/statistics.py

@@ -28,9 +28,9 @@ def add_game_played(user_id):
 def get_stats(percentage):
     text = ""
     perc = int(percentage//10+1)
-    for x in range(perc):
+    for _ in range(perc):
         text += "🏆"
-    for x in range(10-perc):
+    for _ in range(10-perc):
         text += "🔴"
     return text
 

game/blackJack.py

@@ -2,12 +2,13 @@
 import logging
 
 from telegram.keyboardbutton import KeyboardButton
-from telegram.replykeyboardhide import ReplyKeyboardHide
+from telegram.replykeyboardremove import ReplyKeyboardRemove
 from telegram.replykeyboardmarkup import ReplyKeyboardMarkup
 
 from database.statistics import add_game_played, set_game_won
 from game.cardDeck import CardDeck
 from game.dealer import Dealer
+from game.message import Message
 from game.player import Player
 from lang.language import translate
 
@@ -23,7 +24,7 @@ class BlackJack(object):
     # Adds Player to the Game
     def add_player(self, user_id, first_name, message_id, silent=None):
         if not self.game_running:
-            if self.get_index_by_user_id(user_id) == None and len(self.players) <= self.MAX_PLAYERS:
+            if self.get_index_by_user_id(user_id) is None and len(self.players) < self.MAX_PLAYERS:
                 self.logger.debug("Adding user '" + first_name + "' to players.")
                 player = Player(user_id, first_name, self.deck)
                 self.players.append(player)
@@ -33,31 +34,28 @@ def add_player(self, user_id, first_name, message_id, silent=None):
                     # TODO When game is multiplayer then print current players?
                     self.send_message(self.chat_id, translate("playerJoined", self.lang_id).format(first_name), message_id=message_id, game_id=self.__game_id)
             else:
-                self.logger.debug("User '" + first_name + "' already in player list.")
+                self.logger.debug("User '" + first_name + "' already in player list. Or max players reached")
 
     def get_index_by_user_id(self, user_id):
-        index = 0
-        for user in self.players:
+        for index, user in enumerate(self.players):
             if user.get_userid() == user_id:
                 return index
-            index += 1
 
         return None
 
     def get_user_by_user_id(self, user_id):
         for user in self.players:
             if user.get_userid() == user_id:
                 return user
-
         return None
 
     def next_player(self):
         if self.game_running:
-            if self.current_player is not None and (self.current_player + 1) < len(self.players):
+            if self.current_player is not None and self.current_player < (len(self.players) - 1):
                 self.logger.debug("Next Player!")
                 self.current_player += 1
                 self.send_message(self.chat_id, translate("overview", self.lang_id) + "\n\n" + self.get_player_overview(show_points=True) + "\n" +
-                                  translate("nextPlayer", self.lang_id).format(self.players[self.current_player].first_name),
+                                  translate("nextPlayer", self.lang_id).format(self.players[self.current_player].get_first_name()),
                                   message_id=self.join_message_ids[self.current_player], reply_markup=self.keyboard_running, game_id=self.__game_id)
 
                 self.give_player_one()
@@ -69,58 +67,62 @@ def next_player(self):
     # gives player one card
     def give_player_one(self):
         if self.game_running:
-            player_index = self.current_player
-            user = self.players[player_index]
-            self.logger.debug("Giving player one card | chatID: " + str(self.chat_id) + " | player: " + user.first_name)
+            user = self.players[self.current_player]
+            self.logger.debug("Giving player one card | chatID: " + str(self.chat_id) + " | player: " + user.get_first_name())
 
-            if user.get_number_of_cards() == 0:
+            if not user.has_cards():
                 # give user 2 cards at beginning
-                for i in range(2):
+                for _ in range(2):
                     card = self.deck.pick_one_card()
                     cardvalue = self.deck.get_card_value(card)
-
                     user.give_card(card, cardvalue)
 
-                # TODO check if cardvalue = 21. If yes, mention it in the message
                 cards_string = "\n" + user.get_cards_string() + "\n"
-                self.send_message(self.chat_id, str(translate("yourCardsAre", self.lang_id).format(
-                    user.first_name, cards_string, str(user.cardvalue))), reply_markup=self.keyboard_running,
-                                  message_id=self.join_message_ids[self.current_player], game_id=self.__game_id)
+                if user.cardvalue == 21:
+                    got21_text = "\n\n" + user.first_name + " " + translate("got21", self.lang_id)
+
+                    self.send_message(self.chat_id, str(translate("yourCardsAre", self.lang_id).format(
+                        user.first_name, cards_string, str(user.cardvalue))) + got21_text, reply_markup=ReplyKeyboardRemove, game_id=self.__game_id)
+                    self.next_player()
+                else:
+                    self.send_message(self.chat_id, str(translate("yourCardsAre", self.lang_id).format(
+                        user.first_name, cards_string, str(user.cardvalue))), reply_markup=self.keyboard_running,
+                                      message_id=self.join_message_ids[self.current_player], game_id=self.__game_id)
             else:
                 card = self.deck.pick_one_card()
                 cardvalue = self.deck.get_card_value(card)
+                message = Message()
 
                 if user.has_ace and (user.cardvalue + cardvalue > 21):
-                    # user got an ace
-                    cardvalue = 1
+                    # user got already an ace -> soft hand
                     user.remove_ace()
-                    self.send_message(self.chat_id, translate("softHandLater", self.lang_id), game_id=self.__game_id)
+                    message.add_text(translate("softHandLater", self.lang_id))
 
                 if self.game_type == self.PRIVATE_CHAT:
-                    player_drew = translate("playerDraws1", self.lang_id).format(str(self.deck.get_card_name(card)))
+                    message.add_text(translate("playerDraws1", self.lang_id).format(str(self.deck.get_card_name(card))))
                 else:
-                    player_drew = translate("playerDrew", self.lang_id).format(user.first_name, str(self.deck.get_card_name(card)))
+                    message.add_text(translate("playerDrew", self.lang_id).format(user.first_name, str(self.deck.get_card_name(card))))
 
                 user.give_card(card, cardvalue)
-
-                player_drew += "\n" + translate("cardvalue", self.lang_id).format(str(user.cardvalue))
+                message.add_text_nl(translate("cardvalue", self.lang_id).format(str(user.cardvalue)))
 
                 if user.cardvalue >= 21:
                     if user.cardvalue > 21:
                         if self.game_type == self.GROUP_CHAT:
-                            player_drew += "\n\n" + translate("playerBusted", self.lang_id).format(user.first_name)
+                            message.add_text("\n\n" + translate("playerBusted", self.lang_id).format(user.first_name))
 
                     elif user.cardvalue == 21:
-                        player_drew += "\n\n" + user.first_name + " " + translate("got21", self.lang_id)
+                        message.add_text("\n\n" + user.first_name + " " + translate("got21", self.lang_id))
 
-                    self.send_message(self.chat_id, text=player_drew, game_id=self.__game_id)
+                    self.send_message(self.chat_id, text=message.get_text(), game_id=self.__game_id)
                     self.next_player()
                 else:
-                    self.send_message(self.chat_id, text=player_drew, reply_markup=self.keyboard_running, game_id=self.__game_id)
+                    self.send_message(self.chat_id, text=message.get_text(), reply_markup=self.keyboard_running, game_id=self.__game_id)
 
     # Gives the dealer cards
     def dealers_turn(self):
         if self.dealer.get_number_of_cards() < 2:
+            card = None
             for i in range(2):
                 card = self.deck.pick_one_card()
                 cardvalue = self.deck.get_card_value(card)
@@ -153,7 +155,7 @@ def dealers_turn(self):
             self.evaluation()
 
     def start_game(self, message_id=None):
-        if ((self.game_type == self.GROUP_CHAT or self.game_type == self.MULTIPLAYER_GAME) and len(self.players) >= 1) or self.game_type == self.PRIVATE_CHAT:
+        if ((self.game_type == self.GROUP_CHAT or self.game_type == self.MULTIPLAYER_GAME) and len(self.players) > 1) or self.game_type == self.PRIVATE_CHAT:
             if not self.game_running:
                 self.game_running = True
 
@@ -338,5 +340,4 @@ def __init__(self, chat_id, user_id, lang_id, first_name, game_handler, message_
 
     # When game is being ended / object is destructed
     def __del__(self):
-        self.send_message(self.chat_id, translate("gameEnded", self.lang_id), reply_markup=ReplyKeyboardHide(), game_id=self.__game_id)
-        pass
+        self.send_message(self.chat_id, translate("gameEnded", self.lang_id), reply_markup=ReplyKeyboardRemove(), game_id=self.__game_id)

game/cardDeck.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+__author__ = 'Rico'
+
+
+class Message(object):
+    def __init__(self, message=""):
+        self.message = message
+
+    def add_text(self, text):
+        self.message += text
+
+    def add_text_nl(self, text):
+        self.message += "\n" + text
+
+    def get_text(self):
+        return self.message
+
+    def __repr__(self):
+        return self.message
+
+    def __str__(self):
+        return self.message

game/message.py

@@ -25,6 +25,9 @@ def has21(self):
     def has_busted(self):
         return self.cardvalue > 21
 
+    def has_cards(self):
+        return len(self.cards) > 0
+
     def get_cards_string(self):
         cards_string = ""
         for i, card in enumerate(self.cards):

game/player.py

@@ -14,6 +14,8 @@ def gl_create(self):
 
     def gl_remove(self, chat_id):
         index = self.get_index_by_chatid(chat_id)
+        if index is None:
+            return
         if not index < 0:
             self.GameList.pop(index)
 
@@ -50,11 +52,11 @@ def get_game_by_id(self, game_id):
         return None
 
     def generate_id(self):
-        game_id = ''.join(random.choice(string.digits + string.ascii_letters) for i in range(8))
+        game_id = ''.join(random.choice(string.digits + string.ascii_letters) for _ in range(8))
 
         while self.id_already_existing(game_id):
             print("ID already existing: " + str(game_id))
-            game_id = ''.join(random.choice(string.digits + string.ascii_letters) for i in range(8))
+            game_id = ''.join(random.choice(string.digits + string.ascii_letters) for _ in range(8))
 
         return game_id