Added new kind of multicolor gradient to old styles. (a la artfreakwiu)

Added option to old style to use all common rarity symbols (like before Exodus).
Cleaned up fix for horizontal hybrid textboxes and typelines.
Automatic paintbrushes for magic-textless, magic-new-token, futureshifts, and all FPM styles.
Removed paintbrush font and all associated scripts.
Newly failed attempt at making different colored colorless symbols in magic-mana-future work.
Non-mana costs work for Suspend and Forecast.
Guild mana for magic-mana-future.
Fixed problem relating to name alignment in magic-new-token.
Updated image mask and artifact masks for magic-futureshift.
Started alterations to font colors in magic-futureshift.

data/magic-blends.mse-include/new-blends

@@ -43,6 +43,102 @@ vertical_card_hybrid := {
 	card_hybrid.horizontal[color_count]()
 }
 
+horizontal_card_hybrid := [
+	1: { template(colors[0]) }
+	2: card_hybrid_2
+	3: {linear_blend(
+		image1: template(colors[0])
+		x1: 0.22,  y1: 0
+		x2: 0.4,   y2: 0
+		image2: linear_blend(
+		  image1: template(colors[1])
+		  x1: 0.6,   y1: 0
+		  x2: 0.78,  y2: 0
+		  image2: template(colors[2])
+	   ))}
+	4: {linear_blend(
+		# blend = 0.16
+		image1: template(colors[0])
+		x1: 0.15,  y1: 0
+		x2: 0.31,  y2: 0
+		image2: linear_blend(
+		  image1: template(colors[1])
+		  x1: 0.42,  y1: 0
+		  x2: 0.58,  y2: 0
+		  image2: linear_blend(
+		    image1: template(colors[2])
+		    x1: 0.69, y1: 0
+		    x2: 0.85, y2: 0
+		    image2: template(colors[3])
+	   )))}
+	5: {linear_blend(
+		image1: template(colors[0])
+		x1: 2.0 / 15,  y1: 0
+		x2: 4.0 / 15,  y2: 0
+		image2: linear_blend(
+		  image1: template(colors[1])
+		  x1: 5.0 / 15,  y1: 0
+		  x2: 7.0 / 15,  y2: 0
+		  image2: linear_blend(
+		    image1: template(colors[2])
+		    x1:  8.0 / 15,  y1: 0
+		    x2: 10.0 / 15,  y2: 0
+		    image2: linear_blend(
+		      image1: template(colors[3])
+		      x1: 11.0 / 15,  y1: 0
+		      x2: 13.0 / 15,  y2: 0
+		      image2: template(colors[4])
+	   ))))}
+	6: {linear_blend(
+		image1: template(colors[0])
+		x1: 1.5 / 15,  y1: 0
+		x2: 3.1 / 15,  y2: 0
+		image2: linear_blend(
+		  image1: template(colors[1])
+		  x1: 4.1 / 15,  y1: 0
+		  x2: 5.7 / 15,  y2: 0
+		  image2: linear_blend(
+		    image1: template(colors[2])
+		    x1: 6.7 / 15,  y1: 0
+		    x2: 8.3 / 15,  y2: 0
+		    image2: linear_blend(
+		      image1: template(colors[3])
+		      x1: 9.3 / 15,  y1: 0
+		      x2: 10.9 / 15,  y2: 0
+		      image2: linear_blend(
+		        image1: template(colors[4])
+		        x1: 11.9 / 15, y1: 0
+		        x2: 13.5 / 15, y2: 0
+		        image2: template(colors[5])
+	   )))))}
+	7: {linear_blend(
+		image1: template(colors[0])
+		x1: 1.3 / 15,  y1: 0
+		x2: 2.7 / 15,  y2: 0
+		image2: linear_blend(
+		  image1: template(colors[1])
+		  x1: 3.5 / 15,  y1: 0
+		  x2: 4.9 / 15,  y2: 0
+		  image2: linear_blend(
+		    image1: template(colors[2])
+		    x1: 5.7 / 15,  y1: 0
+		    x2: 7.1 / 15,  y2: 0
+		    image2: linear_blend(
+		      image1: template(colors[3])
+		      x1: 7.9 / 15,  y1: 0
+		      x2: 9.3 / 15,  y2: 0
+		      image2: linear_blend(
+		        image1: template(colors[4])
+		        x1: 10.1 / 15, y1: 0
+		        x2: 11.5 / 15, y2: 0
+		        image2: linear_blend(
+		          image1: template(colors[5])
+		          x1: 12.3 / 15, y1: 0
+		          x2: 13.7 / 15, y2: 0
+		          image2: template(colors[6])
+	   ))))))}
+]
+
 card_hybrid := [
 	radial: [
 		0: { template("c") }
@@ -99,101 +195,7 @@ card_hybrid := [
 			x2: 0,  y2: 1.300
 		   )}
 	]
-	horizontal: [
-		1: { template(colors[0]) }
-		2: card_hybrid_2
-		3: {linear_blend(
-			image1: template(colors[0])
-			x1: 0.22,  y1: 0
-			x2: 0.4,   y2: 0
-			image2: linear_blend(
-			  image1: template(colors[1])
-			  x1: 0.6,   y1: 0
-			  x2: 0.78,  y2: 0
-			  image2: template(colors[2])
-		   ))}
-		4: {linear_blend(
-			# blend = 0.16
-			image1: template(colors[0])
-			x1: 0.15,  y1: 0
-			x2: 0.31,  y2: 0
-			image2: linear_blend(
-			  image1: template(colors[1])
-			  x1: 0.42,  y1: 0
-			  x2: 0.58,  y2: 0
-			  image2: linear_blend(
-			    image1: template(colors[2])
-			    x1: 0.69, y1: 0
-			    x2: 0.85, y2: 0
-			    image2: template(colors[3])
-		   )))}
-		5: {linear_blend(
-			image1: template(colors[0])
-			x1: 2.0 / 15,  y1: 0
-			x2: 4.0 / 15,  y2: 0
-			image2: linear_blend(
-			  image1: template(colors[1])
-			  x1: 5.0 / 15,  y1: 0
-			  x2: 7.0 / 15,  y2: 0
-			  image2: linear_blend(
-			    image1: template(colors[2])
-			    x1:  8.0 / 15,  y1: 0
-			    x2: 10.0 / 15,  y2: 0
-			    image2: linear_blend(
-			      image1: template(colors[3])
-			      x1: 11.0 / 15,  y1: 0
-			      x2: 13.0 / 15,  y2: 0
-			      image2: template(colors[4])
-		   ))))}
-		6: {linear_blend(
-			image1: template(colors[0])
-			x1: 1.5 / 15,  y1: 0
-			x2: 3.1 / 15,  y2: 0
-			image2: linear_blend(
-			  image1: template(colors[1])
-			  x1: 4.1 / 15,  y1: 0
-			  x2: 5.7 / 15,  y2: 0
-			  image2: linear_blend(
-			    image1: template(colors[2])
-			    x1: 6.7 / 15,  y1: 0
-			    x2: 8.3 / 15,  y2: 0
-			    image2: linear_blend(
-			      image1: template(colors[3])
-			      x1: 9.3 / 15,  y1: 0
-			      x2: 10.9 / 15,  y2: 0
-			      image2: linear_blend(
-			        image1: template(colors[4])
-			        x1: 11.9 / 15, y1: 0
-			        x2: 13.5 / 15, y2: 0
-			        image2: template(colors[5])
-		   )))))}
-		7: {linear_blend(
-			image1: template(colors[0])
-			x1: 1.3 / 15,  y1: 0
-			x2: 2.7 / 15,  y2: 0
-			image2: linear_blend(
-			  image1: template(colors[1])
-			  x1: 3.5 / 15,  y1: 0
-			  x2: 4.9 / 15,  y2: 0
-			  image2: linear_blend(
-			    image1: template(colors[2])
-			    x1: 5.7 / 15,  y1: 0
-			    x2: 7.1 / 15,  y2: 0
-			    image2: linear_blend(
-			      image1: template(colors[3])
-			      x1: 7.9 / 15,  y1: 0
-			      x2: 9.3 / 15,  y2: 0
-			      image2: linear_blend(
-			        image1: template(colors[4])
-			        x1: 10.1 / 15, y1: 0
-			        x2: 11.5 / 15, y2: 0
-			        image2: linear_blend(
-			          image1: template(colors[5])
-			          x1: 12.3 / 15, y1: 0
-			          x2: 13.7 / 15, y2: 0
-			          image2: template(colors[6])
-		   ))))))}
-	]
+	horizontal: horizontal_card_hybrid
 	vertical: [
 		1: { template(colors[0]) }
 		2: { linear_blend(
@@ -401,101 +403,7 @@ textbox_hybrid := [
 		6: { card_hybrid_2(colors: colors[4] + colors[3]) }
 		7: { template(colors[4]) }
 	]
-	horizontal: [#same as horizontal from card_hybrid, but referencing script through "card_hybrid.horizontal" wasn't working
-		1: { template(colors[0]) }
-		2: card_hybrid_2
-		3: {linear_blend(
-			image1: template(colors[0])
-			x1: 0.22,  y1: 0
-			x2: 0.4,   y2: 0
-			image2: linear_blend(
-			  image1: template(colors[1])
-			  x1: 0.6,   y1: 0
-			  x2: 0.78,  y2: 0
-			  image2: template(colors[2])
-		   ))}
-		4: {linear_blend(
-			# blend = 0.16
-			image1: template(colors[0])
-			x1: 0.15,  y1: 0
-			x2: 0.31,  y2: 0
-			image2: linear_blend(
-			  image1: template(colors[1])
-			  x1: 0.42,  y1: 0
-			  x2: 0.58,  y2: 0
-			  image2: linear_blend(
-			    image1: template(colors[2])
-			    x1: 0.69, y1: 0
-			    x2: 0.85, y2: 0
-			    image2: template(colors[3])
-		   )))}
-		5: {linear_blend(
-			image1: template(colors[0])
-			x1: 2.0 / 15,  y1: 0
-			x2: 4.0 / 15,  y2: 0
-			image2: linear_blend(
-			  image1: template(colors[1])
-			  x1: 5.0 / 15,  y1: 0
-			  x2: 7.0 / 15,  y2: 0
-			  image2: linear_blend(
-			    image1: template(colors[2])
-			    x1:  8.0 / 15,  y1: 0
-			    x2: 10.0 / 15,  y2: 0
-			    image2: linear_blend(
-			      image1: template(colors[3])
-			      x1: 11.0 / 15,  y1: 0
-			      x2: 13.0 / 15,  y2: 0
-			      image2: template(colors[4])
-		   ))))}
-		6: {linear_blend(
-			image1: template(colors[0])
-			x1: 1.5 / 15,  y1: 0
-			x2: 3.1 / 15,  y2: 0
-			image2: linear_blend(
-			  image1: template(colors[1])
-			  x1: 4.1 / 15,  y1: 0
-			  x2: 5.7 / 15,  y2: 0
-			  image2: linear_blend(
-			    image1: template(colors[2])
-			    x1: 6.7 / 15,  y1: 0
-			    x2: 8.3 / 15,  y2: 0
-			    image2: linear_blend(
-			      image1: template(colors[3])
-			      x1: 9.3 / 15,  y1: 0
-			      x2: 10.9 / 15,  y2: 0
-			      image2: linear_blend(
-			        image1: template(colors[4])
-			        x1: 11.9 / 15, y1: 0
-			        x2: 13.5 / 15, y2: 0
-			        image2: template(colors[5])
-		   )))))}
-		7: {linear_blend(
-			image1: template(colors[0])
-			x1: 1.3 / 15,  y1: 0
-			x2: 2.7 / 15,  y2: 0
-			image2: linear_blend(
-			  image1: template(colors[1])
-			  x1: 3.5 / 15,  y1: 0
-			  x2: 4.9 / 15,  y2: 0
-			  image2: linear_blend(
-			    image1: template(colors[2])
-			    x1: 5.7 / 15,  y1: 0
-			    x2: 7.1 / 15,  y2: 0
-			    image2: linear_blend(
-			      image1: template(colors[3])
-			      x1: 7.9 / 15,  y1: 0
-			      x2: 9.3 / 15,  y2: 0
-			      image2: linear_blend(
-			        image1: template(colors[4])
-			        x1: 10.1 / 15, y1: 0
-			        x2: 11.5 / 15, y2: 0
-			        image2: linear_blend(
-			          image1: template(colors[5])
-			          x1: 12.3 / 15, y1: 0
-			          x2: 13.7 / 15, y2: 0
-			          image2: template(colors[6])
-		   ))))))}
-	]
+	horizontal: horizontal_card_hybrid
 	vertical:  [
 		0: { template("c")       }
 		1: { template(colors[0]) }

data/magic-firepenguinmaster-flip.mse-style/style

@@ -31,7 +31,8 @@ init script:
 	# Only white cards use a black font
 	# TODO: also for some overlays involving white
 	font_colors_white := { input != "w" }
-
+	
+	paintbrush_color := { if font_white() then "white" else "black" }
 
 ############################################################## Extra style
 styling field:
@@ -394,19 +395,16 @@ card style:
 
 	############################# Copyright stuff
 	illustrator:
-		left: 200
+		right: 350
 		top : 340
-		width: 150
+		width: { max(20, card_style.illustrator.content_width) + 5 }
 		height: 16
 		z index: 1
-		alignment: bottom right
+		alignment: middle right
 		font:
 			name: MPlantin-Italic
 			size: 8
 			color: { font_color(card.card_color) }
-		symbol font:
-			name: magic-paintbrush
-			size: 14
 	copyright line:
 		left: 65
 		top : 493
@@ -431,6 +429,13 @@ extra card field:
 	name: pt symbols 2
 	script: "shieldsword"
 	editable: false
+extra card field:
+	type: choice
+	name: paintbrush
+	script: paintbrush_color(card.card_color)
+	editable: false
+	choice: black
+	choice: white
 
 extra card style:
 	pt symbols:
@@ -454,3 +459,13 @@ extra card style:
 		angle: 180
 		choice images:
 			shieldsword: ptshieldsword.png
+	paintbrush:
+		right: { 350 - card_style.illustrator.content_width }
+		top : 341
+		width: 40
+		height: 15
+		z index: 1
+		render style: image
+		choice images:
+			black: paintbrush.png
+			white: paintbrush_w.png

data/magic-firepenguinmaster.mse-style/style

@@ -37,7 +37,8 @@ init script:
 	# Only white cards use a black font
 	# TODO: also for some overlays involving white
 	font_colors_white := { input != "w" }
-
+	
+	paintbrush_color := { if font_white() then "white" else "black" }
 
 ############################################################## Extra style options
 
@@ -288,19 +289,16 @@ card style:
 	############################# Copyright stuff
 
 	illustrator:
-		left: 200
+		right: 350
 		top : 293
-		width: 150
+		width: { max(20, card_style.illustrator.content_width) + 5 }
 		height: 16
 		z index: 1
-		alignment: bottom right
+		alignment: middle right
 		font:
 			name: MPlantin-Italic
 			size: 8
 			color: { font_color(card.card_color) }
-		symbol font:
-			name: magic-paintbrush
-			size: 14
 
 	copyright line:
 		left: 65
@@ -321,6 +319,13 @@ extra card field:
 	name: pt symbols
 	script: "shieldsword"
 	editable: false
+extra card field:
+	type: choice
+	name: paintbrush
+	script: paintbrush_color(card.card_color)
+	editable: false
+	choice: black
+	choice: white
 
 extra card style:
 	pt symbols:
@@ -333,3 +338,13 @@ extra card style:
 		render style: image
 		choice images:
 			shieldsword: ptshieldsword.png
+	paintbrush:
+		right: { 350 - card_style.illustrator.content_width }
+		top : 294
+		width: 40
+		height: 15
+		z index: 1
+		render style: image
+		choice images:
+			black: paintbrush.png
+			white: paintbrush_w.png

data/magic-firepenguinmasterpromo.mse-style/style

@@ -30,7 +30,6 @@ init script:
 	
 	# Use guild mana symbols?
 	guild_mana := { styling.use_guild_mana_symbols }
-
 	
 ############################################################## Extra style
 styling field:
@@ -277,12 +276,12 @@ card style:
 	############################# Copyright stuff
 
 	illustrator:
-		left: 200
+		right: 350
 		top : 293
-		width: 150
+		width: { max(20, card_style.illustrator.content_width) + 5 }
 		height: 16
 		z index: 1
-		alignment: bottom right
+		alignment: middle right
 		font:
 			name: MPlantin-Italic
 			size: 8
@@ -317,6 +316,17 @@ extra card field:
 	name: pt symbols
 	script: "shieldsword"
 	editable: false
+extra card field:
+	type: choice
+	name: black paintbrush
+	editable: false
+	choice: black
+extra card field:
+	type: choice
+	name: white paintbrush
+	editable: false
+	choice: white
+
 extra card style:
 	pt symbols:
 		left:	25
@@ -328,3 +338,23 @@ extra card style:
 		render style: image
 		choice images:
 			shieldsword: ptshieldsword.png
+	black paintbrush:
+		right: { 350 - card_style.illustrator.content_width }
+		top : 294
+		width: 40
+		height: 15
+		z index: 1
+		render style: image
+		visible: { styling.font_color == "black" }
+		choice images:
+			black: paintbrush.png
+	white paintbrush:
+		right: { 350 - card_style.illustrator.content_width }
+		top : 294
+		width: 40
+		height: 15
+		z index: 1
+		render style: image
+		visible: { styling.font_color == "white" }
+		choice images:
+			white: paintbrush_w.png

data/magic-firepenguinmastersplit.mse-style/style

@@ -40,6 +40,8 @@ init script:
 	# Only white cards use a black font
 	# TODO: also for some overlays involving white
 	font_colors_white := { input != "w" }
+	
+	paintbrush_color := { if font_white() then "white" else "black" }
 
 ############################################################## Extra style
 styling field:
@@ -435,33 +437,27 @@ card style:
 		
 	############################# Copyright stuff
 	illustrator:
-		left: 142.52
+		right: 246.41
 		top : 208
-		width: 103.89
+		width: { max(20, card_style.illustrator.content_width) + 5 }
 		height: 11.08
 		z index: 1
-		alignment: bottom right
+		alignment: middle right
 		font:
 			name: MPlantin-Italic
 			size: 5.54
 			color: { font_color(card.card_color) }
-		symbol font:
-			name: magic-paintbrush
-			size: 9.7
 	illustrator 2:
-		left: 396.01
+		right: 499.9
 		top : 208
-		width: 103.89
+		width: { max(20, card_style.illustrator.content_width) + 5 }
 		height: 11.08
 		z index: 1
-		alignment: bottom right
+		alignment: middle right
 		font:
 			name: MPlantin-Italic
 			size: 5.54
 			color: { font_color(card.card_color_2) }
-		symbol font:
-			name: magic-paintbrush
-			size: 9.7
 	copyright line:
 		left: 45.02
 		top : 348
@@ -497,6 +493,20 @@ extra card field:
 	name: pt symbols 2
 	script: "shieldsword"
 	editable: false
+extra card field:
+	type: choice
+	name: paintbrush
+	script: paintbrush_color(card.card_color)
+	editable: false
+	choice: black
+	choice: white
+extra card field:
+	type: choice
+	name: paintbrush 2
+	script: paintbrush_color(card.card_color_2)
+	editable: false
+	choice: black
+	choice: white
 
 extra card style:
 	pt symbols:
@@ -519,3 +529,23 @@ extra card style:
 		render style: image
 		choice images:
 			shieldsword: ptshieldsword.png
+	paintbrush:
+		right: { 246.41 - card_style.illustrator.content_width }
+		top : 209
+		width: 30
+		height: 10
+		z index: 1
+		render style: image
+		choice images:
+			black: paintbrush.png
+			white: paintbrush_w.png
+	paintbrush 2:
+		right: { 499.9 - card_style.illustrator_2.content_width }
+		top : 209
+		width: 30
+		height: 10
+		z index: 1
+		render style: image
+		choice images:
+			black: paintbrush.png
+			white: paintbrush_w.png

data/magic-firepenguinmastertokens.mse-style/style

@@ -36,6 +36,8 @@ init script:
 	# TODO: also for some overlays involving white
 	font_colors_white := { input != "w" }
 	
+	paintbrush_color := { if font_white() then "white" else "black" }
+
 ############################################################## Extra style
 styling field:
 	type: choice
@@ -286,19 +288,16 @@ card style:
 	############################# Copyright stuff
 
 	illustrator:
-		left: 200
+		right: 350
 		top : 460
-		width: 150
+		width: { max(20, card_style.illustrator.content_width) + 5 }
 		height: 16
 		z index: 3
-		alignment: bottom right
+		alignment: middle right
 		font:
 			name: MPlantin-Italic
 			size: 8
 			color: { font_color(card.card_color) }
-		symbol font:
-			name: magic-paintbrush
-			size: 14
 
 	copyright line:
 		left: 65
@@ -334,6 +333,13 @@ extra card field:
 	show statistics: false
 	editable: false
 	save value: false
+extra card field:
+	type: choice
+	name: paintbrush
+	script: paintbrush_color(card.card_color)
+	editable: false
+	choice: black
+	choice: white
 
 extra card style:
 	pt symbols:
@@ -368,3 +374,13 @@ extra card style:
 		visible: { card.type != "" or card.illustrator != "" or card.copyright != "" }
 		image: { card_typeline() }
 		z index: 2
+	paintbrush:
+		right: { 350 - card_style.illustrator.content_width }
+		top : 461
+		width: 40
+		height: 15
+		z index: 3
+		render style: image
+		choice images:
+			black: paintbrush.png
+			white: paintbrush_w.png

data/magic-future-textless.mse-style/style

@@ -65,7 +65,38 @@ init script:
 		else                                            "new"
 	}
 	
+	colorless_color := {
+		if contains(card.card_color, match: "white")
+		   and not contains(card.card_color, match: "hybrid")
+		   and not contains(card.card_color, match: "multicolor")
+		   and not contains(card.card_color, match: "artifact")
+		   and not contains(card.card_color, match: "land") then "w"
+		else if contains(card.card_color, match: "blue")
+		   and not contains(card.card_color, match: "hybrid")
+		   and not contains(card.card_color, match: "multicolor")
+		   and not contains(card.card_color, match: "artifact")
+		   and not contains(card.card_color, match: "land") then "u"
+		else if contains(card.card_color, match: "black")
+		   and not contains(card.card_color, match: "hybrid")
+		   and not contains(card.card_color, match: "multicolor")
+		   and not contains(card.card_color, match: "artifact")
+		   and not contains(card.card_color, match: "land") then "b"
+		else if contains(card.card_color, match: "red")
+		   and not contains(card.card_color, match: "hybrid")
+		   and not contains(card.card_color, match: "multicolor")
+		   and not contains(card.card_color, match: "artifact")
+		   and not contains(card.card_color, match: "land") then "r"
+		else if contains(card.card_color, match: "green")
+		   and not contains(card.card_color, match: "hybrid")
+		   and not contains(card.card_color, match: "multicolor")
+		   and not contains(card.card_color, match: "artifact")
+		   and not contains(card.card_color, match: "land") then "g"
+		else "c"
+	}
+	
 	font_colors_white := { input != "w" and input != "c" and input != "a" and input != "l" and input != "m" }
+	
+	paintbrush_color := { if font_white() then "white" else "black" }
 
 ############################################################## Extra style options
 
@@ -262,19 +293,16 @@ card style:
 	############################# Copyright stuff
 
 	illustrator:
-		left: 131
+		right: { if card.pt != "" then 281 else 341 }
 		top : 478
-		width: { if card.pt != "" then 150 else 210 }
+		width: { max(150, card_style.illustrator.content_width) + 5 }
 		height: 16
 		z index: 2
-		alignment: bottom right
+		alignment: middle right
 		font:
 			name: MPlantin
 			size: 8
 			color: { font_color(card.card_color) }
-		symbol font:
-			name: magic-paintbrush
-			size: 14
 
 	copyright line:
 		left: 22
@@ -294,6 +322,13 @@ extra card field:
 	name: pt box
 	script: card.card_color
 	editable: false
+extra card field:
+	type: choice
+	name: paintbrush
+	script: paintbrush_color(card.card_color)
+	editable: false
+	choice: black
+	choice: white
 
 extra card style:
 	pt box:
@@ -306,3 +341,13 @@ extra card style:
 		render style: image
 		image: { card_ptbox() }
 		mask: mask_pt.png
+	paintbrush:
+		right: { ( if card.pt != "" then 281 else 341 ) - card_style.illustrator.content_width }
+		top : 479
+		width: 40
+		height: 15
+		z index: 2
+		render style: image
+		choice images:
+			black: paintbrush.png
+			white: paintbrush_w.png

data/magic-futureshift.mse-style/style

@@ -14,9 +14,6 @@ card dpi: 150
 #Todo:
 #Colorless Frame
 #Make different colored colorless mana symbols work
-#white font color blue land, red land, black land, and green land
-#style choice to override font color?
-#mana gears on colored artifacts need more color.
 ############################################################## Extra scripts
 
 init script:
@@ -66,7 +63,70 @@ init script:
 	# Use guild mana symbols?
 	guild_mana := { styling.use_guild_mana_symbols }
 	
-	font_colors_white := { input != "w" and input != "c" and input != "a" and input != "l" and input != "m" }
+	colorless_color := {
+		if contains(card.card_color, match: "white")
+		   and not contains(card.card_color, match: "hybrid")
+		   and not contains(card.card_color, match: "multicolor")
+		   and not contains(card.card_color, match: "artifact")
+		   and not contains(card.card_color, match: "land") then "w"
+		else if contains(card.card_color, match: "blue")
+		   and not contains(card.card_color, match: "hybrid")
+		   and not contains(card.card_color, match: "multicolor")
+		   and not contains(card.card_color, match: "artifact")
+		   and not contains(card.card_color, match: "land") then "u"
+		else if contains(card.card_color, match: "black")
+		   and not contains(card.card_color, match: "hybrid")
+		   and not contains(card.card_color, match: "multicolor")
+		   and not contains(card.card_color, match: "artifact")
+		   and not contains(card.card_color, match: "land") then "b"
+		else if contains(card.card_color, match: "red")
+		   and not contains(card.card_color, match: "hybrid")
+		   and not contains(card.card_color, match: "multicolor")
+		   and not contains(card.card_color, match: "artifact")
+		   and not contains(card.card_color, match: "land") then "r"
+		else if contains(card.card_color, match: "green")
+		   and not contains(card.card_color, match: "hybrid")
+		   and not contains(card.card_color, match: "multicolor")
+		   and not contains(card.card_color, match: "artifact")
+		   and not contains(card.card_color, match: "land") then "g"
+		else "c"
+	}
+	
+	font_colors_white := { input == "b" or input == "bl" or input == "u" or input == "ul" or input == "r" or input == "rl" or input == "g" or input == "gl" }
+	
+	font_white := {
+		hybrid   := chosen(choice:"hybrid")
+		artifact := chosen(choice:"artifact")
+		colors := sort_text( order: "(wubrg)"
+			           , (if chosen(choice:"white") then "w")
+			           + (if chosen(choice:"blue")  then "u")
+			           + (if chosen(choice:"black") then "b")
+			           + (if chosen(choice:"red")   then "r")
+			           + (if chosen(choice:"green") then "g"))
+			           + (if artifact               then "a")
+		font_colors_white(
+			if chosen(choice:"land") and chosen(choice:"white") then "wl"
+			else if chosen(choice:"land") and chosen(choice:"blue") then "ul"
+			else if chosen(choice:"land") and chosen(choice:"black") then "bl"
+			else if chosen(choice:"land") and chosen(choice:"red") then "rl"
+			else if chosen(choice:"land") and chosen(choice:"green") then "gl"
+			else if chosen(choice:"land") then "l"
+			else if input == "artifact, multicolor" then "a"
+			else if chosen(choice:"multicolor")     then "m"
+			else if artifact and not hybrid         then "a"
+			else if colors == ""                    then "c"
+			else colors[
+				font_color_positions
+				[	if      chosen(choice:"horizontal") then "horizontal"
+					else if chosen(choice:"vertical")   then "vertical"
+					else if chosen(choice:"overlay")    then "overlay"
+					else                                     "radial"
+				][number_of_items(in: colors)]
+			]
+		)
+	}
+	
+	paintbrush_color := { if font_white() then "white" else "black" }
 
 ############################################################## Extra style options
 
@@ -278,7 +338,7 @@ card style:
 				   styling.center_text == "always"
 				then "middle center"
 				else "middle left"
-		z index: 2
+		z index: 3
 		padding left:   6
 		padding top:    2
 		padding right:  4
@@ -290,7 +350,7 @@ card style:
 		top : 321
 		width: 152
 		height: 152
-		z index: 1
+		z index: 2
 		render style: image
 		alignment: middle center
 		include file: magic-watermarks.mse-include/watermarks
@@ -313,19 +373,16 @@ card style:
 	############################# Copyright stuff
 
 	illustrator:
-		left: 131
+		right: { if card.pt != "" then 275 else 338 }
 		top : 475
-		width: { if card.pt != "" then 144 else 207 }
+		width: { max(150, card_style.illustrator.content_width) + 5 }
 		height: 16
 		z index: 2
-		alignment: bottom right
+		alignment: middle right
 		font:
 			name: MPlantin
 			size: 8
 			color: { font_color(card.card_color) }
-		symbol font:
-			name: magic-paintbrush
-			size: 14
 
 	copyright line:
 		left: 20
@@ -358,6 +415,13 @@ extra card field:
 	script: card.card_color
 	editable: false
 	save value: false
+extra card field:
+	type: choice
+	name: paintbrush
+	script: paintbrush_color(card.card_color)
+	editable: false
+	choice: black
+	choice: white
 
 extra card style:
 	textbox:
@@ -387,3 +451,13 @@ extra card style:
 		visible: { card.pt != "" }
 		render style: image
 		image: { card_ptbox() }
+	paintbrush:
+		right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width }
+		top : 476
+		width: 40
+		height: 15
+		z index: 2
+		render style: image
+		choice images:
+			black: paintbrush.png
+			white: paintbrush_w.png

data/magic-mana-beveled.mse-symbol-font/symbol-font

 mse version: 0.3.2
-# Symbol font in the normal, flat, style, used for text boxes and on old style cards
+# Symbol font in the beveled style used for casting costs on FPM cards
 # Note:
 #  Define  small_mana_t:="mana_t(_old)?.png" in the init script of the style
 #

data/magic-mana-future.mse-symbol-font/symbol-font

 mse version: 0.3.3
-# Symbol font in the 'popup' style, used for casting costs on modern cards
+# Symbol font in the 'futuristic' style, used for casting costs on futureshift cards
 
 image font size: 135
 horizontal space: 2
 symbol:
 	image: mana_circle_w.png
-	enabled: { contains(card.card_color, match:"white") and not contains(card.card_color, match:"blue") and not contains(card.card_color, match:"black") and not contains(card.card_color, match:"red") and not contains(card.card_color, match:"green") }
+	enabled: { colorless_color() == "w" }
 symbol:
 	image: mana_circle_u.png
-	enabled: { contains(card.card_color, match:"blue") and not contains(card.card_color, match:"white") and not contains(card.card_color, match:"black") and not contains(card.card_color, match:"red") and not contains(card.card_color, match:"green") }
+	enabled: { colorless_color() == "u" }
 symbol:
 	image: mana_circle_b.png
-	enabled: { contains(card.card_color, match:"black") and not contains(card.card_color, match:"blue") and not contains(card.card_color, match:"white") and not contains(card.card_color, match:"red") and not contains(card.card_color, match:"green") }
+	enabled: { colorless_color() == "b" }
 symbol:
 	image: mana_circle_r.png
-	enabled: { contains(card.card_color, match:"red") and not contains(card.card_color, match:"blue") and not contains(card.card_color, match:"black") and not contains(card.card_color, match:"white") and not contains(card.card_color, match:"green") }
+	enabled: { colorless_color() == "r" }
 symbol:
 	image: mana_circle_g.png
-	enabled: { contains(card.card_color, match:"green") and not contains(card.card_color, match:"blue") and not contains(card.card_color, match:"black") and not contains(card.card_color, match:"red") and not contains(card.card_color, match:"white") }
+	enabled: { colorless_color() == "g" }
 symbol:
 	image: mana_circle.png
-	enabled: { not contains(card.card_color, match:"white") and not contains(card.card_color, match:"blue") and not contains(card.card_color, match:"black") and not contains(card.card_color, match:"red") and not contains(card.card_color, match:"green") }
+	enabled: { colorless_color() == "c" }
 symbol:
 	code: T
 	image: mana_t.png
+symbol:
+	code: W/U
+	image: mana_guild_wu.png
+	enabled: { guild_mana() }
+symbol:
+	code: U/B
+	image: mana_guild_ub.png
+	enabled: { guild_mana() }
+symbol:
+	code: B/R
+	image: mana_guild_br.png
+	enabled: { guild_mana() }
+symbol:
+	code: R/G
+	image: mana_guild_rg.png
+	enabled: { guild_mana() }
+symbol:
+	code: G/W
+	image: mana_guild_gw.png
+	enabled: { guild_mana() }
+symbol:
+	code: W/B
+	image: mana_guild_wb.png
+	enabled: { guild_mana() }
+symbol:
+	code: U/R
+	image: mana_guild_ur.png
+	enabled: { guild_mana() }
+symbol:
+	code: B/G
+	image: mana_guild_bg.png
+	enabled: { guild_mana() }
+symbol:
+	code: R/W
+	image: mana_guild_rw.png
+	enabled: { guild_mana() }
+symbol:
+	code: G/U
+	image: mana_guild_gu.png
+	enabled: { guild_mana() }
 symbol:
 	code: W/U
 	image: mana_wu.png

data/magic-new-token.mse-style/style

@@ -13,7 +13,6 @@ card width: 375
 card height: 523
 card dpi: 150
 
-#error list:
 ############################################################## Extra scripts
 
 init script:
@@ -48,6 +47,8 @@ init script:
 	
 	# AE replacement shouldn't happen in the title, or else MSE compresses the symbol
 	name_filter := { input }
+	
+	paintbrush_color := { if font_white() then "white" else "black" }
 
 ############################################################## Set info fields
 
@@ -127,9 +128,13 @@ card style:
 
 	###################C######### Name line
 	name:
-		left: 50
+		left:
+			{ if card_style.name.content_width > 269 then 50
+			   else card_style.name.content_width * -0.5 + 184.5 }
 		top: 25
-		width: 275
+		width:
+			{ if card_style.name.content_width > 269 then 275
+			   else card_style.name.content_width + 6 }
 		height: 28
 		alignment: bottom center justify-overflow
 		padding bottom: -2
@@ -262,9 +267,9 @@ card style:
 	############################# Copyright stuff
 
 	illustrator:
-		left: 27
-		top : 481
-		width: 246
+		left: 58
+		top : 479
+		width: 215
 		height: 16
 		z index: 2
 		font:
@@ -272,9 +277,6 @@ card style:
 			size: 11
 			weight: bold
 			color: { font_color(card.card_color) }
-		symbol font:
-			name: magic-paintbrush
-			size: 10.5
 
 	copyright line:
 		left: 30
@@ -317,6 +319,13 @@ extra card field:
 	editable: false
 	save value: false
 	show statistics: false
+extra card field:
+	type: choice
+	name: paintbrush
+	script: paintbrush_color(card.card_color)
+	editable: false
+	choice: black
+	choice: white
 
 extra card style:
 	pt box:
@@ -354,7 +363,6 @@ extra card style:
 		width: 15
 		height: 35
 		z index: 2
-		visible: { card.name != "" }
 		render style: image
 		image: name-left.png
 	name box right:
@@ -365,7 +373,15 @@ extra card style:
 		width: 14
 		height: 35
 		z index: 2
-		visible: { card.name != "" }
 		render style: image
 		image: name-right.png
-
+	paintbrush:
+		left: 27
+		top : 481
+		width: 30
+		height: 11
+		z index: 2
+		render style: image
+		choice images:
+			black: paintbrush.png
+			white: paintbrush_w.png

data/magic-old-split.mse-style/style

@@ -48,7 +48,9 @@ init script:
 			)
 		else if multi then 
 			masked_blend(
-				mask:  "multicolor_blend_{type}.png",
+				mask: ( if styling.type_of_gradient_multicolor == "full card" then "multicolor_blend_{type}.png"
+					else if styling.type_of_gradient_multicolor == "trim only" then "multicolor_blend_{type}2.png"
+					else "multicolor_blend_{type}.png" ),
 				dark:  template("m"),
 				light: base,
 			)
@@ -103,6 +105,13 @@ styling field:
 	name: popup mana symbols
 	description: Use the symbols of the casting cost line inside the text box as well
 	initial: no
+styling field:
+	type: choice
+	name: type of gradient multicolor
+	description: What parts of the card should be blended for gradient multicolor?
+	choice: full card
+	choice: trim only
+	initial: full card
 styling field:
 	type: choice
 	name: tap symbol
@@ -119,6 +128,11 @@ styling field:
 	choice: short text only
 	choice: never
 	initial: never
+styling field:
+	type: boolean
+	name: colored rarities
+	description: Should rarity symbols be different colors, such as gold, silver, and purple?
+	initial: yes
 
 styling style:
 	use guild mana symbols:
@@ -284,9 +298,21 @@ card style:
 			# Images based on the set symbol
 			basic land:	script: symbol_variation(symbol: set.symbol, variation: "common")
 			common:   script: symbol_variation(symbol: set.symbol, variation: "common")
-			uncommon: script: symbol_variation(symbol: set.symbol, variation: "olduncommon")
-			rare:     script: symbol_variation(symbol: set.symbol, variation: "oldrare")
-			special:	script: symbol_variation(symbol: set.symbol, variation: "special")
+			uncommon:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "olduncommon")
+					else symbol_variation(symbol: set.symbol, variation: "common")
+			rare:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "oldrare")
+					else symbol_variation(symbol: set.symbol, variation: "common")
+			special:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "special")
+					else symbol_variation(symbol: set.symbol, variation: "common")
 
 	rarity 2:
 		left: 480
@@ -299,9 +325,21 @@ card style:
 			# Images based on the set symbol
 			basic land:	script: symbol_variation(symbol: set.symbol, variation: "common")
 			common:   script: symbol_variation(symbol: set.symbol, variation: "common")
-			uncommon: script: symbol_variation(symbol: set.symbol, variation: "olduncommon")
-			rare:     script: symbol_variation(symbol: set.symbol, variation: "oldrare")
-			special:	script: symbol_variation(symbol: set.symbol, variation: "special")
+			uncommon:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "olduncommon")
+					else symbol_variation(symbol: set.symbol, variation: "common")
+			rare:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "oldrare")
+					else symbol_variation(symbol: set.symbol, variation: "common")
+			special:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "special")
+					else symbol_variation(symbol: set.symbol, variation: "common")
 
 	############################# Text box
 	text:

data/magic-old-token.mse-style/style

@@ -33,6 +33,40 @@ init script:
 	
 	# Only white cards use a black font
 	font_colors_white := { input != "w" }
+	
+	color_combination := {
+		# The base hybrid, without the outer frame blended over it
+		base := base_hybrid[shape][color_count]()
+		
+		# Put a frame around it?
+		if land and not colored_lands then
+			masked_blend(
+				mask:  "multicolor_blend_{type}.png",
+				dark:  land_template("c"),
+				light: base,
+			)
+		else if multi then 
+			masked_blend(
+				mask: ( if styling.type_of_gradient_multicolor == "full card" then "multicolor_blend_{type}.png"
+					else if styling.type_of_gradient_multicolor == "trim only" then "multicolor_blend_{type}2.png"
+					else "multicolor_blend_{type}.png" ),
+				dark:  template("m"),
+				light: base,
+			)
+		else if artifact then 
+			masked_blend(
+				mask:  "multicolor_blend_{type}.png",
+				dark:  template("a"),
+				light: base,
+			)
+		else if color_count > 1 and mask_hybrid_with_land() then
+			masked_blend(
+				mask:  "hybrid_blend_{type}.png",
+				dark:  land_template("c"),
+				light: base,
+			)
+		else base
+	}
 
 ############################################################## Set info fields
 set info style:
@@ -66,6 +100,13 @@ styling field:
 	name: popup mana symbols
 	description: Use the symbols of the casting cost line inside the text box as well
 	initial: no
+styling field:
+	type: choice
+	name: type of gradient multicolor
+	description: What parts of the card should be blended for gradient multicolor?
+	choice: full card
+	choice: trim only
+	initial: full card
 styling field:
 	type: choice
 	name: tap symbol
@@ -82,6 +123,11 @@ styling field:
 	choice: short text only
 	choice: never
 	initial: short text only
+styling field:
+	type: boolean
+	name: colored rarities
+	description: Should rarity symbols be different colors, such as gold, silver, and purple?
+	initial: yes
 
 styling style:
 	use guild mana symbols:
@@ -177,9 +223,21 @@ card style:
 			# Images based on the set symbol
 			basic land: script: symbol_variation(symbol: set.symbol, variation: "common")
 			common:     script: symbol_variation(symbol: set.symbol, variation: "common")
-			uncommon:   script: symbol_variation(symbol: set.symbol, variation: "olduncommon")
-			rare:       script: symbol_variation(symbol: set.symbol, variation: "oldrare")
-			special:    script: symbol_variation(symbol: set.symbol, variation: "special")
+			uncommon:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "olduncommon")
+					else symbol_variation(symbol: set.symbol, variation: "common")
+			rare:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "oldrare")
+					else symbol_variation(symbol: set.symbol, variation: "common")
+			special:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "special")
+					else symbol_variation(symbol: set.symbol, variation: "common")
 
 	############################# Text box
 	text:

data/magic-old.mse-style/style

@@ -52,7 +52,9 @@ init script:
 			)
 		else if multi then 
 			masked_blend(
-				mask:  "multicolor_blend_{type}.png",
+				mask: ( if styling.type_of_gradient_multicolor == "full card" then "multicolor_blend_{type}.png"
+					else if styling.type_of_gradient_multicolor == "trim only" then "multicolor_blend_{type}2.png"
+					else "multicolor_blend_{type}.png" ),
 				dark:  template("m"),
 				light: base,
 			)
@@ -108,6 +110,13 @@ styling field:
 	name: alpha style blending
 	description: Use Alpha-style dual blending
 	initial: no
+styling field:
+	type: choice
+	name: type of gradient multicolor
+	description: What parts of the card should be blended for gradient multicolor?
+	choice: full card
+	choice: trim only
+	initial: full card
 styling field:
 	type: choice
 	name: tap symbol
@@ -124,7 +133,11 @@ styling field:
 	choice: short text only
 	choice: never
 	initial: never
-
+styling field:
+	type: boolean
+	name: colored rarities
+	description: Should rarity symbols be different colors, such as gold, silver, and purple?
+	initial: yes
 styling style:
 	use guild mana symbols:
 		choice images:
@@ -240,9 +253,21 @@ card style:
 			# Images based on the set symbol
 			basic land: script: symbol_variation(symbol: set.symbol, variation: "common")
 			common:     script: symbol_variation(symbol: set.symbol, variation: "common")
-			uncommon:   script: symbol_variation(symbol: set.symbol, variation: "olduncommon")
-			rare:       script: symbol_variation(symbol: set.symbol, variation: "oldrare")
-			special:    script: symbol_variation(symbol: set.symbol, variation: "special")
+			uncommon:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "olduncommon")
+					else symbol_variation(symbol: set.symbol, variation: "common")
+			rare:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "oldrare")
+					else symbol_variation(symbol: set.symbol, variation: "common")
+			special:
+				script:
+					if styling.colored_rarities
+					then symbol_variation(symbol: set.symbol, variation: "special")
+					else symbol_variation(symbol: set.symbol, variation: "common")
 
 	############################# Text box
 	text:

data/magic-paintbrush.mse-symbol-font/symbol-font

-mse version: 0.3.2
-#symbol font for custom magic paintbrushes
-image font size: 135
-horizontal space: 2
-symbol:
-	code: O
-	image: paintbrush_w.png
-	image font size: 145
-symbol:
-	code: P
-	image: paintbrush.png
-	image font size: 145

data/magic-textless.mse-style/style

@@ -36,6 +36,8 @@ init script:
 	}
 	# Use guild mana symbols?
 	guild_mana := { styling.use_guild_mana_symbols }
+	
+	paintbrush_color := { if font_white() then "white" else "black" }
 
 ############################################################## Extra style options
 
@@ -180,18 +182,15 @@ card style:
 	############################# Copyright stuff
 
 	illustrator:
-		left: 23
+		left: 54
 		top : 477
-		width: 250
+		width: 219
 		height: 16
 		z index: 1
 		font:
 			name: Matrix
 			size: 10
 			color: { font_color(card.card_color) }
-		symbol font:
-			name: magic-paintbrush
-			size: 10
 
 	copyright line:
 		left: 26
@@ -211,7 +210,13 @@ extra card field:
 	name: pt box
 	script: card.card_color
 	editable: false
-
+extra card field:
+	type: choice
+	name: paintbrush
+	script: paintbrush_color(card.card_color)
+	editable: false
+	choice: black
+	choice: white
 extra card style:
 	pt box:
 		left:	277
@@ -223,3 +228,13 @@ extra card style:
 		render style: image
 		mask: mask_pt.png
 		image: { card_ptbox() }
+	paintbrush:
+		left: 23
+		top : 480
+		width: 30
+		height: 11
+		z index: 1
+		render style: image
+		choice images:
+			black: paintbrush.png
+			white: paintbrush_w.png

data/magic.mse-game/game

@@ -12,8 +12,6 @@ init script:
 	
 	############################################################## Sorting mana symbols
 	
-	# Used in FPM and Future Sight
-	brush_sort := sort_rule(order: "OP")
 	# correctly sort mana symbols
 	mana_sort := sort_rule(order: "ordered(XYZ)"
 	                            + "mixed(0123456789)"
@@ -233,7 +231,7 @@ init script:
 	# replaces — correctly
 	add := "" # default is nothing
 	for_mana_costs := format_cost := {
-		if input.separator_before == "—" then (
+		if input.separator_before == "—" and contains(input.param, match: " ") then (
 			if contains(input.param, match:",") then (
 				if match(match: "^[STXYZWUBRG0-9/|]+,", input.param) then
 					"{add}<param-cost>{combined_cost(input.param)}</param-cost>"
@@ -402,25 +400,7 @@ init script:
 		# curly quotes
 		curly_quotes
 	# Used in FPM and Future Sight
-	brush_context :=
-		"(?ix)				# case insensitive, ignore whitespace
-		 (^|[[:space:]\"(])		# start of a word
-		 (  (^)<match>(A|B|C|D|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|Æ)
-		 )
-		 ";
-	# Used in FPM and Future Sight
 	artist_line_filter :=
-		tag_remove_rule(tag: "<sym-auto>") +
-		replace_rule(
-			match: "\\][OP]+\\[",
-			replace: {"<nosym>" + brush_sort() + "</nosym>"} ) +
-		replace_rule(
-			match: "[OP|]+",
-			in_context: brush_context,
-			replace: {"<sym-auto>" + brush_sort() + "</sym-auto>"} ) +
-		replace_rule(
-			match: "\\[[OP]+\\]",
-			replace: {"<sym>" + brush_sort() + "</sym>"} ) +
 		replace_rule(
 			match: "AE",
 			replace: "Æ") +
@@ -1756,7 +1736,7 @@ keyword:
 	reminder: {if has_pt() then "This creature" else "This permanent"} comes into play with {english_number_a(param1)} +1/+1 counter(s) on it. Whenever {if has_pt() then "another" else "a"} creature comes into play, you may move a +1/+1 counter from {if has_pt() then "this creature" else "this permanent"} onto it.
 keyword:
 	keyword: Forecast
-	match: Forecast — <atom-param>mana</atom-param>, Reveal <atom-param>name</atom-param> from your hand: <atom-param>action</atom-param>
+	match: Forecast — <atom-param>action</atom-param>, Reveal <atom-param>name</atom-param> from your hand: <atom-param>action</atom-param>
 	mode: expert
 	reminder: Play this ability only during your upkeep and only once each turn.
 keyword:
@@ -1786,9 +1766,9 @@ keyword:
 	reminder: As long as this spell is on the stack, players can't play spells or activated abilities that aren't mana abilities.
 keyword:
 	keyword: Suspend
-	match: Suspend <atom-param>number</atom-param>—<atom-param>mana</atom-param>
+	match: Suspend <atom-param>number</atom-param>—<atom-param>cost</atom-param>
 	mode: expert
-	reminder: Rather than play this card from your hand,{if has_cc() then " you may" else ""} pay {param2} and remove it from the game with {english_number_a(param1)} time counter(s) on it. At the beginning of your upkeep, remove a time counter. When the last is removed, play it without paying its mana cost.{if has_pt() then " It has haste." else ""}
+	reminder: Rather than play this card from your hand,{if has_cc() then " you may" else ""} {for_mana_costs(add:"pay ", param2)} and remove it from the game with {english_number_a(param1)} time counter(s) on it. At the beginning of your upkeep, remove a time counter. When the last is removed, play it without paying its mana cost.{if has_pt() then " It has haste." else ""}
 keyword:
 	keyword: Vanishing
 	match: Vanishing <atom-param>number</atom-param>

data/vanguard.mse-game/game

@@ -38,7 +38,7 @@ init script:
 	# replaces — correctly
 	add := "" # default is nothing
 	for_mana_costs := format_cost := {
-		if input.separator_before == "—" then (
+		if input.separator_before == "—" and contains(input.param, " ") then (
 			if contains(input.param, match:",") then (
 				if match(match: "^[STXYZWUBRG0-9/|]+,", input.param) then
 					"{add}<param-cost>{combined_cost(input.param)}</param-cost>"
@@ -714,16 +714,6 @@ keyword:
 		 if param1.value==1 then "card of your library, then you may put that card on the bottom of your library."
 		 else "{english_number(param1)} cards of your library. Put any number of them on the bottom of your library in any order and the rest on top in any order."
 		}
-keyword:
-	keyword: Scry
-	match: scry <atom-param>number</atom-param>
-	mode: expert
-	reminder:
-		To scry {param1}, look at the top {
-		 if param1.value==1 then "card of your library, then you may put that card on the bottom of your library."
-		 else "{english_number(param1)} cards of your library. Put any number of them on the bottom of your library in any order and the rest on top in any order."
-		}
-
 keyword:
 	keyword: Sunburst
 	match: sunburst
@@ -827,7 +817,7 @@ keyword:
 	reminder: It comes into play with {english_number_a(param1)} +1/+1 counter(s) on it. Whenever a creature comes into play, you may move a +1/+1 counter from the permanent onto it.
 keyword:
 	keyword: Forecast
-	match: forecast — <atom-param>mana</atom-param>, Reveal <atom-param>name</atom-param> from your hand: <atom-param>action</atom-param>
+	match: forecast — <atom-param>action</atom-param>, Reveal <atom-param>name</atom-param> from your hand: <atom-param>action</atom-param>
 	mode: expert
 	reminder: Play the ability only during your upkeep and only once each turn.
 keyword:
@@ -856,7 +846,7 @@ keyword:
 	reminder: As long as it is on the stack, players can't play spells or activated abilities that aren't mana abilities.
 keyword:
 	keyword: Suspend
-	match: suspend <atom-param>number</atom-param>—<atom-param>mana</atom-param>
+	match: suspend <atom-param>number</atom-param>—<atom-param>cost</atom-param>
 	mode: expert
 	reminder: Rather than play it from your hand, you may pay {param2} and remove it from the game with {english_number_a(param1)} time counter(s) on it. At the beginning of your upkeep, remove a time counter. When the last is removed, play it without paying its mana cost. If it is a creature, it has haste.
 keyword: