From b3ee2c72ed53262b1c25b8555e3ac90b143edd37 Mon Sep 17 00:00:00 2001
From: cajun <12363371+CajunAvenger@users.noreply.github.com>
Date: Sat, 12 Apr 2025 20:02:56 -0500
Subject: [PATCH] fixes to auto custom border

---
 data/magic-m15-altered.mse-style/style            |   2 +-
 .../artifact_blend_custom_border.png              | Bin 0 -> 119 bytes
 .../hybrid_blend_custom_border.png                | Bin 0 -> 119 bytes
 .../multicolor_blend_custom_border.png            | Bin 0 -> 119 bytes
 data/magic-m15-mainframe-tokens.mse-style/style   |   8 ++++----
 5 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 data/magic-m15-mainframe-tokens.mse-style/artifact_blend_custom_border.png
 create mode 100644 data/magic-m15-mainframe-tokens.mse-style/hybrid_blend_custom_border.png
 create mode 100644 data/magic-m15-mainframe-tokens.mse-style/multicolor_blend_custom_border.png

diff --git a/data/magic-m15-altered.mse-style/style b/data/magic-m15-altered.mse-style/style
index 3787d05ac..0beb9cba1 100644
--- a/data/magic-m15-altered.mse-style/style
+++ b/data/magic-m15-altered.mse-style/style
@@ -285,7 +285,7 @@ init script:
 	}
 	is_nyx := {
 		chosen(styling.frames, choice:"nyx")
-		or (lang_setting("is_enchantment")(card.super_type) and set.auto_nyx)
+		or (lang_setting("is_enchantment")(card.super_type) and set.auto_nyx and not auto_custom_border())
 	}
 	is_leveler := {
 		chosen(styling.frames, choice:"leveler")
diff --git a/data/magic-m15-mainframe-tokens.mse-style/artifact_blend_custom_border.png b/data/magic-m15-mainframe-tokens.mse-style/artifact_blend_custom_border.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf47e2a74c47ff4f612d4746effce38227123fd1
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0y~yU@T`~VB%(E28w91`ON}S%mF?ju0VQumF+DcrSIwD
u7*cWT?Lk9EAn%aE@8#Q$_$2_DSius$BmoA-3&%4PK+>MBelF{r5}E)j4;PdG

literal 0
HcmV?d00001

diff --git a/data/magic-m15-mainframe-tokens.mse-style/hybrid_blend_custom_border.png b/data/magic-m15-mainframe-tokens.mse-style/hybrid_blend_custom_border.png
new file mode 100644
index 0000000000000000000000000000000000000000..c869dd687f3c8d0df72e34fdf0be7143e883d1ec
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0y~yU@T`~VB%(E28w91`ON}S%mF?juK)l4Uw%aT1dyxm
w>EaktaqI0tLq;I)kizff+m84p0GU|9622q>2F44=GZR44p00i_>zopr02kRBrvLx|

literal 0
HcmV?d00001

diff --git a/data/magic-m15-mainframe-tokens.mse-style/multicolor_blend_custom_border.png b/data/magic-m15-mainframe-tokens.mse-style/multicolor_blend_custom_border.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf47e2a74c47ff4f612d4746effce38227123fd1
GIT binary patch
literal 119
zcmeAS@N?(olHy`uVBq!ia0y~yU@T`~VB%(E28w91`ON}S%mF?ju0VQumF+DcrSIwD
u7*cWT?Lk9EAn%aE@8#Q$_$2_DSius$BmoA-3&%4PK+>MBelF{r5}E)j4;PdG

literal 0
HcmV?d00001

diff --git a/data/magic-m15-mainframe-tokens.mse-style/style b/data/magic-m15-mainframe-tokens.mse-style/style
index 500ddfaaa..d09122409 100644
--- a/data/magic-m15-mainframe-tokens.mse-style/style
+++ b/data/magic-m15-mainframe-tokens.mse-style/style
@@ -208,7 +208,7 @@ init script:
 	]
 	swap_fonts_body_default := [
 		name: {if is_archetype() then "Gotham Pro" else "MPlantin"},
-		size: {14},
+		size: {if styling.shrink_font_size != "" then 14 - to_number(styling.shrink_font_size) else 14},
 		color: {if white_state_font() then "white" else "black"},
 		vertical: {0},
 		italic: {"MPlantin-Italic"}
@@ -572,7 +572,7 @@ card style:
 			shadow displacement y: 1
 		symbol font:
 			name: { styling.text_box_mana_symbols }
-			size: { if styling.shrink_font_size != "" then 14 - to_number(styling.shrink_font_size) else 14}
+			size: { body_font_size() }
 		alignment:
 			script:
 				if (styling.center_text == "short text only" and
@@ -726,7 +726,7 @@ extra card field:
 extra card field:
 	type: choice
 	name: custom overlay
-	choice: plate
+	script: card.card_color
 	save value: false
 	editable: false
 extra card field:
@@ -873,7 +873,7 @@ extra card style:
 		image: voverlay.png
 		mask: {"v_" + (if is_nyx() or is_snow() then "nyx_" else "") + if is_tall() then "tall_mask.png" else if is_textless() then "short_mask.png" else "mid_mask.png"}
 		visible: { is_vehicle() }
-	vehicle overlay:
+	custom overlay:
 		left: 15
 		top: 15
 		width: 345