3.0.0 (#6)

---------

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

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

@@ -6,7 +6,7 @@ icon: card-sample.png
 installer group: magic/m15 style/normal cards
 position hint: 018
 
-version: 2018-05-03
+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-small-spellbook.mse-symbol-font
 	version: 2018-05-07
@@ -46,8 +43,20 @@ 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: "/magic-identity-new.mse-include/"]
-	template_suffix := [card: "card.jpg" pt: "pt.png" identity: "identity.png"]
+	template_prefix := [
+		card: ""
+		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] + input + template_suffix[type] }
 	# Use land templates for previews because they show more contrast
@@ -71,82 +80,9 @@ init script:
 		else
 			sort_text@(order: "XYZI[0123456789]HSCA(WUBRG)")()
 	}
-	has_identity := { styling.color_indicator_dot }
+	watermark_include := "/magic-modules.mse-include/watermarks"
 	is_unsorted := {styling.remove_from_autocount}
 
-	top_of_textbox := {if styling.chop_top != "" then (335 - (-styling.chop_top)) else 335 }
-	bottom_of_textbox := {if styling.chop_bottom != "" then (460 - styling.chop_bottom) else 460 }
-	paragraph_count := filter_text@(match:"\n")
-	hard_paragraph_count := 
-		replace@(match:"<soft-line>\n", replace:"")+
-		filter_text@(match:"\n")
-	soft_break_filter :=
-		filter_text @(match:"<", in_context: "<match>soft-line>")
-	flavor_text := {remove_tags(card.flavor_text) + "\n"}
-	length_of_flavor := { to_int(length(split_text(match:"\n", flavor_text()).0)) }
-	hard_flavor_break := { if not contains(card.flavor_text, match:"\n") then 0 else if contains(card.flavor_text, match:"<soft-line>\n") then 0 else if lines_of_rules() >= 3 then -3 else -2}
-	char_per_line := { (if card_style.text.content_lines == "9" then 60 else if card_style.text.content_lines == "8" then 52 else if card_style.text.content_lines == "7" then 49 else if card_style.text.content_lines == "6" then 46 else 42.5) + (if card_style.text.content_lines < 7 then (4*chop_correction())/line_height())}
-	chop_correction := { (if styling.chop_bottom != "" then styling.chop_bottom else 0) }
-	lines_of_flavor := { to_int((length_of_flavor() / char_per_line()) + 0.99) + (if length(split_text(match:"\n", flavor_text()).1) >= max(43,char_per_line()-4) then 2 else if split_text(match:"\n", flavor_text()).1 != "" then length(soft_break_filter(card.flavor_text)) else 0) + length(filter_text(styling.flavor_bar_offset, match:"u")) - length(filter_text(styling.flavor_bar_offset, match:"d")) + (if contains(card.notes, match:"!fbu") then 1 else 0)}
-	lines_of_rules := { card_style.text.content_lines - lines_of_flavor() }
-	line_height := {(card_style.text.content_height / card_style.text.content_lines)}
-	height_of_flavor := { lines_of_flavor() * line_height() }
-	padding_height := { 0.5*(bottom_of_textbox() - top_of_textbox() - card_style.text.content_height) }
-	linebreak_height := { 2*length(hard_paragraph_count(card.rule_text)) }
-	uneven_correction := { if lines_of_flavor() == 1 then max(4, (card_style.text.content_lines - (2*lines_of_flavor()))) else (card_style.text.content_lines - (2*lines_of_flavor())) }
-	bar_offset := {if styling_offset() == "-" then 0 else if styling_offset() != "" then -styling_offset() else 0}
-	styling_offset := { replace(styling.flavor_bar_offset, match:"(u|d)+", replace: "") }
-	bar_equation := { top_of_textbox() + padding_height() + card_style.text.content_height - height_of_flavor() + linebreak_height() - uneven_correction() + correction_coeff() + bar_offset()  + hard_flavor_break() +1 }
-	correction_coeff := {
-		(if lines_of_rules() == 1 then
-			(if lines_of_flavor() == 1 then 3
-			else if lines_of_flavor() == 2 then 1
-			else if lines_of_flavor() == 3 then 1.5
-			else if lines_of_flavor() == 4 then 0
-			else 5 - lines_of_flavor())
-		else if lines_of_rules() == 2 and linebreak_height() == 2 then
-			(if lines_of_flavor() == 1 then 1
-			else if lines_of_flavor() == 2 then 1
-			else if lines_of_flavor() == 3 then 2
-			else if lines_of_flavor() == 4 then 2
-			else 3)
-		else if lines_of_rules() == 2 then
-			(if lines_of_flavor() == 1 then 1
-			else if lines_of_flavor() == 2 then 0
-			else if lines_of_flavor() == 3 then 0
-			else if lines_of_flavor() == 4 then 0
-			else -1)
-		else if lines_of_rules() == 3 and linebreak_height() == 2 then
-			(if lines_of_flavor() == 1 then 0
-			else if lines_of_flavor() == 2 then 0
-			else if lines_of_flavor() == 3 then 1
-			else if lines_of_flavor() == 4 then 1
-			else 2)
-		else if lines_of_rules() == 3 then
-			(if lines_of_flavor() == 1 then 0
-			else if lines_of_flavor() == 2 then -1
-			else if lines_of_flavor() == 3 then -0.5
-			else if lines_of_flavor() == 4 then -1
-			else 0)
-		else if lines_of_rules() == 4 and linebreak_height() == 2 then
-			(-2 + lines_of_flavor())
-		else if lines_of_rules() == 4 then
-			(if lines_of_flavor() == 1 then -1
-			else if lines_of_flavor() == 2 then 0
-			else if lines_of_flavor() == 3 then -0.5
-			else -1)
-		else if lines_of_rules() == 5 and linebreak_height() == 4 then
-			(-5 + lines_of_flavor())
-		else if lines_of_rules() == 5 and linebreak_height() == 2 then
-			(-2 + lines_of_flavor())
-		else if lines_of_rules() == 5 then
-			(2 - lines_of_flavor())
-		else if lines_of_rules() == 6 and linebreak_height() == 2 then
-			(-1 - lines_of_flavor())
-		else if lines_of_rules() == 6 then
-			(2 - lines_of_flavor())
-		else 0) + (if linebreak_height() >= 4 then 0.5*linebreak_height()-1)
-	}
 ############################################################## Set info fields
 set info style:
 	symbol:
@@ -165,14 +101,6 @@ styling field:
 	type: text
 	name: chop bottom
 	description: Shrinks the textbox from the bottom.
-styling field:
-	type: text
-	name: flavor bar offset
-	description: Moves the flavor bar.
-styling field:
-	type: boolean
-	name: use flavor bar
-	description: Enables the flavor bar.
 styling field:
 	type: boolean
 	name: black on black
@@ -269,6 +197,10 @@ 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/card-symbols/card_fields
+include file: /magic-modules.mse-include/separators/card_fields
 card style:
 	############################# Background stuff
 	border color:
@@ -321,15 +253,6 @@ card style:
 		always symbol: true
 		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
-		render style: image
-		choice images:
-			tombstone: tombstone.png
 	############################# Image
 	image:
 		left: 29
@@ -347,7 +270,7 @@ card style:
 		z index: 2
 		render style: image
 		visible: { has_identity() }
-		image: { card_identity() }
+		image: { module_identity() }
 	type:
 		left: { if has_identity() then "52" else "32" }
 		top: 296
@@ -369,27 +292,13 @@ 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: 29
-		top: { top_of_textbox() }
+		top: {if styling.chop_top != "" then (335 - (-styling.chop_top)) else 335 }
 		width: 314
-		bottom: { bottom_of_textbox() }
+		bottom: {if styling.chop_bottom != "" then (460 - styling.chop_bottom) else 460 }
 		font:
 			name: MPlantin
 			italic name: MPlantin-Italic
@@ -408,13 +317,13 @@ card style:
 				   styling.center_text == "always"
 				then "middle center"
 				else "middle left"
-		z index: 2
+		z index: 900
 		padding left:   6
 		padding right:  4
-		line height hard: 1.2
+		line height hard: {if is_modal(card.rule_text) then 0.9 else 1.2 }
 		line height line: 1.5
 		line height soft: 0.9
-		line height hard max: 1.3
+		line height hard max: {if is_modal(card.rule_text) then 1.0 else 1.3 }
 		line height line max: 1.6
 	watermark:
 		left: 117
@@ -425,7 +334,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_image_1() }
 	############################# PT
 	pt:
 		z index: 2
@@ -439,58 +349,7 @@ card style:
 			size: 16
 			color: black
 			separator color: red
-	############################# Card sorting / numbering
-	set code:
-		left: 24
-		top: 498
-		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: 497.5
-		width: 200
-		height: 10
-		z index: 1
-		font:
-			name: Beleren Small Caps Bold
-			size: 7.25
-			color: white
-	copyright:
-		right: 350
-		top: { if card.pt != "" then 500 else 488 }
-		width: 140
-		height: 10
-		z index: 2
-		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
@@ -503,40 +362,7 @@ extra card field:
 	choice: foil
 	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 field:
-	type: choice
-	name: flavor bar
-	choice: bar
-	editable: false
-	save value: false
-	show statistics: false
 extra card style:
-	card code:
-		left: 24
-		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: 500
-		width: 12
-		height: 7
-		z index: 1
-		render style: image
-		image: artist_arrow.png
 	pt box:
 		left: 273
 		top: 466
@@ -545,35 +371,13 @@ extra card style:
 		z index: 1
 		visible: { card.pt != "" }
 		render style: image
-		image: { card_ptbox() }
+		image: { module_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" }
-	auto copyright:
-		right: 350
-		top: { if card.pt != "" then 500 else 488 }
-		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
-	flavor bar:
-		left: 0
-		top: { bar_equation() }
-		width: 375
-		height: 1
-		z index: 1
-		render style: image
-		image: bar.png
-		visible: { styling.use_flavor_bar and card.rule_text != "" and remove_tags(card.flavor_text) != "" }
+		mask: { "foil_mask.png" }