More Shadowmoor Updates.

New keyword (Conspire).
New colored artifact blends.
Partially adjusted sorting.
Truncated legend names via "@".
Fixed some errors in magic-new-flip.

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

data/magic-blends.mse-include/include

@@ -1,6 +1,6 @@
 mse version: 0.3.6
 full name: Magic The Gathering, card blend utilities
-version: 2008-01-20
+version: 2008-04-13
 
 # 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

@@ -513,7 +513,7 @@ color_combination := {
 		)
 	else if artifact then 
 		masked_blend(
-			mask:  "multicolor_blend_{type}.png",
+			mask:  "artifact_blend_{type}.png",
 			dark:  template("a"),
 			light: base,
 		)

data/magic-extended-art.mse-style/style

@@ -5,7 +5,7 @@ short name: Extended Art
 icon: card-sample.png
 position hint: 006
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

data/magic-firepenguinmaster-flip.mse-style/style

@@ -5,7 +5,7 @@ short name: FPM Flip
 icon: card-sample.png
 position hint: 402
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

data/magic-firepenguinmaster.mse-style/style

@@ -5,7 +5,7 @@ short name: FPM Normal
 icon: card-sample.png
 position hint: 401
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

data/magic-firepenguinmasterpromo.mse-style/style

@@ -5,7 +5,7 @@ short name: FPM Promo
 icon: card-sample.png
 position hint: 404
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

data/magic-firepenguinmastersplit.mse-style/style

@@ -5,7 +5,7 @@ short name: FPM Split
 icon: card-sample.png
 position hint: 403
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

data/magic-firepenguinmastertokens.mse-style/style

@@ -5,7 +5,7 @@ short name: FPM Token
 icon: card-sample.png
 position hint: 407
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

data/magic-future-textless.mse-style/style

@@ -5,7 +5,7 @@ full name: Futureshift Textless
 icon: card-sample.png
 position hint: 055
 
-version: 2008-03-12
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-09-23
@@ -34,43 +34,6 @@ init script:
 	
 	template      := { input + "{type}.jpg" }
 	land_template := { (if input == "a" then "c" else input) + "l{type}.jpg" }
-	color_combination := {
-		# The base hybrid, without the outer frame blended over it
-		base := base_hybrid[shape][color_count]()
-		
-		# Put a frame around it?
-		if land and not colored_lands then
-			masked_blend(
-				mask:  "multicolor_blend_{type}.png",
-				dark:  land_template("c"),
-				light: base,
-			)
-		else if land and multi and mask_multi_land_with_color() then
-			masked_blend(
-				mask:  "hybrid_blend_{type}.png",
-				dark:  base,
-				light:  land_template("m"),
-			)
-		else if multi then 
-			masked_blend(
-				mask:  "multicolor_blend_{type}.png",
-				dark:  template("m"),
-				light: base,
-			)
-		else if artifact then 
-			masked_blend(
-				mask:  "artifact_blend_{type}.png",
-				dark:  template("a"),
-				light: base,
-			)
-		else if color_count > 1 and mask_hybrid_with_land() then
-			masked_blend(
-				mask:  "hybrid_blend_{type}.png",
-				dark:  land_template("c"),
-				light: base,
-			)
-		else base
-	}
 	
 	# Use the normal tap symbol
 	mana_t := {

data/magic-future.mse-style/style

@@ -5,7 +5,7 @@ full name: Futureshift
 icon: card-sample.png
 position hint: 050
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -42,43 +42,6 @@ init script:
 	template_suffix := [card: "card.jpg", pt: "pt.png", textbox: "textbox.png", typeline: "typeline.png"]
 	template := { input + template_suffix[type] }
 	land_template := { (if input == "a" then "c" else input) + "l" + template_suffix[type] }
-	color_combination := {
-		# The base hybrid, without the outer frame blended over it
-		base := base_hybrid[shape][color_count]()
-		
-		# Put a frame around it?
-		if land and not colored_lands then
-			masked_blend(
-				mask:  "multicolor_blend_{type}.png",
-				dark:  land_template("c"),
-				light: base,
-			)
-		else if land and multi and mask_multi_land_with_color() then
-			masked_blend(
-				mask:  "hybrid_blend_{type}.png",
-				dark:  base,
-				light:  land_template("m"),
-			)
-		else if multi then 
-			masked_blend(
-				mask:  "multicolor_blend_{type}.png",
-				dark:  template("m"),
-				light: base,
-			)
-		else if artifact then 
-			masked_blend(
-				mask:  "artifact_blend_{type}.png",
-				dark:  template("a"),
-				light: base,
-			)
-		else if color_count > 1 and mask_hybrid_with_land() then
-			masked_blend(
-				mask:  "hybrid_blend_{type}.png",
-				dark:  land_template("c"),
-				light: base,
-			)
-		else base
-	}
 	
 	# Use the normal tap symbol
 	mana_t := {

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

@@ -5,7 +5,7 @@ full name: Modern flip cards
 icon: card-sample.png
 position hint: 002
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -229,9 +229,9 @@ card style:
 			separator color: rgb(128,128,128)
 
 	type 2:
-		right: { if card.pt != "" then 86 else 34 }
+		right: { if card.pt_2 != "" then 86 else 34 }
 		bottom: 353
-		width: { if card.pt != "" then 256 else 308 }
+		width: { if card.pt_2 != "" then 256 else 308 }
 		height: 18
 		alignment: top shrink-overflow
 		angle: 180
@@ -419,7 +419,7 @@ extra card field:
 
 extra card style:
 	pt box:
-		left:	286
+		left:	285
 		top:	123
 		width:	70
 		height:	38
@@ -430,7 +430,7 @@ extra card style:
 		image: { flip_ptbox() }
 
 	pt box 2:
-		left:	17
+		left:	18
 		top:	342
 		width:	70
 		height:	38

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

@@ -5,7 +5,7 @@ full name: Modern Planeswalkers
 icon: card-sample.png
 position hint: 008
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

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

@@ -5,7 +5,7 @@ full name: Large image
 icon: card-sample.png
 position hint: 004
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

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

@@ -5,7 +5,7 @@ full name: Modern split cards
 icon: card-sample.png
 position hint: 003
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

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

@@ -5,7 +5,7 @@ full name: Modern style
 icon: card-sample.png
 position hint: 007
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

data/magic-new.mse-style/style

@@ -5,7 +5,7 @@ full name: After 8th edition
 icon: card-sample.png
 position hint: 001
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

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

@@ -5,7 +5,7 @@ short name: Old Splits
 icon: card-sample.png
 position hint: 103
 
-version: 2008-04-05
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -67,7 +67,9 @@ init script:
 			)
 		else if artifact then 
 			masked_blend(
-				mask:  "multicolor_blend_{type}.png",
+				mask: ( if styling.type_of_gradient_artifact == "full card" then "multicolor_blend_{type}.png"
+					else if styling.type_of_gradient_artifact == "trim only" then "multicolor_blend_{type}2.png"
+					else "multicolor_blend_{type}.png" ),
 				dark:  template("a"),
 				light: base,
 			)
@@ -119,6 +121,13 @@ styling field:
 	choice: full card
 	choice: trim only
 	initial: full card
+styling field:
+	type: choice
+	name: type of gradient artifact
+	description: What parts of the card should be blended for gradient artifact?
+	choice: full card
+	choice: trim only
+	initial: full card
 styling field:
 	type: choice
 	name: tap symbol

data/magic-old-token.mse-style/style

@@ -11,7 +11,7 @@ full name: Old style
 icon: card-sample.png
 position hint: 107
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -67,7 +67,9 @@ init script:
 			)
 		else if artifact then 
 			masked_blend(
-				mask:  "multicolor_blend_{type}.png",
+				mask: ( if styling.type_of_gradient_artifact == "full card" then "multicolor_blend_{type}.png"
+					else if styling.type_of_gradient_artifact == "trim only" then "multicolor_blend_{type}2.png"
+					else "multicolor_blend_{type}.png" ),
 				dark:  template("a"),
 				light: base,
 			)
@@ -121,6 +123,13 @@ styling field:
 	choice: full card
 	choice: trim only
 	initial: full card
+styling field:
+	type: choice
+	name: type of gradient artifact
+	description: What parts of the card should be blended for gradient artifact?
+	choice: full card
+	choice: trim only
+	initial: full card
 styling field:
 	type: choice
 	name: tap symbol

data/magic-old.mse-style/style

@@ -11,7 +11,7 @@ full name: Before 8th edition
 icon: card-sample.png
 position hint: 101
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29
@@ -75,7 +75,9 @@ init script:
 			)
 		else if artifact then 
 			masked_blend(
-				mask:  "multicolor_blend_{type}.png",
+				mask: ( if styling.type_of_gradient_artifact == "full card" then "multicolor_blend_{type}.png"
+					else if styling.type_of_gradient_artifact == "trim only" then "multicolor_blend_{type}2.png"
+					else "multicolor_blend_{type}.png" ),
 				dark:  template("a"),
 				light: base,
 			)
@@ -132,6 +134,13 @@ styling field:
 	choice: full card
 	choice: trim only
 	initial: full card
+styling field:
+	type: choice
+	name: type of gradient artifact
+	description: What parts of the card should be blended for gradient artifact?
+	choice: full card
+	choice: trim only
+	initial: full card
 styling field:
 	type: choice
 	name: tap symbol

data/magic-planeshifted.mse-style/style

@@ -5,7 +5,7 @@ full name: Planar Chaos Timeshifts
 icon: card-sample.png
 position hint: 011
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

data/magic-textless.mse-style/style

@@ -5,7 +5,7 @@ full name: Modern style
 icon: card-sample.png
 position hint: 005
 
-version: 2008-04-01
+version: 2008-04-13
 depends on:
 	package: magic.mse-game
 	version: 2007-12-29

data/magic.mse-game/game

@@ -5,7 +5,7 @@ installer group: magic/game files
 icon: card-back.png
 position hint: 01
 
-version: 2008-04-01
+version: 2008-04-14
 depends on:
 	package: magic-blends.mse-include
 	version: 2007-09-23
@@ -202,6 +202,20 @@ init script:
 		else if contains(card.name, match:"Forest")   then "LF"      # Forests
 		else                                               "LA"      # other basic lands
 	}
+	hybrid_cost_sort := {
+		colors := sort_text(casting_cost, order: "<WUBRG>")
+		if colors = "WU" then "GA"
+		else if colors = "WB" then "GB"
+		else if colors = "UB" then "GC"
+		else if colors = "UR" then "GD"
+		else if colors = "BR" then "GE"
+		else if colors = "BG" then "GF"
+		else if colors = "RG" then "GG"
+		else if colors = "WR" then "GH"
+		else if colors = "WG" then "GI"
+		else if colors = "UG" then "GJ"
+		else "GK"
+	}
 	color_of_card := {
 		card_color := card.card_color
 		casting_cost := card.casting_cost
@@ -211,7 +225,7 @@ init script:
 			if card.rarity != "basic land" then "K"              # Nonbasic Land
 			else basic_land_sort()
 		) else if is_null_cost(casting_cost) then (
-			if chosen(choice: "hybrid", card_color)    then "G"  # Hybrids
+			if chosen(choice: "hybrid", card_color)    then "GK"  # Hybrids
 			else if is_multicolor(card_color)          then "F"  # Multicolor
 			else if chosen(choice:"white", card_color) then "A"  # White
 			else if chosen(choice:"blue", card_color)  then "B"  # Blue
@@ -228,7 +242,7 @@ init script:
 			else if colors == "B" then "C"                       # Black
 			else if colors == "R" then "D"                       # Red
 			else if colors == "G" then "E"                       # Green
-			else if contains(casting_cost, match:"/") then "G"  #Hybrid
+			else if contains(casting_cost, match:"/") then hybrid_cost_sort()  #Hybrid
 			else                       "F"                       # Multicolor
 		)
 	}
@@ -308,6 +322,9 @@ init script:
 		 |  <param-cost>[ ]*<match></param-cost>		# keyword argument that is declared as cost
 		 |  <param-cost><match>,		# keyword argument that is declared as cost
 		 ";
+	# truncates the name of legends
+	legend_filter := replace_rule(match:", [A-Z,a-z,0-9,' ]*", replace: "" )+
+		replace_rule(match:"the [A-Z,a-z,0-9,' ]*", replace: "" )
 	# the rule text filter
 	#  - adds mana symbols
 	#  - makes text in parentheses italic
@@ -338,11 +355,21 @@ init script:
 			in_context: "(^|[[:space:]]|\\()<match>", # TODO: Allow any punctuation before
 			replace: "<atom-cardname></atom-cardname>"
 			) +
-		# step 3b : fill in atom fields
+		# step 3b : expand shortcut words ` and shortened LEGENDNAME
+		replace_rule(
+			match: "LEGENDNAME",
+			in_context: "(^|[[:space:]]|\\()<match>", # TODO: Allow any punctuation before
+			replace: "<atom-legname></atom-legname>"
+			) +
+		# step 3c : fill in atom fields
 		tag_contents_rule(
 			tag: "<atom-cardname>",
 			contents: { if card_name=="" then "CARDNAME" else card_name }
 			) +
+		tag_contents_rule(
+			tag: "<atom-legname>",
+			contents: { if card_name=="" then "LEGENDNAME" else legend_filter(card_name) }
+			) +
 		# step 4 : explict non mana symbols
 		replace_rule(
 			match: "\\][STQXYZIWUBRG0-9/|]+\\[",
@@ -1759,6 +1786,9 @@ auto replace:
 auto replace:
 	match: AAA
 	replace: as an additional cost to play
+auto replace:
+	match: @
+	replace: LEGENDNAME
 
 ############################################################## Add multiple cards
 
@@ -2424,3 +2454,8 @@ keyword:
 	match: Wither
 	mode: expert
 	reminder: This deals damage to creatures in the form of -1/-1 counters.
+keyword:
+	keyword: Conspire
+	match: Conspire
+	mode: expert
+	reminder: As you play this spell, you may tap two untapped creatures you control that share a color with it. When you do, copy it{ if is_targeted() then " and you may choose a new target for the copy" }.

data/vanguard.mse-game/game

@@ -4,7 +4,7 @@ full name: Magic Vanguard
 icon: card-sample.png
 position hint: 02
 
-version: 2008-04-01
+version: 2008-04-09
 
 # Author : Wolfwood
 # Most stuff is copy/pasted from magic.mse-game
@@ -966,3 +966,8 @@ keyword:
 	match: wither
 	mode: expert
 	reminder: It deals damage to creatures in the form of -1/-1 counters.
+keyword:
+	keyword: Conspire
+	match: conspire
+	mode: expert
+	reminder: As you play it, you may tap two untapped creatures you control that share a color with it. When you do, copy it and you may choose a new target for the copy.