diff --git a/domdiv/cards.py b/domdiv/cards.py index 98ea671..fb8ca84 100644 --- a/domdiv/cards.py +++ b/domdiv/cards.py @@ -227,11 +227,6 @@ class CardType(object): return None return self.tabImageFile - def getNoCoinTabImageFile(self): - if not self.tabImageFile: - return None - return ''.join(os.path.splitext(self.tabImageFile)[0] + '_nc' + os.path.splitext(self.tabImageFile)[1]) - def getTabTextHeightOffset(self): return self.tabTextHeightOffset diff --git a/domdiv/draw.py b/domdiv/draw.py index f752c91..5baee2e 100644 --- a/domdiv/draw.py +++ b/domdiv/draw.py @@ -640,7 +640,7 @@ class DividerDrawer(object): card.getType().getTabTextHeightOffset() # draw banner - img = card.getType().getNoCoinTabImageFile() + img = card.getType().getTabImageFile() if not self.options.no_tab_artwork and img: self.canvas.drawImage( DividerDrawer.get_image_filepath(img), diff --git a/domdiv/images/action-shelter.png b/domdiv/images/action-shelter.png index cfec72e..284e71b 100644 Binary files a/domdiv/images/action-shelter.png and b/domdiv/images/action-shelter.png differ diff --git a/domdiv/images/action-shelter_nc.png b/domdiv/images/action-shelter_nc.png deleted file mode 100644 index 284e71b..0000000 Binary files a/domdiv/images/action-shelter_nc.png and /dev/null differ diff --git a/domdiv/images/action-treasure_nc.png b/domdiv/images/action-treasure.png similarity index 100% rename from domdiv/images/action-treasure_nc.png rename to domdiv/images/action-treasure.png diff --git a/domdiv/images/action-victory.png b/domdiv/images/action-victory.png index cc280b3..596108d 100644 Binary files a/domdiv/images/action-victory.png and b/domdiv/images/action-victory.png differ diff --git a/domdiv/images/action-victory_nc.png b/domdiv/images/action-victory_nc.png deleted file mode 100644 index 596108d..0000000 Binary files a/domdiv/images/action-victory_nc.png and /dev/null differ diff --git a/domdiv/images/action.png b/domdiv/images/action.png index f7ad344..13d60c0 100644 Binary files a/domdiv/images/action.png and b/domdiv/images/action.png differ diff --git a/domdiv/images/action_nc.png b/domdiv/images/action_nc.png deleted file mode 100644 index 13d60c0..0000000 Binary files a/domdiv/images/action_nc.png and /dev/null differ diff --git a/domdiv/images/boon_nc.png b/domdiv/images/boon.png similarity index 100% rename from domdiv/images/boon_nc.png rename to domdiv/images/boon.png diff --git a/domdiv/images/curse.png b/domdiv/images/curse.png index 911d783..b14dc21 100644 Binary files a/domdiv/images/curse.png and b/domdiv/images/curse.png differ diff --git a/domdiv/images/curse_nc.png b/domdiv/images/curse_nc.png deleted file mode 100644 index b14dc21..0000000 Binary files a/domdiv/images/curse_nc.png and /dev/null differ diff --git a/domdiv/images/duration-reaction_nc.png b/domdiv/images/duration-reaction.png similarity index 100% rename from domdiv/images/duration-reaction_nc.png rename to domdiv/images/duration-reaction.png diff --git a/domdiv/images/duration.png b/domdiv/images/duration.png index b1b501f..c57fae6 100644 Binary files a/domdiv/images/duration.png and b/domdiv/images/duration.png differ diff --git a/domdiv/images/duration_nc.png b/domdiv/images/duration_nc.png deleted file mode 100644 index c57fae6..0000000 Binary files a/domdiv/images/duration_nc.png and /dev/null differ diff --git a/domdiv/images/event_nc.png b/domdiv/images/event.png similarity index 100% rename from domdiv/images/event_nc.png rename to domdiv/images/event.png diff --git a/domdiv/images/expansion_nc.png b/domdiv/images/expansion.png similarity index 100% rename from domdiv/images/expansion_nc.png rename to domdiv/images/expansion.png diff --git a/domdiv/images/hex_nc.png b/domdiv/images/hex.png similarity index 100% rename from domdiv/images/hex_nc.png rename to domdiv/images/hex.png diff --git a/domdiv/images/landmark_nc.png b/domdiv/images/landmark.png similarity index 100% rename from domdiv/images/landmark_nc.png rename to domdiv/images/landmark.png diff --git a/domdiv/images/night_nc.png b/domdiv/images/night.png similarity index 100% rename from domdiv/images/night_nc.png rename to domdiv/images/night.png diff --git a/domdiv/images/reaction-shelter.png b/domdiv/images/reaction-shelter.png index 134eb4a..7a2cac9 100644 Binary files a/domdiv/images/reaction-shelter.png and b/domdiv/images/reaction-shelter.png differ diff --git a/domdiv/images/reaction-shelter_nc.png b/domdiv/images/reaction-shelter_nc.png deleted file mode 100644 index 7a2cac9..0000000 Binary files a/domdiv/images/reaction-shelter_nc.png and /dev/null differ diff --git a/domdiv/images/reaction.png b/domdiv/images/reaction.png index 8021712..9e93038 100644 Binary files a/domdiv/images/reaction.png and b/domdiv/images/reaction.png differ diff --git a/domdiv/images/reaction_nc.png b/domdiv/images/reaction_nc.png deleted file mode 100644 index 9e93038..0000000 Binary files a/domdiv/images/reaction_nc.png and /dev/null differ diff --git a/domdiv/images/reserve-treasure_nc.png b/domdiv/images/reserve-treasure.png similarity index 100% rename from domdiv/images/reserve-treasure_nc.png rename to domdiv/images/reserve-treasure.png diff --git a/domdiv/images/reserve-victory_nc.png b/domdiv/images/reserve-victory.png similarity index 100% rename from domdiv/images/reserve-victory_nc.png rename to domdiv/images/reserve-victory.png diff --git a/domdiv/images/reserve_nc.png b/domdiv/images/reserve.png similarity index 100% rename from domdiv/images/reserve_nc.png rename to domdiv/images/reserve.png diff --git a/domdiv/images/ruins.png b/domdiv/images/ruins.png index 8389e3b..a20f10c 100644 Binary files a/domdiv/images/ruins.png and b/domdiv/images/ruins.png differ diff --git a/domdiv/images/ruins_nc.png b/domdiv/images/ruins_nc.png deleted file mode 100644 index a20f10c..0000000 Binary files a/domdiv/images/ruins_nc.png and /dev/null differ diff --git a/domdiv/images/shelter.png b/domdiv/images/shelter.png index ab95f18..66fbc19 100644 Binary files a/domdiv/images/shelter.png and b/domdiv/images/shelter.png differ diff --git a/domdiv/images/shelter_nc.png b/domdiv/images/shelter_nc.png deleted file mode 100644 index 66fbc19..0000000 Binary files a/domdiv/images/shelter_nc.png and /dev/null differ diff --git a/domdiv/images/state_nc.png b/domdiv/images/state.png similarity index 100% rename from domdiv/images/state_nc.png rename to domdiv/images/state.png diff --git a/domdiv/images/treasure-reaction.png b/domdiv/images/treasure-reaction.png index 70d9b79..c8e79b0 100644 Binary files a/domdiv/images/treasure-reaction.png and b/domdiv/images/treasure-reaction.png differ diff --git a/domdiv/images/treasure-reaction_nc.png b/domdiv/images/treasure-reaction_nc.png deleted file mode 100644 index c8e79b0..0000000 Binary files a/domdiv/images/treasure-reaction_nc.png and /dev/null differ diff --git a/domdiv/images/treasure-victory.png b/domdiv/images/treasure-victory.png index 5334f36..dd635a6 100644 Binary files a/domdiv/images/treasure-victory.png and b/domdiv/images/treasure-victory.png differ diff --git a/domdiv/images/treasure-victory_nc.png b/domdiv/images/treasure-victory_nc.png deleted file mode 100644 index dd635a6..0000000 Binary files a/domdiv/images/treasure-victory_nc.png and /dev/null differ diff --git a/domdiv/images/treasure.png b/domdiv/images/treasure.png index fd331ac..1aa432c 100644 Binary files a/domdiv/images/treasure.png and b/domdiv/images/treasure.png differ diff --git a/domdiv/images/treasure_nc.png b/domdiv/images/treasure_nc.png deleted file mode 100644 index 1aa432c..0000000 Binary files a/domdiv/images/treasure_nc.png and /dev/null differ diff --git a/domdiv/images/victory-reaction.png b/domdiv/images/victory-reaction.png index 1e3d690..e322632 100644 Binary files a/domdiv/images/victory-reaction.png and b/domdiv/images/victory-reaction.png differ diff --git a/domdiv/images/victory-reaction_nc.png b/domdiv/images/victory-reaction_nc.png deleted file mode 100644 index e322632..0000000 Binary files a/domdiv/images/victory-reaction_nc.png and /dev/null differ diff --git a/domdiv/images/victory-shelter.png b/domdiv/images/victory-shelter.png index 469ddbf..3357196 100644 Binary files a/domdiv/images/victory-shelter.png and b/domdiv/images/victory-shelter.png differ diff --git a/domdiv/images/victory-shelter_nc.png b/domdiv/images/victory-shelter_nc.png deleted file mode 100644 index 3357196..0000000 Binary files a/domdiv/images/victory-shelter_nc.png and /dev/null differ diff --git a/domdiv/images/victory.png b/domdiv/images/victory.png index 23afbeb..5ce2ed9 100644 Binary files a/domdiv/images/victory.png and b/domdiv/images/victory.png differ diff --git a/domdiv/images/victory_nc.png b/domdiv/images/victory_nc.png deleted file mode 100644 index 5ce2ed9..0000000 Binary files a/domdiv/images/victory_nc.png and /dev/null differ