Added Clash to keywords.

Added transparent textbox effect to magic-new and magic-planeshifted.
Added future sight type symbol watermarks.
Added colored orbs to vanguard.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@662 0fc631ac-6414-0410-93d0-97cfa31319b6

data/magic-new.mse-style/style

@@ -116,6 +116,13 @@ styling field:
 	name: inverted common symbol
 	description: Should the common rarity symbol be inverted, like in Coldsnap?
 	initial: no
+styling field:
+	type: choice
+	name: image size
+	description: Should the art extend into a transparent textbox?
+	initial: standard
+	choice: standard
+	choice: extended
 styling style:
 	artifact style:
 		render style: both
@@ -204,11 +211,13 @@ card style:
 
 	############################# Image
 	image:
-		left:	32
+		left:	31
 		top:	62
-		width:	311
-		height:	228
+		width:	312
+		height:	{ if styling.image_size == "extended" then 407 else 228 }
 		z index: 1
+		mask:
+			script: if styling.image_size == "extended" then "imagemask_extended.png" else "imagemask_standard.png"
 		default: {default_image(card.card_color)}
 
 	############################# Card type

data/magic-planeshifted.mse-style/style

@@ -80,6 +80,13 @@ styling field:
 	name: inverted common symbol
 	description: Should the common rarity symbol be inverted, like in Coldsnap?
 	initial: no
+styling field:
+	type: choice
+	name: image size
+	description: Should the art extend into a transparent textbox?
+	initial: standard
+	choice: standard
+	choice: extended
 styling style:
 	use guild mana symbols:
 		choice images:
@@ -161,11 +168,13 @@ card style:
 
 	############################# Image
 	image:
-		left:	32
+		left:	31
 		top:	62
-		width:	311
-		height:	228
+		width:	312
+		height:	{ if styling.image_size == "extended" then 408 else 228 }
 		z index: 1
+		mask:
+			script: if styling.image_size == "extended" then "imagemask_extended.png" else "imagemask_standard.png"
 
 	############################# Card type
 

data/magic-watermarks.mse-include/watermark-names

@@ -48,5 +48,14 @@ choice:
 	choice: G/W
 	choice: R/W
 	choice: W/U
+choice:
+	name: future sight type symbols
+	choice: artifact
+	choice: creature
+	choice: enchantment
+	choice: instant
+	choice: land
+	choice: multiple
+	choice: sorcery
 choice:
 	name: set symbol

data/magic-watermarks.mse-include/watermarks

@@ -40,7 +40,15 @@ choice images:
 	colored xander hybrid mana G/W:			/magic-watermarks.mse-include/watermark_gwmana_colored.png
 	colored xander hybrid mana R/W:			/magic-watermarks.mse-include/watermark_rwmana_colored.png
 	colored xander hybrid mana W/U:			/magic-watermarks.mse-include/watermark_wumana_colored.png
-	
+
+	future sight type symbols artifact:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/FUTsymbol_artifact.png")
+	future sight type symbols creature:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/FUTsymbol_creature.png")
+	future sight type symbols enchantment:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/FUTsymbol_enchantment.png")
+	future sight type symbols instant:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/FUTsymbol_instant.png")
+	future sight type symbols land:				script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/FUTsymbol_land.png")
+	future sight type symbols multiple:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/FUTsymbol_multiple.png")
+	future sight type symbols sorcery:			script: set_combine(combine:"shadow", input:"/magic-watermarks.mse-include/FUTsymbol_sorcery.png")
+
 	set symbol:
 		{ set_combine(combine:"shadow",
 		   set_alpha(

data/magic.mse-game/game

@@ -1961,3 +1961,8 @@ keyword:
 	match: Champion <atom-param>a</atom-param> <atom-param>name</atom-param>
 	mode: expert
 	reminder: When this comes into play, sacrifice it unless you remove another {param2} you control from the game. When this leaves play, that card returns to play.
+keyword:
+	keyword: Clash
+	match: Clash
+	mode: action
+	reminder: Each clashing player reveals the top card of his or her library then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.

data/vanguard-standard.mse-style/style

@@ -1,4 +1,4 @@
-mse version: 0.3.2
+mse version: 0.3.2
 game: vanguard
 short name: Standard
 icon: card-sample.png
@@ -233,3 +233,34 @@ card style:
 			name: MPlantin
 			size: 6
 			color: rgb(0,0,0)
+
+############################################################## Extra card fields
+
+extra card field:
+	type: choice
+	name: orb
+	choice: none
+	choice: white
+	choice: blue
+	choice: black
+	choice: red
+	choice: green
+	choice: artifact
+	choice: multicolor
+
+extra card style:
+	orb:
+		left:	179
+		top:	483
+		width:	17
+		height:	17
+		z index: 2
+		render style: image
+		choice images:
+			white:		cost_w.png
+			blue:		cost_u.png
+			black:		cost_b.png
+			red:		cost_r.png
+			green:		cost_g.png
+			artifact:		cost_a.png
+			multicolor:	cost_m.png

data/vanguard.mse-game/game

@@ -932,11 +932,16 @@ keyword:
 	mode: pseudo
 keyword:
 	keyword: Evoke
-	match: Evoke <atom-param>cost</atom-param>
+	match: evoke <atom-param>cost</atom-param>
 	mode: expert
 	reminder: You may play this spell for its evoke cost. If you do, it's sacrificed when it comes into play.
 keyword:
 	keyword: Champion
-	match: Champion <atom-param>a</atom-param> <atom-param>name</atom-param>
+	match: champion <atom-param>a</atom-param> <atom-param>name</atom-param>
 	mode: expert
 	reminder: When this comes into play, sacrifice it unless you remove another {param2} you control from the game. When this leaves play, that card returns to play.
+keyword:
+	keyword: Clash
+	match: clash
+	mode: expert
+	reminder: Each clashing player reveals the top card of his or her library then puts that card on the top or bottom. A player wins if his or her card had a higher converted mana cost.