3.0.0 (#6)

---------

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

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

@@ -6,13 +6,13 @@ icon: card-sample.png
 position hint: 901
 installer group: magic/m15 style/normal cards/Clear
 
-version: 2018-02-08
+version: 2024-06-06
 depends on:
 	package: magic.mse-game
 	version: 2008-06-24
 depends on:
-	package: magic-watermarks.mse-include
-	version: 2007-09-23
+	package: magic-modules.mse-include
+	version: 2024-10-01
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
@@ -39,6 +39,8 @@ init script:
 	# Is the card a promo card?
 	is_promo := { styling.promo }
 	is_unsorted := {styling.remove_from_autocount}
+	card_symbol_offset_top_1 := {-2}
+	watermark_include := "/magic-modules.mse-include/watermarks"
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -118,6 +120,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/card-symbols/card_fields
+include file: /magic-modules.mse-include/separators/card_fields
+include file: /magic-modules.mse-include/corners/card_fields
 card style:
 	############################# Name line
 	name:
@@ -127,7 +132,7 @@ card style:
 		height: 23
 		alignment: bottom shrink-overflow
 		padding bottom: 0
-		z index: 2
+		z index: 900
 		font:
 			name: Beleren Bold
 			size: 16
@@ -146,24 +151,15 @@ card style:
 			size: 15
 			alignment: middle right
 		always symbol: true
-		z index: 2
+		z index: 920
 		padding top: 0
-	card symbol:
-		left: {if card.card_symbol=="none" then 20 else 30}
-		top: 26
-		height: 20
-		width: 14
-		z index: 1
-		render style: image
-		choice images:
-			tombstone: tombstone.png
 	############################# Image
 	image:
 		left: 0
 		top:  0
 		width:  375
 		height:	 523
-		z index: 0
+		z index: 100
 		mask: image_mask.png
 	############################# Card type
 	type:
@@ -172,7 +168,7 @@ card style:
 		width: { 307 - max(22,card_style.rarity.content_width) }
 		height: 20
 		alignment: top shrink-overflow
-		z index: 2
+		z index: 900
 		padding top: 2
 		font:
 			name: Beleren Bold
@@ -184,24 +180,10 @@ card style:
 		top : 320
 		width: 44
 		height: 22
-		z index: 3
+		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: 30
@@ -227,7 +209,7 @@ card style:
 				   styling.center_text == "always"
 				then "middle center"
 				else "middle left"
-		z index: 3
+		z index: 900
 		padding left:   6
 		padding right:  4
 		line height hard: 1.2
@@ -240,11 +222,11 @@ card style:
 		top : 436
 		width: 44
 		height: 44
-		z index: 3
+		z index: 740
 		render style: image
 		alignment: middle center
-		include file: /magic-watermarks.mse-include/watermarks
-############################# PT
+		include file:	/magic.mse-game/watermarks/menu_choice_images
+		image:			{ watermark_image_1() }
 	############################# Card sorting / numbering
 	set code:
 		left: 24
@@ -298,44 +280,28 @@ 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)
+	script: card_code_script(value)
 extra card field:
 	type: text
 	name: card code copy
 	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)
+	script: card_code_script(value)
 extra card field:
 	type: text
 	name: card code copy 2
 	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)
+	script: card_code_script(value)
 extra card field:
 	type: text
 	name: card code copy 3
 	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)
+	script: card_code_script(value)
 extra card field:
 	type: choice
 	name: artist arrow
+	script: "frame"
 	editable: false
 	save value: false
-	choice: white
 extra card field:
 	type: choice
 	name: frame
@@ -354,12 +320,6 @@ extra card field:
 	choice: foil
 	save value: false
 	editable: false
-extra card field:
-	type: choice
-	name: artist arrow
-	editable: false
-	save value: false
-	choice: white
 extra card field:
 	type: choice
 	name: image liner
@@ -447,7 +407,7 @@ extra card style:
 		top:	0
 		width:	375
 		height:	523
