Skip to content

Commit c81b1c6

Browse files
NEUKhoaLeNEUKhoaLe
committed
Fixing Bugs in regard to Dragging; Refactoring and moving files
1 parent 856eb39 commit c81b1c6

File tree

6 files changed

+96
-80
lines changed

6 files changed

+96
-80
lines changed

‎Cards/Deck/PlayDeck/LeftDeck.py

+20-19
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ def draw_deck(self, move_from_shuffle=False, game_update=False):
2020
starting = max((self.length + self.y) - (num_cards * self.card_width), self.y)
2121

2222
if num_cards == 0 or num_cards == 1:
23-
card_pos = self.card_width
23+
self.card_pos = self.card_width
2424
else:
25-
card_pos = min(self.card_width,
26-
round((self.length - self.card_width) / (num_cards - 1)))
25+
self.card_pos = min(self.card_width,
26+
round((self.length - self.card_width) / (num_cards - 1)))
2727

2828
update_rect(self.collide_point, self.x, self.y,
2929
self.card_height, min((num_cards * self.card_width), self.length))
3030

3131
for i in range(len(self.deck)):
32-
self.surface.blit(self.full_card, (self.x, starting + card_pos))
32+
self.surface.blit(self.full_card, (self.x, starting + self.card_pos))
3333

3434
x = self.deck[i]
3535

@@ -39,14 +39,14 @@ def draw_deck(self, move_from_shuffle=False, game_update=False):
3939
if not x.get_chosen():
4040
# We draw the background, then draw the previous cards, then proceed.
4141
if self.was_chosen_deck.__contains__(x):
42-
length = self.get_cover_length(i, card_pos, for_chosen=False)
42+
length = self.get_cover_length(i, for_chosen=False)
4343
self.half_card = pygame.Surface((self.card_height/2, length + 2))
4444
self.half_card.fill(self.settings.bg_color)
4545
self.surface.blit(self.half_card,
4646
(self.x + self.card_height, starting + self.card_width - length))
4747
self.was_chosen_deck.remove(x)
4848

49-
self.draw_previous(i, card_pos)
49+
self.draw_previous(i)
5050

5151
self.draw_rest_deck(x)
5252

@@ -59,25 +59,25 @@ def draw_deck(self, move_from_shuffle=False, game_update=False):
5959

6060
if i != len(self.deck) - 1:
6161
if not self.deck[i+1].get_chosen():
62-
x.update_card_block_area(self.x, starting + card_pos,
63-
self.card_height, self.card_width - card_pos)
62+
x.update_card_block_area(self.x, starting + self.card_pos,
63+
self.card_height, self.card_width - self.card_pos)
6464
else:
65-
x.update_card_block_area(self.x + self.card_height/2, starting + card_pos,
66-
self.card_height/2, self.card_width - card_pos)
65+
x.update_card_block_area(self.x + self.card_height/2, starting + self.card_pos,
66+
self.card_height/2, self.card_width - self.card_pos)
6767
else:
68-
x.update_card_block_area(self.x, starting + card_pos, 0, 0)
68+
x.update_card_block_area(self.x, starting + self.card_pos, 0, 0)
6969

7070
# Do this portion
7171
else:
7272
if self.to_be_chosen_cards.__contains__(x):
73-
length = self.get_cover_length(i, card_pos, for_chosen=True)
73+
length = self.get_cover_length(i, for_chosen=True)
7474
self.half_card = pygame.Surface((self.card_height/2, length + 2))
7575
self.half_card.fill(self.settings.bg_color)
7676
self.surface.blit(self.half_card,
7777
(self.x + self.card_height/2, starting + self.card_width - length))
7878
self.to_be_chosen_cards.remove(x)
7979

80-
self.draw_previous(i, card_pos)
80+
self.draw_previous(i)
8181

8282
self.draw_rest_deck(x)
8383

@@ -88,18 +88,18 @@ def draw_deck(self, move_from_shuffle=False, game_update=False):
8888
if i != len(self.deck) - 1:
8989
if not self.deck[i+1].get_chosen():
9090
x.update_card_block_area(self.x + self.card_height/2,
91-
original_y + card_pos,
91+
original_y + self.card_pos,
9292
self.chosen_x - self.x,
93-
self.card_width - card_pos)
93+
self.card_width - self.card_pos)
9494
else:
9595
x.update_card_block_area(self.chosen_x,
96-
original_y + card_pos,
96+
original_y + self.card_pos,
9797
self.card_height,
98-
self.card_width - card_pos)
98+
self.card_width - self.card_pos)
9999
else:
100-
x.update_card_block_area(self.y, original_x + card_pos, 0, 0)
100+
x.update_card_block_area(self.y, original_x + self.card_pos, 0, 0)
101101

102-
starting += card_pos
102+
starting += self.card_pos
103103
if self.was_drag_card.__contains__(x):
104104
self.was_drag_card.remove(x)
105105

@@ -120,6 +120,7 @@ def handle_selected(self, mouse_x, mouse_y, dragging):
120120

121121
self.surface.blit(self.full_card, (card.cur_pos()))
122122

123+
self.draw_previous(i)
123124
self.draw_rest_deck(self.deck[max(i - 1, 0)], for_drag=True)
124125
self.update(False)
125126

‎Cards/Deck/PlayDeck/OppositeDeck.py

+20-19
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ def draw_deck(self, move_from_shuffle=False, game_update=False):
2020
starting = max((self.width + self.x) - (num_cards * self.card_width), self.x)
2121

2222
if num_cards == 0 or num_cards == 1:
23-
card_pos = self.card_width
23+
self.card_pos = self.card_width
2424
else:
25-
card_pos = min(self.card_width,
26-
round((self.width - self.card_width) / (num_cards - 1)))
25+
self.card_pos = min(self.card_width,
26+
round((self.width - self.card_width) / (num_cards - 1)))
2727

2828
update_rect(self.collide_point, self.x, self.y,
2929
min((num_cards * self.card_width), self.width), self.card_height)
3030

3131
for i in range(len(self.deck)):
32-
self.surface.blit(self.full_card, (starting + card_pos, self.y))
32+
self.surface.blit(self.full_card, (starting + self.card_pos, self.y))
3333

3434
x = self.deck[i]
3535

@@ -39,14 +39,14 @@ def draw_deck(self, move_from_shuffle=False, game_update=False):
3939
if not x.get_chosen():
4040
# We draw the background, then draw the previous cards, then proceed.
4141
if self.was_chosen_deck.__contains__(x):
42-
width = self.get_cover_width(i, card_pos, for_chosen=False)
42+
width = self.get_cover_width(i, for_chosen=False)
4343
self.half_card = pygame.Surface((width + 2, self.card_height/2))
4444
self.half_card.fill(self.settings.bg_color)
4545
self.surface.blit(self.half_card,
4646
(starting + self.card_width - width, self.y + self.card_height))
4747
self.was_chosen_deck.remove(x)
4848

49-
self.draw_previous(i, card_pos)
49+
self.draw_previous(i)
5050

5151
self.draw_rest_deck(x)
5252

@@ -59,25 +59,25 @@ def draw_deck(self, move_from_shuffle=False, game_update=False):
5959

6060
if i != len(self.deck) - 1:
6161
if not self.deck[i+1].get_chosen():
62-
x.update_card_block_area(starting + card_pos, self.y,
63-
self.card_width - card_pos, self.card_height)
62+
x.update_card_block_area(starting + self.card_pos, self.y,
63+
self.card_width - self.card_pos, self.card_height)
6464
else:
65-
x.update_card_block_area(starting + card_pos, self.y + self.card_height/2,
66-
self.card_width - card_pos, self.card_height/2)
65+
x.update_card_block_area(starting + self.card_pos, self.y + self.card_height/2,
66+
self.card_width - self.card_pos, self.card_height/2)
6767
else:
68-
x.update_card_block_area(starting + card_pos, self.y, 0, 0)
68+
x.update_card_block_area(starting + self.card_pos, self.y, 0, 0)
6969

7070
# Do this portion
7171
else:
7272
if self.to_be_chosen_cards.__contains__(x):
73-
width = self.get_cover_width(i, card_pos, for_chosen=True)
73+
width = self.get_cover_width(i, for_chosen=True)
7474
self.half_card = pygame.Surface((width, self.card_height/2 + 2))
7575
self.half_card.fill(self.settings.bg_color)
7676
self.surface.blit(self.half_card,
7777
(starting + self.card_width - width, self.y))
7878
self.to_be_chosen_cards.remove(x)
7979

80-
self.draw_previous(i, card_pos)
80+
self.draw_previous(i)
8181

8282
self.draw_rest_deck(x)
8383

@@ -87,20 +87,20 @@ def draw_deck(self, move_from_shuffle=False, game_update=False):
8787

8888
if i != len(self.deck) - 1:
8989
if not self.deck[i+1].get_chosen():
90-
x.update_card_block_area(original_x + card_pos,
90+
x.update_card_block_area(original_x + self.card_pos,
9191
self.y + self.card_height/2,
92-
self.card_width - card_pos,
92+
self.card_width - self.card_pos,
9393
self.chosen_y - self.y)
9494
else:
95-
x.update_card_block_area(original_x + card_pos,
95+
x.update_card_block_area(original_x + self.card_pos,
9696
self.chosen_y,
97-
self.card_width - card_pos,
97+
self.card_width - self.card_pos,
9898
self.card_height)
9999

100100
else:
101-
x.update_card_block_area(original_x + card_pos, self.y, 0, 0)
101+
x.update_card_block_area(original_x + self.card_pos, self.y, 0, 0)
102102

103-
starting += card_pos
103+
starting += self.card_pos
104104
if self.was_drag_card.__contains__(x):
105105
self.was_drag_card.remove(x)
106106

@@ -122,6 +122,7 @@ def handle_selected(self, mouse_x, mouse_y, dragging):
122122
cx, cy = card.cur_pos()
123123
self.surface.blit(self.full_card, (cx + 2, cy))
124124

125+
self.draw_previous(i)
125126
self.draw_rest_deck(self.deck[max(i - 1, 0)], for_drag=True)
126127
self.update(False)
127128

‎Cards/Deck/PlayDeck/PlayerDeck.py

+21-19
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,35 @@ def __init__(self, x, y, chosen_y, width, collide_point, display, surface):
1414
def draw_deck(self, move_from_shuffle=False, game_update=False):
1515
if not move_from_shuffle:
1616
self.surface.blit(self.background, (self.x, self.y))
17+
self.surface.blit(self.half_background, (self.x, self.chosen_y))
1718

1819
num_cards = len(self.deck)
1920
starting = max((self.width + self.x) - (num_cards * self.card_width), self.x)
2021

2122
if num_cards == 0 or num_cards == 1:
22-
card_pos = self.card_width
23+
self.card_pos = self.card_width
2324
else:
24-
card_pos = min(self.card_width,
25-
round((self.width - self.card_width) / (num_cards - 1)))
25+
self.card_pos = min(self.card_width,
26+
round((self.width - self.card_width) / (num_cards - 1)))
2627

2728
update_rect(self.collide_point, self.x, self.y,
2829
min((num_cards * self.card_width), self.width), self.card_height)
2930

3031
for i in range(len(self.deck)):
31-
self.surface.blit(self.full_card, (starting + card_pos, self.y))
32+
self.surface.blit(self.full_card, (starting + self.card_pos, self.y))
3233

3334
x = self.deck[i]
3435

3536
if not x.get_chosen():
3637
# We draw the background, then draw the previous cards, then proceed.
3738
if self.was_chosen_deck.__contains__(x):
38-
width = self.get_cover_width(i, card_pos, for_chosen=False)
39+
width = self.get_cover_width(i, for_chosen=False)
3940
self.half_card = pygame.Surface((width, self.card_height/2))
4041
self.half_card.fill(self.settings.bg_color)
4142
self.surface.blit(self.half_card, (starting + self.card_width - width, self.chosen_y))
4243
self.was_chosen_deck.remove(x)
4344

44-
self.draw_previous(i, card_pos)
45+
self.draw_previous(i)
4546

4647
self.draw_rest_deck(x)
4748
x.update_vis(True)
@@ -53,25 +54,25 @@ def draw_deck(self, move_from_shuffle=False, game_update=False):
5354

5455
if i != len(self.deck) - 1:
5556
if not self.deck[i + 1].get_chosen():
56-
x.update_card_block_area(starting + card_pos, self.y,
57-
self.card_width - card_pos, self.card_height)
57+
x.update_card_block_area(starting + self.card_pos, self.y,
58+
self.card_width - self.card_pos, self.card_height)
5859
else:
59-
x.update_card_block_area(starting + card_pos, self.y,
60-
self.card_width - card_pos, self.card_height/2)
60+
x.update_card_block_area(starting + self.card_pos, self.y,
61+
self.card_width - self.card_pos, self.card_height/2)
6162
else:
62-
x.update_card_block_area(starting + card_pos, self.y, 0, 0)
63+
x.update_card_block_area(starting + self.card_pos, self.y, 0, 0)
6364

6465
# Do this portion
6566
else:
6667
if self.to_be_chosen_cards.__contains__(x):
67-
width = self.get_cover_width(i, card_pos, for_chosen=True)
68+
width = self.get_cover_width(i, for_chosen=True)
6869
self.half_card = pygame.Surface((width, self.card_height/2))
6970
self.half_card.fill(self.settings.bg_color)
7071
self.surface.blit(self.half_card,
7172
(starting + self.card_width - width, self.y + self.card_height/2))
7273
self.to_be_chosen_cards.remove(x)
7374

74-
self.draw_previous(i, card_pos)
75+
self.draw_previous(i)
7576

7677
self.draw_rest_deck(x)
7778

@@ -81,19 +82,19 @@ def draw_deck(self, move_from_shuffle=False, game_update=False):
8182

8283
if i != len(self.deck) - 1:
8384
if not self.deck[i+1].get_chosen():
84-
x.update_card_block_area(original_x + card_pos,
85+
x.update_card_block_area(original_x + self.card_pos,
8586
self.y,
86-
self.card_width - card_pos,
87+
self.card_width - self.card_pos,
8788
self.y - self.chosen_y)
8889
else:
89-
x.update_card_block_area(original_x + card_pos,
90+
x.update_card_block_area(original_x + self.card_pos,
9091
self.chosen_y,
91-
self.card_width - card_pos,
92+
self.card_width - self.card_pos,
9293
self.card_height)
9394
else:
94-
x.update_card_block_area(original_x + card_pos, self.y, 0, 0)
95+
x.update_card_block_area(original_x + self.card_pos, self.y, 0, 0)
9596

96-
starting += card_pos
97+
starting += self.card_pos
9798
if self.was_drag_card.__contains__(x):
9899
self.was_drag_card.remove(x)
99100

@@ -114,6 +115,7 @@ def handle_selected(self, mouse_x, mouse_y, dragging):
114115

115116
self.surface.blit(self.full_card, (card.cur_pos()))
116117

118+
self.draw_previous(i)
117119
self.draw_rest_deck(self.deck[max(i - 1, 0)], for_drag=True)
118120
self.update(False)
119121

0 commit comments

Comments
 (0)