Fixed a bug relating to suspend's parameters.

Added colorless, multicolor, dark artifact, artifact styling choice, and new masks to magic-textless.

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

data/magic-textless.mse-style/style

@@ -20,8 +20,13 @@ init script:
 	# There is no land template
 	land_template := { "a{type}.jpg" }
 	
-	# there is no multi template
+	# Which artifact template should be used?
-	template := { (if input == "m" then "a" else input) + "{type}.jpg" }
+	artifact_template := {
+		if input == "a" and not styling.darker_artifacts
+		then	"oa"
+		else	input
+	}
+	template := { artifact_template() + "{type}.jpg" }
 	
 	# Use the normal tap symbol
 	mana_t := {
@@ -39,6 +44,10 @@ styling field:
 	name: grey hybrid name
 	description: Use a grey background for the name and type line on hybrid cards. This is done on real cards.
 	initial: no
+styling field:
+	type: boolean
+	name: darker artifacts
+	description: Use darker artifacts, as used by Wizards since Fifth Dawn.
 styling field:
 	type: boolean
 	name: use guild mana symbols
@@ -130,10 +139,10 @@ card style:
 
 	############################# Image
 	image:
-		left:	0
+		left:	31
-		top:	55
+		top:	60
-		width:	375
+		width:	314
-		height:	472
+		height:	410
 		mask: mask_image.png
 		z index: 1
 

data/magic.mse-game/game

@@ -1778,7 +1778,7 @@ 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>mana</atom-param>—<atom-param>cost</atom-param>
+	match: Suspend <atom-param>number</atom-param>—<atom-param>mana</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 ""}
 keyword: