Merge pull request #27 from fabi200123/add-double-click

Add double-click option

Author: fabi200123

CHANGELOG/CHANGELOG-1.2.0.md

@@ -4,7 +4,7 @@
 
 - [v1.0.0](https://github.com/fabi200123/Solitaire-Game/releases/tag/v1.0.0)
 - [v1.1.0](https://github.com/fabi200123/Solitaire-Game/releases/tag/v1.1.0)
-- [v1.2.0](https://github.com/fabi200123/Solitaire-Game/releases/tag/v1.1.0)
+- [v1.2.0](https://github.com/fabi200123/Solitaire-Game/releases/tag/v1.2.0)
 
 
 > **NOTE** The code is based on the tutorial from [Python Arcade 2.6.17](https://api.arcade.academy/en/latest/tutorials/card_game/index.html)

CHANGELOG/CHANGELOG-1.3.0.md

@@ -0,0 +1,26 @@
+# TBA - Updates on master branch
+
+# Solitaire Game
+
+## Current versions
+
+- [v1.0.0](https://github.com/fabi200123/Solitaire-Game/releases/tag/v1.0.0)
+- [v1.1.0](https://github.com/fabi200123/Solitaire-Game/releases/tag/v1.1.0)
+- [v1.2.0](https://github.com/fabi200123/Solitaire-Game/releases/tag/v1.2.0)
+- [v1.3.0](https://github.com/fabi200123/Solitaire-Game/releases/tag/v1.3.0)
+
+> **NOTE** The code is based on the tutorial from [Python Arcade 2.6.17](https://api.arcade.academy/en/latest/tutorials/card_game/index.html)
+
+### Why did I do this?
+I have decided to create my own Solitaire game because almost all current games use ADS or other stuff that I mostly don't enjoy having there.
+Oh... And I love Solitaire as my time waste game : )
+
+### How did I do it?
+
+- Thought about the concept in my mind, tried to come up to something similar to the default Solitaire Game
+- Graphic for the cards will be created by me, probably using **Paint.net** or **Aseprite**
+- Code will be written in **Python**
+
+### Changelog since v1.2.0
+
+- Added double-click option to automatically add cards in top-piles

game/game.py

@@ -358,6 +358,9 @@ def __init__(self, language="EN"):
         # Number of points the user has
         self.moves = 0
 
+        # Last click time for double-click detection
+        self.last_click_time = 0
+
 
     def setup(self, hard_mode: bool, language="EN"):
         '''Set up the game and also restart the game'''
@@ -532,7 +535,11 @@ def on_mouse_press(self, x, y, button, key_modifiers):
             for i, card in enumerate(self.held_cards):
                 card.position = self.held_cards_original_position[i]
             return
-        
+
+        curr_time = time.time()
+        double_click = curr_time - self.last_click_time < 0.3
+        self.last_click_time = curr_time
+
         # Get list of cards that were clicked
         cards = arcade.get_sprites_at_point((x, y), self.card_list)
 
@@ -545,7 +552,20 @@ def on_mouse_press(self, x, y, button, key_modifiers):
             # Figure out which pile the card is in
             pile_index = self.get_pile_for_card(top_card)
 
-            if pile_index == BOTTOM_FACE_DOWN_PILE:
+            # If we double-clicked, try to move the card to a top pile
+            if double_click and top_card.is_face_up:
+                for top_pile_index in range(TOP_PILE_1, TOP_PILE_4 + 1):
+                    # If the card is the top card of the pile
+                    if self.can_add_to_top_pile(top_card, top_pile_index):
+                        self.move_card_to_new_pile(top_card, top_pile_index)
+                        top_card.position = self.pile_mat_list[top_pile_index].position
+                        top_card.is_face_up = True
+                        self.pull_to_top(top_card)  # Adjust z-order
+                        self.moves += 1
+                        # --- Win check
+                        self.check_winning()
+                        return
+            elif pile_index == BOTTOM_FACE_DOWN_PILE:
                 if self.hard_mode:
                     # Move all face up cards to the position of the face up mat pile
                     for card in self.piles[BOTTOM_FACE_UP_PILE]:
@@ -627,6 +647,13 @@ def on_mouse_press(self, x, y, button, key_modifiers):
                         self.piles[BOTTOM_FACE_DOWN_PILE].append(card)
                         card.position = self.pile_mat_list[BOTTOM_FACE_DOWN_PILE].position
 
+    def can_add_to_top_pile(self, card, pile_index):
+        '''Check if a card can be added to a top pile'''
+        if len(self.piles[pile_index]) == 0:
+            return card.value == 'A'
+        top_card = self.piles[pile_index][-1]
+        return top_card.suit == card.suit and CARD_VALUES.index(top_card.value) + 1 == CARD_VALUES.index(card.value)
+
     def remove_card_from_pile(self, card):
         '''Remove the card from the pile'''
         for pile in self.piles:
@@ -767,10 +794,7 @@ def on_mouse_release(self, x, y, button, key_modifiers):
         self.held_cards = []
 
         # --- Win check
-        if self.check_winning():
-            # Show the winning window
-            view = WinningView(self.elapsed_time, self.moves, language=self.language)
-            self.window.show_view(view)
+        self.check_winning()
 
     def on_mouse_motion(self, x: float, y: float, dx: float, dy: float):
         """ User moves mouse """
@@ -794,8 +818,10 @@ def check_winning(self):
         '''Check if the player has won the game'''
         for pile in self.piles[TOP_PILE_1:]:
             if len(pile) != 13:
-                return False
-        return True
+                return
+        # Show the winning window
+        view = WinningView(self.elapsed_time, self.moves, language=self.language)
+        self.window.show_view(view)
 
 def main():
     '''Main function to run the game'''