Merge branch 'pjmikkol-master'

- lots of new tab images, mainly for the new Adventures cards
- tabs for Prizes, extra tab for Possession
- fix for Scavenger

card_db/en_us/dominion_card_extras.txt

@@ -207,27 +207,11 @@ coins from Treasures or previous Actions (like the
 Market) to increase the cost of the card you may
 gain. [You cannot gain cards with Potion in the cost
 with Workshop.]
-:::
+:::Possession 2/2
--If you make another player play an Attack via Possession, that Attack will hit you like it would
+-Possession causes an extra turn to be played, like the card Outpost does (from Seaside). The extra turn happens only after this turn is completely over - you will have discarded everything and drawn your next hand. Outpost only prevents itself from giving a player two consecutive turns, it does not prevent other cards or the rules from doing so. So, for example, if you play Possession in a two player game, then after the Possession turn, that player still gets his normal turn. If he played Outpost during that turn though, it would not give him an extra turn. If you play both Outpost and Possession in the same turn, the Outpost turn happens first. If you make someone play Outpost during a turn in which you Possessed them, that player will get the extra turn and make decisions during it and so forth, not you; if you make someone play Possession during a turn in which you Possessed them, that will make that player Possess the player to his left, rather than you getting to Possess anyone further. Possession turns (and other extra turns) do not count for the tiebreaker. Once the game ends, no further turns are played, including extra turns from Possession and Outpost.
-normally. If you want to use a Reaction in response to that Attack (such as Secret Chamber from
-Intrigue), you would be the one revealing the Reaction, not the player being Possessed.
--Possession causes an extra turn to be played, like the card Outpost does (from Seaside). The extra
-turn happens only after this turn is completely over - you will have discarded everything and drawn
-your next hand. Outpost only prevents itself from giving a player two consecutive turns, it does not
-prevent other cards or the rules from doing so. So, for example, if you play Possession in a two player
-game, then after the Possession turn, that player still gets his normal turn. If he played
-Outpost during that turn though, it would not give him an extra turn. If you play both Outpost and
-Possession in the same turn, the Outpost turn happens first. If you make someone play Outpost
-during a turn in which you Possessed them, that player will get the extra turn and make decisions
-during it and so forth, not you; if you make someone play Possession during a turn in which you
-Possessed them, that will make that player Possess the player to his left, rather than you getting to
-Possess anyone further. Possession turns (and other extra turns) do not count for the tiebreaker.
-Once the game ends, no further turns are played, including extra turns from Possession and
-Outpost.
 -Unlike Outpost, Possession is not a Duration card. It is discarded in the Clean-up phase of the turn
 you played it.
--Possession is cumulative; if you play it twice in one turn, there will be two extra turns after this
+
-one.
 :::Curse
 Curses are an available pile in the Supply regardless
 of what other cards are in the Supply.
@@ -906,14 +890,6 @@ cards he has set aside with Native Village (from Seaside). You can count any car
 bought, as well as cards gained due to Actions. The cards you gain this way go to your discard pile, even if
 they would have gone to that player's hand or the top of his deck or somewhere else. You only gain cards
 he would have; you do not gain tokens he would have (for example from the Seaside card Pirate Ship).
--During the Possessed turn, whenever one of that player's cards is trashed, set it aside, and that player puts
-it into his discard pile at the end of the turn, after Clean-up. This counts as the card being trashed, so, for
-example, you could trash a Mining Village (from Intrigue) and get the 2 coins. Getting those cards back at
-end of turn does not count as those cards being gained (so for example, you won't get them). Other players'
-cards that are trashed during that turn are not returned.
--Cards passed with Masquerade (from Intrigue) are not being gained or trashed, and so are passed normally.
-Cards returned to the Supply with Ambassador (from Seaside) are also not being trashed, and so return to
-the Supply normally.
 [Continued on blank tab]
 :::Scrying Pool
 First you reveal the top card of each player's deck, and either have them
@@ -1347,6 +1323,9 @@ This is a Treasure worth 2 coins, like Silver. You play it in your Buy phase, li
 :::Fairgrounds
 At the end of the game, this is worth 2 VP per 5 differently named cards in your deck, rounded down. So if you have 0-4 different cards, it is worth 0 VP; if you have 5-9, it is worth 2 VP; if you have 10-14, it is worth 4 VP; if you have 15-19, it is worth 6; and so on. By default there are only 17 differently named cards available in a game, but sometimes there may be more cards, such as via Young Witch's setup rule, or due to Tournament. Use 8 Fairgrounds in a game with 2 players, and 12 for a game with 3 or more players.
 
+:::Prizes
+Prizes are never in the supply. They can only be obtained via Tournament. When Tournament is one of the Kingdom cards, set out the pile of five Prizes at the start of the game.
+
 :::Farming Village
 Reveal cards from the top of your deck until you reveal a Treasure or Action card. If you run out of cards before finding one, shuffle your discard pile (but not the revealed cards), and keep revealing cards. If you still cannot find one, just discard
 all of the revealed cards. If you do find a Treasure or Action card, put it into your hand, and discard the rest of the revealed cards. A card with multiple types, one of which is Treasure or Action (for example Diadem, a Treasure - Prize), is a Treasure or Action and so will be drawn by this. You do not choose Treasure or Action – you stop on the first card matching either type.

card_db/en_us/dominion_cards.txt

@@ -127,6 +127,10 @@ Trash a card from your hand.
 +1 Card per Coin it costs.
 +2 Cards if it has Potion in its cost.
 13	Possession	Alchemy	Action	$6 1P	The player to your left takes an extra turn after this one, in which you can see all cards he can and make all decisions for him. Any cards he would gain on that turn, you gain instead; any cards of his that are trashed are set aside and returned to his discard pile at end of turn.
+14	Possession 2/2	Alchemy	Action	$6 1P	-During the Possessed turn, whenever one of that player's cards is trashed, set it aside, and that player puts it into his discard pile at the end of the turn, after Clean-up. This counts as the card being trashed, so, for example, you could trash a Mining Village (from Intrigue) and get the 2 coins. Getting those cards back at end of turn does not count as those cards being gained (so for example, you won't get them). Other players' cards that are trashed during that turn are not returned.
+-If you make another player play an Attack via Possession, that Attack will hit you like it would normally. If you want to use a Reaction in response to that Attack (such as Secret Chamber from Intrigue), you would be the one revealing the Reaction, not the player being Possessed.
+-Possession is cumulative; if you play it twice in one turn, there will be two extra turns after this one.
+-Cards passed with Masquerade (from Intrigue) are not being gained or trashed, and so are passed normally. Cards returned to the Supply with Ambassador (from Seaside) are also not being trashed, and so return to the Supply normally.
 
 1	Loan	Prosperity	Treasure	$3	Worth 1 Coin.
 When you play this, reveal cards from your deck until you reveal a Treasure. Discard it or trash it. Discard the other cards.
@@ -268,6 +272,12 @@ Reveal your hand. Reveal cards from your deck until you reveal a card that isn
 17	Jester	Cornucopia	Action - Attack	$5	+2 Coins
 Each other player discards the top card of his deck. If it’s a Victory card he gains a Curse. Otherwise he gains a copy of the discarded card or you do, your choice.
 18	Fairgrounds	Cornucopia	Victory	$6	Worth 2 <VP> for every 5 differently named cards in your deck (rounded down)
+19	Prizes	Cornucopia Extras	Prize	$0	Prizes are never in the supply. They can only be obtained via Tournament.
+Bag of Gold: +1 Action; Gain a Gold, putting it on top of your deck.
+Diadem: +2 Coins; When you play this, +1 Coins per unused Action you have.
+Followers: +2 Cards; Gain an Estate. Each other player gains a Curse and discards down to 3 cards in hand.
+Princess: +1 Buy; While this is in play, cards cost 2 Coins less, but not less than 0 Coins.
+Trusty Steed: Choose two: +2 Cards; or +2 Actions; or +2 Coins; or gain 4 Silvers and put your deck into your discard pile.
 
 1	Crossroads	Hinterlands	Action	$2	Reveal your hand.
 +1 Card per Victory card revealed. If this is the first time you played a Crossroads this turn, +3 Actions.
