card_fields rewrite and magic-modules.mse-include (#21)

Overhauls the card_fields file to allow for template designers more freedom in manipulating data.

Adds magic-modules.mse-include, a large scale include file for building templates in a standardized way. Applying this to existing frames will be coming in future updates.

.gitignore

@@ -0,0 +1,14 @@
+# ignore everything with magic-mainframe-extras
+/data/magic-mainframe-extras.mse-include/*
+
+# include the include file and readme
+!/data/magic-mainframe-extras.mse-include/include
+!/data/magic-mainframe-extras.mse-include/readme.txt
+
+# include the specific example files
+!/data/magic-mainframe-extras.mse-include/examples
+!/data/magic-mainframe-extras.mse-include/examples/*
+
+# include mainframe shared files until we relocate them
+!/data/magic-mainframe-extras.mse-include/mfsfiles
+!/data/magic-mainframe-extras.mse-include/mfsfiles/*

changelog.txt

@@ -0,0 +1,61 @@
+MSE Template Packs 1.3.0 Showcase Catchup (PRERELEASE)
+
+SHOWCASE FRAMES
+
+MAGIC MODULES
+• Genevensis has figured out a powerful tool for template building, which has been added to the pack as magic-modules.mse-include
+• magic-modules will allow any template to very easily gain access to complicated field behavior, such as...
+
+MAGIC MODULE ROLLOUT
+• [todo applicable frames]
+• Frames can now use Standard, Acorn, Universes Beyond, Heart, and Alchemy stamps!
+• Frames can add styling options to change their casting cost mana symbols, apply custom fonts, or use the rarity recolor and offset options.
+• Frames can use Genevensis's Corners tech for square, diagonal, aliased, or pixel curve corners.
+• Frames can use the expanded credit suite, which allows up to 4 spots around the art credit to add additional symbols for Mechanics, Flavor Text, Frame, etc.
+• Frames can use the updated OCR fields, which have UB Copyright and the new card numbering code (see Parititons below).
+• Frames can use the loyalty module to painlessly make Planeswalker versions of frames.
+• Frames can use the symbols module to include transform symbols, which now lets you to select Modal DFC icons.
+• The watermarks module now simplifies watermarks to one script instead of three include files.
+
+ADVENTURE OVERHAUL
+• Adventures can now customize both halves of the textbox, allowing for two pages.
+• Added support for flat pages and pages with only a nameline and no typeline.
+• Added "page decorations," images that layer over pages that can be added to magic-mainframe-extras.
+
+PARTITIONS
+• Cards can now be put into partitions 0-9 and A-Z, which will change how the automatic sorter sorts them. This allows MSE to handle things like overcounted cards, and face commanders being listed before everything else.
+• Cards are in Partition A by default. Paritions 0-9 sort before this, Partitions B-Z sort after it. Cards within the same partition sort under the normal logic.
+• Partitions N-Z by default are "over-partition", and their cards won't be counted in the set's total. There is a set option for displaying these cards in the "301/300" or "301" format. There is also a set option for changing the "last main partition" that does not have this effect, default "M".
+• Currently this is supported on M15 Mainframe and Adventures. Other frames can now add the card field "parition select" to access a card's partition.
+• Normally this is put over the automated card number. You can click there to select a new parition for a card.
+• Additionally, there is a set option for defining the card number style, "0001", "0001/0099", "001", "001/099", "1", and "1/99"
+
+OTHER UPDATES
+• MSE has been updated to MSE 2.1.3! This fixes a bug where single line text-fields like names and typelines couldn't be automatically shrunk, and adds shift-click to select multiple options in the export window. This isn't the full jump to hagan's 2.4.0 fork yet, but we're getting there.
+• Added Custom Border to M15 Mainframe and Adventure, which allows defining a trim frame like Vehicle or Nyx with images from magic-mainframe-extras
+• Keywords for MKM, PIP, and OTJ have been added.
+• Added Capenna, DND, Desparked, Judge Academy, MLP, Shooting Star, Transformers, and hi-res mana symbol watermarks.
+• Added support for Custom Watermarks up to a maximum size of 1024x1024. Watermarks that aren't 500x500 will still need to include their height and width.
+• Split the "blend with colors" watermark option into one that applies to custom watermarks and one that applies to default watermarks.
+• Reorganized the Set tab into something hopefully easier to navigate.
+• 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 omni and polyamory flags to Pride Pinlines.
+
+BUG FIXES
+• Fixed a bug where the 8th Edition Tokens name spacing would go beserk.
+• Fixed a bug that was eating spaces in the typeline.
+• Fixed some cases where +1/+1 was getting converted to loyalty symbols.
+• Fixed many template warnings across the template packs.
+• Fixed a bug with custom italic font.
+• Fixed a bug with token custom font using the wrong fonts.
+
+TEMPLATE CLEANUP
+• magic-mainframe-extras examples have been cleaned up and moved into one folder. The repo now has a .gitignore for this so it's easier to run MSE off the repo.
+• Take the Crown Draft Matters frame now includes the Conspiracy frame.
+• M15 Leveler now has TriLeveler support.
+• The following frames have been removed from the Full Pack. There is an Outdated Templates pack available as a backup, but these templates are now redundant and are no longer being supported.
+• Redudant with M15 Mainframe: M15 Clear, M15 Custom, M15 Metropolis, Mined & Mined Planeshifted, M15 Miracle, M15 Nyx, M15 Planeshifted & Planeshifted Leveler, M15 Vehicles, Vehicles
+• Redundant with Mainframe Tokens: M15 Tokens
+• Redundant with CN2 Styles and M15 Mainframe: TTK Conspiracy

data/magic-blends.mse-include/new-blends

@@ -9,18 +9,18 @@
 ########################################################################
 	include file: masks
 
-	mask_hybrid_with_land			:=	{ false }
+	mask_hybrid_with_land :=		{ false }
-	mask_hybrid_with_gold			:=	{ false }
+	mask_hybrid_with_gold :=		{ false }
-	mask_multi_land_with_color		:=	{ false }
+	mask_multi_land_with_color :=	{ false }
-	template				:=	{ input					 +  "{type}.jpg" }
+	template :=						{ input + "{type}.jpg" }
-	land_template				:=	{ ( if	input == "a" then "c" else input)+ "l{type}.jpg" }
+	land_template :=				{ ( if	input == "a" then "c" else input) + "l{type}.jpg" }
-	offset					:=	0
+	offset :=						0
 # For what value should thumbnails of hybrids be made?
-	hybrid_previews					:= "hybrid"
+	hybrid_previews :=				"hybrid"
 
 # Are there templates for colored lands, land_template(...)?
-	colored_lands					:= true
+	colored_lands :=				true
-	trim_colors					:=
+	trim_colors :=
 		replace@(match:"(, )?(multicolor|hybrid|artifact|land|horizontal|vertical|radial)", replace:"")
 
 watermark_colors := {
@@ -41,27 +41,27 @@ hybrid_color := {
 	check_colors := card.card_color
 	if face != "" then check_colors := face
 	trimmed := trim_colors(check_colors)
-	if 	trimmed == "white, blue"			then "wu"
+	if		trimmed == "white, blue"			then	"wu"
-	else if trimmed == "white, black"			then "wb"
+	else if	trimmed == "white, black"			then	"wb"
-	else if trimmed == "white, red"			then "rw"
+	else if	trimmed == "white, red"				then	"rw"
-	else if trimmed == "white, green"			then "gw"
+	else if	trimmed == "white, green"			then	"gw"
-	else if trimmed == "blue, black"			then "ub"
+	else if	trimmed == "blue, black"			then	"ub"
-	else if trimmed == "blue, red"			then "ur"
+	else if	trimmed == "blue, red"				then	"ur"
-	else if trimmed == "blue, green"			then "gu"
+	else if	trimmed == "blue, green"			then	"gu"
-	else if trimmed == "black, red"			then "br"
+	else if	trimmed == "black, red"				then	"br"
-	else if trimmed == "black, green"			then "bg"
+	else if	trimmed == "black, green"			then	"bg"
-	else if trimmed == "red, green"			then "rg"
+	else if	trimmed == "red, green"				then	"rg"
-	else if trimmed == "white, blue, reversed"	then "uw"
+	else if	trimmed == "white, blue, reversed"	then	"uw"
-	else if trimmed == "white, black, reversed"	then "bw"
+	else if	trimmed == "white, black, reversed"	then	"bw"
-	else if trimmed == "white, red, reversed"	then "wr"
+	else if	trimmed == "white, red, reversed"	then	"wr"
-	else if trimmed == "white, green, reversed"	then "wg"
+	else if	trimmed == "white, green, reversed"	then	"wg"
-	else if trimmed == "blue, black, reversed"	then "bu"
+	else if	trimmed == "blue, black, reversed"	then	"bu"
-	else if trimmed == "blue, red, reversed"	then "ru"
+	else if	trimmed == "blue, red, reversed"	then	"ru"
-	else if trimmed == "blue, green, reversed"	then "ug"
+	else if	trimmed == "blue, green, reversed"	then	"ug"
-	else if trimmed == "black, red, reversed"	then "rb"
+	else if	trimmed == "black, red, reversed"	then	"rb"
-	else if trimmed == "black, green, reversed"	then "bg"
+	else if	trimmed == "black, green, reversed"	then	"bg"
-	else if trimmed == "red, green, reversed"	then "gr"
+	else if	trimmed == "red, green, reversed"	then	"gr"
-	else									 "mm"
+	else												"mm"
 }@(face:"")
 ########################################################################
 # Combining multiple colors (hybrids)
@@ -78,8 +78,8 @@ card_hybrid_2 := {linear_blend(
 overlay_hybrid := [
 	1: {								template(				colors[0]			)	}
 	2: {combine_blend(
-			image1: 					template(				colors[0]				),
+			image1:						template(				colors[0]				),
-			image2: 					template(				colors[1]				),
+			image2:						template(				colors[1]				),
 			combine: "symmetric overlay"
 	)}
 ]
@@ -87,7 +87,7 @@ overlay_hybrid := [
 
 # vertical version of a horizontal hybrid
 vertical_card_hybrid	:= {
-	do_linear_blend			:=	  linear_blend
+	do_linear_blend			:=	linear_blend
 	linear_blend			:=	{ do_linear_blend(x1: 0, x2: 0, y1: x1, y2: x2) }
 	card_hybrid.horizontal[color_count]()
 }
@@ -102,7 +102,7 @@ horizontal_card_hybrid := [
 										x2: 0.4,	y2: 0
 		image2: linear_blend(
 			image1:						template(				colors[(to_int(offset) + 1 ) mod 3]	),
-			image2: 					template(				colors[(to_int(offset) + 2 ) mod 3]	),
+			image2:						template(				colors[(to_int(offset) + 2 ) mod 3]	),
 										x1: 0.6,	y1: 0
 										x2: 0.78,	y2: 0
 			)
@@ -124,15 +124,15 @@ horizontal_card_hybrid := [
 	)))}
 
 	5: {linear_blend(
-		image1: 						template(				colors[(to_int(offset) + 0 ) mod 5]	),
+		image1:							template(				colors[(to_int(offset) + 0 ) mod 5]	),
 										x1:  2.0 / 15,	y1: 0
 										x2:  4.0 / 15,	y2: 0
 		image2: linear_blend(
-			image1: 					template(				colors[(to_int(offset) + 1 ) mod 5]	),
+			image1:						template(				colors[(to_int(offset) + 1 ) mod 5]	),
 										x1:  5.0 / 15,	y1: 0
 										x2:  7.0 / 15,	y2: 0
 			image2: linear_blend(
-			image1: 					template(				colors[(to_int(offset) + 2 ) mod 5]	),
+			image1:						template(				colors[(to_int(offset) + 2 ) mod 5]	),
 										x1:  8.0 / 15,	y1: 0
 										x2: 10.0 / 15,	y2: 0
 				image2: linear_blend(
@@ -198,19 +198,19 @@ card_hybrid := [
 	radial: [
 		0: {							template(				"c")					}
 			1: {						template(				colors[0])				}
-		2:							card_hybrid_2
+		2:								card_hybrid_2
 
 		3:{linear_blend(
-			image1: 					card_hybrid_2(			colors: colors[(to_int(offset) + 0 ) mod 3]	+
+			image1:						card_hybrid_2(			colors: colors[(to_int(offset) + 0 ) mod 3]	+
 														colors[(to_int(offset) + 1 ) mod 3]	),
-			image2: 					template(				colors[(to_int(offset) + 2 ) mod 3]	),
+			image2:						template(				colors[(to_int(offset) + 2 ) mod 3]	),
 										x1: 0,		y1: 0.55
 										x2: 0,		y2: 0.77
 		)}
 		4:{linear_blend(
 			image1:						card_hybrid_2(			colors: colors[(to_int(offset) + 0 ) mod 4]	+
 														colors[(to_int(offset) + 1 ) mod 4]	),
-			image2: 					card_hybrid_2(			colors: colors[(to_int(offset) + 3 ) mod 4]	+
+			image2:						card_hybrid_2(			colors: colors[(to_int(offset) + 3 ) mod 4]	+
 														colors[(to_int(offset) + 2 ) mod 4]	),
 										x1: 0,		y1: 0.4
 										x2: 0,		y2: 0.62
@@ -219,7 +219,7 @@ card_hybrid := [
 		5: {linear_blend(
 			image1: linear_blend(
 				image1:					card_hybrid_2(			colors: colors[(to_int(offset) + 0 ) mod 5]	+
-														colors[(to_int(offset) + 1 ) mod 5] 	),
+														colors[(to_int(offset) + 1 ) mod 5]	),
 				image2:					card_hybrid_2(			colors: colors[(to_int(offset) + 4 ) mod 5]	+
 														colors[(to_int(offset) + 2 ) mod 5]	),
 										x1: 0,		y1: 0.19
@@ -235,7 +235,7 @@ card_hybrid := [
 				image1:					card_hybrid_2(			colors: colors[(to_int(offset) + 0 ) mod 6]	+
 														colors[(to_int(offset) + 1 ) mod 6]	),
 				image2:					card_hybrid_2(			colors: colors[(to_int(offset) + 5 ) mod 6]	+
-														colors[(to_int(offset) + 2 ) mod 6] 	),
+														colors[(to_int(offset) + 2 ) mod 6]	),
 										x1: 0,		y1: 0.19
 										x2: 0,		y2: 0.35
 			),
@@ -267,7 +267,7 @@ card_hybrid := [
 	]
 	horizontal:		horizontal_card_hybrid
 	vertical:		[
-		1: { 							template(				colors[0])				}
+		1: {							template(				colors[0])				}
 		2: { linear_blend(
 			image1:						template(				colors[0]				),
 			image2:						template(				colors[1]				),
@@ -350,7 +350,7 @@ pt_hybrid := [
 										x1: 0,		y1: -1.5
 										x2: 0,		y2:  0.7
 		)}
-		7: {							template(					colors[(to_int(offset) + 4 ) mod 7]) 	}
+		7: {							template(					colors[(to_int(offset) + 4 ) mod 7])	}
 	]
 	horizontal: horizontal_pt_hybrid
 	vertical: [
@@ -799,7 +799,7 @@ stamp_hybrid := [
 			image2:						template(					colors[(to_int(offset) + 3) mod 6]	),
 										x1: -0.3,	y1: 0
 										x2:  1.3,	y2: 0
-		   )}
+		)}
 		7: {							template(					colors[(to_int(offset) + 4 ) mod 7])	}
 	]
 	horizontal: horizontal_stamp_hybrid
@@ -858,10 +858,10 @@ color_background := {
 	if colors == "" then colors == "c"
 	
 	# 'shape' / type of hybrid
-	shape := if		chosen(choice:"horizontal"	)	then	"horizontal"
+	shape :=	if		chosen(choice:"horizontal"	)	then	"horizontal"
-	         else if	chosen(choice:"vertical"	)	then	"vertical"
+				else if	chosen(choice:"vertical"	)	then	"vertical"
-	         else if	chosen(choice:"overlay"		)	then	"overlay"
+				else if	chosen(choice:"overlay"		)	then	"overlay"
-	         else								"radial"
+				else											"radial"
 	
 	# Determine background (allows styles to hook something else here)
 	color_combination(folder:folder)
@@ -983,36 +983,36 @@ font_color_positions := [
 
 # Determine whether light or dark fonts should be used
 font_white	:= {
-	hybrid		:=		  chosen(choice:"hybrid"	)
+	hybrid :=		chosen(choice:"hybrid"	)
-	artifact	:=		  chosen(choice:"artifact"	)
+	artifact :=		chosen(choice:"artifact"	)
-	colors		:= sort_text( order: "(wubrg)"
+	colors :=		sort_text( order: "(wubrg)"
-				, (if chosen(choice:"white"	)	then "w")
+				,	(if chosen(choice:"white"	)	then "w")
-				+ (if chosen(choice:"blue"	)	then "u")
+				+	(if chosen(choice:"blue"	)	then "u")
-				+ (if chosen(choice:"black"	)	then "b")
+				+	(if chosen(choice:"black"	)	then "b")
-				+ (if chosen(choice:"red"	)	then "r")
+				+	(if chosen(choice:"red"		)	then "r")
-				+ (if chosen(choice:"green"	)	then "g"))
+				+	(if chosen(choice:"green"	)	then "g"))
-				+ (if artifact				then "a")
+				+	(if artifact				then "a")
 	font_colors_white(
 		if		chosen(choice:"land")			then "l"
-		else if		input == "artifact, multicolor"		then "a"
+		else if	input == "artifact, multicolor"	then "a"
-		else if		chosen(choice:"multicolor")		then "m"
+		else if	chosen(choice:"multicolor")		then "m"
-		else if		artifact and not hybrid			then "a"
+		else if	artifact and not hybrid			then "a"
-		else if		colors == ""				then "c"
+		else if	colors == ""					then "c"
-		else		colors[
+		else	colors[
 					font_color_positions[
-						if		chosen(choice:"horizontal") then	"horizontal"
+						if		chosen(choice:"horizontal")	then	"horizontal"
-						else if		chosen(choice:"vertical")   then	"vertical"
+						else if	chosen(choice:"vertical")	then	"vertical"
-						else if		chosen(choice:"overlay")    then	"overlay"
+						else if	chosen(choice:"overlay")	then	"overlay"
-						else							"radial"
+						else										"radial"
-				][number_of_items(in: colors)]
+					][number_of_items(in: colors)]
-		]
+				]
 	)
 }
 
 font_color := { if font_white() then rgb(255,255,255) else rgb(0,0,0) }
 
 #####Watermark Blending
-watermark_hybrid:= {
+watermark_hybrid := {
 	linear_blend(
 		image1: colors[0] + input + ".png"
 		image2: colors[1] + input + ".png"
@@ -1043,38 +1043,106 @@ set_watermark_blend := {
 	)
 }
 spotlight_watermark_blend := {
-	if face == false then face := card.card_color
+	face := [1:card.card_color, 2:card.card_color_2, 3:card.card_color_3][face]
-	wmc := watermark_colors(face:face)
+	if type_name(input) == "string" and contains(input, match:".png,") then (
-	c1 := "/magic-watermarks.mse-include/spotlight/" + wmc.0 + (if contains(face, match:"land") then "l") + "spotlight.png"
-	c2 := "/magic-watermarks.mse-include/spotlight/" + wmc.1 + (if contains(face, match:"land") then "l") + "spotlight.png"
-	if contains(input, match:".png,") then (
 		array := split_text(input+",,", match:",")
 		input := array.0
 		l := min(to_number(array.1),500)
 		h := min(to_number(array.2),500)
 	)
+	wmc := watermark_colors(face:face)
+	c1 := wmc.0 + (if contains(face, match:"land") then "l") + "spotlight.png"
+	c2 := wmc.1 + (if contains(face, match:"land") then "l") + "spotlight.png"
+	wmdir := "/magic-watermarks.mse-include/spotlight/"
 	if (h != 500 or l != 500) then (
-		c1 := crop(c1, height:h, width:l, offset_x:0, offset_y:0)
+		wmdir := wmdir + "1024/"
-		c2 := crop(c2, height:h, width:l, offset_x:0, offset_y:0)
+		c1 := crop(wmdir+c1, height:h, width:l, offset_x:0, offset_y:0)
+		c2 := crop(wmdir+c2, height:h, width:l, offset_x:0, offset_y:0)
+	)else(
+		c1 := wmdir + c1
+		c2 := wmdir + c2
 	)
+	mask := input
 	set_alpha(
-		alpha: 0.75
+		alpha: alpha
 		input:
 			linear_blend(
 				image1: 
 					masked_blend(
 						light: input
 						dark: c1
-					mask: input
+					mask: mask
 					)
 				image2:
 					masked_blend(
 						light: input
 						dark: c2
-					mask: input
+					mask: mask
 					)
 				x1: 0.4,  y1: 0
 				x2: 0.6,  y2: 0
 			)
 	)
-}@(h:500,l:500,face:false)
+}@(h:500,l:500,face:1,alpha:0.2)
+
+shadow_watermark_blend := {
+	set_combine(
+		combine:"shadow",
+		set_alpha(
+			alpha: 0.5,
+			drop_shadow(
+				offset_x: -0.01,
+				offset_y: 0.03,
+				blur_radius: 0.02,
+				alpha: 1,
+				color: rgb(0,0,0),
+				enlarge(
+					border_size: 0.03,
+					invert_image(input)
+				)
+			)
+		)
+	)
+}
+
+glow_watermark_blend := {
+	set_combine(
+		combine:"glow",
+		set_alpha(
+			alpha: 0.3,
+			drop_shadow(
+				offset_x: -0.01,
+				offset_y: 0.03,
+				blur_radius: 0.02,
+				alpha: 1,
+				color: rgb(0,0,0),
+				enlarge(
+					border_size: 0.03,
+					invert_image(input)
+				)
+			)
+		)
+	)
+}
+
+watermark_blend :=
+{
+	dark_textbox :=		(face == 1 and invert_watermark())
+					or	(face == 2 and invert_watermark2())
+					or	(face == 3 and invert_watermark3())
+	invert_base_image := false
+	if dark_textbox then
+	(
+		alpha := dark_alpha
+		spotlight_alpha := dark_spotlight_alpha
+		invert_base_image := true
+	)
+	backup := if custom then set.blend_with_colors else set.use_blended_watermarks
+	option := styling.watermark_render or else backup
+	if colored then set_alpha(alpha: alpha, input)
+	else if option == "yes" or option == "blend with colors" then spotlight_watermark_blend(h:h, l:l, face:face, alpha: spotlight_alpha, input)
+	else if option == "shadow" then shadow_watermark_blend(input)
+	else if option == "glow" then glow_watermark_blend(input)
+	else if invert_base_image then set_alpha(alpha: alpha, invert_image(input))
+	else set_alpha(alpha: alpha, input)
+}@(h:500,l:500,colored:false,face:1,alpha:0.25,spotlight_alpha:0.75,dark_alpha:0.25,dark_spotlight_alpha:0.35,custom:false)

data/magic-genevensis-90-counter.mse-style/style

@@ -39,7 +39,16 @@ card dpi: 300
 ############################################################## Extra scripts
 init script:
 	card_shape := { "counter" }
-	
+	faces_coordinates := {
+		[
+			[
+				left: 0,
+				top: 0,
+				width: ((if styling.increase_height then 520 else 420) + increased_width()),
+				height: (if styling.increase_height then 260 else 160)
+			]
+		]
+	}
 	guild_mana := { styling.use_guild_mana_symbols }
 	
 	ancestral_mana := { false }

data/magic-identity-new.mse-include/include

@@ -1,7 +1,13 @@
-mse version: 0.3.9
+mse version:	2.0.0
 full name: Magic The Gathering, modern identities
-version: 2012-02-23
+version:		2024-01-29
+depends on:
+	package:			magic.mse-game
+	version:			2014-06-25
 
-# This file doesn't do anything, other files in this directory can be included
+
-# in game/style files:
+
-#    watermarks		Includes references to the watermark images, to be used in a style file
+#### This file doesn't do anything.
+#### Other files in this directory can be included in game/style files.
+#### This include covers the color indicator dot.
+#### This include is being phased out in favor of magic-modules.mse-include/indicators

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

@@ -918,7 +918,7 @@ card style:
 				   styling.center_text == "always"
 				then "middle center"
 				else "middle left"
-		z index: 2
+		z index: 3
 		padding left:   6
 		padding right:  4
 		line height hard: {if is_modal(card.rule_text) then 0.9 else 1.2 }
@@ -949,7 +949,7 @@ card style:
 				   styling.center_text == "always"
 				then "middle center"
 				else "middle left"
-		z index: 2
+		z index: 3
 		padding left:   6
 		padding right:  4
 		line height hard: {if is_modal(card.rule_text_2) then 0.9 else 1.2 }
@@ -980,7 +980,7 @@ card style:
 				   styling.center_text == "always"
 				then "middle center"
 				else "middle left"
-		z index: 2
+		z index: 3
 		padding left:   6
 		padding right:  4
 		line height hard: {if is_modal(card.rule_text) then 0.9 else 1.2 }
@@ -989,11 +989,11 @@ card style:
 		line height hard max: {if is_modal(card.rule_text) then 1.0 else 1.3 }
 		line height line max: 1.6
 	watermark:
-		left: { min(page_coords[page_1_side()][(if is_spot() then "spot_watermark" else "watermark")], page_coords[page_3_side()][(if is_spot() then "spot_watermark" else "watermark")]) }
+		left: { page_coords[page_1_side()][(if is_spot() then "spot_watermark" else "watermark")] }
-		top: { if is_spot() then 330 else max(page_1_top(), page_3_top()) }
+		top: { if is_spot() then 330 else page_1_top() }
 		width: { if is_spot() then 150 else 168}
 		bottom: {if is_spot() then 470 else 481}
-		z index: 1
+		z index: 2
 		render style: image
 		popup style: in place
 		alignment: middle center
@@ -1003,11 +1003,21 @@ card style:
 		top: { page_2_top() }
 		width: { if is_spot() then 154 else 167}
 		bottom: {if is_spot() then 470 else 481}
-		z index: 1
+		z index: 2
 		render style: image
 		popup style: in place
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
+		include file: /magic-watermarks.mse-include/watermarks_back
+	watermark 3:
+		left: { page_coords[page_3_side()][(if is_spot() then "spot_watermark" else "watermark")] }
+		top: { if is_spot() then 330 else page_3_top() }
+		width: { if is_spot() then 154 else 167}
+		bottom: {if is_spot() then 470 else 481}
+		z index: 2
+		render style: image
+		popup style: in place
+		alignment: middle center
+		include file: /magic-watermarks.mse-include/watermarks_third
 	############################# PT
 	pt:
 		z index: 2

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

@@ -13,9 +13,6 @@ depends on:
 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
@@ -28,9 +25,15 @@ depends on:
 depends on:
 	package: magic-mainframe-extras.mse-include
 	version: 2018-01-01
+depends on:
+	package: magic-modules.mse-include
+	version: 2024-05-20
 depends on:
 	package: magic-pride.mse-include
-	version: 2021-05-26
+	version: 2024-05-22
+depends on:
+	package: magic-watermarks.mse-include
+	version: 2007-09-23
 
 card width: 375
 card height: 523
@@ -245,7 +248,7 @@ init script:
 		+ (if box_leveler() then -5 else 0)
 		+ (if aug_leveler(input) then 4 else 0)
 	}
-	custom_watermark_a := {if styling.card_watermark == "" or not contains(styling.card_watermark, match:".png") then "/magic-watermarks.mse-include/planeswalker.png" else "/magic-watermarks.mse-include/" + styling.card_watermark}
+	custom_watermark_a := {if styling.card_watermark == "" or not contains(styling.card_watermark, match:".png") then "/magic-modules.mse-include/watermarks/other/planeswalker.png" else "/magic-mainframe-extras.mse-include/" + styling.card_watermark}
 	special_text := {if is_leveler() then ((if card.level_0 != "" then "[" + level_label(0) + " " + card.level_0 + "] " else "") + card.level_1_text + (if card.pt != "" then " [" + card.pt + "]" else "") + "\n"
 			+ (if card.level_1 != "" then "[" + level_label(1) + " " + card.level_1 + "] " else "") + card.level_2_text + (if card.pt_2 != "" then " [" + card.pt_2 + "]" else "") + "\n"
 			+ (if card.level_2 != "" then "[" + level_label(2) + " " + card.level_2 + "] " else "") + card.level_3_text + (if card.pt_3 != "" then " [" + card.pt_3 + "]" else "") + (if card.level_4_text != "" then "\n" else "")
@@ -258,7 +261,7 @@ init script:
 	card_shape := {if is_leveler() then "leveler" else "normal"}
 
 	white_text := {is_full_art() or is_fnm() or is_inverted()}
-
+	alch_compatible := {styling.text_box_mana_symbols == "/magic-mana-small.mse-symbol-font"}
 	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
@@ -628,7 +631,6 @@ card style:
 		alignment: {if center_map() then "center bottom shrink-overflow" else "left bottom shrink-overflow" }
 		padding bottom: 0
 		z index: 2
-		font:
 		font:
 			name: { name_font() }
 			italic name: { name_font_italic() }
@@ -952,7 +954,8 @@ card style:
 		render style: image
 		popup style: in place
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
+		include file: /magic.mse-game/watermarks/menu_choice_images
+		image: { watermark_scripts[card.watermark](face:watermark_face_1()) }
 	############################# Levels
 	level 0:
 		z index: 7
@@ -1519,7 +1522,6 @@ extra card field:
 	save value: true
 	editable: true
 
-
 extra card style:
 	promo label:
 		left: 40

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

@@ -55,6 +55,7 @@ init script:
 
 	# styling stuff
 	card_shape := {"token"}
+	card_name_for_level := {if set.alias_as_cardname and card.alias != "" then card.alias else card.name}
 	shrink_name := {if styling.shrink_name_text != "" then to_int(styling.shrink_name_text) else 0 }
 	note_cleaner := replace@(match:"\\+", replace:"")
 	num_cleaner := replace@(match:"[0-9]", replace:"")
@@ -215,7 +216,7 @@ init script:
 	arrow_to_room := {
 		span := span_array(y)
 		span2 := span_array(y+1)
-		interface := sort_list(join_arrays(a1:span, a2:span2), remove_duplicates:true)
+		interface := sort_list((span+span2), remove_duplicates:true)
 		if x >= length(interface)
 			then 0
 		else (
@@ -266,7 +267,7 @@ init script:
 		[58, 138, 198, 278, -10]
 	]
 	arrow_x := {
-		arr := sort_list(join_arrays(a1:span_array(y), a2:span_array(y+1)), remove_duplicates:true)
+		arr := sort_list((span_array(y)+span_array(y+1)), remove_duplicates:true)
 		if y >= max_level() or x >= length(arr)
 			then 0
 		else if use_fast() then (
@@ -343,7 +344,7 @@ init script:
 	}
 	add_level_lanes := {
 		ml := max_level()
-		walls := sort_list(join_arrays(a1:span_array(line), a2:span_array(line+1)), remove_duplicates:true)
+		walls := sort_list((span_array(line)+span_array(line+1)), remove_duplicates:true)
 		len := length(walls)
 		y := 380-line_offset(line)
 		baseline := wall_crop("new_masks/"+s+"lane.png", offset:y)

data/magic-m15-future-planeswalker.mse-style/style

@@ -173,7 +173,8 @@ init script:
 		else if contains(input, match: "-") then "loyalty down"
 		else                                     "loyalty naught"
 	}
-	has_identity := { styling.color_indicator_dot }
+	has_identity := { false }
+	has_identity_2 := { false }
 	is_unsorted := {styling.remove_from_autocount}
 	is_hybrid := {contains(card.card_color, match:"hybrid")}
 	is_legend := { styling.legendary_symbol }

data/magic-m15-mainframe-dfc.mse-style/style

@@ -155,6 +155,22 @@ init script:
 	}
 
 	####### Shape things
+	faces_coordinates := {
+		[
+			[
+				left: 0,
+				top: 0,
+				width: 375,
+				height: 523
+			],
+			[
+				left: 377,
+				top: 0,
+				width: 375,
+				height: 523
+			]
+		]
+	}
 	card_shape := {if contains(styling.dfc_type, match: "modal") then "modal double faced" else "transform double faced"}
 	a_saga := {is_saga() or is_class()}
 	b_saga := {back_saga() or back_class()}
@@ -969,6 +985,7 @@ styling field:
 	choice: use hovering pt
 	choice: use hovering loyalty
 	choice: use holofoil stamps
+	choice: use backface rarity
 	choice: center front
 	choice: center back
 	choice: center first name
@@ -1269,7 +1286,7 @@ card style:
 	type 2:
 		left: { if back_map() then 462 else if has_identity2() then "429" else "409" }
 		top: { (if back_map() then 297.5 else if back_saga() or back_class() then 444 else if back_four_abilities() then 261 else 296) + shrink_type2() }
-		width: { if back_map() then 205 else (if has_identity2() then "290" else "310") - rare_width() }
+		width: { if back_map() then 205 else (if has_identity2() then "290" else "310") - (if chosen(styling.other_options, choice:"use backface rarity") and set.shorten_types_for_rarity then rare_width() else 0) }
 		height: { if back_map() then 18 - shrink_type2() else 20 - shrink_type2()}
 		alignment: {if back_map() then "center top shrink-overflow" else "top shrink-overflow"}
 		z index: 2
@@ -1330,7 +1347,7 @@ card style:
 	rarity 2:
 		right: { if back_map() then 576 else 721}
 		top: { if back_saga() or back_class() then 445 else if back_map() then 53 else if back_normal() then 297 else if back_four_abilities() then 262 else 297 }
-		width: {if set.shorten_types_for_rarity then 44 else 0}
+		width: { if chosen(styling.other_options, choice:"use backface rarity") and set.shorten_types_for_rarity then 44 else 0 }
 		height: 22
 		z index: 3
 		render style: image

data/magic-m15-mainframe-planes-mini.mse-style/style

@@ -277,17 +277,6 @@ card style:
 			size: 6.25
 			color: white
 			weight: bold
-	card number m15:
-		left: { if styling.center_set_info then 222 else 161 }
-		top: 362
-		width: 81
-		height: 12
-		z index: -1
-		font:
-			name: Relay-Medium
-			size: 6.25
-			color: white
-			weight: bold
 ############################################################## Extra card fields
 extra card field:
 	type: text

data/magic-m15-mainframe-planes.mse-style/style

@@ -277,17 +277,6 @@ card style:
 			size: 7
 			color: white
 			weight: bold
-	card number m15:
-		left: { if styling.center_set_info then 360 else 270 }
-		top: 542
-		width: 120
-		height: 19
-		z index: -1
-		font:
-			name: Relay-Medium
-			size: 7
-			color: white
-			weight: bold
 ############################################################## Extra card fields
 extra card field:
 	type: text

data/magic-m15-mainframe-planeswalker.mse-style/style

@@ -79,7 +79,8 @@ init script:
 	}
 	
 	card_shape := {"planeswalker"}
-	
+	card_name_for_level := {if set.alias_as_cardname and card.alias != "" then card.alias else card.name}
+
 	# Is the card a promo card?
 	is_promo := { styling.promo }
 	

data/magic-m15-meld-3in1.mse-style/style

@@ -14,8 +14,8 @@ depends on:
 	package: magic-default-image.mse-include
 	version: 2007-09-23
 depends on:
-	package: magic-watermarks.mse-include
+	package: magic-modules.mse-include
-	version: 2007-09-23
+	version: 2024-05-20
 depends on:
 	package: magic-identity-new.mse-include
 	version: 2012-01-22
@@ -70,6 +70,27 @@ init script:
 	has_pt_2 := { card.power_2 != "" or card.toughness_2 != "" }
 	
 	card_shape := { "double faced" }
+	faces_coordinates := {[
+		[
+			left: 0,
+			top: 0,
+			width: 188,
+			height: 261
+		],
+		[
+			left: 0,
+			top: 263,
+			width: 188,
+			height: 260
+		],
+		[
+			left: 193,
+			top: 0,
+			width: 375,
+			height: 523
+		]
+	]}
+	
 	has_identity := { styling.color_indicator_dot }
 	has_identity_2 := {styling.color_indicator_dot_2 }
 	is_unsorted := {styling.remove_from_autocount}
@@ -610,7 +631,8 @@ card style:
 		render style: image
 		popup style: in place
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
+		include file: /magic.mse-game/watermarks/menu_choice_images
+		image: { watermark_scripts[card.watermark](face:1) }
 	watermark 2:
 		left: 59
 		top: 422
@@ -620,7 +642,8 @@ card style:
 		render style: image
 		popup style: in place
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
+		include file:  /magic.mse-game/watermarks/menu_choice_images
+		image: { watermark_scripts[card.watermark](face:2) }
 		visible: { styling.three_cards }
 	watermark 3:
 		left: 310
@@ -631,7 +654,8 @@ card style:
 		render style: image
 		popup style: in place
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
+		include file:  /magic.mse-game/watermarks/menu_choice_images
+		image: { watermark_scripts[card.watermark](face:3) }
 	############################# PT
 	pt:
 		z index: 12

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

@@ -373,11 +373,11 @@ card style:
 			scale down to: 6
 		alignment:
 			script:
-				if card.rule_text == "" then "middle " else "top " + (if (styling.center_text == "short text only" and
+				if	card.rule_text == "" then "middle " else "top " + (if (styling.center_text == "short text only" and
-				   not contains(match:"\n", card.rule_text) and
+					not contains(match:"\n", card.rule_text) and
-				   card.flavor_text == "<i-flavor></i-flavor>" and
+					card.flavor_text == "<i-flavor></i-flavor>" and
-				   card_style.text.content_lines <= 2) or
+					card_style.text.content_lines <= 2) or
-				   styling.center_text == "always"
+					styling.center_text == "always"
 				then "center"
 				else "left")
 		z index: 3

data/magic-m15-showcase-kaldheim-dfc.mse-style/style

@@ -35,6 +35,24 @@ card dpi: 150
 ####### images from digiman
 ############################################################## Extra scripts
 init script:
+	faces_coordinates := {
+		[
+			[
+				left: 0,
+				top: 0,
+				width: 375,
+				height: 523
+			],
+			[
+				left: 377,
+				top: 0,
+				width: 375,
+				height: 523
+			]
+		]
+	}
+	card_shape := { "transform double faced" }
+	
 	# Load scripts for image box
 	include file: /magic-default-image.mse-include/scripts
 	

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

@@ -86,20 +86,20 @@ init script:
 		}
 		2: textbox_hybrid_2
 		3: {	linear_blend(
-					image1: 							textbox_hybrid_2(				colors: colors[(to_int(offset) + 0 ) mod 3]	+ colors[(to_int(offset) + 1 ) mod 3]	),
+					image1:								textbox_hybrid_2(				colors: colors[(to_int(offset) + 0 ) mod 3]	+ colors[(to_int(offset) + 1 ) mod 3]	),
 					x1: 0,		y1: 0.55
 					x2: 0,		y2: 0.77
-					image2: 							shorten_textbox_image(template(	colors[(to_int(offset) + 2 ) mod 3]	))
+					image2:								shorten_textbox_image(template(	colors[(to_int(offset) + 2 ) mod 3]	))
 		)}
 		4: {	linear_blend(
 					image1:								textbox_hybrid_2(				colors: colors[(to_int(offset) + 0 ) mod 4]	+ colors[(to_int(offset) + 1 ) mod 4]	),
-					image2: 							textbox_hybrid_2(				colors: colors[(to_int(offset) + 3 ) mod 4]	+ colors[(to_int(offset) + 2 ) mod 4]	),
+					image2:								textbox_hybrid_2(				colors: colors[(to_int(offset) + 3 ) mod 4]	+ colors[(to_int(offset) + 2 ) mod 4]	),
 					x1: 0,		y1: 0.4
 					x2: 0,		y2: 0.62
 		)}
 		5: {	linear_blend(
 					image1: linear_blend(
-						image1:							textbox_hybrid_2(				colors: colors[(to_int(offset) + 0 ) mod 5]	+ colors[(to_int(offset) + 1 ) mod 5] 	),
+						image1:							textbox_hybrid_2(				colors: colors[(to_int(offset) + 0 ) mod 5]	+ colors[(to_int(offset) + 1 ) mod 5]	),
 						image2:							textbox_hybrid_2(				colors: colors[(to_int(offset) + 4 ) mod 5]	+ colors[(to_int(offset) + 2 ) mod 5]	),
 						x1: 0,		y1: 0.19
 						x2: 0,		y2: 0.35),
@@ -118,7 +118,7 @@ init script:
 					x2: 0.4,	y2: 0
 					image2:	linear_blend(
 						image1:							shorten_textbox_image(template(	colors[(to_int(offset) + 1 ) mod 3]	)),
-						image2: 						shorten_textbox_image(template(	colors[(to_int(offset) + 2 ) mod 3]	)),
+						image2:							shorten_textbox_image(template(	colors[(to_int(offset) + 2 ) mod 3]	)),
 						x1: 0.6,	y1: 0
 						x2: 0.78,	y2: 0
 		))}
@@ -137,15 +137,15 @@ init script:
 							x2: 0.85,	y2: 0
 		)))}
 		5: {	linear_blend(
-					image1: 							shorten_textbox_image(template(	colors[(to_int(offset) + 0 ) mod 5]	)),
+					image1:								shorten_textbox_image(template(	colors[(to_int(offset) + 0 ) mod 5]	)),
 					x1:  2.0 / 15,	y1: 0
 					x2:  4.0 / 15,	y2: 0
 					image2: linear_blend(
-						image1: 						shorten_textbox_image(template(	colors[(to_int(offset) + 1 ) mod 5]	)),
+						image1:							shorten_textbox_image(template(	colors[(to_int(offset) + 1 ) mod 5]	)),
 						x1:  5.0 / 15,	y1: 0
 						x2:  7.0 / 15,	y2: 0
 						image2: linear_blend(
-							image1: 					shorten_textbox_image(template(	colors[(to_int(offset) + 2 ) mod 5]	)),
+							image1:						shorten_textbox_image(template(	colors[(to_int(offset) + 2 ) mod 5]	)),
 							x1:  8.0 / 15,	y1: 0
 							x2: 10.0 / 15,	y2: 0
 							image2: linear_blend(
@@ -609,11 +609,11 @@ card style:
 			scale down to: 6
 		alignment:
 			script:
-				if (styling.center_text == "short text only" and
+				if	(styling.center_text == "short text only" and
-				   not contains(match:"\n", card.rule_text) and
+					not contains(match:"\n", card.rule_text) and
-				   card.flavor_text == "<i-flavor></i-flavor>" and
+					card.flavor_text == "<i-flavor></i-flavor>" and
-				   card_style.text.content_lines <= 2) or
+					card_style.text.content_lines <= 2) or
-				   styling.center_text == "always"
+					styling.center_text == "always"
 				then "middle center"
 				else "middle left"
 		z index: 2

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

@@ -342,11 +342,11 @@ card style:
 			scale down to: 6
 		alignment:
 			script:
-				if (styling.center_text == "short text only" and
+				if	(styling.center_text == "short text only" and
-				   not contains(match:"\n", card.rule_text) and
+					not contains(match:"\n", card.rule_text) and
-				   card.flavor_text == "<i-flavor></i-flavor>" and
+					card.flavor_text == "<i-flavor></i-flavor>" and
-				   card_style.text.content_lines <= 2) or
+					card_style.text.content_lines <= 2) or
-				   styling.center_text == "always"
+					styling.center_text == "always"
 				then "middle center"
 				else "middle left"
 		z index: 2

data/magic-mainframe-extras.mse-include/readme.txt

@@ -11,21 +11,22 @@ mfsfiles/ contains images that can be shared across most Mainframe templates
 
 Some example images are provided:
 Transform/Lesson Circles
-	aetherprint.png, comedy.png, tragedy.png
+	examples/symbol/aetherprint.png, examples/symbol/comedy.png, examples/symbol/tragedy.png
-Mainframe Rarity
-	DISc.png, DISu.png, DISr.png, DISm.png, DISmp.png, DISs.png
 Custom Saga chapter
-	discovery.png
+	examples/symbol/discovery.png
 Replacement Saga chapters
-	doom/ folder
+	examples/doom/ folder
+Mainframe Rarity
+	examples/rarity/ folder (DISc.png, DISu.png, DISr.png, DISm.png, DISmp.png, DISs.png)
+	use examples/rarity/DIS.png as the mainframe rarity name
 Custom Legend Crowns
-	cajun/legend/ folder
+	examples/legend/ folder
 Mainframe Custom Mana
-	cajun/small, cajun/large, cajun/future folders
+	examples/small, examples/large, examples/future folders
 Custom Border
-	colorless.png
+	examples/border/colorless.png
 Adventure Decorations
-	decoration/ folder
+	examples/decoration/ folder
 	these images can be used as the forms
-		decoration/clight.png
+		examples/decoration/clight.png
-		decoration/light.png;color
+		examples/decoration/light.png;color

data/magic-mana-small.mse-symbol-font/symbol-font

@@ -178,6 +178,14 @@ symbol:
 	code: r6
 	image: chapter6.png
 	image font size: 40
+###################################################################################### Alchemy Symbols
+symbol:
+	code: A-
+	image: alchemy old.png
+	enabled: {card.card_symbol == "alchemy old"}
+symbol:
+	code: A-
+	image: alchemy.png
 ###################################################################################### Phy Hybrid
 symbol:
 	code: H/W/U

data/magic-modules.mse-include/card-symbols/card_fields

@@ -0,0 +1,12 @@
+card style:
+	card symbol:
+		left:				{ card_symbol_left_1() + nameline_offset_left_1() }
+		top:				{ card_symbol_top_1() + nameline_offset_top_1() }
+		width:				{ card_symbol_width_1() + nameline_offset_height_1() }
+		height:				{ if card_symbol_disabled_1() then 0 else card_symbol_height_1() + nameline_offset_height_1() }
+		visible:			{ not card_symbol_disabled_1() }
+		popup style:		in place
+		include file:		/magic.mse-game/card-symbols/menu_choice_images
+		render style:		image
+		image:				{ card_symbol_image(face: 1) }
+		z index:			810

data/magic-modules.mse-include/card-symbols/card_fields_dfc

@@ -0,0 +1,13 @@
+include file: /magic-modules.mse-include/card-symbols/card_fields
+card style:
+	card symbol 2:
+		left:				{ card_symbol_left_2() + nameline_offset_left_2() }
+		top:				{ card_symbol_top_2() + nameline_offset_top_2() }
+		width:				{ card_symbol_width_2() + nameline_offset_height_2() }
+		height:				{ if card_symbol_disabled_2() then 0 else card_symbol_height_2() + nameline_offset_height_2() }
+		visible:			{ not card_symbol_disabled_2() }
+		popup style:		in place
+		include file:		/magic.mse-game/card-symbols/menu_choice_images
+		render style:		image
+		image:				{ card_symbol_image(face: 2) }
+		z index:			810

data/magic-modules.mse-include/card-symbols/card_fields_tfc

@@ -0,0 +1,13 @@
+include file: /magic-modules.mse-include/card-symbols/card_fields_dfc
+card style:
+	card symbol 3:
+		left:				{ card_symbol_left_3() + nameline_offset_left_3() }
+		top:				{ card_symbol_top_3() + nameline_offset_top_3() }
+		width:				{ card_symbol_width_3() + nameline_offset_height_3() }
+		height:				{ if card_symbol_disabled_3() then 0 else card_symbol_height_3() + nameline_offset_height_3() }
+		visible:			{ not card_symbol_disabled_3() }
+		popup style:		in place
+		include file:		/magic.mse-game/card-symbols/menu_choice_images
+		render style:		image
+		image:				{ card_symbol_image(face: 3) }
+		z index:			810

data/magic-modules.mse-include/card-symbols/choices

@@ -0,0 +1,4 @@
+choice: none
+choice: tombstone
+choice: alchemy
+choice: alchemy old