Fix the bevel of Saga creatures' bottom textbox in Borderless Enhanced template

Author: pappnu

py/utils/layer_fx.py

@@ -0,0 +1,35 @@
+from typing import TypedDict
+
+from photoshop.api import ActionDescriptor, ActionReference
+from photoshop.api._artlayer import ArtLayer
+from photoshop.api._layerSet import LayerSet
+
+from src import APP
+
+sID, cID = APP.stringIDToTypeID, APP.charIDToTypeID
+
+
+class StrokeDetails(TypedDict):
+    size: int
+
+
+def get_stroke_details(layer: ArtLayer | LayerSet) -> StrokeDetails | None:
+    APP.activeDocument.activeLayer = layer
+
+    ref = ActionReference()
+    ref.putEnumerated(cID("Lyr "), cID("Ordn"), cID("Trgt"))
+    desc: ActionDescriptor = APP.executeActionGet(ref)
+
+    layer_effects_id = sID("layerEffects")
+    if not desc.hasKey(layer_effects_id):
+        return
+
+    layer_effects: ActionDescriptor = desc.getObjectValue(layer_effects_id)
+
+    frame_fx_id = sID("frameFX")
+    if not layer_effects.hasKey(frame_fx_id):
+        return
+
+    frame_fx: ActionDescriptor = layer_effects.getObjectValue(frame_fx_id)
+
+    return {"size": frame_fx.getInteger(sID("size"))}

py/utils/mask.py

@@ -0,0 +1,49 @@
+from typing import Iterable
+
+from photoshop.api import ElementPlacement, RasterizeType
+from photoshop.api._artlayer import ArtLayer
+from photoshop.api._layerSet import LayerSet
+
+from src import APP
+from src.helpers.adjustments import create_color_layer
+from src.helpers.colors import rgb_white
+from src.helpers.layers import merge_layers
+from src.helpers.masks import create_mask, enter_mask_channel, enter_rgb_channel
+from src.helpers.selection import select_canvas
+
+from ..helpers import copy, paste
+
+
+# TODO fix the original function in Proxyshop
+def copy_to_mask(
+    target: ArtLayer | LayerSet,
+    source: ArtLayer | LayerSet | None = None,
+):
+    docref = APP.activeDocument
+    if source:
+        docref.activeLayer = source
+    docsel = docref.selection
+    select_canvas(docref)
+    copy()
+    docsel.deselect()
+
+    docref.activeLayer = target
+    create_mask()
+    enter_mask_channel()
+    # The pasting threw an error in the original function for some reason
+    # even though the operation succeeded in Photoshop
+    paste()
+    enter_rgb_channel()
+
+
+def create_mask_from(apply_to: ArtLayer | LayerSet, layers: Iterable[ArtLayer]) -> None:
+    background = create_color_layer(rgb_white(), clipped=False)
+    layers_to_merge: list[ArtLayer] = [background]
+    for layer in layers:
+        duplicate = layer.duplicate(background, ElementPlacement.PlaceBefore)
+        duplicate.visible = True
+        layers_to_merge.append(duplicate)
+    merged = merge_layers(layers_to_merge)
+    merged.rasterize(RasterizeType.EntireLayer)
+    copy_to_mask(apply_to, merged)
+    merged.remove()

py/vertical_mod.py

@@ -19,6 +19,8 @@
 from src.utils.adobe import LayerObjectTypes, ReferenceLayer
 
 from .helpers import LAYER_NAMES, get_numeric_setting
+from .utils.layer_fx import get_stroke_details
+from .utils.mask import create_mask_from
 from .utils.path import create_shape_layer, get_shape_dimensions
 from .uxp.shape import ShapeOperation, merge_shapes
 from .uxp.text import create_text_layer_with_path
@@ -112,16 +114,33 @@ def load_expansion_symbol(self) -> None:
 
     def create_shapes_for_vertical_creature(self) -> None:
         if ref_textbox := getLayer(LAYERS.TALL, (self.textbox_group, LAYERS.SHAPE)):
+            pinlines_stroke = (
+                get_stroke_details(self.pinlines_group) if self.pinlines_group else None
+            )
+            pinlines_stroke_size = pinlines_stroke["size"] if pinlines_stroke else 0
             ref_textbox_dims = get_shape_dimensions(ref_textbox)
-            textbox_top = ref_textbox_dims["bottom"] - self.textbox_height
+            textbox_bottom = ref_textbox_dims["bottom"] - pinlines_stroke_size
+            textbox_top = textbox_bottom - self.textbox_height
 
             # Build bottom textbox
             self.bottom_textbox_shape = create_shape_layer(
                 (
-                    {"x": ref_textbox_dims["left"], "y": textbox_top},
-                    {"x": ref_textbox_dims["right"], "y": textbox_top},
-                    {"x": ref_textbox_dims["right"], "y": ref_textbox_dims["bottom"]},
-                    {"x": ref_textbox_dims["left"], "y": ref_textbox_dims["bottom"]},
+                    {
+                        "x": ref_textbox_dims["left"] + pinlines_stroke_size,
+                        "y": textbox_top,
+                    },
+                    {
+                        "x": ref_textbox_dims["right"] - pinlines_stroke_size,
+                        "y": textbox_top,
+                    },
+                    {
+                        "x": ref_textbox_dims["right"] - pinlines_stroke_size,
+                        "y": textbox_bottom,
+                    },
+                    {
+                        "x": ref_textbox_dims["left"] + pinlines_stroke_size,
+                        "y": textbox_bottom,
+                    },
                 ),
                 relative_layer=ref_textbox,
                 placement=ElementPlacement.PlaceAfter,
@@ -153,6 +172,7 @@ def create_shapes_for_vertical_creature(self) -> None:
                 pinlines_top = (
                     ref_textbox_pinlines_dims["bottom"]
                     - self.textbox_height
+                    - 2 * pinlines_stroke_size
                     - (ref_textbox_pinlines_dims["height"] - ref_textbox_dims["height"])
                 )
 
@@ -559,13 +579,15 @@ def textbox_positioning(self) -> None:
         if (
             self.has_extra_textbox
             and (
-                ref_textbox_tall := getLayer(LAYERS.TALL, self.textbox_reference_group)
+                ref_textbox_pinlines := getLayer(
+                    LAYERS.TALL, (self.pinlines_group, LAYERS.SHAPE, LAYERS.TEXTBOX)
+                )
             )
-            and self.textbox_bottom_reference
+            and self.bottom_textbox_pinlines_shape
         ):
             delta = (
-                get_shape_dimensions(self.textbox_bottom_reference)["top"]
-                - get_shape_dimensions(ref_textbox_tall)["top"]
+                get_shape_dimensions(self.bottom_textbox_pinlines_shape)["top"]
+                - get_shape_dimensions(ref_textbox_pinlines)["top"]
             )
 
             # Shift typeline text
@@ -577,8 +599,20 @@ def textbox_positioning(self) -> None:
                 self.typeline_pinline_shape.translate(0, delta)
 
             # Shift typeline box
-            if isinstance(self.twins_shape, list):
-                self.twins_shape[1].translate(0, delta)
+            if isinstance(self.twins_shape, list) and isinstance(
+                (typeline_box := self.twins_shape[1]), ArtLayer
+            ):
+                typeline_box.translate(0, delta)
+
+                # Create mask for pinlines
+                if (
+                    isinstance((name_box := self.twins_shape[0]), ArtLayer)
+                    and self.bottom_textbox_shape
+                ):
+                    create_mask_from(
+                        self.pinlines_group,
+                        (name_box, typeline_box, self.bottom_textbox_shape),
+                    )
 
             # Shift expansion symbol
             if CFG.symbol_enabled and self.expansion_symbol_layer: