New reminders for Banding and Bands with other.

Fixed horizontal hybrid textboxes and typelines.
Guild mana for magic-mana-beveled.
Last of the lands for magic-future-textless.
Keyword polishing.
Undid a change to magic sort script because card_shape doesn't work yet.
Grey hybrid names and gradient multicolor for magic-future-textless.  Still needs work.

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

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

@@ -387,7 +387,7 @@ flip_pt_hybrid2 := [
 ]
 
 ########################################################################
-# Textbox and typeline for FPM templates
+# Textbox and typeline for FPM templates and Futureshifts
 ########################################################################
 
 textbox_hybrid := [
@@ -401,7 +401,101 @@ textbox_hybrid := [
 		6: { card_hybrid_2(colors: colors[4] + colors[3]) }
 		7: { template(colors[4]) }
 	]
-	horizonal: card_hybrid.horizontal # the same
+	horizontal: [#same as horizontal from card_hybrid, but referencing script through "card_hybrid.horizontal" wasn't working
+		1: { template(colors[0]) }
+		2: card_hybrid_2
+		3: {linear_blend(
+			image1: template(colors[0])
+			x1: 0.22,  y1: 0
+			x2: 0.4,   y2: 0
+			image2: linear_blend(
+			  image1: template(colors[1])
+			  x1: 0.6,   y1: 0
+			  x2: 0.78,  y2: 0
+			  image2: template(colors[2])
+		   ))}
+		4: {linear_blend(
+			# blend = 0.16
+			image1: template(colors[0])
+			x1: 0.15,  y1: 0
+			x2: 0.31,  y2: 0
+			image2: linear_blend(
+			  image1: template(colors[1])
+			  x1: 0.42,  y1: 0
+			  x2: 0.58,  y2: 0
+			  image2: linear_blend(
+			    image1: template(colors[2])
+			    x1: 0.69, y1: 0
+			    x2: 0.85, y2: 0
+			    image2: template(colors[3])
+		   )))}
+		5: {linear_blend(
+			image1: template(colors[0])
+			x1: 2.0 / 15,  y1: 0
+			x2: 4.0 / 15,  y2: 0
+			image2: linear_blend(
+			  image1: template(colors[1])
+			  x1: 5.0 / 15,  y1: 0
+			  x2: 7.0 / 15,  y2: 0
+			  image2: linear_blend(
+			    image1: template(colors[2])
+			    x1:  8.0 / 15,  y1: 0
+			    x2: 10.0 / 15,  y2: 0
+			    image2: linear_blend(
+			      image1: template(colors[3])
+			      x1: 11.0 / 15,  y1: 0
+			      x2: 13.0 / 15,  y2: 0
+			      image2: template(colors[4])
+		   ))))}
+		6: {linear_blend(
+			image1: template(colors[0])
+			x1: 1.5 / 15,  y1: 0
+			x2: 3.1 / 15,  y2: 0
+			image2: linear_blend(
+			  image1: template(colors[1])
+			  x1: 4.1 / 15,  y1: 0
+			  x2: 5.7 / 15,  y2: 0
+			  image2: linear_blend(
+			    image1: template(colors[2])
+			    x1: 6.7 / 15,  y1: 0
+			    x2: 8.3 / 15,  y2: 0
+			    image2: linear_blend(
+			      image1: template(colors[3])
+			      x1: 9.3 / 15,  y1: 0
+			      x2: 10.9 / 15,  y2: 0
+			      image2: linear_blend(
+			        image1: template(colors[4])
+			        x1: 11.9 / 15, y1: 0
+			        x2: 13.5 / 15, y2: 0
+			        image2: template(colors[5])
+		   )))))}
+		7: {linear_blend(
+			image1: template(colors[0])
+			x1: 1.3 / 15,  y1: 0
+			x2: 2.7 / 15,  y2: 0
+			image2: linear_blend(
+			  image1: template(colors[1])
+			  x1: 3.5 / 15,  y1: 0
+			  x2: 4.9 / 15,  y2: 0
+			  image2: linear_blend(
+			    image1: template(colors[2])
+			    x1: 5.7 / 15,  y1: 0
+			    x2: 7.1 / 15,  y2: 0
+			    image2: linear_blend(
+			      image1: template(colors[3])
+			      x1: 7.9 / 15,  y1: 0
+			      x2: 9.3 / 15,  y2: 0
+			      image2: linear_blend(
+			        image1: template(colors[4])
+			        x1: 10.1 / 15, y1: 0
+			        x2: 11.5 / 15, y2: 0
+			        image2: linear_blend(
+			          image1: template(colors[5])
+			          x1: 12.3 / 15, y1: 0
+			          x2: 13.7 / 15, y2: 0
+			          image2: template(colors[6])
+		   ))))))}
+	]
 	vertical:  [
 		0: { template("c")       }
 		1: { template(colors[0]) }

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

@@ -12,18 +12,17 @@ card dpi: 150
 #By: Pichoro
 #
 #Todo:
-#More frames (missing colored lands)
 #Make different colored colorless mana symbols work
 #Casting cost mask
 #Frames can be changed to jpegs
-#Multicolor masks
-#hybrid masks
 #make colored artifacts look right
 #white font color for blue land, red land, black land, and green land
 ############################################################## Extra scripts
 
 init script:
-	# there are only wubrg templates
+	# Should hybrids have a grey name?
+	mask_hybrid_with_land := { styling.grey_hybrid_name }
+	
 	suffix := [card: "card.png", pt: "pt.png"]
 	template := { input + suffix[type] }
 	land_template := { (if input == "a" then "c" else input) + "l" + suffix[type] }
@@ -32,10 +31,30 @@ init script:
 		base := base_hybrid[shape][color_count]()
 		
 		# Put a frame around it?
-		if land and not colored_lands then "l" + suffix[type]
-		else if multi then "m" + suffix[type]
-		else if artifact then "a" + suffix[type]
-		else if color_count > 1 and mask_hybrid_with_land() then base
+		if land and not colored_lands then
+			masked_blend(
+				mask:  "multicolor_blend_{type}.png",
+				dark:  land_template("c"),
+				light: base,
+			)
+		else if multi then 
+			masked_blend(
+				mask:  "multicolor_blend_{type}.png",
+				dark:  template("m"),
+				light: base,
+			)
+		else if artifact then 
+			masked_blend(
+				mask:  "multicolor_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
 	}
 	
@@ -50,6 +69,10 @@ init script:
 
 ############################################################## Extra style options
 
+styling field:
+	type: boolean
+	name: grey hybrid name
+	description: Use a grey background for the name and type line on hybrid cards. This is done on real cards.
 styling field:
 	type: boolean
 	name: use guild mana symbols
@@ -274,3 +297,4 @@ extra card style:
 		visible: { card.pt != "" }
 		render style: image
 		image: { card_ptbox() }
+		mask: mask_pt.png

data/magic-mana-beveled.mse-symbol-font/symbol-font

@@ -53,6 +53,56 @@ symbol:
 symbol:
 	code: W/U/B
 	image: mana_wub.png
+symbol:
+	code: W/U
+	image: mana_guild_wu.png
+	image font size: 145
+	enabled: { guild_mana() }
+symbol:
+	code: U/B
+	image: mana_guild_ub.png
+	image font size: 145
+	enabled: { guild_mana() }
+symbol:
+	code: B/R
+	image: mana_guild_br.png
+	image font size: 145
+	enabled: { guild_mana() }
+symbol:
+	code: R/G
+	image: mana_guild_rg.png
+	image font size: 145
+	enabled: { guild_mana() }
+symbol:
+	code: G/W
+	image: mana_guild_gw.png
+	image font size: 145
+	enabled: { guild_mana() }
+symbol:
+	code: W/B
+	image: mana_guild_wb.png
+	image font size: 145
+	enabled: { guild_mana() }
+symbol:
+	code: U/R
+	image: mana_guild_ur.png
+	image font size: 145
+	enabled: { guild_mana() }
+symbol:
+	code: B/G
+	image: mana_guild_bg.png
+	image font size: 145
+	enabled: { guild_mana() }
+symbol:
+	code: R/W
+	image: mana_guild_rw.png
+	image font size: 145
+	enabled: { guild_mana() }
+symbol:
+	code: G/U
+	image: mana_guild_gu.png
+	image font size: 145
+	enabled: { guild_mana() }
 symbol:
 	code: W/U
 	image: mana_wu.png

data/magic.mse-game/game

@@ -170,7 +170,7 @@ init script:
 	sort_index := {
 		card_color   := card.card_color
 		casting_cost := card.casting_cost
-		if      card.shape = "split" and
+		if      card.casting_cost_2 != "" and
 		        card_color != card.card_color_2                      then "H"    # multicolor splits
 		else if chosen(choice: "land", card_color) then (
 			# land
@@ -1474,7 +1474,7 @@ keyword:
 	keyword: Banding
 	match: Banding
 	mode: old
-	reminder: When declaring attackers or blockers, this creature may group with other creatures with banding and one creature without banding. When damage is dealt, you decide where damage is dealt.
+	reminder: Any number of attacking creatures with banding, and up to one without, can form a band. Blocking a creature in the band blocks all of them. You assign combat damage for any creature blocking or blocked by this creature.
 keyword:
 	keyword: Landwalk
 	match: <atom-param>prefix</atom-param>walk
@@ -1489,12 +1489,12 @@ keyword:
 	keyword: Regeneration
 	match: Regenerate
 	mode: action
-	reminder: The next time {if has_pt() then "this creature" else "this"} would be destroyed this turn, it isn't.{if has_pt() then " Instead tap it, remove all damage from it, and remove it from combat." else " Instead tap it"}
+	reminder: The next time {if has_pt() then "this creature" else "this"} would be destroyed this turn, it isn't.{if has_pt() then " Instead tap it, remove all damage from it, and remove it from combat." else " Instead tap it."}
 keyword:
 	keyword: Bands with other
 	match: Bands with other <atom-param>name</atom-param>
 	mode: old
-	reminder: When declaring attackers or blockers, this creature may group with other creatures with banding or bands with other {param1}. When damage is dealt, you decide where damage is dealt.
+	reminder: Any number of attacking creatures with banding or bands with other {param1} can form a band. Blocking a creature in the band blocks all of them. You assign combat damage for any creature blocking or blocked by this creature and another creature with bands with other {param1}.
 keyword:
 	keyword: Rampage
 	match: Rampage <atom-param>number</atom-param>

data/vanguard.mse-game/game

@@ -540,7 +540,7 @@ keyword:
 	keyword: Banding
 	match: banding
 	mode: old
-	reminder: When declaring attackers or blockers, it may group with other creatures with banding and one creature without banding. When damage is dealt, you decide where damage is dealt.
+	reminder: Any number of attacking creatures with banding, and up to one without, can form a band. Blocking a creature in the band blocks all of them. You assign combat damage for any creature blocking or blocked by this creature.
 keyword:
 	keyword: Landwalk
 	match: <atom-param>prefix</atom-param>walk
@@ -560,7 +560,7 @@ keyword:
 	keyword: Bands with other
 	match: bands with other <atom-param>name</atom-param>
 	mode: old
-	reminder: When declaring attackers or blockers, it may group with other creatures with banding or bands with {param1}. When damage is dealt, you decide where damage is dealt.
+	reminder: Any number of attacking creatures with banding or bands with other {param1} can form a band. Blocking a creature in the band blocks all of them. You assign combat damage for any creature blocking or blocked by this creature and another creature with bands with other {param1}.
 keyword:
 	keyword: Rampage
 	match: rampage <atom-param>number</atom-param>