Add corners options to some showcases (#44)

* Add corners option for Strixhaven showcases, Amonkhet Invocation, Dungeon Module, Secret Lair Full Art, and Unstable Basics
* Added option to remove name background from Unstable Basics
---------

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

changelog.txt

@@ -41,6 +41,7 @@ OTHER UPDATES
 • Added the up and down triangles as mainframe transform options.
 • Added support for dungeons with 8 levels.
 • Added option to remove backface rarity symbol to Mainframe DFC.
+• Added option to remove the colored name banner from Unstable Basics.
 • Added omni and polyamory flags to Pride Pinlines.
 
 BUG FIXES

data/magic-m15-art-lair.mse-style/style

@@ -6,10 +6,13 @@ icon: card-sample.png
 installer group: magic/m15 style/normal cards
 position hint: 099
 
-version: 2021-06-01
+version: 2024-05-26
 depends on:
 	package: magic.mse-game
 	version: 2014-06-25
+depends on:
+	package: magic-modules.mse-include
+	version: 2024-05-20
 
 card width: 375
 card height: 523
@@ -25,7 +28,11 @@ styling field:
 	name: promo
 	description: Is this card a promo card, with the "P" rarity?
 	initial: no
+
 ############################################################## Card fields
+include file: /magic-modules.mse-include/information/card_fields
+include file: /magic-modules.mse-include/stamps/card_fields
+include file: /magic-modules.mse-include/corners/card_fields
 card style:
 	############################# Image
 	image:
@@ -33,106 +40,22 @@ card style:
 		top: 0
 		width: 375
 		height:	486
-		z index: 1
-		mask: mask.png
-	############################# Card sorting / numbering
-	set code:
-		left: 24
-		top: 498
-		width: 40
-		height: 10
-		z index: 1
-		font:
-			name: Relay-Medium
-			size: 7
-			color: white
-			weight: bold
-	############################# Copyright stuff
-	illustrator:
-		left: { 44 + card_style.set_code.content_width }
-		top: 497.5
-		width: 200
-		height: 10
-		z index: 1
-		font:
-			name: Beleren Small Caps Bold
-			size: 7.25
-			color: white
-	copyright:
-		right: 350
-		top: { if card.pt != "" then 500 else 488 }
-		width: 140
-		height: 10
-		z index: 2
-		visible: {not set.automatic_copyright}
-		alignment: middle right shrink-overflow
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold
+		z index: 100
 ############################################################## Extra card fields
-extra card field:
-	type: text
-	name: card code
-	save value: false
-	script:
-		if set.automatic_card_numbers and not styling.remove_from_autocount then
-			forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text)
-		else
-			combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text)
-extra card field:
-	type: choice
-	name: artist arrow
-	editable: false
-	save value: false
-	choice: white
-extra card field:
-	type: text
-	name: auto copyright
-	script: set.copyright
-	save value: false
-	editable: false
-	show statistics: false
 extra card field:
 	type: choice
 	name: border
 	editable: false
 	save value: false
 	choice: border
+extra card field:
+	type: choice
+	name: stamp backing
+	choice: backing
+	editable: false
+	save value: false
+
 extra card style:
-	card code:
-		left: 24
-		top: 488
-		width: 120
-		height: 10
-		z index: 1
-		font:
-			name: Relay-Medium
-			size: 7
-			color: white
-			weight: bold
-	artist arrow:
-		left: { 28 + card_style.set_code.content_width }
-		top: 500
-		width: 12
-		height: 7
-		z index: 1
-		render style: image
-		image: artist_arrow.png
-	auto copyright:
-		right: 350
-		top: { if card.pt != "" then 500 else 488 }
-		width: 140
-		height: 10
-		z index: 2
-		alignment: middle right shrink-overflow
-		visible: {set.automatic_copyright}
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold
 	border:
 		left: 0
 		top: 0
@@ -140,4 +63,13 @@ extra card style:
 		height: 523
 		z index: 0
 		render style: image
-		image: card.png
+		image: card.png
+	stamp backing:
+		left: 165
+		top: 472
+		width: 46
+		height: 26
+		z index: 850
+		visible: { card.card_stamp != "none" }
+		render style: image
+		image: { "/magic-modules.mse-include/stamps/backs/" + (if stamp_shape(field:1) == "triangle" then "triangle_stamp.png" else "stamp.png") }

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

@@ -7,7 +7,7 @@ installer group: magic/m15 style/amonkhet/invocations
 position hint: 092
 
 
-version: 2018-01-10
+version: 2024-05-26
 depends on:
 	package: magic.mse-game
 	version: 2015-04-08
@@ -17,6 +17,9 @@ depends on:
 depends on:
 	package: magic-mana-small-invocation.mse-symbol-font
 	version: 2017-03-31
+depends on:
+	package: magic-modules.mse-include
+	version: 2024-05-20
 
 card width: 375
 card height: 523
@@ -118,6 +121,7 @@ styling style:
 		render style: checklist
 		direction: vertical
 ############################################################## Card fields
+include file: /magic-modules.mse-include/corners/card_fields
 card style:
 	card color:
 		left:	0
@@ -128,7 +132,6 @@ card style:
 		render style: image
 		popup style: in place
 		image: { saturate(card_background(), amount: frame_saturation()) }
-	############################# Background stuff
 	############################# Name line
 	name: 
 		left: 35
@@ -302,11 +305,7 @@ extra card field:
 	type: text
 	name: card code
 	save value: false
-	script: 
-		if set.automatic_card_numbers and not styling.remove_from_autocount then
-			forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + ( set.set_code ) + " * " + set.set_language + " " + rarity_code() + " ", field: card.card_code_text)
-		else
-			combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text)
+	script: card_number_script_core()
 extra card field:
 	type: choice
 	name: artist arrow
@@ -417,6 +416,7 @@ extra card field:
 	choice: glowmaster
 	initial: glowmaster
 	editable: false
+
 extra card style:
 	artist arrow:
 		left: 34
@@ -440,7 +440,7 @@ extra card style:
 		top : 0
 		width: 375
 		height: 523
-		z index: 3
+		z index: 1050
 		render style: image
 		image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
 		mask: foil_mask.png

data/magic-m15-showcase-dungeon-module.mse-style/style

@@ -6,7 +6,7 @@ icon: card-sample.png
 position hint: 095
 installer group: magic/new style/normal cards
 
-version: 2021-02-16
+version: 2024-05-26
 depends on:
 	package: magic.mse-game
 	version: 2014-06-25
@@ -14,11 +14,8 @@ depends on:
 	package: magic-default-image.mse-include
 	version: 2007-09-23
 depends on:
-	package: magic-watermarks.mse-include
-	version: 2007-09-23
-depends on:
-	package: magic-identity-new.mse-include
-	version: 2012-01-22
+	package: magic-modules.mse-include
+	version: 2024-05-20
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
@@ -55,8 +52,8 @@ init script:
 		)
 		else	input
 	}
-	template_prefix := [card:"" identity: "/magic-identity-new.mse-include/"]
-	template_suffix := [card:"card.jpg" identity: "identity.png"]
+	template_prefix := [card:"" identity: "/magic-modules.mse-include/identity/"]
+	template_suffix := [card:"card.png" identity: "identity.png"]
 	template      := { template_prefix[type] + input + template_suffix[type] }
 	land_template := { template_prefix[type] + input + template_suffix[type] }
 	# Use land templates for previews because they show more contrast
@@ -80,7 +77,6 @@ init script:
 	guild_mana := { styling.use_guild_mana_symbols }
 
 	ancestral_mana := { styling.ancestral_mana_symbols }
-	has_identity := { styling.color_indicator_dot }
 	is_unsorted := {styling.remove_from_autocount}
 
 	chop_top := {to_number(pull_comma_array(styling.text_chops, cell:0, end:false))}
@@ -88,8 +84,6 @@ init script:
 	chop_correction := { chop_bot() }
 	shrink_type := {if styling.shrink_typeline_text != "" then to_number(styling.shrink_typeline_text) else 0}
 	shrink_name := {if styling.shrink_name_text != "" then to_number(styling.shrink_name_text) else 0}
-	use_main_rarity := { contains(set.mainframe_rarity_name, match: ".png")}
-	un_png := replace@(match:".png", replace: "")
 
 	break_name := {
 		words := split_text(card.name, match:" ")
@@ -154,15 +148,7 @@ styling field:
 	choice: all breaks +2
 	choice: all breaks +3
 	description: Do dice levels normally, off, on all linebreaks, on all but the first linebreak, etc.
-styling field:
-	type: boolean
-	name: use holofoil stamps
-	description: Change to no to disable rare holofoil stamps
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot
-	initial: no
+include file: /magic-modules.mse-include/stamps/styling_fields
 styling field:
 	type: boolean
 	name: remove from autocount
@@ -213,11 +199,6 @@ styling field:
 	name: promo
 	description: Is this card a promo card, with the "P" rarity?
 	initial: no
-styling field:
-	type: boolean
-	name: masterpiece
-	description: Is this card a Masterpiece?
-	initial: no
 styling field:
 	type: boolean
 	name: inverted common symbol
@@ -252,6 +233,9 @@ styling style:
 			yes: { symbol_variation(symbol: set.symbol, variation: "invertedcommon") }
 
 ############################################################## Card fields
+include file: /magic-modules.mse-include/corners/card_fields
+include file: /magic-modules.mse-include/stamps/card_fields
+include file: /magic-modules.mse-include/information/card_fields
 card style:
 	############################# Background stuff
 	card color:
@@ -259,11 +243,11 @@ card style:
 		top:	0
 		width:	375
 		height:	523
-		z index: -2
+		z index: 200
 		render style: image
 		popup style: in place
 		image: { card_background() }
-
+		mask: frame_mask.png
 	############################# Name line
 	name:
 		left: 57
@@ -272,7 +256,7 @@ card style:
 		height: 30
 		alignment: center shrink-overflow
 		padding bottom: 0
-		z index: 1
+		z index: 900
 		font:
 			name: ITC Souvenir
 			size: 20
@@ -292,7 +276,7 @@ card style:
 			size: 15
 			alignment: middle right
 		always symbol: true
-		z index: 4
+		z index: 920
 		padding top: 0
 	############################# Image
 	image:
@@ -300,7 +284,7 @@ card style:
 		top: 99
 		width: 342
 		height:	212
-		z index: 1
+		z index: 100
 	############################# Card type
 	type:
 		left: 33
@@ -308,7 +292,7 @@ card style:
 		width: { 291 - max(23,card_style.rarity.content_width) }
 		height: 19
 		alignment: top shrink-overflow
-		z index: 1
+		z index: 900
 		padding top: 2
 		font:
 			name: ITC Souvenir Demi
@@ -320,47 +304,16 @@ card style:
 		top: 317
 		width: 44
 		height: 22
-		z index: 2
+		z index: 950
 		render style: image
 		alignment: middle right
-		choice images:
-			# Images based on the set symbol
-			basic land:
-				script:
-					if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "c.png"
-					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 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 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 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 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 symbol_variation(symbol: set.symbol, variation: "special")
-			masterpiece:
-				script:
-					if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "mp.png"
-					else symbol_variation(symbol: set.masterpiece_symbol, variation: "mythic rare")
+		include file: /magic-modules.mse-include/rarities/choice_images
 	############################# Text box
 	text:
 		left: 28
 		top : {348-(-chop_top())}
 		width: 311
-		bottom: {483-chop_bot()-(if is_rare() and styling.use_holofoil_stamps then 3 else 0)}
+		bottom: {483-chop_bot()-(if is_rare() and has_identity() then 3 else 0)}
 		font:
 			name: ITC Souvenir
 			size: 14
@@ -380,7 +333,7 @@ card style:
 					styling.center_text == "always"
 				then "center"
 				else "left")
-		z index: 3
+		z index: 900
 		padding left:   6
 		padding right:  4
 		line height hard: {if is_modal(card.rule_text) then 0.9 else 1.2 }
@@ -390,7 +343,7 @@ card style:
 		line height line max: 1.6
 	############################# PT
 	pt:
-		z index: 4
+		z index: 900
 		left: 320
 		top: 456
 		width: 55
@@ -401,58 +354,7 @@ card style:
 			size: 15
 			color: white
 			separator color: red
-	############################# Card sorting / numbering
-	set code:
-		left: 24
-		top: 498
-		width: 40
-		height: 10
-		z index: 2
-		font:
-			name: Relay-Medium
-			size: 7
-			color: white
-			weight: bold
-	############################# Copyright stuff
-	illustrator:
-		left: { 44 + card_style.set_code.content_width }
-		top: 497.5
-		width: 200
-		height: 10
-		z index: 2
-		font:
-			name: Beleren Small Caps Bold
-			size: 7.25
-			color: white
-	copyright:
-		right: 350
-		top: { if card.pt != "" then 500 else 488 }
-		width: 140
-		height: 10
-		z index: 2
-		visible: {not set.automatic_copyright}
-		alignment: middle right shrink-overflow
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold
 ############################################################## Extra card fields
-extra card field:
-	type: text
-	name: card code
-	save value: false
-	script:
-		if set.automatic_card_numbers and not styling.remove_from_autocount then
-			forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text)
-		else
-			combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text)
-extra card field:
-	type: choice
-	name: artist arrow
-	editable: false
-	save value: false
-	choice: white
 extra card field:
 	type: text
 	name: module title
@@ -508,49 +410,14 @@ extra card field:
 	choice: mask
 	editable: false
 	show statistics: false
-extra card field:
-	type: text
-	name: auto copyright
-	script: set.copyright
-	save value: false
-	editable: false
-	show statistics: false
 extra card field:
 	type: choice
-	name: foil stamp
-	choice: stamp
-	save value: false
+	name: stamp backing
+	choice: backing
 	editable: false
+	save value: false
 
 extra card style:
-	card code:
-		left: 24
-		top: 488
-		width: 120
-		height: 10
-		z index: 2
-		font:
-			name: Relay-Medium
-			size: 7
-			color: white
-			weight: bold
-	artist arrow:
-		left: { 28 + card_style.set_code.content_width }
-		top: 500
-		width: 12
-		height: 7
-		z index: 1
-		render style: image
-		image: artist_arrow.png
-	foil stamp:
-		left: 165
-		top: 472
-		width: 46
-		height: 26
-		z index: 2
-		visible: { is_rare() and styling.use_holofoil_stamps }
-		render style: image
-		image: holo_stamp.png
 	module title:
 		left: 100
 		top: 7
@@ -558,7 +425,7 @@ extra card style:
 		height: 20
 		alignment: center shrink-overflow
 		padding bottom: 0
-		z index: 1
+		z index: 900
 		font:
 			name: ITC Souvenir Bold
 			size: 12
@@ -570,7 +437,7 @@ extra card style:
 		height: 10
 		alignment: right shrink-overflow
 		padding bottom: 0
-		z index: 1
+		z index: 900
 		font:
 			name: ITC Souvenir Bold
 			size: 7
@@ -582,7 +449,7 @@ extra card style:
 		height: 15
 		alignment: center shrink-overflow
 		padding bottom: 0
-		z index: 1
+		z index: 900
 		font:
 			name: ITC Souvenir Demi
 			size: 10
@@ -595,7 +462,7 @@ extra card style:
 		angle: 45
 		alignment: center shrink-overflow
 		padding bottom: 0
-		z index: 1
+		z index: 900
 		font:
 			name: ITC Souvenir Bold
 			size: 7.5
@@ -607,7 +474,7 @@ extra card style:
 		height: 38
 		alignment: middle center shrink-overflow
 		padding bottom: 0
-		z index: 1
+		z index: 700
 		font:
 			name: ITC Souvenir
 			size: 18
@@ -621,7 +488,7 @@ extra card style:
 		height: 38
 		alignment: middle center shrink-overflow
 		padding bottom: 0
-		z index: 1
+		z index: 700
 		font:
 			name: ITC Souvenir
 			size: 18
@@ -633,7 +500,7 @@ extra card style:
 		top: { top_of_para(rolls_start(card.text))}
 		height: { height_of_para(rolls_start(card.text))}
 		width: 314
-		z index: 2
+		z index: 640
 		render style: image
 		image: d20slice.png
 		visible: {is_d20() and number_of_rolls(card.text) > 0}
@@ -642,7 +509,7 @@ extra card style:
 		top: { top_of_para(rolls_start(card.text)+2)}
 		height: { height_of_para(rolls_start(card.text)+2)}
 		width: 314
-		z index: 2
+		z index: 640
 		render style: image
 		image: d20slice.png
 		visible: {is_d20() and number_of_rolls(card.text) > 2}
@@ -651,20 +518,16 @@ extra card style:
 		top: { top_of_para(rolls_start(card.text)+4)}
 		height: { height_of_para(rolls_start(card.text)+4)}
 		width: 314
-		z index: 2
+		z index: 640
 		render style: image
 		image: d20slice.png
 		visible: {is_d20() and number_of_rolls(card.text) > 4}
-	auto copyright:
-		right: 350
-		top: { if card.pt != "" then 500 else 488 }
-		width: 140
-		height: 10
-		z index: 2
-		alignment: middle right shrink-overflow
-		visible: {set.automatic_copyright}
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold
+	stamp backing:
+		left: 165
+		top: 472
+		width: 46
+		height: 26
+		z index: 850
+		visible: { card.card_stamp != "none" }
+		render style: image
+		image: { "/magic-modules.mse-include/stamps/backs/" + (if stamp_shape(field:1) == "triangle" then "triangle_stamp.png" else "stamp.png") }

data/magic-m15-showcase-strixhaven-jp.mse-style/style

@@ -16,8 +16,8 @@ depends on:
 	package: magic-watermarks.mse-include
 	version: 2007-09-23
 depends on:
-	package: magic-identity-new.mse-include
-	version: 2012-01-22
+	package: magic-modules.mse-include
+	version: 2024-05-20
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
@@ -38,8 +38,34 @@ init script:
 	# Load scripts for image box
 	include file: /magic-default-image.mse-include/scripts
 	
-	template_prefix	:= [card: "card/", name1: "name/", name2: "name/", name3: "name/", type1: "type/", type2: "type/", type3: "type/", pt: "pt/", nonpt: "nonpt/", textbox: "textbox/", stamp: "stamp/", nonstamp: "nonstamp/", identity: "/magic-identity-new.mse-include/"]
-	template_suffix	:= [card: "card.png", name1: "cap.png", name2: "name.png", name3: "cap.png", type1: "cap.png", type2: "type.png", type3: "cap.png", pt: "pt.png", nonpt: "nonpt.png", textbox: "textbox.png", stamp: "stamp.png", nonstamp: "nonstamp.png", identity: "identity.png"]
+	template_prefix	:= [
+		card: "card/",
+		name1: "name/",
+		name2: "name/",
+		name3: "name/",
+		type1: "type/",
+		type2: "type/",
+		type3: "type/",
+		pt: "pt/",
+		textbox: "textbox/",
+		stamp: "stamp/",
+		triangle_stamp: "triangle/",
+		identity: "/magic-modules.mse-include/identity"
+	]
+	template_suffix	:= [
+		card: "card.png",
+		name1: "cap.png",
+		name2: "name.png",
+		name3: "cap.png",
+		type1: "cap.png",
+		type2: "type.png",
+		type3: "cap.png",
+		pt: "pt.png",
+		textbox: "textbox.png",
+		stamp: "stamp.png",
+		triangle_stamp: "stamp.png",
+		identity: "identity.png"
+	]
 	template		:= { template_prefix[type] + input + template_suffix[type] }
 	land_template	:= { template_prefix[type] + (if input == "a" then "c" else input) + template_suffix[type] }
 	# Use land templates for previews because they show more contrast
@@ -241,6 +267,7 @@ init script:
 	card_ptbox			:= { color_background(type: "pt",		base_hybrid: card_hybrid)		}@(offset:0 )
 	card_nonptbox		:= { color_background(type: "nonpt",	base_hybrid: card_hybrid)		}@(offset:0 )
 	card_stamp			:= { color_background(type: "stamp",	base_hybrid: card_hybrid)		}@(offset:0 )
+	card_stamp_triangle := { color_background(type: "triangle_stamp",	base_hybrid: stamp_hybrid)		}@(offset:0 )
 	card_nonstamp		:= { color_background(type: "nonstamp",	base_hybrid: card_hybrid)		}@(offset:0 )
 	card_textbox		:= { color_background(type: "textbox",	base_hybrid: textbox_hybrid)	}@(offset:0 )
 	
@@ -264,7 +291,6 @@ init script:
 			sort_text@(order: "XYZI[0123456789]HSCA(WUBRG)")()
 	}
 	ancestral_mana := { styling.ancestral_mana_symbols }
-	has_identity := { styling.color_indicator_dot }
 	is_unsorted := {styling.remove_from_autocount}
 
 	chop_top := {to_number(pull_comma_array(styling.text_chops, cell:0, end:false))}
@@ -275,6 +301,7 @@ init script:
 	use_main_rarity := { contains(set.mainframe_rarity_name, match: ".png")}
 	un_png := replace@(match:".png", replace: "")
 	jp_name_length := {card_style.name.content_height * length(card.name)}
+	## TODO
 	shown_cr := {if set.automatic_copyright then set.copyright != "" else card.copyright != ""}
 	
 	enlarge_in_pixels :=
@@ -323,6 +350,17 @@ init script:
 		enlarge_in_pixels(cropped, current_width: 375, current_height: height, left: 0, right: 0, top: top, bottom: 64)
 	}
 	
+	mask_background := {
+		img := card_background()
+		shape := stamp_shape()
+		if shape == "round" then
+			img := set_mask(image:img, mask:"textbox_masks/round.png")
+		else if shape == "triangle" then
+			img := set_mask(image:img, mask:"textbox_masks/triangle.png")
+		if card.pt != "" then img := set_mask(image:img, mask:"textbox_masks/pt.png")
+		img
+	}
+	
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -358,15 +396,6 @@ styling field:
 	type: text
 	name: popout image style
 	description: The styling instructions for the popout image field, formatted as "left,top,width,height,". The text MUST end with a comma.
-styling field:
-	type: boolean
-	name: use holofoil stamps
-	description: Change to no to disable rare holofoil stamps
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot
-	initial: no
 styling field:
 	type: boolean
 	name: remove from autocount
@@ -400,6 +429,11 @@ styling field:
 	name: text box mana symbols
 	match: magic-mana-*.mse-symbol-font
 	initial: magic-mana-small.mse-symbol-font
+styling field:
+	type: package choice
+	name: casting cost mana symbols
+	match: magic-mana-*.mse-symbol-font
+	initial: magic-mana-small-strixhaven.mse-symbol-font
 styling field:
 	type: choice
 	name: center text
@@ -413,11 +447,6 @@ styling field:
 	name: promo
 	description: Is this card a promo card, with the "P" rarity?
 	initial: no
-styling field:
-	type: boolean
-	name: masterpiece
-	description: Is this card a Masterpiece?
-	initial: no
 styling field:
 	type: boolean
 	name: inverted common symbol
@@ -431,6 +460,7 @@ styling field:
 	choice: black
 	initial: white
 	allow custom: true
+include file: /magic-modules.mse-include/fonts/styling_fields
 styling field:
 	type: package choice
 	name: overlay
@@ -459,6 +489,9 @@ styling style:
 			no:  { symbol_variation(symbol: set.symbol, variation: "common") }
 			yes: { symbol_variation(symbol: set.symbol, variation: "invertedcommon") }
 ############################################################## Card fields
+include file: /magic-modules.mse-include/corners/card_fields
+include file: /magic-modules.mse-include/information/card_fields
+include file: /magic-modules.mse-include/stamps/card_fields
 card style:
 	############################# Background stuff
 	border color:
@@ -466,17 +499,17 @@ card style:
 		top : 0
 		width:	375
 		height:	523
-		z index: -1
+		z index: 500
 		mask: { "border_mask" + (if card.pt != "" then "_pt" else "") + ".png" }
 	card color:
 		left:	0
 		top:	0
 		width:	375
 		height:	523
-		z index: 0
+		z index: 200
 		render style: image
 		popup style: in place
-		image: { card_background() }
+		image: { mask_background() }
 		mask: frame_mask.png
 	############################# Name line
 	name:
@@ -486,7 +519,7 @@ card style:
 		height: 22
 		alignment: top shrink-overflow
 		padding bottom: 0
-		z index: 2
+		z index: 900
 		font:
 			name: Beleren Bold
 			size: {13 - shrink_name()}
@@ -510,7 +543,7 @@ card style:
 			size: 15
 			alignment: middle right
 		always symbol: true
-		z index: 2
+		z index: 920
 		padding top: 0
 	############################# Image
 	image:
@@ -518,9 +551,8 @@ card style:
 		top: 0
 		width: 375
 		height:	494
-		z index: -2
+		z index: 100
 		default: {default_image(card.card_color)}
-		mask: image_mask.png
 	mainframe image:
 		left: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).0 else "0"}
 		top: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).1 else "0"}
@@ -534,17 +566,17 @@ card style:
 		top: { 296 + shorten_textbox_amount() }
 		width: 17
 		height: 17
-		z index: 2
+		z index: 800
 		render style: image
 		visible: { has_identity() }
 		image: { card_identity() }
 	type:
-		left: { if styling.color_indicator_dot then 51 else 32 }
+		left: { if has_identity() then 51 else 32 }
 		top: { 292 + shrink_type() + shorten_textbox_amount() }
-		width: { min(263-if styling.color_indicator_dot then 19 else 0,max(105, card_style.type.content_width)) }
+		width: { min(263-if has_identity() then 19 else 0,max(105, card_style.type.content_width)) }
 		height: { 19 - shrink_type() }
 		alignment: top center shrink-overflow
-		z index: 3
+		z index: 900
 		padding top: 2
 		font:
 			name: Beleren Bold
@@ -556,41 +588,10 @@ card style:
 		top: { 298 + shorten_textbox_amount() }
 		width: 44
 		height: 22
-		z index: 2
+		z index: 950
 		render style: image
 		alignment: middle right
-		choice images:
-			# Images based on the set symbol
-			basic land:
-				script:
-					if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "c.png"
-					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 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 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 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 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 symbol_variation(symbol: set.symbol, variation: "special")
-			masterpiece:
-				script:
-					if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "mp.png"
-					else symbol_variation(symbol: set.masterpiece_symbol, variation: "mythic rare")
+		include file: /magic-modules.mse-include/rarities/choice_images
 	############################# Text box
 	text:
 		left: 32
