Miscellaneous colored artifact updates for Magic, following Shards.

First Conflux keyword for Magic.
Improved Mythic Rare coloration.
Slightly improved creature type lists.

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

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

@@ -470,7 +470,7 @@ color_background := {
 		colors := colors + "m"
 		multi := false
 	)
-	if artifact and (multi or hybrid or colors == "") then (
+	if artifact and (hybrid or colors == "") then (
 		colors := colors + "a"
 		artifact := false
 	)
@@ -505,6 +505,16 @@ color_combination := {
 			dark:  base,
 			light:  land_template("m"),
 		)
+	else if multi and artifact then
+		masked_blend(
+			mask: "artifact_blend_{type}.png",
+			dark: template("a"),
+			light: masked_blend(
+				mask: "multicolor_blend_{type}.png",
+				dark: template("m"),
+				light: base
+			)
+		)
 	else if multi then 
 		masked_blend(
 			mask:  "multicolor_blend_{type}.png",