Alexander Schremmer avatar Alexander Schremmer committed d4c67c3

Fix Margrave logic.

Comments (0)

Files changed (1)

domination/cards/hinterlands.py

                 handle_defense(self, game, other_player)
             except Defended:
                 continue
+            other_player.draw_cards(1)
             if len(other_player.hand) < 4:
                 continue
             count = len(other_player.hand) - 3
-            cards = yield SelectHandCards(game, other_player, count_lower=2, count_upper=2,
-                    msg=_("%s played Margrave, you need to discard your hand down to three card. Which cards do you want to discard?", (player.name, )))
+            if count <= 0:
+                continue
+            cards = yield SelectHandCards(game, other_player, count_lower=count, count_upper=count,
+                    msg=_("%s played Margrave, you need to discard your hand down to three cards. Which cards do you want to discard?", (player.name, )))
             for card in cards:
                 card.discard(other_player)
             for info_player in game.participants:
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.