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/include

@@ -1,6 +1,6 @@
-mse version: 0.3.6
+mse version: 0.3.7
 full name: Magic The Gathering, card blend utilities
-version: 2008-04-13
+version: 2008-09-24
 
 # This file doesn't do anything, other files in this directory can be included
 # in game/style files:

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",

data/magic.mse-game/game

@@ -5,7 +5,7 @@ installer group: magic/game files
 icon: card-back.png
 position hint: 01
 
-version: 2008-08-08
+version: 2008-12-29
 depends on: magic-blends.mse-include 2007-09-23
 depends on: magic-watermarks.mse-include 2007-09-23
 

data/magic.mse-game/keywords

@@ -360,7 +360,7 @@ keyword:
 	keyword: Soulshift
 	match: Soulshift <atom-param>number</atom-param>
 	mode: expert
-	reminder: When this is put into a graveyard from play, you may return target Spirit card with converted mana cost {param1} or less from you graveyard to your hand.
+	reminder: When this is put into a graveyard from play, you may return target Spirit card with converted mana cost {param1} or less from your graveyard to your hand.
 keyword:
 	keyword: Enchant
 	match: Enchant <atom-param>name</atom-param>
@@ -635,3 +635,8 @@ keyword:
 	match: Exalted
 	mode: expert
 	reminder: Whenever a creature you control attacks alone, that creature gets +1/+1 until end of turn.
+keyword:
+	keyword: Domain
+	match: Domain
+	mode: pseudo
+	rules: Domain — [effect] for each basic land type among lands you control.

data/magic.mse-game/script

@@ -51,8 +51,19 @@ color_filter  := sort_text@(order: "<WUBRG>")
 color_filterH := sort_text@(order: "</>")
 mana_to_color := {
 	count  := number_of_items(in: colors)
-	if hybrid == "" then
-		# not a hybrid
+	if hybrid == "" and contains(type, match:"Artifact") then
+		# not a hybrid, but artifact
+		if      count == 0 then  "artifact"
+		else if count == 1 then  color_names_1() + ", artifact"
+		else if set.set_info.use_gradient_multicolor == "no"  then "artifact, multicolor" # stop here
+		else if count == 2 then  color_names_2() + ", artifact, multicolor"
+		else if set.set_info.use_gradient_multicolor != "yes" then "artifact, multicolor" # stop here
+		else if count == 3 then  color_names_3() + ", artifact, multicolor"
+		else if count == 4 then  color_names_4() + ", artifact, multicolor"
+		else if count == 5 then  color_names_5() + ", artifact, multicolor"
+		else                     "artifact, multicolor"
+	else if hybrid == "" then
+		# not a hybrid, not artifact
 		if      count == 0 then  "colorless"
 		else if count == 1 then  color_names_1()
 		else if set.set_info.use_gradient_multicolor == "no"  then "multicolor" # stop here
@@ -62,8 +73,15 @@ mana_to_color := {
 		else if count == 4 then  color_names_4() + ", multicolor"
 		else if count == 5 then  color_names_5() + ", multicolor"
 		else                     "multicolor"
+	else if contains(type, match:"Artifact") then
+		# hybrid, but artifact
+		if count == 0 then "artifact"
+		else if count == 1 then color_names_1() + ", artifact"
+		else if count == 2 then  color_names_2() + ", artifact"
+		else if count == 3 then  color_names_3() + ", artifact"
+		else                     "artifact, multicolor"
 	else
-		# hybrid
+		# hybrid, not artifact
 		if count == 0 then "colorless"
 		else if count == 1 then color_names_1()
 		else if count == 2 then  color_names_2() + ", hybrid"
@@ -87,7 +105,6 @@ land_multicolor := {
 	if      count == 0 then "land"
 	else if count == 1 then color_names_1() + ", land"
 	else if count == 2 then color_names_2() + ", land"
-	else if count == 3 then color_names_3() + ", land"
 	else                    "land, multicolor"
 }
 land_to_color := {

data/magic.mse-game/set_fields

@@ -125,8 +125,8 @@ default set style:
 			name: mythic rare
 			border radius: 0.07
 			fill type: linear gradient
-			fill color 1:   rgb(255, 160, 40)
-			fill color 2:   rgb(202, 49, 35)
+			fill color 1:   rgb(245,148,31)
+			fill color 2:   rgb(186,45,38)
 			border color 1: rgb(0,  0,  0)
 			border color 2: rgb(0,  0,  0)
 		variation:

data/magic.mse-game/word_lists

@@ -358,6 +358,7 @@ word list:
 			word: Scout
 			word: Serf
 			word: Shaman
+			word: Skeleton
 			word: Soldier
 			word: Spellshaper
 			word: Survivor