@@ -616,7 +617,7 @@ card style:
 					styling.center_text == "always"
 				then "middle center"
 				else "middle left"
-		z index: 2
+		z index: 900
 		padding left:   6
 		padding right:  4
 		line height hard: {if is_modal(card.rule_text) then 0.9 else 1.2 }
@@ -629,14 +630,15 @@ card style:
 		top: { 338 + shorten_textbox_amount() }
 		width: 344
 		height: { 139 - shorten_textbox_amount() }
-		z index: 1
 		render style: image
 		popup style: in place
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
-	############################# PT
+		include file:	/magic.mse-game/watermarks/menu_choice_images
+		image:			{ watermark_scripts[card.watermark](face:watermark_face_1()) }
+		z index:		720
+############################# PT
 	pt:
-		z index: 2
+		z index: 900
 		left: 302
 		top: 467
 		width: 41
@@ -647,58 +649,7 @@ card style:
 			size: 15
 			color: black
 			separator color: red
-	############################# Card sorting / numbering
-	set code:
-		left: 24
-		top: 498
-		width: 40
-		height: 10
-		z index: 1
-		font:
-			name: Relay-Medium
-			size: 7
-			color: { styling.copyright_text_color }
-			weight: bold
-	############################# Copyright stuff
-	illustrator:
-		left: { 44 + card_style.set_code.content_width }
-		top: 497.5
-		width: 200
-		height: 10
-		z index: 1
-		font:
-			name: Beleren Small Caps Bold
-			size: 7.25
-			color: { styling.copyright_text_color }
-	copyright:
-		right: 350
-		top: { if card.pt != "" then 500 else 493 }
-		width: 140
-		height: 10
-		z index: 2
-		visible: {not set.automatic_copyright}
-		alignment: middle right shrink-overflow
-		font:
-			name: Matrix
-			size: 7
-			color: { styling.copyright_text_color }
-			weight: bold
 ############################################################## Extra card fields
-extra card field:
-	type: text
-	name: card code
-	save value: false
-	script:
-		if set.automatic_card_numbers and not styling.remove_from_autocount then
-			forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text)
-		else
-			combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text)
-extra card field:
-	type: choice
-	name: artist arrow
-	editable: false
-	save value: false
-	choice: white
 extra card field:
 	type: choice
 	name: pt box
@@ -753,23 +704,16 @@ extra card field:
 	choice: foil
 	save value: false
 	editable: false
-extra card field:
-	type: color
-	name: stamp border
-	script: card.border_color
-	editable: false
-	show statistics: false
 extra card field:
 	type: choice
-	name: stamp
+	name: stamp border
 	script: card.card_color
 	editable: false
 	show statistics: false
 extra card field:
-	type: text
-	name: auto copyright
-	script: set.copyright
-	save value: false
+	type: color
+	name: stamp filler
+	script: card.border_color
 	editable: false
 	show statistics: false
 extra card field:
@@ -789,34 +733,17 @@ extra card field:
 	save value: true
 	editable: true
 	description: Where they put mtgstory.com on story spotlights.
+
 extra card style:
-	card code:
-		left: 24
-		top: 488
-		width: 120
-		height: 10
-		z index: 1
-		font:
-			name: Relay-Medium
-			size: 7
-			color: { styling.copyright_text_color }
-			weight: bold
-	artist arrow:
-		left: { 28 + card_style.set_code.content_width }
-		top: 500
-		width: 12
-		height: 7
-		z index: 1
-		render style: image
-		image: { recolor_image("artist_arrow.png", color: styling.copyright_text_color) }
 	pt box:
 		left: 0
 		top: 0
 		width: 375
 		height:	523
-		z index: 1
+		z index: 840
 		render style: image
-		image: { if card.pt != "" then card_ptbox() else card_nonptbox() }
+		visible: {card.pt != ""}
+		image: { card_ptbox() }
 	text box:
 		#left: 27
 		#top: { 320 + shorten_textbox_amount() }
@@ -826,7 +753,7 @@ extra card style:
 		top: 0
 		width: 375
 		height:	523
-		z index: 1
+		z index: 600
 		render style: image
 		image:{ card_textbox() }
 	name bar 1:
@@ -834,7 +761,7 @@ extra card style:
 		top: 24
 		width: 22
 		height:	56
-		z index: 1
+		z index: 600
 		render style: image
 		image: {name1_background()}
 		angle: {if styling.language == "Japanese" then -90 else 0}
@@ -843,7 +770,7 @@ extra card style:
 		top: {if styling.language == "Japanese" then 46 else 24}
 		width: {if styling.language == "Japanese" then max(34, jp_name_length()-20) else card_style.name.content_width}
 		height:	56
-		z index: 1
+		z index: 600
 		render style: image
 		image: {name2_background()}
 		angle: {if styling.language == "Japanese" then -90 else 0}
@@ -852,7 +779,7 @@ extra card style:
 		top: {if styling.language == "Japanese" then 46 + max(34, jp_name_length()-20)-0.5 else 24}
 		width: 22
 		height:	56
-		z index: 1
+		z index: 600
 		render style: image
 		image: {flip_horizontal(name3_background())}
 		angle: {if styling.language == "Japanese" then -90 else 0}
@@ -861,23 +788,23 @@ extra card style:
 		top: { 289 + shorten_textbox_amount() }
 		width: 15
 		height:	30
-		z index: 1
+		z index: 600
 		render style: image
 		image: {type1_background()}
 	type bar 2:
 		left: 37
 		top: { 289 + shorten_textbox_amount() }
-		width: {min(254,max(96, card_style.type.content_width+(if styling.color_indicator_dot then 19 else 0)))}
+		width: {min(254,max(96, card_style.type.content_width+(if has_identity() then 19 else 0)))}
 		height:	30
-		z index: 1
+		z index: 600
 		render style: image
 		image: {type2_background()}
 	type bar 3:
-		left: {37+min(254,max(96, card_style.type.content_width+(if styling.color_indicator_dot then 19 else 0)))-0.4}
+		left: {37+min(254,max(96, card_style.type.content_width+(if has_identity() then 19 else 0)))-0.4}
 		top: { 289 + shorten_textbox_amount() }
 		width: 15
 		height:	30
-		z index: 1
+		z index: 600
 		render style: image
 		image: {flip_horizontal(type3_background())}
 	foil layer:
@@ -885,45 +812,33 @@ extra card style:
 		top : 0
 		width: 375
 		height: 523
-		z index: 3
+		z index: 1050
 		render style: image
 		image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
-		mask: { "foil_mask" + (if card.pt != "" then "_pt" else "") + (if is_rare() and styling.use_holofoil_stamps then "_rare" else "") + ".png" }
+		mask: { "foil_mask" + (if card.pt != "" then "_pt" else "") + (if is_stamped() then "_rare" else "") + ".png" }
 	stamp border:
 		left: 0
 		top: 0
 		width: 375
 		height: 523
-		z index: 1
-		visible: { is_rare() and styling.use_holofoil_stamps }
-		mask: stamp_mask.png
-	stamp:
+		z index: 600
+		render style: image
+		visible: { card.card_stamp != "none" }
+		image: { if stamp_shape() == "triangle" then card_stamp_triangle() else card_stamp() }
+	stamp filler:
 		left: 0
-		top: 0
+		top: 4
 		width: 375
 		height: 523
-		z index: 1
-		render style: image
-		image: { if is_rare() and styling.use_holofoil_stamps then card_stamp() else card_nonstamp() }
-	auto copyright:
-		right: 350
-		top: { if card.pt != "" then 500 else 493 }
-		width: 140
-		height: 10
-		z index: 2
-		alignment: middle right shrink-overflow
-		visible: {set.automatic_copyright}
-		font:
-			name: Matrix
-			size: 7
-			color: { styling.copyright_text_color }
-			weight: bold
+		z index: 850
+		visible: { card.card_stamp != "none" }
+		mask: { "stamp/" + (if stamp_shape() == "triangle" then "triangle" else "round") + "_mask.png" }
 	flavor bar:
 		left: 0
 		top: { bar_equation() }
 		width: 375
 		height: 1
-		z index: 1
+		z index: 740
 		render style: image
 		image: bar.png
 		visible: { card.rule_text != "" and remove_tags(card.flavor_text) != "" and set.use_flavor_bar }
@@ -935,7 +850,7 @@ extra card style:
 		direction: vertical
 		alignment: top center shrink-overflow
 		padding bottom: 0
-		z index: 2
+		z index: 900
 		font:
 			name: Beleren Bold
 			size: {13 - shrink_name()}
@@ -950,7 +865,7 @@ extra card style:
 		top: {if card.pt == "" and shown_cr() then 502 else 488}
 		width: { 70 }
 		height: 10
-		z index: 3
+		z index: 900
 		alignment: middle right
 		font:
 			name: Relay-Medium