3.0.0 (#6)

---------

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

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

@@ -6,7 +6,7 @@ icon: card-sample.png
 installer group: magic/m15 style/Duplex
 position hint: 903
 
-version: 2018-02-09
+version: 2024-06-06
 depends on:
 	package: magic.mse-game
 	version: 2014-06-25
@@ -14,11 +14,8 @@ depends on:
 	package: magic-m15-altered.mse-style
 	version: 2014-07-15
 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-10-01
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
@@ -37,13 +34,26 @@ init script:
 	#Should multicolor lands with basic land types have a colored name?
 	mask_multi_land_with_color := { styling.colored_multicolor_land_name }
 	
-	template_prefix := [card: "/magic-m15-altered.mse-style/" pt: "/magic-m15-altered.mse-style/" stamp: "/magic-m15-altered.mse-style/" identity: "/magic-identity-new.mse-include/"]
-	template_suffix := [card: "card.jpg" pt: "pt.png", stamp: "stamp.jpg" identity: "identity.png"]
+	template_prefix := [
+		card: "/magic-modules.mse-include/cards/375 m15 simple/"
+		pt: "/magic-modules.mse-include/pts/375 m15/"
+		stamp: "/magic-modules.mse-include/stamps/backs/375 round/"
+		ubstamp: "/magic-modules.mse-include/stamps/backs/375 ub/"
+		identity: "/magic-modules.mse-include/indicators/"
+	]
+	template_suffix := [
+		card: "card.jpg"
+		pt: "pt.png"
+		stamp: "stamp.png"
+		ubstamp: "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) + "l" + template_suffix[type] }
 	# Use land templates for previews because they show more contrast
 	hybrid_previews := "land,hybrid"
 	
+	card_dir := template_prefix["card"]
 	color_combination := {
 		# The base hybrid, without the outer frame blended over it
 		base := base_hybrid[shape][color_count]()
@@ -51,19 +61,19 @@ init script:
 		# Put a frame around it?
 		if land and not colored_lands then
 			masked_blend(
-				mask:  "/magic-m15-altered.mse-style/multicolor_blend_{type}.png",
+				mask:  "{card_dir}multicolor_blend_{type}.png",
 				dark:  land_template("c"),
 				light: base,
 			)
 		else if land and multi and mask_multi_land_with_color() then
 			masked_blend(
-				mask:  "/magic-m15-altered.mse-style/hybrid_blend_{type}.png",
+				mask:  "{card_dir}hybrid_blend_{type}.png",
 				dark:  base,
 				light:  land_template("m"),
 			)
 		else if multi and artifact then
 			masked_blend(
-				mask: "/magic-m15-altered.mse-style/artifact_blend_{type}.png",
+				mask: "{card_dir}artifact_blend_{type}.png",
 				dark: template("a"),
 				light: masked_blend(
 					mask: "multicolor_blend_{type}.png",
@@ -73,19 +83,19 @@ init script:
 			)
 		else if multi then 
 			masked_blend(
-				mask:  "/magic-m15-altered.mse-style/multicolor_blend_{type}.png",
+				mask:  "{card_dir}multicolor_blend_{type}.png",
 				dark:  template("m"),
 				light: base,
 			)
 		else if artifact then 
 			masked_blend(
-				mask:  "/magic-m15-altered.mse-style/artifact_blend_{type}.png",
+				mask:  "{card_dir}artifact_blend_{type}.png",
 				dark:  template("a"),
 				light: base,
 			)
 		else if color_count > 1 and mask_hybrid_with_land() then
 			masked_blend(
-				mask:  "/magic-m15-altered.mse-style/hybrid_blend_{type}.png",
+				mask:  "{card_dir}hybrid_blend_{type}.png",
 				dark:  land_template("c"),
 				light: base,
 			)
@@ -107,7 +117,7 @@ init script:
 	
 	ifside := {if styling.side == "left" then left else right}
 	sideset := {if styling.side == "left" then input else input-15}
-	has_identity := { styling.color_indicator_dot }
+	watermark_include := "/magic-modules.mse-include/watermarks"
 	is_unsorted := {styling.remove_from_autocount}
 ############################################################## Set info fields
 set info style:
@@ -211,6 +221,12 @@ 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/separators/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/stamps/stamp_back
+include file: /magic-modules.mse-include/watermarks/card_fields
 card style:
 	############################# Background stuff
 	border color:
@@ -218,21 +234,20 @@ card style:
 		top : 0
 		width:	375
 		height:	523
-		radius: 15
 		left width:   15
 		right width:  15
 		top width:    15
 		bottom width: 37
-		z index: 2
+		z index: 500
 	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: { module_card() }
 	############################# Name line
 	name:
 		left: { ifside(left:if card.card_symbol=="none" then 32 else 50,right:if card.card_symbol=="none" then 32-311-30 else 50-311-30) }
@@ -241,7 +256,7 @@ card style:
 		height: 23
 		alignment: bottom shrink-overflow
 		padding bottom: 0
-		z index: 1
+		z index: 900
 		font:
 			name: Beleren Bold
 			size: 16
@@ -260,41 +275,41 @@ card style:
 			size: 15
 			alignment: middle right
 		always symbol: true
-		z index: 4
+		z index: 920
 		padding top: 0
 	card symbol:
-		left: {if card.card_symbol=="none" then 20 else sideset(30)}
+		left: {if card.card_symbol=="none" then 8 else sideset(26)}
 		top: 29
-		height: { if styling.side == "left" then 20 else 0 }
-		width: { if styling.side == "left" then 14 else 0 }
-		z index: 1
-		render style: image
-		choice images:
-			tombstone: /magic-m15-altered.mse-style/tombstone.png
+		height: { if styling.side == "left" then 21 else 0 }
+		width: { if styling.side == "left" then 23 else 0 }
+		include file:		/magic.mse-game/card-symbols/menu_choice_images
+		render style:		image
+		image:				{ card_symbol_image(face: 1) }
+		z index:			810
 	############################# Image
 	image:
 		left:	{ifside(left:29,right:-312)}
 		top: 60
 		width: 657
 		height:	231
-		z index: 1
+		z index: 300
 	############################# Card type
 	indicator:
 		left:	{ifside(left:31 right:-310)}
 		top: 300
 		width: 17
 		height: 17
-		z index: 4
+		z index: 800
 		render style: image
 		visible: { has_identity() }
-		image: { card_identity() }
+		image: { module_identity() }
 	type:
 		left:	{if has_identity() then ifside(left:52 right:-289) else ifside(left:32 right:-309)}
 		top: 296
 		width: { (if has_identity() then "616" else "646") - max(22,card_style.rarity.content_width) }
 		height: 20
 		alignment: top shrink-overflow
-		z index: 4
+		z index: 900
 		padding top: 2
 		font:
 			name: Beleren Bold
@@ -306,24 +321,10 @@ card style:
 		top: 297
 		width: {if styling.side=="right" then 44 else 0}
 		height: {if styling.side=="right" then 22 else 0}
-		z index: 4
+		z index: 950
 		render style: image
 		alignment: middle right
-		choice images:
-			# Images based on the set symbol
-			basic land:
-				script:
-					if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon")
-					else symbol_variation(symbol: set.symbol, variation: "common")
-			common:
-				script:
-					if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon")
-					else symbol_variation(symbol: set.symbol, variation: "common")
-			uncommon:   script: symbol_variation(symbol: set.symbol, variation: "uncommon")
-			rare:       script: symbol_variation(symbol: set.symbol, variation: "rare")
-			mythic rare:       script: symbol_variation(symbol: set.symbol, variation: "mythic rare")
-			special:    script: symbol_variation(symbol: set.symbol, variation: "special")
-			masterpiece: script: symbol_variation(symbol: set.masterpiece_symbol, variation: "mythic rare")
+		include file: /magic-modules.mse-include/rarities/choice_images
 	############################# Text box
 	text:
 		left:	{ifside(left:29 right:-312)}
@@ -348,7 +349,7 @@ card style:
 				   styling.center_text == "always"
 				then "middle center"
 				else "middle left"
-		z index: 4
+		z index: 900
 		padding left:   6
 		padding right:  4
 		line height hard: 1.2
@@ -361,23 +362,25 @@ card style:
 		top : 321
 		width: {ifside(left:138,right:0)}
 		height: {ifside(left:166,right:0)}
-		z index: 1
+		z index: 710
 		render style: image
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
+		include file:	/magic.mse-game/watermarks/menu_choice_images
+		image:			{ watermark_image_1() }
 	watermark 2:
 		left: {117+ifside(left:7.5,right:-7.5)}
 		top: 321
 		width: {ifside(left:0,right:138)}
 		height: {ifside(left:0,right:166)}
-		z index: 1
+		z index: 710
 		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_image_1() }
 	############################# PT
 	pt:
-		z index: 4
+		z index: 900
 		left: 286
 		top: 469
 		width: { ifside(left:0,right:60) }
@@ -388,76 +391,13 @@ card style:
 			size: 16
 			color: black
 			separator color: red
-	############################# Card sorting / numbering
-	set code:
-		left: 24
-		top: 498
-		width: 40
-		height: 10
-		z index: 3
-		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: 3
-		font:
-			name: Beleren Small Caps Bold
-			size: 7.25
-			color: white
-	copyright:
-		right: 350
-		top: { if card.pt != "" and styling.side == "right" then 500 else 488 }
-		width: 140
-		height: 10
-		z index: 4
-		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: choice
 	name: pt box
 	script: card.card_color
 	editable: false
 	save value: false
-extra card field:
-	type: choice
-	name: stamp
-	script: card.card_color
-	editable: false
-	save value: false
-extra card field:
-	type: choice
-	name: foil stamp
-	choice: stamp
-	save value: false
-	editable: false
 extra card field:
 	type: choice
 	name: foil layer
@@ -476,66 +416,22 @@ extra card field:
 	script: card.card_color
 	save value: false
 	editable: false
-extra card field:
-	type: text
-	name: auto copyright
-	script: set.copyright
-	save value: false
-	editable: false
-	show statistics: false
 extra card style:
-	card code:
-		left: 24
-		top: 488
-		width: 120
-		height: 10
-		z index: 3
-		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: 3
-		render style: image
-		image: /magic-m15-altered.mse-style/artist_arrow.png
 	pt box:
 		left: 273
 		top: 466
 		width: 81
 		height:	42
-		z index: 3
+		z index: 840
 		visible: { card.pt != "" and styling.side == "right" }
 		render style: image
-		image: { card_ptbox() }
-	stamp:
-		left: 165
-		top: 472
-		width: 46
-		height: 26
-		z index: 3
-		visible: { is_rare() and styling.use_holofoil_stamps }
-		render style: image
-		image: { card_stamp() }
-	foil stamp:
-		left: 165
-		top: 472
-		width: 46
-		height: 26
-		z index: 3
-		visible: { is_rare() and styling.use_holofoil_stamps }
-		render style: image
-		image: /magic-m15-altered.mse-style/foil_stamp.png
+		image: { module_ptbox() }
 	foil layer:
 		left: 0
 		top : 0
 		width: 375
 		height: 523
-		z index: 5
+		z index: 1050
 		render style: image
 		image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
 		mask: { if is_rare() then "/magic-m15-altered.mse-style/foil_mask_rare.png" else "/magic-m15-altered.mse-style/foil_mask.png" }
@@ -544,7 +440,7 @@ extra card style:
 		top : 0
 		width: 375
 		height: 523
-		z index: 0
+		z index: 210
 		render style: image
 		mask: {ifside(left:"left" right:"right")+"_blend.png"}
 		image: { card_background() }
@@ -553,20 +449,7 @@ extra card style:
 		top : 0
 		width: 375
 		height: 523
-		z index: 0
+		z index: 210
 		render style: image
 		mask: {ifside(left:"left" right:"right")+"_blend.png"}
 		image: { card_background() }
-	auto copyright:
-		right: 350
-		top: { if card.pt != "" and styling.side == "right" then 500 else 488 }
-		width: 140
-		height: 10
-		z index: 4
-		alignment: middle right shrink-overflow
-		visible: {set.automatic_copyright}
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold