3.0.0 (#6)

---------

Co-authored-by: cajun <12363371+CajunAvenger@users.noreply.github.com>

data/magic-genevensis-20-battle.mse-style/style

@@ -13,8 +13,8 @@ depends on:
 	package: magic-mainframe-extras.mse-include
 	version: 2001-01-01
 depends on:
-	package: magic-watermarks.mse-include
-	version: 2001-01-01
+	package: magic-modules.mse-include
+	version: 2024-10-01
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2001-01-01
@@ -43,11 +43,79 @@ card dpi: 300
 init script:
 	card_shape := { "battle" }
 	
-	guild_mana := { styling.use_guild_mana_symbols }
+	corners_default := { "diagonal" }
 	
-	ancestral_mana := { false }
+	swap_font := { true }
 	
-	mana_t := { "new" }
+	swap_fonts_name_src := { styling.name_font }
+	swap_fonts_name_default :=
+	[
+		name: {"Beleren Bold"},
+		size: {32},
+		color: {"black"},
+		vertical: {0},
+		italic: {""}
+	]
+	
+	swap_fonts_type_src := { styling.type_font }
+	swap_fonts_type_default :=
+	[
+		name: {"Beleren Bold"},
+		size: {25},
+		color: {"black"},
+		vertical: {0},
+		italic: {""}
+	]
+	
+	swap_fonts_body_src := { styling.text_font }
+	swap_fonts_body_default :=
+	[
+		name: {"MPlantin"},
+		size: {28},
+		color: {"black"},
+		vertical: {0},
+		italic: {"MPlantin-Italic"}
+	]
+	
+	swap_fonts_pt_src := { styling.PT_font }
+	swap_fonts_pt_default :=
+	[
+		name: {"Beleren Bold"},
+		size: {32},
+		color: {"black"},
+		vertical: {0},
+		italic: {""}
+	]
+	
+	swap_fonts_pt2_src := { styling.defense_font }
+	swap_fonts_pt2_default :=
+	[
+		name: {"Beleren Bold"},
+		size: {32},
+		color: {"black"},
+		vertical: {0},
+		italic: {""}
+	]
+	
+	swap_fonts_name2_src := { styling.alias_font }
+	swap_fonts_name2_default :=
+	[
+		name: {"Beleren Bold"},
+		size: {18},
+		color: {"black"},
+		vertical: {0},
+		italic: {""}
+	]
+	
+	swap_fonts_name3_src := { styling.auxiliary_font }
+	swap_fonts_name3_default :=
+	[
+		name: {"Beleren Bold"},
+		size: {30},
+		color: {"black"},
+		vertical: {0},
+		italic: {""}
+	]
 	
 	mana_sort :=		sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WUBRG)")
 	mana_sort_wedge :=	sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WBGUR)")
@@ -64,21 +132,6 @@ init script:
 		styling.remove_from_autocount
 	}
 	
-	shrink_type :=
-	{
-		if styling.shrink_type == "-" then 0
-		else if styling.shrink_type != "" then (clamp(to_int(styling.shrink_type), minimum: -40, maximum: 24) or else 0)
-		else if length(remove_tags(card.type)) > 41 then 2
-		else if length(remove_tags(card.type)) > 38 then 1
-		else 0
-	}
-	
-	shrink_name :=
-	{
-		if styling.shrink_name == "-" then 0
-		else clamp(to_int(styling.shrink_name), minimum: -40, maximum: 31) or else 0
-	}
-	
 	shrink_reminder :=
 	{
 		if styling.shrink_transformation_reminder_text == "-" then 0
@@ -131,11 +184,6 @@ init script:
 		not (styling.symbol == "none")
 	}
 	
-	has_identity :=
-	{
-		styling.color_indicator_dot and length(color_to_base_prefix()) > 0
-	}
-	
 	has_custom_rarity :=
 	{
 		contains(set.mainframe_rarity_name, match: ".png")
@@ -432,10 +480,16 @@ init script:
 		image(name, side: "right")
 	}
 	
+	pt_image :=
+	{
+		name := "battlept" + if card.loyalty == "" then "" else "defense"
+		image(name, side: "right")
+	}
+	
 	opacity_watermark_image :=
 	{
 		image :=	if styling.watermark == "setsymbol" or styling.watermark == "’setsymbol’" or styling.watermark == "'setsymbol'" then set_symbol_image()
-					else if contains(match: ".png", styling.watermark) then ("/magic-watermarks.mse-include/" + styling.watermark)
+					else if contains(match: ".png", styling.watermark) then ("/magic-mainframe-extras.mse-include/" + styling.watermark)
 					else ""
 		if styling.watermark_opacity_percentage == "" then image
 		else set_alpha(image, alpha: get_alpha(styling.watermark_opacity_percentage, default: 100))
@@ -631,14 +685,6 @@ set info style:
 			border color 2: rgb(0,  0,  0)
 
 ############################################################## Extra style options
-styling field:
-	type: text
-	name: shrink name
-	description: Reduces the name text's font size by this many points.
-#	localized caption:
-#		fr: Rapetisser le nom
-#	localized description:
-#		fr: Réduire la taille du nom de N points.
 styling field:
 	type: boolean
 	name: center name
@@ -648,14 +694,6 @@ styling field:
 #	localized description:
 #		fr: Aligner le nom au milieu de la carte?
 	initial: no
-styling field:
-	type: text
-	name: shrink type
-	description: Reduces the type text's font size by this many points.
-#	localized caption:
-#		fr: Rapetisser le type
-#	localized description:
-#		fr: Réduire la taille du type de N points.
 styling field:
 	type: boolean
 	name: center type
@@ -665,21 +703,6 @@ styling field:
 #	localized description:
 #		fr: Aligner le type au milieu de la carte?
 	initial: no
-styling field:
-	type: color
-	name: type text color
-	description: Use the specified color for the text in the typeline.
-#	localized caption:
-#		fr: Couleur du type
-#	localized description:
-#		fr: Utiliser la couleur spécifiée pour le texte du type.
-	choice:
-		name: black
-		color: rgb(0,0,0)
-	choice:
-		name: white
-		color: rgb(255,255,255)
-	initial: black
 styling field:
 	type: text
 	name: typebox opacity percentage
@@ -704,14 +727,6 @@ styling field:
 #		fr: Tronquer le texte de règles
 #	localized description:
 #		fr: Réduire la taille du haut, du bas, et de la droite de la zone du texte de règles de N pixels. Format: "1,2,3"
-styling field:
-	type: text
-	name: rule text font size cap
-	description: The font size of rule text can't become greater than this. Default is 28.
-#	localized caption:
-#		fr: Caper le texte de règles
-#	localized description:
-#		fr: Limiter la taille maximale de police du texte de règles. Valeur par défaut: 28.
 styling field:
 	type: choice
 	name: center rule text
@@ -734,14 +749,6 @@ styling field:
 #		fr: Tronquer le texte d'ambiance
 #	localized description:
 #		fr: Réduire la taille du haut, du bas, et de la droite de la zone du texte d'ambiance de N pixels. Format: "1,2,3"
-styling field:
-	type: text
-	name: flavor text font size cap
-	description: The font size of flavor text can't become greater than this. Default is 24.
-#	localized caption:
-#		fr: Caper le texte d'ambiance
-#	localized description:
-#		fr: Limiter la taille maximale de police du texte d'ambiance. Valeur par défaut: 24.
 styling field:
 	type: choice
 	name: center flavor text
@@ -754,21 +761,6 @@ styling field:
 	choice: one line
 	choice: never
 	initial: always
-styling field:
-	type: color
-	name: text color
-	description: Use the specified color for the rule text and flavor text.
-#	localized caption:
-#		fr: Couleur du texte
-#	localized description:
-#		fr: Utiliser la couleur spécifiée pour le texte de règles et le texte d'ambiance.
-	choice:
-		name: black
-		color: rgb(0,0,0)
-	choice:
-		name: white
-		color: rgb(255,255,255)
-	initial: black
 styling field:
 	type: text
 	name: textbox opacity percentage
@@ -821,11 +813,11 @@ styling field:
 styling field:
 	type: text
 	name: watermark
-	description: The name of a '.png' image inside the /magic-watermarks.mse-include/ folder. Dimensions can be anything, but native is 269x269. Alternatively, write 'setsymbol' to use the set symbol instead.
+	description: The name of a '.png' image inside the /magic-mainframe-extras.mse-include/ folder. Dimensions can be anything, but native is 269x269. Alternatively, write 'setsymbol' to use the set symbol instead.
 #	localized caption:
 #		fr: Filigrane
 #	localized description:
-#		fr: Le chemin d'une image '.png' située dans le dossier /magic-watermarks.mse-include/. Alternativement, écrivez 'setsymbol' pour utiliser le symbole du Set comme filigrane.
+#		fr: Le chemin d'une image '.png' située dans le dossier /magic-mainframe-extras.mse-include/. Alternativement, écrivez 'setsymbol' pour utiliser le symbole du Set comme filigrane.
 styling field:
 	type: text
 	name: watermark opacity percentage
@@ -977,15 +969,6 @@ styling field:
 #	localized description:
 #		fr: Utiliser un champ de texte sur la gauche de la carte?
 	initial: no
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot?
-#	localized caption:
-#		fr: Indicateur de couleur
-#	localized description:
-#		fr: Utiliser un indicateur de couleur, par exemple sur les cartes sans coût de lancement?
-	initial: no
 styling field:
 	type: text
 	name: alt rarity color
@@ -1117,27 +1100,59 @@ styling field:
 styling field:
 	type: text
 	name: name font
-	description: Font used for the name, alias, type, pt, fuse, transformation reminder, and banner. Hover your mouse over the font file to see it's details, and write it's Title here.
+	description: Formatted as "font name;font size;font color;vertical offset;italic font name" last 4 are optional. Color can be a name or R,G,B,A numbers. Hover your mouse over the font file to see it's details, it's Title is it's name.
 #	localized caption:
 #		fr: Police du nom
 #	localized description:
-#		fr: Police utilisée pour le nom, alias, type, et force/endurance. Survolez le fichier de police avec la souris pour voir ses informations, et écrivez son titre ici.
+#		fr: Format: "nom de la police;taille;couleur;décalage vertical;nom de la police italique". Les 4 derniers sont optionnels. Format couleur: "R,G,B,A". Survolez le fichier de police avec la souris pour voir son titre, qui est son nom.
+styling field:
+	type: text
+	name: type font
+	description: Formatted as "font name;font size;font color;vertical offset;italic font name" last 4 are optional. Color can be a name or R,G,B,A numbers. Hover your mouse over the font file to see it's details, and write it's Title here.
+#	localized caption:
+#		fr: Police du type
+#	localized description:
+#		fr: Format: "nom de la police;taille;couleur;décalage vertical;nom de la police italique". Les 4 derniers sont optionnels. Format couleur: "R,G,B,A". Survolez le fichier de police avec la souris pour voir son titre, qui est son nom.
 styling field:
 	type: text
 	name: text font
-	description: Font used for the rule text. Hover your mouse over the font file to see it's details, and write it's Title here.
+	description: Formatted as "font name;font size;font color;vertical offset;italic font name" last 4 are optional. Color can be a name or R,G,B,A numbers. Hover your mouse over the font file to see it's details, and write it's Title here.
 #	localized caption:
 #		fr: Police du texte des règles
 #	localized description:
-#		fr: Police utilisée pour le texte des règles. Survolez le fichier de police avec la souris pour voir ses informations, et écrivez son titre ici.
+#		fr: Format: "nom de la police;taille;couleur;décalage vertical;nom de la police italique". Les 4 derniers sont optionnels. Format couleur: "R,G,B,A". Survolez le fichier de police avec la souris pour voir son titre, qui est son nom.
 styling field:
 	type: text
-	name: text italic font
-	description: Font used for the flavor text and reminder texts. Hover your mouse over the font file to see it's details, and write it's Title here.
+	name: defense font
+	description: Formatted as "font name;font size;font color;vertical offset;italic font name" last 4 are optional. Color can be a name or R,G,B,A numbers. Hover your mouse over the font file to see it's details, and write it's Title here.
 #	localized caption:
-#		fr: Police du texte d'ambiance
+#		fr: Police de force et endurance
 #	localized description:
-#		fr: Police utilisée pour le text d'ambiance. Survolez le fichier de police avec la souris pour voir ses informations, et écrivez son titre ici.
+#		fr: Format: "nom de la police;taille;couleur;décalage vertical;nom de la police italique". Les 4 derniers sont optionnels. Format couleur: "R,G,B,A". Survolez le fichier de police avec la souris pour voir son titre, qui est son nom.
+styling field:
+	type: text
+	name: PT font
+	description: Formatted as "font name;font size;font color;vertical offset;italic font name" last 4 are optional. Color can be a name or R,G,B,A numbers. Hover your mouse over the font file to see it's details, and write it's Title here.
+#	localized caption:
+#		fr: Police de force et endurance
+#	localized description:
+#		fr: Format: "nom de la police;taille;couleur;décalage vertical;nom de la police italique". Les 4 derniers sont optionnels. Format couleur: "R,G,B,A". Survolez le fichier de police avec la souris pour voir son titre, qui est son nom.
+styling field:
+	type: text
+	name: alias font
+	description: Formatted as "font name;font size;font color;vertical offset;italic font name" last 4 are optional. Color can be a name or R,G,B,A numbers. Hover your mouse over the font file to see it's details, and write it's Title here.
+#	localized caption:
+#		fr: Police de l'alias
+#	localized description:
+#		fr: Format: "nom de la police;taille;couleur;décalage vertical;nom de la police italique". Les 4 derniers sont optionnels. Format couleur: "R,G,B,A". Survolez le fichier de police avec la souris pour voir son titre, qui est son nom.
+styling field:
+	type: text
+	name: auxiliary font
+	description: Font used for the transformation reminder, fuse, choice bar and banner. Formatted as "font name;font size;font color;vertical offset;italic font name" last 4 are optional. Color can be a name or R,G,B,A numbers.
+#	localized caption:
+#		fr: Police auxiliaire
+#	localized description:
+#		fr: Police utilisée pour la bannière, la fusion, la barre de choix et le rappel de transformation. Format: "nom de la police;taille;couleur;décalage vertical;nom de la police italique". Les 4 derniers sont optionnels. Format couleur: "R,G,B,A".
 styling style:
 	center rule text:
 		render style: both
@@ -1164,6 +1179,9 @@ styling style:
 			yes: { symbol_variation(symbol: set.symbol, variation: "invertedcommon") }
 
 ############################################################## Card fields
+
+include file: /magic-modules.mse-include/corners/card_fields
+
 card style:
 	############################# Background
 	card color:
@@ -1179,18 +1197,19 @@ card style:
 	############################# Name line
 	name:
 		left: { 113 + (if styling.center_name then name_margin() else nameline_left_margin()) }
-		top: 44
+		top: { 44 + name_font_vertical() }
 		right: { 971 - (if styling.center_name then name_margin() else nameline_right_margin()) }
 		height: 48
 		alignment: { if styling.center_name then "center middle shrink-overflow" else "left middle shrink-overflow" }
 		z index: 42
 		font:
-			name: { if styling.name_font == "" then "Beleren Bold" else styling.name_font }
-			size: { 32 - shrink_name() }
-			color: black
+			name: { name_font() }
+			italic name: { name_font_italic() }
+			size: { name_font_size() }
+			color: { name_font_color() }
 		symbol font:
 			name: { styling.casting_cost_mana_symbols }
-			size: { 32 - shrink_name() }
+			size: { name_font_size() }
 	casting cost:
 		right: 972
 		top: 44
@@ -1198,7 +1217,7 @@ card style:
 		height: 48
 		alignment: middle right
 		font:
-			name: { if styling.text_font == "" then "MPlantin" else styling.text_font }
+			name: { body_font() }
 			size: 32
 		symbol font:
 			name: { styling.casting_cost_mana_symbols }
@@ -1207,15 +1226,16 @@ card style:
 		z index: 42
 	alias:
 		left: 316
-		top: 106
+		top: { 106 + name2_font_vertical() }
 		width: 452
 		height: 24
 		alignment: center middle shrink-overflow
 		z index: 42
 		font:
-			name: { if styling.name_font == "" then "Beleren Bold" else styling.name_font }
-			size: 18
-			color: black
+			name: { name2_font() }
+			italic name: { name2_font_italic() }
+			size: { name2_font_size() }
+			color: { name2_font_color() }
 	
 	############################# Image
 	image:
@@ -1235,15 +1255,16 @@ card style:
 	############################# Card type
 	type:
 		left: { 168 + (if styling.center_type then type_margin() else typeline_left_margin()) }
-		top: { 389 + move_typebox() }
+		top: { 389 + move_typebox() + type_font_vertical() }
 		right: { 916 - (if styling.center_type then type_margin() else typeline_right_margin()) }
 		height: 44
 		alignment: { if styling.center_type then "center middle shrink-overflow" else "left middle shrink-overflow" }
 		z index: 42
 		font:
-			name: { if styling.name_font == "" then "Beleren Bold" else styling.name_font }
-			size: { 25 - shrink_type() }
-			color: { styling.type_text_color }
+			name: { type_font() }
+			italic name: { type_font_italic() }
+			size: { type_font_size() }
+			color: { type_font_color() }
 			separator color: red
 	rarity:
 		left: { 859 - (-chop_rarity_left()) }
@@ -1293,18 +1314,18 @@ card style:
 	############################# Text boxes
 	rule text:
 		left: { 152 + (if styling.banner then 4 else 0) }
-		top: { 456 - (-chop_top()) + move_typebox() }
+		top: { 456 - (-chop_top()) + move_typebox() + body_font_vertical() }
 		width: { 779 - chop_right() - (if styling.banner then 8 else 0) }
 		bottom: { 699 - chop_bot() }
 		font:
-			name: { if styling.text_font == "" then "MPlantin" else styling.text_font }
-			italic name: { if styling.text_italic_font == "" then "MPlantin-Italic" else styling.text_italic_font }
-			size: { if styling.rule_text_font_size_cap == "" then 28 else to_number(styling.rule_text_font_size_cap) or else 28 }
+			name: { body_font() }
+			italic name: { body_font_italic() }
+			size: { body_font_size() }
+			color: { body_font_color() }
 			scale down to: 12
-			color: { styling.text_color }
 		symbol font:
 			name: { styling.text_box_mana_symbols }
-			size: { if styling.rule_text_font_size_cap == "" then 28 else to_number(styling.rule_text_font_size_cap) or else 28 }
+			size: { body_font_size() }
 			scale down to: 12
 		alignment:
 			script:
@@ -1325,18 +1346,18 @@ card style:
 		line height line max: 1.6
 	flavor text:
 		left: { 152 + (if styling.banner then 4 else 0) }
-		top: { 699 - chop_bot() - (-chop_flavor_top()) }
+		top: { 699 - chop_bot() - (-chop_flavor_top()) + body_font_vertical() }
 		width: { 779 - chop_flavor_right() - (if styling.banner then 8 else 0) }
 		bottom: { 716 - chop_flavor_bot() }
 		font:
-			name: { if styling.text_font == "" then "MPlantin" else styling.text_font }
-			italic name: { if styling.text_italic_font == "" then "MPlantin-Italic" else styling.text_italic_font }
-			size: { if styling.flavor_text_font_size_cap != "" then (to_number(styling.flavor_text_font_size_cap) or else 24) else 24 }
+			name: { body_font() }
+			italic name: { body_font_italic() }
+			size: { body_font_size() }
+			color: { body_font_color() }
 			scale down to: 12
-			color: { styling.text_color }
 		symbol font:
 			name: { styling.text_box_mana_symbols }
-			size: { if styling.flavor_text_font_size_cap != "" then (to_number(styling.flavor_text_font_size_cap) or else 24) else 24 }
+			size: { body_font_size() }
 			scale down to: 12
 		alignment:
 			script:
@@ -1353,7 +1374,7 @@ card style:
 		line height hard max: 1.3
 		line height line max: 1.6
 	rule text 3:
-		left: 526
+		left: { 526 - name3_font_vertical() }
 		top: { (if contains(styling.fuse, match: "right") then 750 else 0) - (if length(remove_tags(card.rule_text_3)) > 9 then 22 else 0) - 128 + 36 }
 		width: { if styling.fuse != "none" then (if length(remove_tags(card.rule_text_3)) > 9 then 228 else 184) else 0 }
 		height: 54
@@ -1361,27 +1382,44 @@ card style:
 		z index: 160
 		alignment: center middle shrink-overflow
 		font:
-			name: { if styling.name_font == "" then "Beleren Bold" else styling.name_font }
-			size: 30
+			name: { name3_font() }
+			italic name: { name3_font_italic() }
+			size: { name3_font_size() }
+			color: { name3_font_color() }
 			scale down to: 12
-			color: black
 		symbol font:
-			name: { styling.casting_cost_mana_symbols }
-			size: 30
+			name: { styling.text_box_mana_symbols }
+			size: { name3_font_size() }
 			scale down to: 12
 	
 	############################# Loyalty
 	loyalty:
-		left: 919
-		top: 667
+		left: { if card.loyalty == "" and card.pt != "" then 759 else 919 }
+		top: { 667 + pt2_font_vertical() }
 		width: 56
 		height: 42
 		z index: 46
 		alignment: center middle shrink-overflow
 		font:
-			name: { if styling.name_font == "" then "Beleren Bold" else styling.name_font }
-			size: 32
-			color: black
+			name: { pt2_font() }
+			italic name: { pt2_font_italic() }
+			size: { pt2_font_size() }
+			color: { pt2_font_color() }
+	
+	############################# PT
+	pt:
+		z index: 46
+		left: { if card.loyalty == "" and card.pt != "" then 865 else 745 }
+		top: { 671 + pt_font_vertical() }
+		width: 120
+		height: 56
+		alignment: center middle shrink-overflow
+		font:
+			name: { pt_font() }
+			italic name: { pt_font_italic() }
+			size: { pt_font_size() }
+			color: { pt_font_color() }
+			scale down to: 12
 			separator color: red
 	
 	############################# Copyright stuff
@@ -1484,6 +1522,12 @@ extra card field:
 	editable: false
 	save value: false
 	choice: loyalty box
+extra card field:
+	type: choice
+	name: pt box
+	editable: false
+	save value: false
+	choice: pt box
 extra card field:
 	type: choice
 	name: watermark image
@@ -1666,6 +1710,13 @@ extra card field:
 	save value: false
 	show statistics: false
 	script: set.border_color
+extra card field:
+	type: color
+	name: pt border
+	editable: false
+	save value: false
+	show statistics: false
+	script: set.border_color
 extra card field:
 	type: color
 	name: typebox border
@@ -1740,18 +1791,19 @@ extra card style:
 		image: { reminder_image() }
 	transformation reminder text:
 		left: { if styling.transformation_reminder == "notch" then 895 else 112 }
-		top: { if styling.transformation_reminder == "notch" then 614 else 680 }
+		top: { (if styling.transformation_reminder == "notch" then 614 else 680) + name3_font_vertical() }
 		height: { if styling.transformation_reminder == "none" then 0 else if styling.transformation_reminder == "notch" then 34 else 60 }
 		width: { if styling.transformation_reminder == "short" then 187 else if styling.transformation_reminder == "medium" then 282 else if styling.transformation_reminder == "long" then 382 else 50 }
 		z index: 46
 		alignment: { if styling.transformation_reminder == "notch" then "right middle" else "center middle shrink-overflow" }
 		font:
-			name: { if styling.name_font == "" then (if styling.transformation_reminder == "notch" then "ModMatrix" else "Beleren Bold") else styling.name_font }
-			size: { (if styling.transformation_reminder == "notch" then 27 else 30) - shrink_reminder() }
-			color: black
+			name: { if styling.auxiliary_font == "" then (if styling.transformation_reminder == "notch" then "ModMatrix" else "Beleren Bold") else name3_font() }
+			italic name: { if styling.auxiliary_font == "" then (if styling.transformation_reminder == "notch" then "ModMatrix" else "Beleren Bold") else name3_font_italic() }
+			size: { name3_font_size() - (if styling.transformation_reminder == "notch" then 3 else 0) - shrink_reminder() }
+			color: { name3_font_color() }
 		symbol font:
 			name: { styling.casting_cost_mana_symbols }
-			size: { (if styling.transformation_reminder == "notch" then 27 else 30) - shrink_reminder() }
+			size: { name3_font_size() - (if styling.transformation_reminder == "notch" then 3 else 0) - shrink_reminder() }
 	transformation reminder defense paste:
 		left: 935
 		top: 647
@@ -1781,20 +1833,21 @@ extra card style:
 		image: { image("battlealias", side: "left") }
 	ascend:
 		left: 93
-		top: 139
+		top: { 139 + name3_font_vertical() }
 		width: { if styling.banner then 50 else 0 }
 		height: { if styling.transformation_reminder != "none" and styling.transformation_reminder != "notch" then 548 else 558 }
 		direction: vertical
 		z index: 42
 		alignment: center middle
 		font:
-			name: { if styling.name_font == "" then "Beleren Bold" else styling.name_font }
-			size: 18
+			name: { name3_font() }
+			italic name: { name3_font_italic() }
+			size: { name3_font_size() - 12 }
+			color: { name3_font_color() }
 			scale down to: 12
-			color: black
 		symbol font:
 			name: { styling.casting_cost_mana_symbols }
-			size: 18
+			size: { name3_font_size() - 12 }
 			scale down to: 12
 	ascend box:
 		left: 81
@@ -1853,6 +1906,15 @@ extra card style:
 		visible: { card.loyalty != "" }
 		render style: image
 		image: { loyalty_image() }
+	pt box:
+		left: { if card.loyalty == "" and card.pt != "" then 824 else 704 }
+		top: 655
+		width: 210
+		height:	82
+		z index: 38
+		visible: { card.pt != "" }
+		render style: image
+		image: { pt_image() }
 	watermark image:
 		left: { 542 - to_int(watermark_width()/2) }
 		top: { 446 + move_typebox() }
@@ -2072,6 +2134,15 @@ extra card style:
 		height: 81
 		z index: 37
 		mask: { border("battleloy") }
+	pt border:
+		visible: { set.border_color != rgb(0,0,0) and card.pt != "" }
+		left: { if card.loyalty == "" and card.pt != "" then 824 else 704 }
+		top: 655
+		width: 210
+		height:	82
+		z index: 39
+		visible: { card.pt != "" }
+		mask: { border("battlept" + if card.loyalty == "" then "" else "defense") }
 	typebox border:
 		left: 97
 		top: { 360 + move_typebox() }