fix assorted stamping bugs

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

@@ -351,7 +351,7 @@ extra card style:
 		z index: 3
 		render style: image
 		image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
-		mask: { if is_rare() and styling.use_holofoil_stamps then "foil_mask_rare.png" else "foil_mask.png" }
+		mask: { if is_stamped() then "foil_mask_rare.png" else "foil_mask.png" }
 	pt box:
 		left: 273
 		top: 466

data/magic-m15-planeswalker-extra-purple.mse-style/style

@@ -694,15 +694,6 @@ extra card style:
 		render style: image
 		image: { card_stamp() }
 		mask: 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: foil_stamp.png
 	frame:
 		left:	0
 		top:	0

data/magic-m15-punk-show.mse-style/style

@@ -322,7 +322,7 @@ card style:
 		left: 28
 		top : {348-(-chop_top())}
 		width: 311
-		bottom: {483-chop_bot()-(if is_rare() and styling.use_holofoil_stamps then 3 else 0)}
+		bottom: {483-chop_bot()-(if is_stamped() then 3 else 0)}
 		font:
 			name: Tahoma
 			size: 14

data/magic-m15-ttk-frames.mse-style/build.bat

@@ -1,7 +0,0 @@
-cd ..
-
-cd ..
-
-mse --create-installer magic-m15.mse-style magic.mse-game magic-blends.mse-include magic-mana-small.mse-symbol-font magic-mana-large.mse-symbol-font magic-watermarks.mse-include magic-default-image.mse-include magic-identity-new.mse-include
-
-ren "magic-m15.mse-installer" "Magic - M15 Style.mse-installer"

data/magic-m15-ttk-frames.mse-style/style

@@ -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
@@ -40,8 +37,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: "" stamp: "" identity: "/magic-modues.mse-include/indicators/"]
-	template_suffix := [card: "card.jpg" pt: "pt.png", stamp: "stamp.jpg" 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-modues.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
@@ -99,10 +108,6 @@ styling field:
 	choice: On cards typed Conspiracy
 	choice: Always
 	choice: Never
-styling field:
-	type: boolean
-	name: use holofoil stamps
-	description: Change to no to disable rare holofoil stamps
 styling field:
 	type: text
 	name: alt rarity color
@@ -184,6 +189,13 @@ 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/corners/card_fields
+include file: /magic-modules.mse-include/information/card_fields
+include file: /magic-modules.mse-include/separators/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/rarities/card_fields
 card style:
 	############################# Background stuff
 	border color:
@@ -191,19 +203,18 @@ card style:
 		top : 0
 		width:	375
 		height:	523
-		radius: 18
 		left width:   17
 		right width:  17
 		top width:    17
 		bottom width: 18
-		z index: 4
+		z index: 400
 		mask: border_mask.png
 	card color:
 		left:	0
 		top:	0
 		width:	375
 		height:	523
-		z index: 0
+		z index: 100
 		render style: image
 		popup style: in place
 		image: { card_background() }
@@ -215,7 +226,7 @@ card style:
 		height: 23
 		alignment: bottom shrink-overflow
 		padding bottom: 0
-		z index: 1
+		z index: 900
 		font:
 			name: Beleren Bold
 			size: 16
@@ -234,24 +245,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: 29
-		height: 20
-		width: 14
-		z index: 1
-		render style: image
-		choice images:
-			tombstone: tombstone.png
 	############################# Image
 	image:
 		left: 29
 		top: 60
 		width: 316
 		height:	231
-		z index: 1
+		z index: 200
 		default: {default_image(card.card_color)}
 	############################# Card type
 	indicator:
@@ -259,7 +261,7 @@ card style:
 		top: 300
 		width: 17
 		height: 17
-		z index: 2
+		z index: 940
 		render style: image
 		visible: { has_identity() }
 		image: { module_identity() }
@@ -269,7 +271,7 @@ card style:
 		width: { (if has_identity() then "290" else "310") - max(22,card_style.rarity.content_width) }
 		height: 20
 		alignment: top shrink-overflow
-		z index: 1
+		z index: 900
 		padding top: 2
 		font:
 			name: Beleren Bold
@@ -281,47 +283,10 @@ card style:
 		top: 297
 		width: 44
 		height: 22
-		z index: 2
+		z index: 950
 		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 use_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 use_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 use_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 use_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 use_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 use_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: 29
@@ -346,7 +311,7 @@ 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
@@ -363,10 +328,11 @@ 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
+		z index: 910
 		left: 286
 		top: 469
 		width: 60
@@ -377,89 +343,19 @@ 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
 	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
 	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: scrolls
@@ -467,80 +363,30 @@ extra card field:
 	save value: false
 	editable: 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
 		width: 81
 		height:	42
-		z index: 1
+		z index: 840
 		visible: { card.pt != "" }
 		render style: image
 		image: { card_ptbox() }
-	stamp:
-		left: 165
-		top: 472
-		width: 46
-		height: 26
-		z index: 1
-		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: 1
-		visible: { is_rare() and styling.use_holofoil_stamps }
-		render style: image
-		image: foil_stamp.png
 	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
+		mask: { if is_stamped() then "foil_mask_rare.png" else "foil_mask.png" }
 	scrolls:
 		left: 0
 		top: 0
 		width: 375
 		height: 523
-		z index: 0
+		z index: 300
 		render style: image
 		image: consscrolls.png
 		visible: {is_cons()}

data/magic-m15-unstable-basics.mse-style/style

@@ -61,7 +61,7 @@ init script:
 	# Is the card a promo card?
 	is_promo := { styling.promo }
 
-	is_stamped := { styling.holofoil_stamps }
+	is_stamped := { styling.holofoil_stamps and card.card_stamp != "none" }
 	is_unsorted := {styling.remove_from_autocount}
 	
 ############################################################## Set info fields

data/magic-m15classic-walker.mse-style/style

@@ -221,7 +221,7 @@ card style:
 		width: 648
 		height:	877
 		z index: 1
-		mask: { "imagemask" + ( if has_four_abilities() then "_4abil" else "" ) + ( if is_rare() and styling.use_holofoil_stamps then "_rare" else "" ) + ".png" }
+		mask: { "imagemask" + ( if has_four_abilities() then "_4abil" else "" ) + ( if is_stamped() then "_rare" else "" ) + ".png" }
 	############################# Card type
 	indicator:
 		left: 62
@@ -455,7 +455,7 @@ extra card style:
 		width: 98
 		height: 53
 		z index: 6
-		visible: { is_rare() and styling.use_holofoil_stamps }
+		visible: { is_stamped() }
 		render style: image
 		image: { card_stamp() }
 		mask: stamp_mask.png
@@ -465,7 +465,7 @@ extra card style:
 		width: 92
 		height: 52
 		z index: 7
-		visible: { is_rare() and styling.use_holofoil_stamps }
+		visible: { is_stamped() }
 		render style: image
 		image: foil_stamp.png
 	foil layer:

data/magic-scifi.mse-style/style

@@ -104,7 +104,6 @@ init script:
 	
 	# Is the card a promo card?
 	is_promo := { styling.promo }
-	is_stamped := {styling.use_holofoil_stamps and (card.rarity ==  "rare" or card.rarity == "mythic rare")}
 	shrink_type := {if styling.shrink_typeline_text != "" then to_int(styling.shrink_typeline_text) else if length(remove_tags(card.type)) > 41 then 2 else if length(remove_tags(card.type)) > 38 then 1 else 0 }
 	shrink_name := {if styling.shrink_name_text != "" then to_int(styling.shrink_name_text) else 0 }
 	is_unsorted := {styling.remove_from_autocount}
@@ -470,7 +469,7 @@ card style:
 		height:	{if is_clear() or is_expanded_art() then 523 else if is_map() then 241 else if is_puma() then 265 else if is_full_art() then 423 else if is_mutate() then 334 else 232}
 		z index: 1
 		default: {default_image(card.card_color)}
-		mask: { if is_clear() then "image_mask.png" else if is_thbland() then "cornermask.png" else if is_puma() then "puma_mask.png" else if is_expanded_art() then expanded_mask() else if is_full_art() then "promo/image_mask" + (if is_rare() and styling.use_holofoil_stamps then "_rare") + ".png" else if is_mutate() then "mutate_mask.png" else ""}
+		mask: { if is_clear() then "image_mask.png" else if is_thbland() then "cornermask.png" else if is_puma() then "puma_mask.png" else if is_expanded_art() then expanded_mask() else if is_full_art() then "promo/image_mask" + (if is_stamped() then "_rare") + ".png" else if is_mutate() then "mutate_mask.png" else ""}
 	mainframe image:
 		left: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).0 else "0"}
 		top: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).1 else "0"}
@@ -1139,7 +1138,7 @@ extra card style:
 		width: 40
 		height: 23
 		z index: 3
-		visible: { is_rare() and styling.use_holofoil_stamps and not is_clear()  }
+		visible: { is_stamped() and not is_clear()  }
 		render style: image
 		image: foil_stamp.png
 	foil layer:
@@ -1150,7 +1149,7 @@ extra card style:
 		z index: 1050
 		render style: image
 		image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"}
-		mask: { "foil_mask" + (if card.pt != "" then "_pt") + (if is_rare() and styling.use_holofoil_stamps then "_rare") + ".png" }
+		mask: { "foil_mask" + (if card.pt != "" then "_pt") + (if is_stamped() then "_rare") + ".png" }
 	auto copyright:
 		right: 350
 		top: { if is_leveler() and not lone_pt() then 488 else if (starting_loyalty() and card.loyalty != "") or (card.pt != "" and not starting_loyalty()) then 500 else 488 }
@@ -1190,7 +1189,7 @@ extra card style:
 		height: 523
 		z index: 1
 		render style: image
-		image: { if is_rare() and styling.use_holofoil_stamps then "clear_rare.png" else "clear.png"}
+		image: { if is_stamped() then "clear_rare.png" else "clear.png"}
 		visible: { is_clear() }
 	map frame:
 		left: 0