diff --git a/dominion_tabs.py b/dominion_tabs.py index 8ddc07f..96c9aad 100644 --- a/dominion_tabs.py +++ b/dominion_tabs.py @@ -57,7 +57,8 @@ class DominionTabs: ('Victory','Shelter') : 'shelter.png', ('Curse',) : 'curse.png' } - + + noCoinLabelImages = dict(((name,''.join((os.path.splitext(fname)[0]+'_nc',os.path.splitext(fname)[1]))) for name,fname in labelImages.iteritems())) setImages = { 'base' : 'base_set.png', } @@ -131,7 +132,7 @@ class DominionTabs: self.tabTotalHeight-self.tabLabelHeight) else: self.canvas.translate(0,self.tabTotalHeight-self.tabLabelHeight) - self.canvas.drawImage(os.path.join('images',DominionTabs.labelImages[card.types]),1,0, + self.canvas.drawImage(os.path.join('images',DominionTabs.noCoinLabelImages[card.types]),1,0, self.tabLabelWidth-2,self.tabLabelHeight-1, preserveAspectRatio=False,anchor='n',mask='auto') if card.types[0] == 'Treasure' and (len(card.types) == 1 or card.types[1] != 'Reaction')\ @@ -151,6 +152,7 @@ class DominionTabs: potSize = 11 potHeight = 2 + self.canvas.drawImage("images/coin_small.png",4,costHeight-5,16,16,preserveAspectRatio=True,mask='auto') textInset = 22 textWidth = 85 @@ -169,8 +171,8 @@ class DominionTabs: if 'Prize' in card.types: cost += '*' costWidthOffset = 12 - if len(card.types) > 1 and card.types[1].lower() == 'shelter': - costWidthOffset = 10 + #if len(card.types) > 1 and card.types[1].lower() == 'shelter': + # costWidthOffset = 10 self.canvas.drawCentredString(costWidthOffset,costHeight,cost) fontSize = 12 name = card.name.upper() diff --git a/images/action-victory_nc.png b/images/action-victory_nc.png new file mode 100644 index 0000000..20d5265 Binary files /dev/null and b/images/action-victory_nc.png differ diff --git a/images/action_nc.png b/images/action_nc.png new file mode 100644 index 0000000..a9e7b6b Binary files /dev/null and b/images/action_nc.png differ diff --git a/images/curse_nc.png b/images/curse_nc.png new file mode 100644 index 0000000..b82964d Binary files /dev/null and b/images/curse_nc.png differ diff --git a/images/duration_nc.png b/images/duration_nc.png new file mode 100644 index 0000000..294ca6e Binary files /dev/null and b/images/duration_nc.png differ diff --git a/images/reaction_nc.png b/images/reaction_nc.png new file mode 100644 index 0000000..5a11df7 Binary files /dev/null and b/images/reaction_nc.png differ diff --git a/images/ruins_nc.png b/images/ruins_nc.png new file mode 100644 index 0000000..2da4732 Binary files /dev/null and b/images/ruins_nc.png differ diff --git a/images/shelter_nc.png b/images/shelter_nc.png new file mode 100644 index 0000000..2a673dd Binary files /dev/null and b/images/shelter_nc.png differ diff --git a/images/treasure-reaction_nc.png b/images/treasure-reaction_nc.png new file mode 100644 index 0000000..8ef385f Binary files /dev/null and b/images/treasure-reaction_nc.png differ diff --git a/images/treasure-victory_nc.png b/images/treasure-victory_nc.png new file mode 100644 index 0000000..ff5fd16 Binary files /dev/null and b/images/treasure-victory_nc.png differ diff --git a/images/treasure_nc.png b/images/treasure_nc.png new file mode 100644 index 0000000..f60140b Binary files /dev/null and b/images/treasure_nc.png differ diff --git a/images/victory-reaction_nc.png b/images/victory-reaction_nc.png new file mode 100644 index 0000000..764a752 Binary files /dev/null and b/images/victory-reaction_nc.png differ diff --git a/images/victory_nc.png b/images/victory_nc.png new file mode 100644 index 0000000..5a6f774 Binary files /dev/null and b/images/victory_nc.png differ