Ferro di Cavallo

This commit is contained in:
Alberto Xamin 2021-06-15 23:04:19 +02:00
parent 8c57e87532
commit 860d6ce3ca
No known key found for this signature in database
GPG Key ID: 4F026F48309500A2

View File

@ -456,6 +456,8 @@ class Player:
if self.pending_action != PendingAction.PICK: if self.pending_action != PendingAction.PICK:
return return
pickable_cards = 1 + self.character.pick_mod pickable_cards = 1 + self.character.pick_mod
if len([c for c in self.equipment if isinstance(c, grc.FerroDiCavallo)]) > 0:
pickable_cards += 1
if self.is_my_turn: if self.is_my_turn:
for i in range(len(self.equipment)): for i in range(len(self.equipment)):
if i < len(self.equipment) and isinstance(self.equipment[i], cs.Dinamite): if i < len(self.equipment) and isinstance(self.equipment[i], cs.Dinamite):
@ -706,6 +708,8 @@ class Player:
def barrel_pick(self): def barrel_pick(self):
pickable_cards = 1 + self.character.pick_mod pickable_cards = 1 + self.character.pick_mod
if len([c for c in self.equipment if isinstance(c, grc.FerroDiCavallo)]) > 0:
pickable_cards += 1
if len([c for c in self.equipment if isinstance(c, cs.Barile)]) > 0 and self.character.check(self.game, chars.Jourdonnais): if len([c for c in self.equipment if isinstance(c, cs.Barile)]) > 0 and self.character.check(self.game, chars.Jourdonnais):
pickable_cards = 2 pickable_cards = 2
while pickable_cards > 0: while pickable_cards > 0:
@ -736,6 +740,8 @@ class Player:
pickable_cards = 1 + self.character.pick_mod pickable_cards = 1 + self.character.pick_mod
if len([c for c in self.equipment if isinstance(c, cs.Barile)]) > 0 and self.character.check(self.game, chars.Jourdonnais): if len([c for c in self.equipment if isinstance(c, cs.Barile)]) > 0 and self.character.check(self.game, chars.Jourdonnais):
pickable_cards = 2 pickable_cards = 2
if len([c for c in self.equipment if isinstance(c, grc.FerroDiCavallo)]) > 0:
pickable_cards += 1
while pickable_cards > 0: while pickable_cards > 0:
pickable_cards -= 1 pickable_cards -= 1
picked: cs.Card = self.game.deck.pick_and_scrap() picked: cs.Card = self.game.deck.pick_and_scrap()