Improve tab artwork & layout (#436)

* Improve tab banner graphics
* Update treasure banner colors
* Brighten images for printing on cardstock
* Synchronize card_db_src/types_db.json
* Improve horizontal layout.
* Adjust margins for Events, Landmarks, and Projects.

card_db_src/types_db.json

@@ -350,8 +350,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 10,
-        "tabCostHeightOffset": 0,
-        "tabTextHeightOffset": 3
+        "tabCostHeightOffset": -1,
+        "tabTextHeightOffset": 0
     },
     {
         "card_type": [
@@ -500,8 +500,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 16,
-        "tabCostHeightOffset": 0,
-        "tabTextHeightOffset": 3
+        "tabCostHeightOffset": -1,
+        "tabTextHeightOffset": 0
     },
     {
         "card_type": [
@@ -874,8 +874,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 10,
-        "tabCostHeightOffset": 0,
-        "tabTextHeightOffset": 3
+        "tabCostHeightOffset": -1,
+        "tabTextHeightOffset": 0
     },
     {
         "card_type": [
@@ -884,8 +884,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 10,
-        "tabCostHeightOffset": 0,
-        "tabTextHeightOffset": 3
+        "tabCostHeightOffset": -1,
+        "tabTextHeightOffset": 0
     },
     {
         "card_type": [
@@ -916,8 +916,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 10,
-        "tabCostHeightOffset": 0,
-        "tabTextHeightOffset": 3
+        "tabCostHeightOffset": -1,
+        "tabTextHeightOffset": 0
     },
     {
         "card_type": [
@@ -926,8 +926,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 6,
-        "tabCostHeightOffset": 0,
-        "tabTextHeightOffset": 3
+        "tabCostHeightOffset": -1,
+        "tabTextHeightOffset": 0
     },
     {
         "card_type": [
@@ -946,8 +946,8 @@
         ],
         "card_type_image": "treasure.png",
         "defaultCardCount": 1,
-        "tabCostHeightOffset": 0,
-        "tabTextHeightOffset": 3
+        "tabCostHeightOffset": -1,
+        "tabTextHeightOffset": 0
     },
     {
         "card_type": [

src/domdiv/cards.py

@@ -160,6 +160,9 @@ def isLandmark(self):
     def isPrize(self):
         return self.isType("Prize")
 
+    def isLandscape(self):
+        return self.getType().getGroupGlobalType() is not None
+
     def get_GroupGlobalType(self):
         return self.getType().getGroupGlobalType()
 

src/domdiv/draw.py

@@ -1478,23 +1478,29 @@ def drawTab(self, item, panel=None, backside=False):
         tabScale = artSize / self.LABEL_HEIGHT
 
         # whitespace
-        margin = padding = 2
+        safety = 1  # empty zone inside tab edge
+        padding = 3  # minimum space around text
+        margin = 0  # space for banner/frame artwork, if any
+        # most non-landscape cards have 2.5mm margins in 52.5mm banners
+        marginRatio = 2.5 / 52.5
 
         # metrics from the package assets
         cardType = card.getType()
         if artwork:
             # adjust dimensions based on the application image metrics
             bannerHeight += cardType.getTabTextHeightOffset() * tabScale
-            # adjust for space around banners and scalloped edges
-            margin = tabWidth / 18
+            # fit text inside banner/frame graphics
+            margin = (tabWidth - 2 * safety) * marginRatio
+            if card.get_GroupGlobalType() in ("Events", "Landmarks", "Projects"):
+                margin *= 1.75
 
         # cost symbol metrics
-        coinHeight = bannerHeight - 1 * tabScale
+        coinHeight = bannerHeight
         costHeight = coinHeight + 4 * tabScale
         costTop = costHeight + tabScale * 18 * 0.624  # Minion Std Black numeral height
 
         # loosely align the tops of the banner text & symbols
-        nameTop = costTop - 0.5
+        nameTop = costTop - 1
         setTop = costTop
 
         # card name metrics
@@ -1536,15 +1542,15 @@ def drawTab(self, item, panel=None, backside=False):
                 imgToDraw,
                 1,
                 artHeight,
-                tabWidth - 2,
+                tabWidth - 2 * safety,
                 artSize,
                 preserveAspectRatio=False,
                 anchor="n",
                 mask="auto",
             )
 
         # initialize margins
-        textInset = textInsetRight = margin + padding
+        textInset = textInsetRight = safety + margin
 
         # draw cost
         if (
@@ -1555,7 +1561,6 @@ def drawTab(self, item, panel=None, backside=False):
             and not card.isType("Trash")
         ):
             textInset += self.drawCost(card, textInset, costHeight, scale=tabScale)
-            textInset += padding
 
         # draw set image
         if "tab" in self.options.set_icon:
@@ -1576,7 +1581,12 @@ def drawTab(self, item, panel=None, backside=False):
                     self.drawSetIcon(
                         setImage, tabWidth - textInsetRight, setImageHeight
                     )
-            textInsetRight += padding
+            # leave extra room between the set icon and text
+            textInsetRight += padding / 2
+
+        # add padding between the text and any icons or margins
+        textInset += padding
+        textInsetRight += padding
 
         # draw name
         textWidth -= textInset
@@ -1665,6 +1675,13 @@ def drawTab(self, item, panel=None, backside=False):
                 w = rmax
             else:  # centre, but keep it inside the margins
                 w = max(lmin, min(tabWidth / 2 - centreWidth / 2, rmax))
+            # use white text for Night cards
+            if (
+                "Night" in card.types
+                and "Action" not in card.types
+                and "Duration" not in card.types
+            ):
+                self.canvas.setFillColorRGB(1, 1, 1)
             self.drawSmallCaps(line, fontSize, w, h, style=style)
 
         self.canvas.restoreState()