First Alara Reborn keyword for Magic.

Lots of improvements to blends and default blends.
Some new words for dictionary.

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

data/magic-blends.mse-include/include

@@ -1,6 +1,6 @@
-mse version: 0.3.7
+mse version: 0.3.8
 full name: Magic The Gathering, card blend utilities
-version: 2008-09-24
+version: 2009-04-09
 
 # 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

@@ -521,6 +521,16 @@ color_combination := {
 			dark:  template("m"),
 			light: base,
 		)
+	else if artifact and color_count > 1 and mask_hybrid_with_land() then 
+		masked_blend(
+			mask:  "artifact_blend_{type}.png",
+			dark:  template("a"),
+			light: masked_blend(
+				mask: "multicolor_blend_{type}.png",
+				dark: template("c"),
+				light: base
+			)
+		)
 	else if artifact then 
 		masked_blend(
 			mask:  "artifact_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: 2009-01-10
+version: 2009-04-08
 depends on: magic-blends.mse-include 2007-09-23
 depends on: magic-watermarks.mse-include 2007-09-23
 

data/magic.mse-game/keywords

@@ -635,3 +635,8 @@ keyword:
 	match: Domain
 	mode: pseudo
 	rules: Domain — [effect] for each basic land type among lands you control.
+keyword:
+	keyword: Cascade
+	match: Cascade
+	mode: expert
+	reminder: When you play this spell, remove the top card of your library from the game until you remove a nonland card that costs less. You may play that card without paying its mana cost. Put the removed cards on the bottom of your library at random.

data/magic.mse-game/magic-words.en_US.dic

@@ -36,3 +36,5 @@ lifelink
 gravestorm
 fateseal
 bloodthirst
+djinn
+unattach

data/magic.mse-game/script

@@ -53,7 +53,7 @@ mana_to_color := {
 	count  := number_of_items(in: colors)
 	if hybrid == "" and contains(type, match:"Artifact") then
 		# not a hybrid, but artifact
-		if      count == 0 then  "artifact"
+		if      count == 0 then  "colorless"
 		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"
@@ -78,14 +78,12 @@ mana_to_color := {
 		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, not artifact
 		if count == 0 then "colorless"
 		else if count == 1 then color_names_1()
 		else if count == 2 then  color_names_2() + ", hybrid"
-		else if count == 3 then  color_names_3() + ", hybrid"
 		else                     "multicolor"
 }
 
@@ -209,20 +207,35 @@ basic_land_sort := {
 	else if contains(card.name, match:"Forest")   then "LF"      # Forests
 	else                                               "LA"      # other basic lands
 }
-hybrid_cost_sort := {
+hybrid_color_pair_sort := {
 	colors := sort_text(casting_cost, order: "<WUBRG>")
 	if colors = "WU" then "GA"
-	else if colors = "WB" then "GB"
+	else if colors = "UB" then "GB"
-	else if colors = "UB" then "GC"
+	else if colors = "BR" then "GC"
-	else if colors = "UR" then "GD"
+	else if colors = "RG" then "GD"
-	else if colors = "BR" then "GE"
+	else if colors = "GW" then "GE"
-	else if colors = "BG" then "GF"
+	else if colors = "WB" then "GF"
-	else if colors = "RG" then "GG"
+	else if colors = "UR" then "GG"
-	else if colors = "WR" then "GH"
+	else if colors = "BG" then "GH"
-	else if colors = "WG" then "GI"
+	else if colors = "RW" then "GI"
-	else if colors = "UG" then "GJ"
+	else if colors = "GU" then "GJ"
 	else "GK"
 }
+multi_color_pair_sort := {
+	colors := sort_text(casting_cost, order: "<WUBRG>")
+	if colors = "WU" then "FA"
+	else if colors = "UB" then "FB"
+	else if colors = "BR" then "FC"
+	else if colors = "RG" then "FD"
+	else if colors = "GW" then "FE"
+	else if colors = "WB" then "FF"
+	else if colors = "UR" then "FG"
+	else if colors = "BG" then "FH"
+	else if colors = "RW" then "FI"
+	else if colors = "GU" then "FJ"
+	else if contains(card.casting_cost, match:"/") then "FL"
+	else "FK"
+}
 # A code for the color of the card
 color_of_card := {
 	card_color := card.card_color
@@ -250,9 +263,9 @@ color_of_card := {
 		else if colors == "B" then "C"                       # Black
 		else if colors == "R" then "D"                       # Red
 		else if colors == "G" then "E"                       # Green
-		else if is_hybrid_cost() then hybrid_cost_sort()  #Hybrid
+		else if is_hybrid_cost() then hybrid_color_pair_sort()  #Hybrid (by pairs)
 		else if contains(casting_cost, match:"/") and contains(card_color, match:"artifact") then "I" # Colorless/Artifact
-		else                       "F"                       # Multicolor
+		else                       multi_color_pair_sort()   # Multicolor (by pairs)
 	)
 }