3.0.0 (#6)

---------

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

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

@@ -6,25 +6,22 @@ installer group: magic/m15 style/planeswalkers/grayscale
 icon: card-sample.png
 position hint: 054
 
-version: 2018-02-09
+version: 2024-09-01
 depends on:
 	package: magic.mse-game
 	version: 2014-06-25
 depends on:
-	package: magic-m15-mainframe-planeswalker.mse-style
+	package: magic-m15-planeswalker.mse-style
 	version: 2015-12-20
 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
 depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
-depends on:
-	package: magic-identity-new.mse-include
-	version: 2012-01-22
 
 card width: 375
 card height: 523
@@ -34,8 +31,20 @@ init script:
 	# Should hybrids have a grey name?
 	mask_hybrid_with_land := { styling.grey_hybrid_name }
 	
-	template_prefix := [card: "/magic-m15-mainframe-planeswalker.mse-style/" card2: "/magic-m15-mainframe-planeswalker.mse-style/" stamp: "/magic-m15-mainframe-planeswalker.mse-style/" identity: "/magic-identity-new.mse-include/"]
-	template_suffix := [card: "card.jpg" card2: "card2.jpg" stamp: "stamp.jpg" identity: "identity.png"]
+	template_prefix := [
+		card: "/magic-m15-planeswalker.mse-style/"
+		card2: "/magic-m15-planeswalker.mse-style/"
+		stamp: "/magic-m15-planeswalker.mse-style/stamps/"
+		ubstamp: "/magic-m15-planeswalker.mse-style/ubstamps/"
+		identity: "/magic-modules.mse-include/indicators/"
+	]
+	template_suffix := [
+		card: "card.jpg"
+		card2: "card2.jpg"
+		stamp: "stamp.png"
+		ubstamp: "stamp.png"
+		identity: "identity.png"
+	]
 	template      := { template_prefix[type] + input + template_suffix[type] }
 	land_template := { template_prefix[type] + "c" + template_suffix[type] }
 	# Use land templates for previews because they show more contrast
@@ -75,7 +84,7 @@ init script:
 	paragraph_count := 
 		replace@(match:"<soft-line>\n", replace:"")+
 		filter_text@(match:"\n")
-	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:
@@ -87,15 +96,6 @@ set info style:
 			fill color:   rgb(255,255,255)
 			border color: rgb(0,0,0)
 ############################################################## Extra style options
-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
@@ -174,6 +174,11 @@ 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
+include file: /magic-modules.mse-include/rarities/card_fields
+include file: /magic-modules.mse-include/watermarks/card_fields
 card style:
 	############################# Background stuff
 	border color:
@@ -187,7 +192,7 @@ card style:
 		top width:    17
 		bottom width: 18
 		z index: 4
-		mask: /magic-m15-mainframe-planeswalker.mse-style/border_mask.png
+		mask: /magic-m15-planeswalker.mse-style/border_mask.png
 	card color:
 		left:	0
 		top:	0
@@ -224,14 +229,14 @@ card style:
 		z index: 2
 		padding top: 0
 	card symbol:
-		left: {if card.card_symbol=="none" then 20 else 29}
-		top: 23
-		height: 18
-		width: 14
+		left: {if card.card_symbol=="none" then 20 else 28}
+		top: 21
+		height: 21
+		width: 23
 		z index: 1
 		render style: image
-		choice images:
-			tombstone: /magic-m15-mainframe-planeswalker.mse-style/tombstone.png
+		include file:		/magic.mse-game/card-symbols/menu_choice_images
+		image:				{ card_symbol_image(face: 1) }
 	############################# Image
 	image:
 		left: 25
@@ -239,7 +244,7 @@ card style:
 		width: { if styling.grayscale_art then 0 else 324 }
 		height:	427.5
 		z index: 1
-		mask: { "/magic-m15-mainframe-planeswalker.mse-style/imagemask" + ( if has_four_abilities() then "_4abil" else "" ) + ( if is_rare() then "_rare" else "" ) + ".png" }
+		mask: { "/magic-m15-planeswalker.mse-style/imagemask" + ( if has_four_abilities() then "_4abil" else "" ) + ( if is_rare() then "_rare" else "" ) + ".png" }
 	############################# Card type
 	indicator:
 		left: 30
@@ -249,7 +254,7 @@ card style:
 		z index: 2
 		render style: image
 		visible: { has_identity() }
-		image: { card_identity() }
+		image: { module_identity() }
 	type:
 		left: { if has_identity() then "53" else "33" }
 		top: { if has_four_abilities() then 261 else 296 }
@@ -271,21 +276,7 @@ card style:
 		z index: 2
 		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: 63
@@ -312,7 +303,7 @@ card style:
 				then "middle center"
 				else "middle left"
 		z index: 4
-		mask: /magic-m15-mainframe-planeswalker.mse-style/text_mask.png
+		mask: /magic-m15-planeswalker.mse-style/text_mask.png
 		padding left:   6
 		padding right:  4
 		padding bottom: 2
@@ -329,7 +320,8 @@ card style:
 		z index: 2
 		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() }
 	############################# Loyalty
 	loyalty:
 		z index: 7
@@ -386,58 +378,7 @@ card style:
 			name: Beleren Bold
 			size: 11
 			color: white
-	############################# Card sorting / numbering
-	set code:
-		left: 24
-		top: 498
-		width: 40
-		height: 10
-		z index: 6
-		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: 498
-		width: 140
-		height: 10
-		z index: 6
-		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: loyalty box
@@ -450,12 +391,6 @@ extra card field:
 	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
@@ -523,33 +458,7 @@ extra card field:
 	choice: art
 	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: 6
-		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: 6
-		render style: image
-		image: /magic-m15-mainframe-planeswalker.mse-style/artist_arrow.png
 	loyalty box:
 		right: 362
 		top: 460
