3.0.0 (#6)

---------

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

data/magic-m15-scroll-demon.mse-style/style

@@ -6,7 +6,7 @@ icon: card-sample.png
 installer group: magic/m15 style/normal cards
 position hint: 080
 
-version: 2018-02-08
+version: 2024-09-01
 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-10-01
 depends on:
 	package: magic-mana-large.mse-symbol-font
 	version: 2007-09-23
@@ -28,9 +25,6 @@ depends on:
 depends on:
 	package: magic-mana-scroll-demon.mse-symbol-font
 	version: 2015-12-13
-depends on:
-	package: magic-mana-null.mse-symbol-font
-	version: 2017-05-30
 
 card width: 375
 card height: 523
@@ -46,8 +40,16 @@ 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: "" pt: "" "" identity: "identity/"]
-	template_suffix := [card: "card.jpg" pt: "pt.png", identity: "identity.png"]
+	template_prefix := [
+		card: ""
+		pt: ""
+		identity: "identity/"
+	]
+	template_suffix := [
+		card: "card.jpg"
+		pt: "pt.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
@@ -65,32 +67,10 @@ init script:
 	
 	# Is the card a promo card?
 	is_promo := { styling.promo }
-	has_identity := { styling.color_indicator_dot }
-	is_unsorted := {styling.remove_from_autocount}
-	alt_rarity := {styling.alt_rarity_color != ""}
-	alt_rarity_color := {
-		string := "83,67,53:177,150,131:0,0,0:0,0,0:0.07:"
-		if match(styling.alt_rarity_color, match:":$") then string := styling.alt_rarity_color
-		colons := length(filter_text(string, match:":"))
-		output := split_text(string, match:",|:")
-		splits := split_text(string, match:":")
-		if colons == 4
-			then output := split_text(string+"0.07:", match:",|:")
-		if colons == 3
-			then output := split_text(string+splits[2]+"0.07:", match:",|:")
-		else if colons == 2
-			then output := split_text(string+"0,0,0:0,0,0:0.07:", match:",|:")
-		else if colons == 1
-			then output := split_text(string+splits[0]+":0,0,0:0,0,0:0.07:", match:",|:")
-		
-		output
-	}
-	alt_symbol := {symbol_variation(symbol:set.symbol, border_radius: alt_rarity_color().12, fill_type: "linear gradient", fill_color_1: rgb(alt_rarity_color().0, alt_rarity_color().1, alt_rarity_color().2), fill_color_2: rgb(alt_rarity_color().3, alt_rarity_color().4, alt_rarity_color().5), border_color_1: rgb(alt_rarity_color().6, alt_rarity_color().7, alt_rarity_color().8), border_color_2: rgb(alt_rarity_color().9, alt_rarity_color().10, alt_rarity_color().11), center_x:0.5, center_y:0.5, end_x:1, end_y:1)}
-	use_main_rarity := { contains(set.mainframe_rarity_name, match: ".png")}
-	un_png := replace@(match:".png", replace: "")
+	watermark_include := "/magic-modules.mse-include/watermarks"
 	chop_top := {if styling.chop_top == "" then 0 else if comma_count(styling.chop_top) == "," or comma_count(styling.chop_top) == ",," then split_text(match:",", styling.chop_top).0 else styling.chop_top}
 	chop_bot := {if comma_count(styling.chop_top) == ",," then split_text(match:",", styling.chop_top).1 else if styling.chop_bottom == "" then 0 else styling.chop_bottom}
-
+	is_unsorted := {styling.remove_from_autocount}
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -117,11 +97,7 @@ styling field:
 	choice: seal only
 	choice: with holofoil stamp
 	description: Optional holofoil seal stamps
-styling field:
-	type: boolean
-	name: color indicator dot
-	description: Use the color indicator dot
-	initial: no
+include file: /magic-modules.mse-include/rarities/styling_fields
 styling field:
 	type: boolean
 	name: remove from autocount
@@ -131,10 +107,6 @@ styling field:
 	type: boolean
 	name: colored multicolor land name
 	description: Use a colored background for the name and type on multicolor land cards with a basic land type. This is done on real cards.
-styling field:
-	type: text
-	name: alt rarity color
-	description: Use a custom color for the rarity symbol. Formatted as "R1,G1,B1:R2,G2,B2:..." 1 and 2 are fill color, 3 and 4 border color
 styling field:
 	type: boolean
 	name: use guild mana symbols
@@ -199,6 +171,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/separators/card_fields
 card style:
 	############################# Background stuff
 	card color:
@@ -240,14 +215,14 @@ card style:
 		z index: 2
 		padding top: 0
 	card symbol:
-		left: {if card.card_symbol=="none" then 20 else 30}
-		top: 29
-		height: 20
-		width: 14
-		z index: 1
+		left: {if card.card_symbol=="none" then 20 else 28}
+		top : 44
+		height: 21
+		width: 23
+		z index: 5
 		render style: image
-		choice images:
-			tombstone: tombstone.png
+		include file:		/magic.mse-game/card-symbols/menu_choice_images
+		image:				{ card_symbol_image(face: 1) }
 	############################# Image
 	image:
 		left: 28
@@ -288,57 +263,21 @@ card style:
 		z index: 2
 		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 alt_rarity() then alt_symbol()
-					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 alt_rarity() then alt_symbol()
-					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 if alt_rarity() then alt_symbol()
-					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 if alt_rarity() then alt_symbol()
-					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 if alt_rarity() then alt_symbol()
-					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 if alt_rarity() then alt_symbol()
-					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: {354-(-chop_top())}
 		width: 318
-		bottom: { 354+(if card.pt != "" then 119 else 128)-chop_bot() }
+		bottom: { 475-chop_bot() }
 		font:
-			name: MagicMedieval
+			name: MPlantin
+			italic name: MPlantin-Italic
 			size: 14
 			scale down to: 6
-			color: { rgba (0,0,0,0) }
+			color: white
 		symbol font:
-			name: magic-mana-null
+			name: magic-mana-small
 			size: 14
 		alignment:
 			script:
@@ -351,22 +290,22 @@ card style:
 				else "middle left"
 		z index: 2
 		padding left:   6
-		padding right:  5
-		line height hard: 1.2
-		line height line: 1.4
-		line height soft: .9
-		line height hard max: 1.1
+		padding right:  4
+		line height hard: {if is_modal(card.level_4_text) then 0.9 else 1.2 }
+		line height line: 1.5
+		line height soft: 0.9
+		line height hard max: {if is_modal(card.level_4_text) then 1.0 else 1.3 }
 		line height line max: 1.6
 	watermark:
-		left: 117
-		top: 321
-		width: 138
-		height: 166
+		left: 21
+		top: 354
+		width: 331
+		height: 120
 		z index: 1
 		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
@@ -376,64 +315,12 @@ card style:
 		height:	28
 		alignment: center middle shrink-overflow
 		font:
-			name: Vivaldi
+			name: Beleren Bold
 			size: 16
 			color: white
 			weight: bold
 			separator color: red
-	############################# Card sorting / numbering
-	set code:
-		left: 24
-		top: 500
-		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: 499
-		width: 200
-		height: 10
-		z index: 1
-		font:
-			name: Beleren Small Caps Bold
-			size: 7.5
-			color: white
-	copyright:
-		right: 349
-		top: 488
-		width: 140
-		height: 10
-		z index: 2
-		alignment: middle right shrink-overflow
-		visible: {not set.automatic_copyright}
-		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
@@ -446,13 +333,6 @@ extra card field:
 	choice: foil
 	save value: false
 	editable: false
-extra card field:
-	type: text
-	name: replacement text
-	editable: false
-	multi line: true
-	save value: false
-	script: replace(card.text, match: "—", replace: "-")
 extra card field:
 	type: text
 	name: replacement type
@@ -478,81 +358,16 @@ extra card field:
 	choice: pt back
 	editable: false
 	save value: 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: { if set.automatic_card_numbers then 24 else 19 }
-		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: 502
-		width: 12
-		height: 7
-		z index: 1
-		render style: image
-		image: artist_arrow.png
-	pt box:
-		left: 304
-		top: 450
-		width: 50
-		height:	42
-		z index: 1
-		visible: { card.pt == "moo" }
-		render style: image
-		image: { card_ptbox() }
 	foil layer:
 		left: 0
 		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" }
-	replacement text:
-		left: 28
-		top: {354-(-chop_top())}
-		width: 318
-		bottom: { 354+(if card.pt != "" then 119 else 128)-chop_bot() }
-		font:
-			name: MagicMedieval
-			size: 14
-			scale down to: 6
-			color: white
-		symbol font:
-			name: { styling.text_box_mana_symbols }
-			size: 14
-		alignment:
-			script:
-				if (styling.center_text == "short text only" and
-				   not contains(match:"\n", card.rule_text) and
-				   card.flavor_text == "<i-flavor></i-flavor>" and
-				   card_style.text.content_lines <= 2) or
-				   styling.center_text == "always"
-				then "middle center"
-				else "middle left"
-		z index: 2
-		padding left:   6
-		padding right:  5
-		line height hard: 1.2
-		line height line: 1.4
-		line height soft: .9
-		line height hard max: 1.1
-		line height line max: 1.6
 	replacement type:
 		left: { if has_identity() then "53" else "32" }
 		top: 327
@@ -574,16 +389,3 @@ extra card style:
 		render style: image
 		image: { if contains(styling.seal_stamps, match:"holofoil") then "foilstamp.png" else "stamp.png" }
 		visible: { not contains(styling.seal_stamps, match:"none") }
-	auto copyright:
-		right: 349
-		top: 488
-		width: 140
-		height: 10
-		z index: 2
-		visible: {set.automatic_copyright}
-		alignment: middle right shrink-overflow
-		font:
-			name: Matrix
-			size: 7
-			color: white
-			weight: bold