-		z index: 1
+		z index: 200
 		render style: image
 		image: frame.png
 	card code:
@@ -455,7 +415,7 @@ extra card style:
 		top: 488
 		width: 120
 		height: 10
-		z index: 3
+		z index: 900
 		font:
 			name: Relay-Medium
 			size: 7
@@ -471,7 +431,7 @@ extra card style:
 		top: 500
 		width: 12
 		height: 7
-		z index: 2
+		z index: 900
 		render style: image
 		image: artist_arrow.png
 	foil layer:
@@ -479,34 +439,36 @@ 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: { if is_rare() then "foil_mask_rare.png" else "foil_mask.png" }
+		mask: { if is_stamped() then "foil_mask_rare.png" else "foil_mask.png" }
 	second watermark:
 		left: 313
 		top : 436
 		width: 44
 		height: 44
-		z index: 3
+		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() }
 	third watermark:
 		left: 313
 		top : 436
 		width: 44
 		height: 44
-		z index: 3
+		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() }
 	set code copy:
 		left: 24
 		top: 498
 		width: 40
 		height: 10
-		z index: 2
+		z index: 890
 		font:
 			name: Relay-Medium
 			size: 7
@@ -521,7 +483,7 @@ extra card style:
 		top: 498
 		width: 40
 		height: 10
-		z index: 2
+		z index: 890
 		font:
 			name: Relay-Medium
 			size: 7
@@ -536,7 +498,7 @@ extra card style:
 		top: 498
 		width: 40
 		height: 10
-		z index: 2
+		z index: 890
 		font:
 			name: Relay-Medium
 			size: 7
@@ -551,7 +513,7 @@ extra card style:
 		top: 497.5
 		width: 200
 		height: 10
-		z index: 2
+		z index: 890
 		font:
 			name: Beleren Small Caps Bold
 			size: 7.25
@@ -565,7 +527,7 @@ extra card style:
 		top: 497.5
 		width: 200
 		height: 10
-		z index: 2
+		z index: 890
 		font:
 			name: Beleren Small Caps Bold
 			size: 7.25
@@ -579,7 +541,7 @@ extra card style:
 		top: 497.5
 		width: 200
 		height: 10
-		z index: 2
+		z index: 890
 		font:
 			name: Beleren Small Caps Bold
 			size: 7.25
@@ -593,7 +555,7 @@ extra card style:
 		top: 500
 		width: 140
 		height: 10
-		z index: 2
+		z index: 890
 		alignment: middle right shrink-overflow
 		font:
 			name: Matrix
@@ -609,7 +571,7 @@ extra card style:
 		top: 500
 		width: 140
 		height: 10
-		z index: 2
+		z index: 890
 		alignment: middle right shrink-overflow
 		font:
 			name: Matrix
@@ -625,7 +587,7 @@ extra card style:
 		top: 500
 		width: 140
 		height: 10
-		z index: 2
+		z index: 890
 		alignment: middle right shrink-overflow
 		font:
 			name: Matrix
@@ -641,7 +603,7 @@ extra card style:
 		top: 488
 		width: 120
 		height: 10
-		z index: 2
+		z index: 890
 		font:
 			name: Relay-Medium
 			size: 7
@@ -656,7 +618,7 @@ extra card style:
 		top: 488
 		width: 120
 		height: 10
-		z index: 2
+		z index: 890
 		font:
 			name: Relay-Medium
 			size: 7
@@ -671,7 +633,7 @@ extra card style:
 		top: 488
 		width: 120
 		height: 10
-		z index: 2
+		z index: 890
 		font:
 			name: Relay-Medium
 			size: 7
@@ -686,7 +648,7 @@ extra card style:
 		top: 500
 		width: 140
 		height: 10
-		z index: 3
+		z index: 900
 		alignment: middle right shrink-overflow
 		visible: {set.automatic_copyright}
 		font: