Fixed a Print Size error in Yu-gi-oh.

Monocolor artifacts now sort correctly.
Fixed dark/light artifacts in Magic-new-split.
Removed dark/light artifacts from Magic-new-textless. (we have no dark artifact frame)
Fixed dark/light artifacts in Magic-new-token. (the file names were reversed)
Polished Magic and Vanguard keywords.
Added required hybrid_blend_card pngs to magic-new-token. (to make grey typeline masking work)

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

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

@@ -23,9 +23,12 @@ init script:
 	
 	# Which artifact template should be used?
 	artifact_template := {
-		if styling.darker_artifacts then "a" else "oa"
+		if input == "a" and not styling.darker_artifacts
+		then	"oa"
+		else	input
 	}
-	
+	template      := { artifact_template() + "{type}.jpg" }
+		
 	# Use the normal tap symbol
 	mana_t := {
 		if      styling.tap_symbol == "old"        then "old"

data/magic-textless.mse-style/style

@@ -34,10 +34,6 @@ init script:
 
 ############################################################## Extra style options
 
-styling field:
-	type: boolean
-	name: darker artifacts
-	description: Use darker artifacts, as used by Wizards since Fifth Dawn.
 styling field:
 	type: boolean
 	name: grey hybrid name

data/magic.mse-game/game

@@ -132,17 +132,18 @@ init script:
 	is_multicolor := { chosen(choice: "multicolor") and input != "artifact, multicolor" }
 	is_hybrid     := { chosen(choice: "hybrid") }
 	is_land       := { chosen(choice: "land") }
+	
 	sort_index := {
 		if card.casting_cost_2 !="" and card.card_color != card.card_color_2 then "H"
-		else if card.card_color=="white"        then "A"
-		else if card.card_color=="blue"         then "B"
-		else if card.card_color=="black"        then "C"
-		else if card.card_color=="red"          then "D"
-		else if card.card_color=="green"        then "E"
 		else if is_land      (card.card_color)  then (if card.rarity != "basic land" then "J" else "K")
-		else if is_multicolor(card.card_color)  then "F"
+		else if is_multicolor(card.card_color) then "F"
 		else if is_hybrid    (card.card_color)  then "G"
-		else                                         "I" # colorless
+		else if chosen(choice:"white", card.card_color) then "A"
+		else if chosen(choice:"blue", card.card_color) then "B"
+		else if chosen(choice:"black", card.card_color) then "C"
+		else if chosen(choice:"red", card.card_color) then "D"
+		else if chosen(choice:"green", card.card_color) then "E"
+		else "I" # colorless, artifacts
 	};
 	
 	# The color of a card
@@ -1393,7 +1394,7 @@ keyword:
 	keyword: Banding
 	match: Banding
 	mode: old
-	reminder: When declaring attackers or blockers this creature may group with other creatures with banding and one creature without banding. When damage is dealt, you decide where damage is dealt.
+	reminder: When declaring attackers or blockers, this creature may group with other creatures with banding and one creature without banding. When damage is dealt, you decide where damage is dealt.
 keyword:
 	keyword: Landwalk
 	match: <atom-param>prefix</atom-param>walk
@@ -1413,7 +1414,7 @@ keyword:
 	keyword: Bands with other
 	match: Bands with other <atom-param>name</atom-param>
 	mode: old
-	reminder: When declaring attackers or blockers this creature may group with other creatures with banding or bands with {param1}. When damage is dealt, you decide where damage is dealt.
+	reminder: When declaring attackers or blockers, this creature may group with other creatures with banding or bands with other {param1}. When damage is dealt, you decide where damage is dealt.
 keyword:
 	keyword: Rampage
 	match: Rampage <atom-param>number</atom-param>
@@ -1652,7 +1653,7 @@ keyword:
 	keyword: Haunt
 	match: Haunt
 	mode: expert
-	reminder: When this card is put into a graveyard from play, remove it from the game haunting target creature.
+	reminder: When this { if contains(card.type,match:"Instant") or contains(card.type,match:"Sorcery") then "spell card is put into a graveyard after resolving," else "card is put into a graveyard from play," } remove it from the game haunting target creature.
 keyword:
 	keyword: Bloodthirst
 	match: Bloodthirst <atom-param>number</atom-param>

data/vanguard.mse-game/game

@@ -505,7 +505,7 @@ keyword:
 	keyword: Banding
 	match: banding
 	mode: old
-	reminder: When declaring attackers or blockers it may group with other creatures with banding and one creature without banding. When damage is dealt, you decide where damage is dealt.
+	reminder: When declaring attackers or blockers, it may group with other creatures with banding and one creature without banding. When damage is dealt, you decide where damage is dealt.
 keyword:
 	keyword: Landwalk
 	match: <atom-param>prefix</atom-param>walk
@@ -525,7 +525,7 @@ keyword:
 	keyword: Bands with other
 	match: bands with other <atom-param>name</atom-param>
 	mode: old
-	reminder: When declaring attackers or blockers it may group with other creatures with banding or bands with {param1}. When damage is dealt, you decide where damage is dealt.
+	reminder: When declaring attackers or blockers, it may group with other creatures with banding or bands with {param1}. When damage is dealt, you decide where damage is dealt.
 keyword:
 	keyword: Rampage
 	match: rampage <atom-param>number</atom-param>
@@ -774,7 +774,7 @@ keyword:
 	keyword: Haunt
 	match: haunt
 	mode: expert
-	reminder: When it is put into a graveyard from play, remove it from the game haunting target creature.
+	reminder: When it is put into a graveyard from play, or when it resolves if it is not a permanent, remove it from the game haunting target creature.
 keyword:
 	keyword: Bloodthirst
 	match: bloodthirst <atom-param>number</atom-param>

data/yugioh-standard.mse-style/style

@@ -3,9 +3,10 @@ game: yugioh
 short name: Standard
 icon: card-sample.png
 
-card width: 375
+card width: 361
 card height: 523
-card dpi: 300
+card dpi: 152.6265
+
 
 ############################################################## Extra scripts
 
@@ -18,7 +19,7 @@ card style:
 	card type:
 		left:	0
 		top:	0
-		width:	375
+		width:	361
 		height:	523
 		z index: -2
 		render style: image
@@ -37,9 +38,9 @@ card style:
 
 	############################# Name line
 	name:
-		left: 35
+		left: 34
 		top : 31
-		width: 265
+		width: 250
 		height: 35
 		alignment: bottom shrink-overflow
 		padding bottom: 0
@@ -51,7 +52,7 @@ card style:
 				script: if is_nmonster() then rgb(255,255,255)
 				else			      rgb(0,0,0)
 	attribute:
-		left: 302
+		left: 290
 		top : 32
 		width: 35
 		height: 35
@@ -69,10 +70,10 @@ card style:
 			spell:		spell.png
 			trap:		trap.png
 	level:
-		left: 45
+		left: 43
 		top : 78
 		height: 25
-		width: 285
+		width: 275
 		z index: 2
 		alignment: middle right
 		font:
@@ -88,18 +89,18 @@ card style:
 
 	############################# Image
 	image:
-		left:	53
+		left:	51
 		top:	114
-		width: 267
+		width: 257
 		height:	261
 		z index: 1
 
 	############################# Card type
 
 	monster type:
-		left: 38
+		left: 37
 		top : 403
-		width: 200
+		width: 193
 		height: 14
 		alignment: top left
 		z index: 2
@@ -113,9 +114,9 @@ card style:
 	############################# Edition and Card ID
 
 	number:
-		left: 210
+		left: 202
 		top : 383
-		width: 120
+		width: 116
 		height: 28
 		z index: 2
 		alignment: top right
@@ -124,9 +125,9 @@ card style:
 			size: 8
 			color: rgb(0,0,0)
 	edition:
-		left: 45
+		left: 43
 		top: 383
-		width: 120
+		width: 116
 		height: 18
 		z index: 2
 		font:
@@ -136,10 +137,10 @@ card style:
 
 	############################# Text box
 	rule text:
-		left: 35
+		left: 34
 		top : 
 			script: if is_nmonster() then 400 else 413
-		width: 301
+		width: 290
 		height: 
 			script: if is_nmonster() then 90 else 63
 		font:
@@ -158,9 +159,9 @@ card style:
 
 	############################# Attack/Defense
 	attack:
-		left:	205
+		left:	197
 		top:	477
-		width:	50
+		width:	48
 		height:	18
 		z index: 2
 		alignment: left middle
@@ -171,10 +172,9 @@ card style:
 		visible: script: if is_nmonster() then false else true
 
 	defense:
-		z index: 4
-		left:	276
+		left:	266
 		top:	477
-		width:	50
+		width:	48
 		height:	18
 		z index: 2
 		alignment: left middle
@@ -188,9 +188,9 @@ card style:
 	############################# Copyright stuff
 
 	gamecode:
-		left: 15
+		left: 14
 		top : 499
-		width: 100
+		width: 96
 		height: 18
 		alignment: top left
 		z index: 2
@@ -200,9 +200,9 @@ card style:
 			color: rgb(0,0,0)
 
 	copyright:
-		left: 195
+		left: 188
 		top : 499
-		width: 150
+		width: 145
 		height: 18
 		z index: 2
 		alignment: top right