fix scrap cards of the dead players
with Vulture Sam
This commit is contained in:
parent
89dfb533b5
commit
ce0611cf8d
@ -226,12 +226,8 @@ class Player:
|
|||||||
self.end_turn(forced=True)
|
self.end_turn(forced=True)
|
||||||
elif self.is_ghost and not self.game.check_event(ceh.CittaFantasma):
|
elif self.is_ghost and not self.game.check_event(ceh.CittaFantasma):
|
||||||
self.is_ghost = False
|
self.is_ghost = False
|
||||||
#mi assicuro che non i morti non abbiano carte
|
|
||||||
if self.is_dead and not self.is_ghost:
|
|
||||||
if len(self.hand):
|
|
||||||
for i in range(len(self.hand)):
|
for i in range(len(self.hand)):
|
||||||
self.game.deck.scrap(self.hand.pop(), True)
|
self.game.deck.scrap(self.hand.pop(), True)
|
||||||
if len(self.equipment):
|
|
||||||
for i in range(len(self.equipment)):
|
for i in range(len(self.equipment)):
|
||||||
self.game.deck.scrap(self.equipment.pop(), True)
|
self.game.deck.scrap(self.equipment.pop(), True)
|
||||||
if self.is_ghost: self.lives = 0
|
if self.is_ghost: self.lives = 0
|
||||||
@ -762,6 +758,7 @@ class Player:
|
|||||||
target.notify_self()
|
target.notify_self()
|
||||||
if self.choose_action == 'steal':
|
if self.choose_action == 'steal':
|
||||||
card.reset_card()
|
card.reset_card()
|
||||||
|
if card.name != "Fantasma" or self.name != target.name: #se si uccide facendo panico su fantasma la carta non gli viene messa in mano
|
||||||
self.hand.append(card)
|
self.hand.append(card)
|
||||||
else:
|
else:
|
||||||
self.game.deck.scrap(card, True)
|
self.game.deck.scrap(card, True)
|
||||||
|
Loading…
Reference in New Issue
Block a user