fix island overrun; Hinterlands; Governor; deflate zip; fix Ill-Gotten Gains

This commit is contained in:
Sumpfork 2012-08-09 23:57:38 +01:00
parent c914299c36
commit 4b9f72e805
6 changed files with 129 additions and 20 deletions

View File

@ -1,3 +1,3 @@
#main package
__version__ = '1.4'
__version__ = '1.5'

0
convert.ff Normal file → Executable file
View File

View File

@ -1,6 +1,6 @@
import dominion_tabs
from __init__ import __version__
from zipfile import ZipFile
from zipfile import ZipFile,ZIP_DEFLATED
prefix = 'sumpfork_dominion_tabs_'
postfix = 'v' + __version__ + '.pdf'
@ -19,7 +19,7 @@ argsets = [
('',''),
('--orientation=vertical','vertical_'),
('--papersize=A4','A4_'),
# ('--papersize=A4','vertical_A4_'),
('--papersize=A4','vertical_A4_'),
('--size=sleeved','sleeved_'),
('--size=sleeved --orientation=vertical','vertical_sleeved_')
]
@ -27,7 +27,8 @@ argsets = [
fnames = [doit(args[0],args[1]) for args in argsets]
print fnames
with ZipFile('sumpfork_dominion_tabs_v' + __version__ + '.zip','w') as zip:
for f in fnames:
zip = ZipFile('sumpfork_dominion_tabs_v' + __version__ + '.zip','w',ZIP_DEFLATED)
for f in fnames:
zip.write(f)
zip.close()

View File

@ -80,7 +80,7 @@ it is worth 1 victory point per 10 cards in your Deck
hand are part of your Deck at that point). Round
down; if you have 39 cards, Gardens is worth 3
victory points. During set-up, place 12 Gardens in
the Supply for a 3 or 4 [or 5 or 6] player game and 8
the Supply for a 3+ player game and 8
in the Supply for a 2 player game.
:::Laboratory
Draw two cards. You may play another Action card
@ -588,18 +588,18 @@ Haven itself is discarded during the Clean-up phase
of that subsequent turn.
:::Island
When you first take this card, take an Island player mat. Island is
both an Action card and a Victory card. In a 3- or 4- [or 5- or 6-]
player game, use 12 Islands. Use 8 Islands in a 2-player game.
both an Action card and a Victory card. Use 8 Islands in a 2 player
game, 12 Islands in a 3+ player game.
Island and the card set aside with it are set aside face up on the
Island player mat provided. They should not be shuffled back into
your deck when you shuffle your discard pile. They are returned to
your deck at the end of the game in order to calculate total victory
points. Island is work 2 VP. If you have no other cards in hand
points. Island is worth 2 VP. If you have no other cards in hand
when you play Island, just set Island aside by itself. If you Throne
Room an Island, set aside the Island and a card from your hand,
then set aside another card from your hand. You may look through
the cards on your Island playing mat (they are face up) and other
players may ask to see what you have there as well.
the cards on your Island playing mat and other
players may ask to see them as well.
:::Lighthouse
You get an action and a coin this turn, but only a coin
next turn. Attack cards played by other players don't
@ -1395,5 +1395,32 @@ This card causes there to be an extra pile in the Supply, called the Bane pile;
When you play Young Witch, after you draw 2 cards and discard 2 cards, each other player may reveal a Bane card from his hand; if he does not, he gains a Curse. This attack hits other players in turn order, which matters when the Curse pile is low. Players may still respond to a Young Witch with Reaction cards like Horse Traders or Moat (from Dominion); those happen before Bane cards are revealed. If Secret Chamber (from Dominion: Intrigue) is the Bane card, first you can reveal it for its Reaction ability, and then, if it's still in your hand, you can reveal it to avoid getting a Curse.
:::Walled Village:
:::Governor:
:::Crossroads:
:::Duchess:
:::Fool's Gold:
:::Develop:
:::Oasis:
:::Oracle:
:::Scheme:
:::Tunnel:
:::Jack of all Trades:
:::Noble Brigand:
:::Nomad Camp:
:::Silk Road:
:::Spice Merchant:
:::Trader:
:::Cache:
:::Cartographer:
:::Embassy:
:::Haggler:
:::Highway:
:::Ill-Gotten Gains:
:::Inn:
:::Mandarin:
:::Margrave:
:::Stables:
:::Border Village:
:::Farmland:

View File

@ -186,6 +186,9 @@ During your Buy phase, this costs $2 less per Action card you have in play, but
4 Walled Village Promo Action $4 +1 Card
+2 Actions
At the start of Clean-up, if you have this and no more than one other Action card in play, you may put this on top of your deck.
5 Governor Promo Action $5 +1 Action
Choose one; you get the version in parentheses: Each player gets +1 (+3) Cards; or each player gains a Silver (Gold); or each player may trash a card from his hand and gain a card costing exactly $1 ($2) more.
1 Copper Common Treasure $0 1 Coin.
2 Curse Common Curse $0 -1 Victory.
3 Estate Common Victory $2 1 Victory.
@ -239,3 +242,83 @@ 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 its 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)
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.
2 Duchess Hinterlands Action $2 +2 Coins
Each player (including you) looks at the top card of his deck, and discards it or puts it back.
----------
In games using this, when you gain a Duchy, you may gain a Duchess.
3 Fool's Gold Hinterlands Treasure - Reaction $2 If this is the first time you played a Fool's Gold this turn, this is worth 1 coin, otherwise it's worth 4 coins.
----------------------
When another player gains a Province, you may trash this from your hand. If you do, gain a Gold, putting it on your deck.
4 Develop Hinterlands Action $3 Trash a card from your hand. Gain a card costing exactly 1 coin more than it and a card costing exactly 1 less than it, in either order, putting them on top of your deck.
5 Oasis Hinterlands Action $3 +1 Card
+1 Action
+1 Coins
Discard a card.
6 Oracle Hinterlands Action - Attack $3 Each player (including you) reveals the top 2 cards of his deck, and you choose one: either he discards them, or he puts them back on top in an order he chooses.
+2 Cards
7 Scheme Hinterlands Action $3 +1 Card
+1 Action
At the start of Clean-up this turn, you may choose an Action card you have in play. If you discard it from play this turn, put it on your deck.
8 Tunnel Hinterlands Victory - Reaction $3 2 VP
----------
When you discard this other than during a Clean-up phase, you may reveal it. If you do, gain a Gold.
9 Jack of all Trades Hinterlands Action $4 Gain a Silver.
Look at the top card of your deck; discard it or put it back.
Draw until you have 5 cards in hand.
You may trash a card from your hand that is not a Treasure.
10 Noble Brigand Hinterlands Action - Attack $4 +1 Coin
When you buy this or play it, each other player reveals the top 2 cards of his deck, trashes a revealed Silver or Gold you choose, and discards the rest. If he didn't reveal a Treasure, he gains a Copper. You gain the trashed cards.
11 Nomad Camp Hinterlands Action $4 +1 Buy
+2 Coins
----------------------
When you gain this, put it on top of your deck.
12 Silk Road Hinterlands Victory $4 Worth 1 VP for every 4 Victory cards in your deck (round down).
13 Spice Merchant Hinterlands Action $4 You may trash a Treasure from your hand. If you do, choose one:
+2 Cards and +1 Action;
or +2 Coins and +1 Buy.
14 Trader Hinterlands Action - Reaction $4 Trash a card from your hand. Gain a number of Silvers equal to its cost in coins.
----------------------
When you would gain a card, you may reveal this from your hand. If you do, instead, gain a silver.
15 Cache Hinterlands Treasure $5 Worth 3 coins
----------
When you gain this, gain two Coppers.
16 Cartographer Hinterlands Action $5 +1 Card
+1 Action
Look at the top 4 cards of your deck. Discard any number of them. Put the rest back on top in any order.
17 Embassy Hinterlands Action $5 +5 Cards
Discard 3 cards.
----------
When you gain this, each other player gains a Silver.
18 Haggler Hinterlands Action $5 +2 Coins
----------
While this is in play, when you buy a card, gain a card costing less than it that is not a Victory card.
19 Highway Hinterlands Action $5 +1 Card
+1 Action
----------
While this is in play, cards cost $1 less, but not less than $0.
20 Ill-Gotten Gains Hinterlands Treasure $5 Worth 1 Coin
When you play this, you may gain a Copper, putting it into your hand.
----------------------
When you gain this, each other player gains a Curse.
21 Inn Hinterlands Action $5 +2 Cards
+2 Actions
Discard 2 cards.
----------
When you gain this, look through your discard pile (including this), reveal any number of Action cards from it, and shuffle them into your deck.
22 Mandarin Hinterlands Action $5 +3 coins
Put a card from your hand on top of your deck.
----------------------
When you gain this, put all Treasures you have in play on top of your deck in any order.
23 Margrave Hinterlands Action - Attack $5 +3 Cards
+1 Buy
Each other player draws a card, then discards down to 3 cards in hand.
24 Stables Hinterlands Action $5 You may discard a Treasure. If you do, +3 Cards and +1 Action.
25 Border Village Hinterlands Action $6 +1 Card
+2 Actions
----------------------
When you gain this, gain a card costing less than this.
26 Farmland Hinterlands Victory $6 2 VP
----------
When you buy this, trash a card from your hand. Gain a card costing exactly $2 more than the trashed card.

View File

@ -46,7 +46,9 @@ class DominionTabs:
('Treasure',) : 'treasure.png',
('Treasure','Victory') : 'treasure-victory.png',
('Treasure','Prize') : 'treasure.png',
('Treasure','Reaction') : 'treasure.png',
('Victory',) : 'victory.png',
('Victory','Reaction') : 'victory.png',
('Curse',) : 'curse.png'
}
@ -142,16 +144,12 @@ class DominionTabs:
#draw text
if useExtra and card.extra:
usingExtra = True
descriptions = (card.extra,)
else:
usingExtra = False
descriptions = re.split("--+",card.description)
height = 0
for d in descriptions:
#if not usingExtra:
#d = re.sub(r"\n",";",d,flags=re.MULTILINE)
# d = re.sub(r"([^ ;])\+",r"\1; +",d)
s = getSampleStyleSheet()['BodyText']
s.fontName = "Times-Roman"
p = Paragraph(d,s)
@ -170,7 +168,7 @@ class DominionTabs:
def read_card_extras(self,fname,cards):
f = open(fname)
cardName = re.compile("^:::(?P<name>[ \w']*)")
cardName = re.compile("^:::(?P<name>[ \w\-']*)")
extras = {}
currentCard = ""
extra = ""
@ -187,7 +185,7 @@ class DominionTabs:
else:
extra += line
if currentCard and extra:
extras[currentCard] = extra
extras[currentCard] = extra.strip()
for c in cards:
if not c.name in extras:
print c.name + ' missing from extras'
@ -214,7 +212,7 @@ class DominionTabs:
def read_card_defs(self,fname):
cards = []
f = open(fname)
carddef = re.compile("^\d+\t+(?P<name>[\w' ]+)\t+(?P<set>\w+)\t+(?P<type>[-\w ]+)\t+\$(?P<cost>\d+)( (?P<potioncost>\d)+P)?\t+(?P<description>.*)")
carddef = re.compile("^\d+\t+(?P<name>[\w\-' ]+)\t+(?P<set>\w+)\t+(?P<type>[-\w ]+)\t+\$(?P<cost>\d+)( (?P<potioncost>\d)+P)?\t+(?P<description>.*)")
currentCard = None
for line in f:
line = line.strip()