@@ -559,32 +468,23 @@ extra card style:
 		render style: image
 		visible: { card.loyalty !="" }
 		choice images:
-			loyalty: /magic-m15-mainframe-planeswalker.mse-style/loyalty.png
+			loyalty: /magic-m15-planeswalker.mse-style/loyalty.png
 	stamp:
-		left: 170
-		top: 473
-		width: 36.5
-		height: 22.5
+		left: 157
+		top: 467
+		width: 61
+		height: 25
 		z index: 6
-		visible: { is_rare() and styling.use_holofoil_stamps }
+		visible: { card.card_stamp != "none" }
 		render style: image
-		image: { saturate(card_stamp(), amount: -1) }
-		mask: /magic-m15-mainframe-planeswalker.mse-style/stamp_mask.png
-	foil stamp:
-		left: 170
-		top: 473
-		width: 36.5
-		height: 22.5
-		z index: 7
-		visible: { is_rare() and styling.use_holofoil_stamps }
-		render style: image
-		image: /magic-m15-mainframe-planeswalker.mse-style/foil_stamp.png
+		image: { saturate(module_stamp(), amount: -1) }
+		mask: /magic-m15-planeswalker.mse-style/stamp_mask.png
 	foil layer:
 		left: 0
 		top : 0
 		width: 375
 		height: 523
-		z index: 4
+		z index: 1050
 		render style: image
 		image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
 	loyalty cost box 1:
@@ -596,9 +496,9 @@ extra card style:
 		render style: image
 		visible: { card.loyalty_cost_1 !="" }
 		choice images:
-			loyalty up: /magic-m15-mainframe-planeswalker.mse-style/loyaltyup.png
-			loyalty down: /magic-m15-mainframe-planeswalker.mse-style/loyaltydown.png
-			loyalty naught: /magic-m15-mainframe-planeswalker.mse-style/loyaltynaught.png
+			loyalty up: /magic-m15-planeswalker.mse-style/loyaltyup.png
+			loyalty down: /magic-m15-planeswalker.mse-style/loyaltydown.png
+			loyalty naught: /magic-m15-planeswalker.mse-style/loyaltynaught.png
 	loyalty cost box 2:
 		left: 18
 		top: { if has_four_abilities() then 342 else 383 }
@@ -608,9 +508,9 @@ extra card style:
 		render style: image
 		visible: { card.loyalty_cost_2 !="" }
 		choice images:
-			loyalty up: /magic-m15-mainframe-planeswalker.mse-style/loyaltyup.png
-			loyalty down: /magic-m15-mainframe-planeswalker.mse-style/loyaltydown.png
-			loyalty naught: /magic-m15-mainframe-planeswalker.mse-style/loyaltynaught.png
+			loyalty up: /magic-m15-planeswalker.mse-style/loyaltyup.png
+			loyalty down: /magic-m15-planeswalker.mse-style/loyaltydown.png
+			loyalty naught: /magic-m15-planeswalker.mse-style/loyaltynaught.png
 	loyalty cost box 3:
 		left: 18
 		top: { if has_four_abilities() then 389 else 432 }
@@ -620,9 +520,9 @@ extra card style:
 		render style: image
 		visible: { card.loyalty_cost_3 !="" }
 		choice images:
-			loyalty up: /magic-m15-mainframe-planeswalker.mse-style/loyaltyup.png
-			loyalty down: /magic-m15-mainframe-planeswalker.mse-style/loyaltydown.png
-			loyalty naught: /magic-m15-mainframe-planeswalker.mse-style/loyaltynaught.png
+			loyalty up: /magic-m15-planeswalker.mse-style/loyaltyup.png
+			loyalty down: /magic-m15-planeswalker.mse-style/loyaltydown.png
+			loyalty naught: /magic-m15-planeswalker.mse-style/loyaltynaught.png
 	loyalty cost box 4:
 		left: 18
 		top: 436
@@ -632,9 +532,9 @@ extra card style:
 		render style: image
 		visible: { card.loyalty_cost_4 !="" }
 		choice images:
-			loyalty up: /magic-m15-mainframe-planeswalker.mse-style/loyaltyup.png
-			loyalty down: /magic-m15-mainframe-planeswalker.mse-style/loyaltydown.png
-			loyalty naught: /magic-m15-mainframe-planeswalker.mse-style/loyaltynaught.png
+			loyalty up: /magic-m15-planeswalker.mse-style/loyaltyup.png
+			loyalty down: /magic-m15-planeswalker.mse-style/loyaltydown.png
+			loyalty naught: /magic-m15-planeswalker.mse-style/loyaltynaught.png
 	colon 1:
 		left: 59
 		top: { if has_four_abilities() then 309 else 347 }
@@ -712,7 +612,7 @@ extra card style:
 				then "middle center"
 				else "middle left"
 		z index: 3
-		mask: /magic-m15-mainframe-planeswalker.mse-style/text_mask.png
+		mask: /magic-m15-planeswalker.mse-style/text_mask.png
 		padding left:   6
 		padding right:  4
 		padding bottom: 2
@@ -730,17 +630,4 @@ extra card style:
 		z index: 1
 		render style: image
 		image: { saturate(card.image, amount: -1) }
-		mask: { "/magic-m15-mainframe-planeswalker.mse-style/imagemask" + ( if has_four_abilities() then "_4abil" else "" ) + ( if is_rare() then "_rare" else "" ) + ".png" }
-	auto copyright:
-		right: 350
-		top: 498
-		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
+		mask: { "/magic-m15-planeswalker.mse-style/imagemask" + ( if has_four_abilities() then "_4abil" else "" ) + ( if is_rare() then "_rare" else "" ) + ".png" }