Merge branch 'robertre2-master'

Add events + option to exclude them.

card_db/en_us/dominion_cards.txt

@@ -655,3 +655,28 @@ When you discard this from play, you may exchange it for a Teacher.
 ______________________
 At the start of your turn, you may call this, to move your +1 Card, +1 Action, +1 Buy, or +1 Coin token to an Action Supply pile you have no tokens on (when you play a card from that pile, you first get that bonus).
 (This is not in the Supply.)
+39	Alms	Adventures	Event	$0	Once per turn: If you have no Treasures in play, gain a card costing up to 4 Coin.
+40	Ball	Adventures	Event	$5	Take your - 1 Coin token. Gain 2 cards each costing up to 4 Coin.
+41	Bonfire	Adventures	Event	$3	Trash up to 2 cards you have in play.
+42	Borrow	Adventures	Event	$0	+1 Buy
+Once per turn: If your -1 Card token isn't on your deck, put it there and +1 Coin.
+43	Expedition	Adventures	Event	$3	Draw 2 extra cards for your next hand.
+44	Ferry	Adventures	Event	$3	Move your - 2 Coin cost token to an Action Supply pile (cards from that pile cost 2 Coin less on your turns, but not less than 0 Coin.
+45	Inheritance	Adventures	Event	$7	Once per game: Set aside a non-Victory Action card from the Supply costing up to 4 Coin. Move your Estate token to it (your Estates gain the abilities and types of that card).
+46	Lost Arts	Adventures	Event	$6	Move your +1 Action token to an Action Supply pile (when you play a card from that pile, you first get +1 Action).
+47	Mission	Adventures	Event	$4	Once per turn: If the previous turn wasn't yours, take another turn after this one, in which you can't buy cards.
+48	Pathfinding	Adventures	Event	$8	Move your +1 Card token to an Action Supply pile (when you play a card from that pile, you first get +1 Card).
+49	Pilgrimage	Adventures	Event	$4	Once per turn: Turn your Journey token over (it starts face up); then if it's face up, choose up to 3 differently named cards you have in play and gain a copy of each.
+50	Plan	Adventures	Event	$3	Move your Trashing token to an Action Supply pile (when you buy a card from that pile, you may trash a card from your hand.)
+51	Quest	Adventures	Event	$0	You may discard an Attack, two Curses, or six cards. If you do, gain a Gold.
+52	Raid	Adventures	Event	$5	Gain a Silver per Silver you have in play. Each other player puts his -1 Card token on his deck.
+53	Save	Adventures	Event	$1	+1 Buy
+Once per turn: Set aside a card from your hand, and put it into your hand at end of turn (after drawing).
+54	Scouting Party	Adventures	Event	$2	+1 Buy
+Look at the top 5 cards of your deck. Discard 3 of them and put the rest back on top of your deck in any order.
+55	Seaway	Adventures	Event	$5	Gain an Action card costing up to 4 Coin. Move your +1 Buy token to its pile (when you play a card from that pile, you first get +1 Buy).
+56	Trade	Adventures	Event	$5	Trash up to 2 cards from your hand.
+Gain a Silver per card you trashed.
+57	Training	Adventures	Event	$6	Move your + 1 Coin token to an Action Supply pile (when you play a card from that pile, you first get + 1 Coin).
+58	Travelling Fair	Adventures	Event	$2	+2 Buys
+When you gain a card this turn, you may put it on top of your deck.

card_db/en_us/mapping.yaml

@@ -12,3 +12,4 @@
 "Blank": "Blank"
 "Reserve": "Reserve"
 "Traveller": "Traveller"
+"Event": "Event"

dominion_tabs.py

@@ -46,6 +46,9 @@ class Card:
     def isExpansion(self):
         return self.getType().getTypeNames() == ('Expansion',)
 
+    def isEvent(self):
+        return self.getType().getTypeNames() == ('Event',)
+
     def setImage(self):
         setImage = DominionTabs.getSetImage(self.cardset, self.name)
         if setImage is None and self.cardset not in ['base', 'extra'] and not self.isExpansion():
@@ -111,6 +114,7 @@ class DominionTabs:
         CardType(('Action', 'Reserve'), 'action.png'),
         CardType(('Action', 'Reserve', 'Victory'), 'action.png'),
         CardType(('Action', 'Traveller'), 'action.png'),
+        CardType(('Event',), 'action.png'),
         CardType(('Reaction',), 'reaction.png'),
         CardType(('Reaction', 'Shelter'), 'shelter.png', 0, 1),
         CardType(('Reserve'), 'action.png'),
@@ -753,6 +757,7 @@ class DominionTabs:
                           help="stop generating after this many pages, -1 for all")
         parser.add_option("--language", default='en_us', help="language of card texts")
         parser.add_option("--include_blanks", action="store_true", help="include a few dividers with extra text")
+        parser.add_option("--exclude_events", action="store_true", default=False, help="exclude individual dividers for events")
         options, args = parser.parse_args(argstring)
         if not options.cost:
             options.cost = ['tab']
@@ -944,6 +949,9 @@ class DominionTabs:
 
             cards = filteredCards
 
+        if self.options.exclude_events:
+            cards = [card for card in cards if not card.isEvent()]
+
         if options.expansion_dividers:
             cardnamesByExpansion = {}
             for c in cards: