sync with Full and prune

update templates to sync up with Full Pack
remove depreciated and full-pack exclusive templates

data/magic-m15-altered.mse-style/style

@@ -6,7 +6,7 @@ icon: card-sample.png
 installer group: magic/m15 style/normal cards
 position hint: 001
 
-version: 2020-09-04
+version: 2024-01-05
 depends on:
 	package: magic.mse-game
 	version: 2020-04-25
@@ -72,6 +72,8 @@ init script:
 	}
 	crown_follow := {
 		if input != "crown" then ""
+		else if is_borderless()
+		  then "bl"
 		else if styling.legend_crown == "nyx" or (is_nyx() and chosen(styling.other_options, choice:"auto nyx crowns"))
 			then "nyx"
 		else if styling.legend_crown == "companion"
@@ -132,8 +134,8 @@ init script:
 	is_mutate := { not is_expanded_art() and not is_full_art() and chosen(styling.frames, choice: "mutate") and not is_map()}
 	is_miracle := { chosen(styling.frames, choice: "miracle") and not is_map() and not is_expanded_art() and not is_cons() and not is_fnm() and not is_inverted()}
 	is_nyx := { chosen(styling.frames, choice: "nyx") and not is_map() }
-	is_vehicle := { (chosen(styling.frames, choice: "vehicle") or (chosen(styling.other_options, choice:"auto vehicles") and match_vehicle(card.sub_type))) and not is_map()}
-	is_snow := { (chosen(styling.frames, choice: "snow") or (chosen(styling.other_options, choice:"auto snow") and match_snow(card.super_type))) and not is_map()}
+	is_vehicle := { (chosen(styling.frames, choice: "vehicle") or (chosen(styling.other_options, choice:"auto vehicles") and lang_setting("is_vehicle")(card.sub_type))) and not is_map()}
+	is_snow := { (chosen(styling.frames, choice: "snow") or (chosen(styling.other_options, choice:"auto snow") and lang_setting("is_snow")(card.super_type))) and not is_map()}
 	is_cons := { chosen(styling.frames, choice: "draft matters") or chosen(styling.frames, choice: "conspiracy") and not is_map() }
 	is_scrolls := { chosen(styling.frames, choice: "conspiracy") and not is_map()}
 	is_shifted := { chosen(styling.frames, choice: "planeshifted") and not is_map() and not is_full_art() and not is_fnm()}
@@ -142,7 +144,7 @@ init script:
 	is_map := { chosen(styling.frames, choice: "map") }
 	use_node := { chosen(styling.frames, choice: "lesson") }
 	is_season := { chosen(styling.frames, choice: "season") and not is_map() }
-	is_legend := {not is_map() and (chosen(styling.frames, choice: "legend") or (set.auto_legends and contains(card.super_type, match:"Legendary"))) }
+	is_legend := {not is_map() and (chosen(styling.frames, choice: "legend") or (set.auto_legends and lang_setting("is_legendary")(card.super_type))) }
 	is_full_art := {chosen(styling.frames, choice:"fullart") and not is_map() and not is_clear()}
 	is_expanded_art := {not is_map() and not is_clear() and contains(styling.frames, match:"less art")}
 	is_borderless := {not is_map() and not is_clear() and chosen(styling.frames, choice:"borderless art")}
@@ -159,10 +161,10 @@ init script:
 	is_d20 := {styling.d20_dividers != "off" and not is_leveler()}
 	is_all_break := {contains(styling.d20_dividers, match:"all breaks")}
 	d20string := "^(<b>)?(((</sym>)?[-0-9 ,+>\<](<sym>)?)+|[Ee]lse|[Oo]ther) ?(</b>)?[|]"
-	d20_array := 
+	d20_array :=
 		filter_text@(match:"(\n|"+d20string+")")
 		+split_text@(match:d20string)
-	number_of_rolls := {if is_all_break() then 1+length(filter_text(card.rule_text, match:"\n"))-rolls_start(card.text) else length(d20_array(input))-1}
+	number_of_rolls := {min(6, if is_all_break() then 1+length(filter_text(card.rule_text, match:"\n"))-(rolls_start(card.text)-invert_rolls()) else length(d20_array(input))-1)}
 	rolls_start := {
 		if styling.d20_dividers == "all breaks +3" then 4
 		else if styling.d20_dividers == "all breaks +2" then 3
@@ -174,41 +176,30 @@ init script:
 	d20_filter := replace@(match:"^([Ee]lse ?|[Oo]ther ?|((</sym>)?[-0-9 ,+>\<](<sym>)?)+)[|]", replace:"<b>\\1</b>|")
 	top_of_para := {
 		input := input + no_roll(card.text)
-		if card_style.text.layout.paragraphs[input].top or else 0 > 0 then
-			card_style.text.top + card_style.text.layout.paragraphs[input].top - 0.5*(card_style.text.layout.paragraphs[input].top-card_style.text.layout.paragraphs[input-1].bottom)
+		input := max(input, 0)
+		if card_style.text.layout.paragraphs[input].top or else -1 >= 0 then
+			if invert_rolls() == 1 and input == rolls_start()-invert_rolls() then card_style.text.top
+			else if input == 0 then card_style.text.top + card_style.text.layout.paragraphs[input].top
+			else card_style.text.top + card_style.text.layout.paragraphs[input].top - 0.5*(card_style.text.layout.paragraphs[input].top-card_style.text.layout.paragraphs[input-1].bottom)
 		else 0
 	}
 	height_of_para := {
 		input := input + no_roll(card.text)
 		if card_style.text.layout.paragraphs[input].bottom or else 0 > 0 then
-			card_style.text.layout.paragraphs[input].bottom + 1.3*(card_style.text.layout.paragraphs[input].top-card_style.text.layout.paragraphs[input-1].bottom) - card_style.text.layout.paragraphs[input].top
+			if invert_rolls() == 1 and input == rolls_start() then card_style.text.layout.paragraphs[input-1].bottom
+			else card_style.text.layout.paragraphs[input].bottom + 1.3*(card_style.text.layout.paragraphs[input].top-card_style.text.layout.paragraphs[input-1].bottom) - card_style.text.layout.paragraphs[input].top
 		else 0
 	}
 	no_roll := {if styling.d20_dividers == "all breaks" then 1 else if rolls_start(input) == 0 then 1 else 0}
-
+	invert_rolls := {if chosen(styling.other_options, choice:"inverted d20") then 1 else 0}
+	
 	text_filter := text_filter + override_clear + d20_filter + {if chosen(styling.other_options, choice:"override-style text") then override_filter(input) else input}
 
 	center_map := {is_map() and (card.casting_cost == "" or chosen(styling.other_options, choice:"always center map names"))}
 	use_evobar := {chosen(styling.other_options, choice:"pokemon evobar")}
-	alt_rarity := {styling.alt_rarity_color != ""}
-	alt_rarity_color := {
-		string := "83,67,53:177,150,131:0,0,0:0,0,0:0.07:"
-		if match(styling.alt_rarity_color, match:":$") then string := styling.alt_rarity_color
-		colons := length(filter_text(string, match:":"))
-		output := split_text(string, match:",|:")
-		splits := split_text(string, match:":")
-		if colons == 4
-			then output := split_text(string+"0.07:", match:",|:")
-		if colons == 3
-			then output := split_text(string+splits[2]+"0.07:", match:",|:")
-		else if colons == 2
-			then output := split_text(string+"0,0,0:0,0,0:0.07:", match:",|:")
-		else if colons == 1
-			then output := split_text(string+splits[0]+":0,0,0:0,0,0:0.07:", match:",|:")
-		
-		output
-	}
-	alt_symbol := {symbol_variation(symbol:set.symbol, border_radius: alt_rarity_color().12, fill_type: "linear gradient", fill_color_1: rgb(alt_rarity_color().0, alt_rarity_color().1, alt_rarity_color().2), fill_color_2: rgb(alt_rarity_color().3, alt_rarity_color().4, alt_rarity_color().5), border_color_1: rgb(alt_rarity_color().6, alt_rarity_color().7, alt_rarity_color().8), border_color_2: rgb(alt_rarity_color().9, alt_rarity_color().10, alt_rarity_color().11), center_x:0.5, center_y:0.5, end_x:1, end_y:1)}
+	# alternate rarity color
+	alt_rarity := {styling.alt_rarity_color}
+
 	is_skinned := {chosen(styling.other_options, choice:"godzilla style alias")}
 	use_vorthos := {((not is_leveler() or lone_pt()) and card.pt != "") or chosen(styling.other_options, choice:"vorthos box")}
 	clear_tops := {chosen(styling.other_options, choice:"clear tops") and not is_puma()}
@@ -216,7 +207,7 @@ init script:
 	pure_snow := {is_snow() and not is_fnm() and not is_inverted() and not is_full_art() and not is_leveler() and not is_shifted()}
 	chop_top := {if styling.chop_top == "" then 0 else if comma_count(styling.chop_top) == "," or comma_count(styling.chop_top) == ",," then split_text(match:",", styling.chop_top).0 else styling.chop_top}
 	chop_bot := {if comma_count(styling.chop_top) == ",," then split_text(match:",", styling.chop_top).1 else if styling.chop_bottom == "" then 0 else styling.chop_bottom}
-	top_of_textbox := {(if is_map() then 340 else if is_full_art() then 359 else if is_mutate() then 395 else 327) - (-chop_top()) }
+	top_of_textbox := {(if is_map() then 340 else if is_full_art() then 359 else if is_mutate() then 395 else 327) - (-chop_top()) + body_font_vertical()}
 	bottom_of_textbox := {(if is_map() then 475 else 481) - chop_bot() }
 
 	is_leveler := {chosen(styling.frames, choice:"leveler")}
@@ -265,6 +256,146 @@ init script:
 	}
 	shown_cr := {if set.automatic_copyright then set.copyright != "" else card.copyright != ""}
 	card_shape := {if is_leveler() then "leveler" else "normal"}
+
+	white_text := {is_full_art() or is_fnm() or is_inverted()}
+
+	rare_width := {
+		cw := card_style.rarity.content_width
+		cw := if cw > 44 then (if set.print_fix != "" then set.print_fix else 22) else if cw < 22 then 22 else cw
+		if card_style.rarity.width == 0 then 0 else cw
+	}
+	
+	### Customize fonts
+	swap_font := {styling.apply_custom_fonts}
+	name_font := {
+		swap_font_name(
+			src:styling.custom_name_font, 
+			font_name: if is_map() then "Beleren Small Caps" else "Beleren Bold"
+		)
+	}
+	name_font_size := {
+		swap_font_size(
+			src:styling.custom_name_font, 
+			font_size: if is_map() then 14.8 else 16
+		) - shrink_name()
+	}
+	name_font_color := {
+		swap_font_color(
+			src: styling.custom_name_font,
+			font_color: if is_shifted() or is_fnm() or is_inverted() then "white" else "black"
+		)
+	}
+	name_font_vertical := {
+		swap_font_vertical(
+			src: styling.custom_name_font
+		)
+	}
+	name_font_italic := {
+		swap_font_italic(
+			src: styling.custom_name_font
+		)
+	}
+	
+	type_font := {
+		swap_font_name(
+			src:styling.custom_type_font, 
+			font_name: "Beleren Bold"
+		)
+	}
+	type_font_size := {
+		swap_font_size(
+			src:styling.custom_type_font, 
+			font_size: if is_map() then 12 else 13
+		) - shrink_type()
+	}
+	type_font_color := {
+		swap_font_color(
+			src: styling.custom_type_font,
+			font_color: if is_full_art() or is_puma() or is_shifted() or is_fnm() or is_inverted() then "white" else "black"
+		)
+	}
+	type_font_vertical := {
+		swap_font_vertical(
+			src: styling.custom_type_font
+		)
+	}
+	type_font_italic := {
+		swap_font_italic(
+			src: styling.custom_type_font
+		)
+	}
+	
+	body_font := {
+		swap_font_name(
+			src:styling.custom_body_font, 
+			font_name: "MPlantin"
+		)
+	}
+	body_font_size := {
+		swap_font_size(
+			src:styling.custom_body_font, 
+			font_size: if styling.font_cap != "" then to_number(styling.font_cap) else if is_mutate() then 12 else 14
+		)
+	}
+	body_font_color := {
+		swap_font_color(
+			src: styling.custom_body_font,
+			font_color: if is_full_art() or is_fnm() or is_inverted() then "white" else "black"
+		)
+	}
+	body_font_vertical := {
+		swap_font_vertical(
+			src: styling.custom_body_font
+		)
+	}
+	body_font_italic := {
+		swap_font_italic(
+			src: styling.custom_body_font
+		)
+	}
+
+	pt_font := {
+		swap_font_name(
+			src:styling.custom_pt_font, 
+			font_name: "Beleren Bold"
+		)
+	}
+	loyalty_font_size := {
+		swap_font_size(
+			src:styling.custom_pt_font, 
+			font_size: 14
+		)
+	}
+	loyalty_font_color := {
+		swap_font_color(
+			src: styling.custom_pt_font,
+			font_color: "white"
+		)
+	}
+	pt_font_size := {
+		swap_font_size(
+			src:styling.custom_pt_font, 
+			font_size: if is_map() then 14 else 16
+		)
+	}
+	pt_font_color := {
+		swap_font_color(
+			src: styling.custom_pt_font,
+			font_color: if is_shifted() or is_fnm() or is_inverted() then "white" else if is_vehicle() and (not is_legend() or chosen(styling.other_options, choice:"brown legendary vehicle pt")) then "white" else "black"
+		)
+	}
+	pt_font_vertical := {
+		swap_font_vertical(
+			src: styling.custom_pt_font
+		)
+	}
+	pt_font_italic := {
+		swap_font_italic(
+			src: styling.custom_pt_font
+		)
+	}
+
+	use_flash_dot := {false}
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -364,6 +495,7 @@ styling field:
 	choice: clear tops
 	choice: vorthos box
 	choice: pride pinlines
+	choice: inverted d20
 	initial: auto nyx crowns, auto vehicles, auto snow
 styling field:
 	type: text
@@ -406,19 +538,35 @@ styling field:
 	name: color indicator dot
 	description: Use the color indicator dot
 	initial: no
-styling field:
-	type: boolean
-	name: remove from autocount
-	description: Removes the automatic card number for specific cards, to allow for overcounted cards like in Planeswalker Decks.
-	initial: no
-styling field:
-	type: text
-	name: alt rarity color
-	description: Use a custom color for the rarity symbol. Formatted as "R1,G1,B1:R2,G2,B2:..." 1 and 2 are fill color, 3 and 4 border color
 styling field:
 	type: text
 	name: card watermark
 	description: Filename in magic-watermarks to use for standalone card watermark
+styling field:
+	type: text
+	name: alt rarity color
+	description: Use a custom color for the rarity symbol. Formatted as "R1,G1,B1:R2,G2,B2:...:X:" 1 and 2 are fill color, 3 and 4 border color, X is border thickness. For example, rare is 214,196,94:95,84,40:0,0,0:0,0,0:0.07
+styling field:
+	type: boolean
+	name: apply custom fonts
+	description: Enable to attempt to use custom fonts given below
+	initial: no
+styling field:
+	type: text
+	name: custom name 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.
+styling field:
+	type: text
+	name: custom 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.
+styling field:
+	type: text
+	name: custom body 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.
+styling field:
+	type: text
+	name: custom 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.
 styling field:
 	type: choice
 	name: hybrid name
@@ -426,6 +574,11 @@ styling field:
 	choice: gold
 	choice: hybrid
 	description: Use a grey background for the name and type line on hybrid cards like real cards, or gold or hybrid instead.
+styling field:
+	type: boolean
+	name: remove from autocount
+	description: Removes the automatic card number for specific cards, to allow for overcounted cards like in Planeswalker Decks.
+	initial: no
 styling field:
 	type: boolean
 	name: colored multicolor land name
@@ -460,6 +613,7 @@ styling field:
 	choice: always
 	choice: short text only
 	choice: never
+	choice: right align
 	initial: never
 styling field:
 	type: boolean
@@ -531,16 +685,18 @@ card style:
 	############################# Name line
 	name:
 		left: { if center_map() then 55 else if is_map() then (if use_node() then 65 else 60) else if use_node() then 58 else if card.card_symbol=="none" then 32 else 50 }
-		top: { if is_map() then 27 else if is_devoid() then 30 else if is_clear() or clear_tops() then 31 else 30 }
+		top: { (if is_map() then 27 else if is_devoid() then 30 else if is_clear() or clear_tops() then 31 else 30)+ name_font_vertical() }
 		right:  { if center_map() then 320 else (if is_map() then 320 else 341) - card_style.casting_cost.content_width }
 		height: { 23 - (0.5 * shrink_name()) }
 		alignment: {if center_map() then "center bottom shrink-overflow" else "left bottom shrink-overflow" }
 		padding bottom: 0
 		z index: 2
 		font:
-			name: { if is_map() then "Beleren Small Caps" else "Beleren Bold" }
-			size: { (if is_map() then 14.8 else 16) - shrink_name() }
-			color: {if is_shifted() or is_fnm() or is_inverted() then "white" else "black"}
+		font:
+			name: { name_font() }
+			italic name: { name_font_italic() }
+			size: { name_font_size() }
+			color: { name_font_color() }
 			shadow color: {if is_shifted() or is_fnm() then rgb(0,0,0) else rgba(0,0,0,0)}
 			shadow displacement x: -1
 			shadow displacement y: 1
@@ -600,7 +756,7 @@ card style:
 		z index: 8
 	############################# Card type
 	indicator:
-		left: { (if is_map() then 18  else if is_season() then 43 else 31) + (if is_clear() then 2 else 0)}
+		left: { (if is_map() then 18  else if is_season() then 43 else 31) + (if is_clear() then 2 else 0) + (if use_flash_dot() then 3 else 0)}
 		top: { if is_clear() or is_map() then 298 else if is_thbland() then 449 else if is_full_art() then 332 else 300 }
 		width: 17
 		height: 17
@@ -609,17 +765,18 @@ card style:
 		visible: { styling.color_indicator_dot }
 		image: { card_identity() }
 	type:
-		left: { if is_map() then 85 else if is_season() then (if styling.color_indicator_dot then 64 else 44)+(if is_clear() then 4 else 0) else (if styling.color_indicator_dot then 52 else 32) + (if is_clear() then 4 else 0) }
-		top: { (if is_map() then 297.5 else if is_clear() then 294 else if is_thbland() then 444 else if is_full_art() then 329 else 296) + shrink_type() }
-		width: { if is_map() then 205 else (if styling.color_indicator_dot then "290" else "310") - (if card_style.rarity.width == 0 then 0 else max(22,card_style.rarity.content_width)) - (if is_season() then 12 else 0) }
+		left: { if is_map() then 85 else (if use_flash_dot() then 3 else 0) + if is_season() then (if styling.color_indicator_dot then 64 else 44)+(if is_clear() then 4 else 0) else (if styling.color_indicator_dot then 52 else 32) + (if is_clear() then 4 else 0) }
+		top: { (if is_map() then 297.5 else if is_clear() then 294 else if is_thbland() then 444 else if is_full_art() then 329 else 296) + shrink_type() + type_font_vertical() }
+		width: { if is_map() then 205 else (if styling.color_indicator_dot then "290" else "310") - rare_width() - (if is_season() then 12 else 0) }
 		height: { (if is_map() then 18 else 20) - shrink_type() }
 		alignment: { if is_map() then "center top shrink-overflow" else "top shrink-overflow"}
 		z index: 5
 		padding top: 2
 		font:
-			name: Beleren Bold
-			size: { (if is_map() then 12 else 13) - shrink_type() }
-			color: { if is_full_art() or is_puma() or is_shifted() or is_fnm() or is_inverted() then "white" else "black"}
+			name: { type_font() }
+			italic name: { type_font_italic() }
+			size: { type_font_size() }
+			color: { type_font_color() }
 			shadow color: {if is_full_art() or is_puma() or is_shifted() or is_fnm() then "black" else rgba(0,0,0,0)}
 			shadow displacement x: -1
 			shadow displacement y: 1
@@ -637,34 +794,34 @@ card style:
 			basic land:
 				script:
 					if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "c.png"
-					else if alt_rarity() then alt_symbol()
+					else if use_alt_rarity() then alt_symbol()
 					else if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon")
 					else symbol_variation(symbol: set.symbol, variation: "common")
 			common:
 				script:
 					if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "c.png"
-					else if alt_rarity() then alt_symbol()
+					else if use_alt_rarity() then alt_symbol()
 					else if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon")
 					else symbol_variation(symbol: set.symbol, variation: "common")
 			uncommon:
 				script:
 					if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "u.png"
-					else if alt_rarity() then alt_symbol()
+					else if use_alt_rarity() then alt_symbol()
 					else symbol_variation(symbol: set.symbol, variation: "uncommon")
 			rare:
 				script:
 					if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "r.png"
-					else if alt_rarity() then alt_symbol()
+					else if use_alt_rarity() then alt_symbol()
 					else symbol_variation(symbol: set.symbol, variation: "rare")
 			mythic rare:
 				script:
 					if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "m.png"
-					else if alt_rarity() then alt_symbol()
+					else if use_alt_rarity() then alt_symbol()
 					else symbol_variation(symbol: set.symbol, variation: "mythic rare")
 			special:
 				script:
 					if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "s.png"
-					else if alt_rarity() then alt_symbol()
+					else if use_alt_rarity() then alt_symbol()
 					else symbol_variation(symbol: set.symbol, variation: "special")
 			masterpiece:
 				script:
@@ -677,11 +834,11 @@ card style:
 		width: { if is_leveler() then 0 else (if(card.level_0 != "" or card.level_1 != "" or card.level_2 != "") then -46 else 0) + if is_map() then 287 else 314 }
 		bottom: { bottom_of_textbox() }
 		font:
-			name: MPlantin
-			italic name: MPlantin-Italic
-			size: {if styling.font_cap != "" then to_number(styling.font_cap) else (if is_mutate() then 12 else 14)}
+			name: { body_font() }
+			italic name: { body_font_italic() }
+			size: { body_font_size() }
 			scale down to: 6
-			color: { if is_full_art() or is_fnm() or is_inverted() then "white" else "black"}
+			color: { body_font_color() }
 			shadow color: {if is_full_art() or is_fnm() then "black" else rgba(0,0,0,0)}
 			shadow displacement x: -1
 			shadow displacement y: 1
@@ -697,6 +854,7 @@ card style:
 				   card_style.text.content_lines <= 2) or
 				   styling.center_text == "always"
 				then "middle center"
+				else if styling.center_text == "right align" then "middle right"
 				else "middle left"
 		z index: 4
 		padding left:   6
@@ -713,11 +871,12 @@ card style:
 		right: { if is_leveler() then (if lone_pt() or card.pt == "" then 342 else 277) else if is_mutate() then 342 else if is_map() then 40 else 29}
 		bottom: { if is_mutate() then 392 else if is_leveler() then (327+lv_1_height()) else bottom_of_textbox() }
 		font:
-			name: MPlantin
-			italic name: MPlantin-Italic
-			size: {if styling.font_cap != "" then to_number(styling.font_cap) else 14}
+		font:
+			name: { body_font() }
+			italic name: { body_font_italic() }
+			size: { body_font_size() }
 			scale down to: 6
-			color: { if is_full_art() or is_fnm() or is_inverted() then "white" else "black"}
+			color: { body_font_color() }
 			shadow color: {if is_full_art() or is_fnm() then "black" else rgba(0,0,0,0)}
 			shadow displacement x: -1
 			shadow displacement y: 1
@@ -748,11 +907,11 @@ card style:
 		right: { if is_leveler() then (if card.pt_2 != "" then 277 else 342) else 0 }
 		bottom: { if is_leveler() then (329 + lv_2_coordinate()) + lv_2_height()-2 else 0 }
 		font:
-			name: MPlantin
-			italic name: MPlantin-Italic
-			size: {if styling.font_cap != "" then to_number(styling.font_cap) else 14}
+			name: { body_font() }
+			italic name: { body_font_italic() }
+			size: { body_font_size() }
 			scale down to: 6
-			color: { if is_full_art() or is_fnm() or is_inverted() then "white" else "black"}
+			color: { body_font_color() }
 			shadow color: {if is_full_art() or is_fnm() then "black" else rgba(0,0,0,0)}
 			shadow displacement x: -1
 			shadow displacement y: 1
@@ -783,11 +942,11 @@ card style:
 		right: {if card.pt_3 != "" then 277 else 342}
 		height: {if not is_leveler()then 0 else lv_3_height()-2}
 		font:
-			name: MPlantin
-			italic name: MPlantin-Italic
-			size: {if styling.font_cap != "" then to_number(styling.font_cap) else 14}
+			name: { body_font() }
+			italic name: { body_font_italic() }
+			size: { body_font_size() }
 			scale down to: 6
-			color: { if is_full_art() or is_fnm() or is_inverted() then "white" else "black"}
+			color: { body_font_color() }
 			shadow color: {if is_full_art() or is_fnm() then "black" else rgba(0,0,0,0)}
 			shadow displacement x: -1
 			shadow displacement y: 1
@@ -818,11 +977,11 @@ card style:
 		right: {if card.pt_7 != "" then 277 else 342}
 		height: {if not is_leveler() then 0 else lv_4_height()-2}
 		font:
-			name: MPlantin
-			italic name: MPlantin-Italic
-			size: {if styling.font_cap != "" then to_number(styling.font_cap) else 14}
+			name: { body_font() }
+			italic name: { body_font_italic() }
+			size: { body_font_size() }
 			scale down to: 6
-			color: { if is_full_art() or is_fnm() then "white" else "black"}
+			color: { body_font_color() }
 			shadow color: {if is_full_art() or is_fnm() then "black" else rgba(0,0,0,0)}
 			shadow displacement x: -1
 			shadow displacement y: 1
@@ -930,14 +1089,15 @@ card style:
 	pt:
 		z index: 4
 		left: {if is_leveler() and not lone_pt() then 291 else 286}
-		top: { if is_leveler() and not lone_pt() then (l1_center() - 14) else if is_map() then 467 else 469}
+		top: { (if is_leveler() and not lone_pt() then (l1_center() - 14) else if is_map() then 467 else 469)+(pt_font_vertical())}
 		width: {if starting_loyalty() and not is_leveler() then 0 else 60}
 		height:	28
 		alignment: center middle shrink-overflow
 		font:
-			name: Beleren Bold
-			size: {if is_map() then 14 else 16}
-			color: {if is_shifted() or is_fnm() or is_inverted() then "white" else if is_vehicle() and (not is_legend() or chosen(styling.other_options, choice:"brown legendary vehicle pt")) then "white" else "black"}
+			name: {pt_font()}
+			italic name: {pt_font_italic()}
+			size: {pt_font_size()}
+			color: {pt_font_color()}
 			separator color: red
 			shadow color: {if is_shifted() or is_fnm() then rgb(0,0,0) else rgba(0,0,0,0)}
 			shadow displacement x: -1
@@ -946,14 +1106,15 @@ card style:
 	pt 2:
 		z index: 4
 		left: 291
-		top: {(l2_center() - 12)}
+		top: {(l2_center() - 12)+(pt_font_vertical())}
 		width: {if is_leveler() and not lone_pt() or card.pt_2 != "" then 60 else 0}
 		height: 28
 		alignment: center middle shrink-overflow
 		font:
-			name: Beleren Bold
-			size: {if is_map() then 14 else 16}
-			color: {if is_shifted() or is_fnm() or is_inverted() then "white" else if is_vehicle() and (not is_legend() or chosen(styling.other_options, choice:"brown legendary vehicle pt")) then "white" else "black"}
+			name: {pt_font()}
+			italic name: {pt_font_italic()}
+			size: {pt_font_size()}
+			color: {pt_font_color()}
 			separator color: red
 			shadow color: {if is_shifted() or is_fnm() then rgb(0,0,0) else rgba(0,0,0,0)}
 			shadow displacement x: -1
@@ -961,14 +1122,15 @@ card style:
 	pt 3:
 		z index: 4
 		left: 291
-		top: {(l3_center() - 12)}
+		top: {(l3_center() - 12)+(pt_font_vertical())}
 		width: {if is_leveler() and not lone_pt() or card.pt_3 != "" then 60 else 0}
 		height: 28
 		alignment: center middle shrink-overflow
 		font:
-			name: Beleren Bold
-			size: {if is_map() then 14 else 16}
-			color: {if is_shifted() or is_fnm() or is_inverted() then "white" else if is_vehicle() and (not is_legend() or chosen(styling.other_options, choice:"brown legendary vehicle pt")) then "white" else "black"}
+			name: {pt_font()}
+			italic name: {pt_font_italic()}
+			size: {pt_font_size()}
+			color: {pt_font_color()}
 			separator color: red
 			shadow color: {if is_shifted() or is_fnm() then rgb(0,0,0) else rgba(0,0,0,0)}
 			shadow displacement x: -1
@@ -976,14 +1138,15 @@ card style:
 	pt 7:
 		z index: 4
 		left: 291
-		top: {(l4_center() - 12)}
+		top: {(l4_center() - 12)+(pt_font_vertical())}
 		width: {if is_leveler() and not lone_pt() or card.pt_7 != "" then 60 else 0}
 		height: {if card_style.level_4_text.height < 10 and card.pt_7 == "" then 0 else 28}
 		alignment: center middle shrink-overflow
 		font:
-			name: Beleren Bold
-			size: {if is_map() then 14 else 16}
-			color: {if is_shifted() or is_fnm() then "white" else if is_vehicle() and (not is_legend() or chosen(styling.other_options, choice:"brown legendary vehicle pt")) then "white" else "black"}
+			name: {pt_font()}
+			italic name: {pt_font_italic()}
+			size: {pt_font_size()}
+			color: {pt_font_color()}
 			separator color: red
 			shadow color: {if is_shifted() or is_fnm() then rgb(0,0,0) else rgba(0,0,0,0)}
 			shadow displacement x: -1
@@ -991,14 +1154,15 @@ card style:
 	loyalty:
 		z index: 7
 		left: 326
-		top: 468
+		top: {468+(pt_font_vertical())}
 		width: {if starting_loyalty() then 13.16 else 0}
 		height:	34.63
 		alignment: center middle
 		font:
-			name: Beleren Bold
-			size: 14
-			color: white
+			name: {pt_font()}
+			italic name: {pt_font_italic()}
+			size: {loyalty_font_size()}
+			color: {loyalty_font_color()}
 	############################# Card sorting / numbering
 	set code:
 		left: 24
@@ -1025,7 +1189,7 @@ card style:
 	copyright:
 		right: 350
 		top:
-			{ 
+			{
 				if is_leveler() and not lone_pt()
 					then 488
 				else if (starting_loyalty() and card.loyalty != "") or (card.pt != "" and not starting_loyalty())
@@ -1041,6 +1205,8 @@ card style:
 			size: 6.5
 			color: white
 			weight: bold
+			
+
 ############################################################## Extra card fields
 extra card field:
 	type: text
@@ -1353,6 +1519,10 @@ extra card field:
 	choice: moon
 	choice: eldrazi
 	choice: compass
+	choice: closed fan
+	choice: open fan
+	choice: specialize triangle
+	choice: specialize arrows
 	choice: artifact
 	choice: creature
 	choice: enchantment
@@ -1363,7 +1533,6 @@ extra card field:
 	choice: planeswalker
 	choice: structure
 	choice: aetherprint
-	choice: modal
 	choice:
 		name: sparker colors
 		choice: white
@@ -1388,6 +1557,21 @@ extra card field:
 	save value: true
 	editable: true
 	description: Where they put mtgstory.com on story spotlights.
+extra card field:
+	type: choice
+	name: flash indicator
+	choice: dot
+	save value: false
+	editable: false
+extra card field:
+	type: choice
+	name: list icon
+	choice: no icon
+	choice: the list
+	save value: true
+	editable: true
+
+
 extra card style:
 	promo label:
 		left: 40
@@ -1496,7 +1680,7 @@ extra card style:
 	auto copyright:
 		right: 350
 		top:
-			{ 
+			{
 				if is_leveler() and not lone_pt()
 					then 488
 				else if (starting_loyalty() and card.loyalty != "") or (card.pt != "" and not starting_loyalty())
@@ -1532,7 +1716,7 @@ extra card style:
 		image: {if (is_clear() or clear_tops()) and not is_devoid() then "legend/xcrown.png" else if is_fnm() then set_mask(image:crown_background(), mask:"legend/fnm_mask.png") else crown_background()}
 		z index: 5
 		visible: {is_legend() and not is_map()}
-		mask: {if is_legend() and styling.legend_crown != "custom" and (is_curtains() or is_expanded_art() or is_puma() or is_devoid()) then "curtainmask.png" else if is_season() then "crown_season_mask.png" else ""}
+		mask: {if is_legend() and styling.legend_crown != "custom" and (is_curtains() or is_expanded_art() or is_puma() or is_devoid() and not is_borderless()) then "curtainmask.png" else if is_season() then "crown_season_mask.png" else ""}
 	curtain:
 		left: 0
 		top: 0
@@ -1540,7 +1724,7 @@ extra card style:
 		height: 523
 		render style: image
 		image: {if is_cons() then cons_background() else curtain_background()}
-		z index: 0
+		z index: 3
 		visible: {is_cons() or is_curtains()}
 		mask: {if is_legend() and is_curtains() then "lcurtainmask.png"}
 	scrolls:
@@ -1701,7 +1885,7 @@ extra card style:
 		visible: {card.level_3 != ""}
 	level 2 overlay:
 		left: 29
-		top: { if is_d20() then top_of_para(rolls_start(card.text)) else 329 + lv_2_coordinate()}
+		top: { if is_d20() then top_of_para(rolls_start(card.text)-invert_rolls()) else 329 + lv_2_coordinate()}
 		height: { if is_d20() then height_of_para(rolls_start(card.text)) else lv_2_height()}
 		width: 314
 		z index: 1
@@ -1710,8 +1894,8 @@ extra card style:
 		visible: {(is_d20() and number_of_rolls(card.text) > 0) or (is_leveler() and not is_full_art() and not is_map() and not is_fnm() and not is_inverted())}
 	level 3 overlay:
 		left: 29
-		top: { if is_d20() then top_of_para(rolls_start(card.text)+2) else 329 + lv_3_coordinate()}
-		height: { if is_d20() then height_of_para(rolls_start(card.text)+2) else lv_3_height()}
+		top: { if is_d20() then top_of_para(rolls_start(card.text)+2-invert_rolls()) else 329 + lv_3_coordinate()}
+		height: { if is_d20() then height_of_para(rolls_start(card.text)+2-invert_rolls()) else lv_3_height()}
 		width: 314
 		z index: 1
 		render style: image
@@ -1719,8 +1903,8 @@ extra card style:
 		visible: {(is_d20() and number_of_rolls(card.text)-no_roll(card.text) > 2) or (is_leveler() and not is_full_art() and not is_map() and not is_fnm() and not is_inverted())}
 	level 4 overlay:
 		left: 29
-		top: { if is_d20() then top_of_para(rolls_start(card.text)+4) else 329 + lv_4_coordinate()}
-		height: { if is_d20() then height_of_para(rolls_start(card.text)+4) else lv_4_height()}
+		top: { if is_d20() then top_of_para(rolls_start(card.text)+4-invert_rolls()) else 329 + lv_4_coordinate()}
+		height: { if is_d20() then height_of_para(rolls_start(card.text)+4-invert_rolls()) else lv_4_height()}
 		width: 314
 		z index: 1
 		render style: image
@@ -1847,6 +2031,10 @@ extra card style:
 			structure: corners/structure.png
 			compass: corners/compass.png
 			aetherprint: corners/aetherprint.png
+			closed fan: corners/closedfan.png
+			open fan: corners/openfan.png
+			specialize triangle: corners/specialize.png
+			specialize arrows: corners/specialized.png
 			sparker colors white: corners/wcorner.png
 			sparker colors blue: corners/ucorner.png
 			sparker colors black: corners/bcorner.png
@@ -1877,3 +2065,21 @@ extra card style:
 			size: 7
 			color: white
 			weight: bold
+	flash indicator:
+		left: 0
+		top: 0
+		width: 375
+		height: 523
+		z index: 5
+		render style: image
+		image: flashdot.png
+		visible: { use_flash_dot() }
+	list icon:
+		left: 0
+		top: 487
+		width: 29
+		height: 36
+		render style: image
+		choice images:
+			the list: /magic-mainframe-extras.mse-include/mfsfiles/list.png
+		z index: 4