@@ -407,7 +417,7 @@ When you trash this, +3 Cards.
 21	Graverobber	Dark Ages	Action	$5	Choose one: Gain a card from the trash costing from 3 Coins to 6 Coins, putting it on top of your deck; or trash an Action card from your hand and gain a card costing up to 3 Coins more than it.
 22	Pillage	Dark Ages	Action - Attack	$5	Trash this. Each other player with 5 or more cards in hand reveals his hand and discards a card that you choose.
 Gain 2 Spoils from the Spoils pile.
-23	Scavenger	Dark Ages	Action	$5	+1 Coins
+23	Scavenger	Dark Ages	Action	$4	+2 Coins
 You may put your deck into your discard pile. Look through your discard pile and put one card from it on top of your deck.
 24	Altar	Dark Ages	Action	$6	Trash a card from your hand. Gain a card costing up to 5 Coins.
 29	Armory	Dark Ages	Action	$4	Gain a card costing up to 4 Coins,putting it on top of your deck.

dominion_tabs.py

@@ -107,30 +107,30 @@ class DominionTabs:
         CardType(('Action', 'Reaction'), 'reaction.png'),
         CardType(('Action', 'Victory'), 'action-victory.png'),
         CardType(('Action', 'Duration'), 'duration.png'),
-        CardType(('Action', 'Duration', 'Reaction'), 'duration.png'),
+        CardType(('Action', 'Duration', 'Reaction'), 'duration-reaction.png'),
         CardType(('Action', 'Attack', 'Duration'), 'duration.png'),
         CardType(('Action', 'Looter'), 'action.png'),
         CardType(('Action', 'Prize'), 'action.png'),
         CardType(('Action', 'Ruins'), 'ruins.png', 0, 1),
-        CardType(('Action', 'Shelter'), 'shelter.png', 0, 1),
+        CardType(('Action', 'Shelter'), 'action-shelter.png'),
         CardType(('Action', 'Attack', 'Looter'), 'action.png'),
         CardType(('Action', 'Attack', 'Traveller'), 'action.png'),
-        CardType(('Action', 'Reserve'), 'action.png'),
+        CardType(('Action', 'Reserve'), 'reserve.png'),
-        CardType(('Action', 'Reserve', 'Victory'), 'action.png'),
+        CardType(('Action', 'Reserve', 'Victory'), 'reserve-victory.png'),
         CardType(('Action', 'Traveller'), 'action.png'),
-        CardType(('Event',), 'action.png'),
+        CardType(('Prize',), 'action.png'),
+        CardType(('Event',), 'event.png'),
         CardType(('Reaction',), 'reaction.png'),
-        CardType(('Reaction', 'Shelter'), 'shelter.png', 0, 1),
+        CardType(('Reaction', 'Shelter'), 'reaction-shelter.png'),
-        CardType(('Reserve'), 'action.png'),
         CardType(('Treasure',), 'treasure.png', 3, 0),
         CardType(('Treasure', 'Attack'), 'treasure.png'),
         CardType(('Treasure', 'Victory'), 'treasure-victory.png'),
         CardType(('Treasure', 'Prize'), 'treasure.png', 3, 0),
         CardType(('Treasure', 'Reaction'), 'treasure-reaction.png', 0, 1),
-        CardType(('Treasure', 'Reserve'), 'treasure.png', 0, 1),
+        CardType(('Treasure', 'Reserve'), 'reserve-treasure.png'),
         CardType(('Victory',), 'victory.png'),
         CardType(('Victory', 'Reaction'), 'victory-reaction.png', 0, 1),
-        CardType(('Victory', 'Shelter'), 'shelter.png', 0, 1),
+        CardType(('Victory', 'Shelter'), 'victory-shelter.png'),
         CardType(('Curse',), 'curse.png', 3),
         CardType(('Expansion',), 'expansion.png', 4),
         CardType(('Blank',), '')
@@ -154,6 +154,7 @@ class DominionTabs:
         'prosperity': 'prosperity_set.png',
         'alchemy': 'alchemy_set.png',
         'cornucopia': 'cornucopia_set.png',
+        'cornucopia extras': 'cornucopia_set.png',
         'hinterlands': 'hinterlands_set.png',
         'dark ages': 'dark_ages_set.png',
         'dark ages extras': 'dark_ages_set.png',