#/C Symbols for all symbol fonts.

New dark artifact frame for magic-new.
New Shadowmoor card sorting.
Slightly improved automatic card color detection.
Colorful infinity and 1/2 symbols for magic-mana-future.

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

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

@@ -1,5 +1,5 @@
 mse version: 0.3.6
-version: 2008-04-01
+version: 2008-05-18
 short name: beveled style (firepenguinmaster)
 position hint: 101
 icon: mana_r.png
@@ -188,6 +188,76 @@ symbol:
 symbol:
 	code: S
 	image: mana_s.png
+symbol:
+	image: mana_nw.png
+	code: ([XYZ0-9])+/W
+	regex: yes
+	draw text: 1
+	text margin left:   -.05
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .35
+	text font:
+		name: MPlantin
+		size: .5
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_ng.png
+	code: ([XYZ0-9])+/G
+	regex: yes
+	draw text: 1
+	text margin left:   -.05
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .35
+	text font:
+		name: MPlantin
+		size: .5
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nu.png
+	code: ([XYZ0-9])+/U
+	regex: yes
+	draw text: 1
+	text margin left:   -.05
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .35
+	text font:
+		name: MPlantin
+		size: .5
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nb.png
+	code: ([XYZ0-9])+/B
+	regex: yes
+	draw text: 1
+	text margin left:   -.05
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .35
+	text font:
+		name: MPlantin
+		size: .5
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nr.png
+	code: ([XYZ0-9])+/R
+	regex: yes
+	draw text: 1
+	text margin left:   -.05
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .35
+	text font:
+		name: MPlantin
+		size: .5
+		color: rgb(0,0,0)
+		max stretch: 0.5
 symbol:
 	code: X
 	image: mana_x.png
@@ -203,6 +273,8 @@ symbol:
 symbol:
 	image: mana_circle.png
 	code: [0-9]+|.
+	regex: yes
+	draw text: 0
 	text font:
 		name: MPlantin
 		size: 1
@@ -274,3 +346,12 @@ insert symbol menu:
 		item: B/G/W
 		item: R/W/U
 		item: G/U/B
+	item:
+		type: line
+	item:
+		name: number hybrids
+		item: 2/W
+		item: 2/U
+		item: 2/B
+		item: 2/R
+		item: 2/G

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

@@ -1,5 +1,5 @@
 mse version: 0.3.6
-version: 2008-04-01
+version: 2008-05-18
 # Symbol font in the 'futuristic' style, used for casting costs on futureshift cards
 short name: Future Sight style
 position hint: 005
@@ -13,6 +13,21 @@ symbol:
 symbol:
 	code: Q
 	image: mana_q.png
+symbol:
+	code: 2/W
+	image: mana_2w.png
+symbol:
+	code: 2/U
+	image: mana_2u.png
+symbol:
+	code: 2/B
+	image: mana_2b.png
+symbol:
+	code: 2/R
+	image: mana_2r.png
+symbol:
+	code: 2/G
+	image: mana_2g.png
 symbol:
 	code: W/U
 	image: mana_guild_wu.png
@@ -83,6 +98,26 @@ symbol:
 symbol:
 	code: G/U
 	image: mana_gu.png
+symbol:
+	code: 1/2
+	enabled: { colorless_color() == "w" }
+	image: mana_1_half_w.png
+symbol:
+	code: 1/2
+	enabled: { colorless_color() == "u" }
+	image: mana_1_half_u.png
+symbol:
+	code: 1/2
+	enabled: { colorless_color() == "b" }
+	image: mana_1_half_b.png
+symbol:
+	code: 1/2
+	enabled: { colorless_color() == "r" }
+	image: mana_1_half_r.png
+symbol:
+	code: 1/2
+	enabled: { colorless_color() == "g" }
+	image: mana_1_half_g.png
 symbol:
 	code: 1/2
 	image: mana_1_half.png
@@ -125,13 +160,35 @@ symbol:
 symbol:
 	code: S
 	image: mana_s.png
+symbol:
+	code: I
+	enabled: { colorless_color() == "w" }
+	image: mana_infinite_w.png
+symbol:
+	code: I
+	enabled: { colorless_color() == "u" }
+	image: mana_infinite_u.png
+symbol:
+	code: I
+	enabled: { colorless_color() == "b" }
+	image: mana_infinite_b.png
+symbol:
+	code: I
+	enabled: { colorless_color() == "r" }
+	image: mana_infinite_r.png
+symbol:
+	code: I
+	enabled: { colorless_color() == "g" }
+	image: mana_infinite_g.png
 symbol:
 	code: I
 	image: mana_infinite.png
 symbol:
 	image: mana_circle_w.png
 	enabled: { colorless_color() == "w" }
-	code: .|[0-9]+(?!/)
+	code: .|[0-9]+|.
+	regex: yes
+	draw text: 0
 	text font:
 		name: MPlantin
 		weight: bold
@@ -145,7 +202,9 @@ symbol:
 symbol:
 	image: mana_circle_u.png
 	enabled: { colorless_color() == "u" }
-	code: .|[0-9]+(?!/)
+	code: .|[0-9]+|.
+	regex: yes
+	draw text: 0
 	text font:
 		name: MPlantin
 		weight: bold
@@ -159,7 +218,9 @@ symbol:
 symbol:
 	image: mana_circle_b.png
 	enabled: { colorless_color() == "b" }
-	code: .|[0-9]+(?!/)
+	code: .|[0-9]+|.
+	regex: yes
+	draw text: 0
 	text font:
 		name: MPlantin
 		weight: bold
@@ -173,7 +234,9 @@ symbol:
 symbol:
 	image: mana_circle_r.png
 	enabled: { colorless_color() == "r" }
-	code: .|[0-9]+(?!/)
+	code: .|[0-9]+|.
+	regex: yes
+	draw text: 0
 	text font:
 		name: MPlantin
 		weight: bold
@@ -187,7 +250,9 @@ symbol:
 symbol:
 	image: mana_circle_g.png
 	enabled: { colorless_color() == "g" }
-	code: .|[0-9]+(?!/)
+	code: .|[0-9]+|.
+	regex: yes
+	draw text: 0
 	text font:
 		name: MPlantin
 		weight: bold
@@ -200,8 +265,9 @@ symbol:
 	text margin bottom: 0.1
 symbol:
 	image: mana_circle.png
-	enabled: { colorless_color() == "c" }
-	code: .|[0-9]+(?!/)
+	code: .|[0-9]+|.
+	regex: yes
+	draw text: 0
 	text font:
 		name: MPlantin
 		weight: bold
@@ -218,6 +284,9 @@ symbol:
 insert symbol menu:
 	item: T
 	item: Q
+	item: X
+	item: Y
+	item: Z
 	item:
 		type: line
 	item: I
@@ -257,3 +326,12 @@ insert symbol menu:
 		item: B/G
 		item: R/W
 		item: G/U
+	item:
+		type: line
+	item:
+		name: number hybrids
+		item: 2/W
+		item: 2/U
+		item: 2/B
+		item: 2/R
+		item: 2/G

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

@@ -1,5 +1,5 @@
 mse version: 0.3.6
-version: 2008-04-01
+version: 2008-05-18
 # Symbol font in the 'popup' style, used for casting costs on modern cards
 short name: popup style
 position hint: 002
@@ -201,6 +201,76 @@ symbol:
 symbol:
 	code: S
 	image: mana_s.png
+symbol:
+	image: mana_nw.png
+	code: ([XYZ0-9])+/W
+	regex: yes
+	draw text: 1
+	text margin left:   -.25
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .4
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_ng.png
+	code: ([XYZ0-9])+/G
+	regex: yes
+	draw text: 1
+	text margin left:   -.25
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .4
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nu.png
+	code: ([XYZ0-9])+/U
+	regex: yes
+	draw text: 1
+	text margin left:   -.25
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .4
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nb.png
+	code: ([XYZ0-9])+/B
+	regex: yes
+	draw text: 1
+	text margin left:   -.25
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .4
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nr.png
+	code: ([XYZ0-9])+/R
+	regex: yes
+	draw text: 1
+	text margin left:   -.25
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .4
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
 symbol:
 	code: X
 	image: mana_x.png
@@ -289,3 +359,12 @@ insert symbol menu:
 		item: B/G/W
 		item: R/W/U
 		item: G/U/B
+	item:
+		type: line
+	item:
+		name: number hybrids
+		item: 2/W
+		item: 2/U
+		item: 2/B
+		item: 2/R
+		item: 2/G

data/magic-mana-small-grey.mse-symbol-font/symbol-font

@@ -1,5 +1,5 @@
 mse version: 0.3.6
-version: 2008-04-01
+version: 2008-05-18
 short name: normal (colorless)
 position hint: 21
 icon: mana_r.png
@@ -208,6 +208,76 @@ symbol:
 symbol:
 	code: S
 	image: mana_s.png
+symbol:
+	image: mana_nw.png
+	code: ([XYZ0-9])+/W
+	regex: yes
+	draw text: 1
+	text margin left:   -.30
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .34
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_ng.png
+	code: ([XYZ0-9])+/G
+	regex: yes
+	draw text: 1
+	text margin left:   -.30
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .34
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nu.png
+	code: ([XYZ0-9])+/U
+	regex: yes
+	draw text: 1
+	text margin left:   -.30
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .34
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nb.png
+	code: ([XYZ0-9])+/B
+	regex: yes
+	draw text: 1
+	text margin left:   -.30
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .34
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nr.png
+	code: ([XYZ0-9])+/R
+	regex: yes
+	draw text: 1
+	text margin left:   -.30
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .34
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
 symbol:
 	code: X
 	image: mana_x.png
@@ -222,16 +292,18 @@ symbol:
 	image: mana_infinite.png
 symbol:
 	image: mana_circle.png
-	code: .|[0-9]+(?!/)
+	code: [0-9]+|.
+	regex: yes
+	draw text: 0
+	text margin left:   .26
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: -.14
 	text font:
 		name: MPlantin
 		size: 1
 		color: rgb(0,0,0)
 		max stretch: 0.5
-	text margin left:   .26
-	text margin right:  .2
-	text margin top:    -.14
-	text margin bottom: -.14
 
 ##############################################################
 # Insert-symbol menu
@@ -294,3 +366,12 @@ insert symbol menu:
 		item: B/G/W
 		item: R/W/U
 		item: G/U/B
+	item:
+		type: line
+	item:
+		name: number hybrids
+		item: 2/W
+		item: 2/U
+		item: 2/B
+		item: 2/R
+		item: 2/G

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

@@ -1,5 +1,5 @@
 mse version: 0.3.6
-version: 2008-04-01
+version: 2008-05-18
 short name: normal
 position hint: 001
 icon: mana_r.png
@@ -208,6 +208,79 @@ symbol:
 symbol:
 	code: S
 	image: mana_s.png
+symbol:
+	code: I
+	image: mana_infinite.png
+symbol:
+	image: mana_nw.png
+	code: ([XYZ0-9])+/W
+	regex: yes
+	draw text: 1
+	text margin left:   -.30
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .34
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_ng.png
+	code: ([XYZ0-9])+/G
+	regex: yes
+	draw text: 1
+	text margin left:   -.30
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .34
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nu.png
+	code: ([XYZ0-9])+/U
+	regex: yes
+	draw text: 1
+	text margin left:   -.30
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .34
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nb.png
+	code: ([XYZ0-9])+/B
+	regex: yes
+	draw text: 1
+	text margin left:   -.30
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .34
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
+symbol:
+	image: mana_nr.png
+	code: ([XYZ0-9])+/R
+	regex: yes
+	draw text: 1
+	text margin left:   -.30
+	text margin right:  .2
+	text margin top:    -.14
+	text margin bottom: .34
+	text font:
+		name: MPlantin
+		size: .6
+		color: rgb(0,0,0)
+		max stretch: 0.5
 symbol:
 	code: X
 	image: mana_x.png
@@ -217,9 +290,6 @@ symbol:
 symbol:
 	code: Z
 	image: mana_z.png
-symbol:
-	code: I
-	image: mana_infinite.png
 symbol:
 	image: mana_circle.png
 	code: [0-9]+|.
@@ -295,3 +365,12 @@ insert symbol menu:
 		item: B/G/W
 		item: R/W/U
 		item: G/U/B
+	item:
+		type: line
+	item:
+		name: number hybrids
+		item: 2/W
+		item: 2/U
+		item: 2/B
+		item: 2/R
+		item: 2/G

data/magic.mse-game/game

@@ -5,7 +5,7 @@ installer group: magic/game files
 icon: card-back.png
 position hint: 01
 
-version: 2008-04-14
+version: 2008-05-18
 depends on:
 	package: magic-blends.mse-include
 	version: 2007-09-23
@@ -75,7 +75,9 @@ init script:
 			else                     "multicolor"
 		else
 			# hybrid
-			if      count == 2 then  color_names_2() + ", hybrid"
+			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"
 	}
@@ -194,6 +196,7 @@ init script:
 	
 	is_multicolor := { chosen(choice: "multicolor") and input != "artifact, multicolor" }
 	is_null_cost  := { input == "" or input == "0" }
+	is_hybrid_cost := { contains(card.casting_cost, match: "W/") or contains(card.casting_cost, match: "U/") or contains(card.casting_cost, match: "B/") or contains(card.casting_cost, match: "R/") or contains(card.casting_cost, match: "G/") }
 	basic_land_sort := {
 		if contains(card.name, match:"Plains")        then "LB"      # Plains
 		else if contains(card.name, match:"Island")   then "LC"      # Islands
@@ -242,7 +245,8 @@ 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 hybrid_cost_sort()  #Hybrid
+			else if is_hybrid_cost() then hybrid_cost_sort()  #Hybrid
+			else if contains(casting_cost, match:"/") and contains(card_color, match:"artifact") then "I" # Colorless/Artifact
 			else                       "F"                       # Multicolor
 		)
 	}
@@ -490,6 +494,7 @@ init script:
 		+ 1 * filter_text(match: "^[0123456789]+(?!/)")      # colorless mana, but not 1/2
 		+ 1 * (length(sort_text(order:"compound(1/2)")) / 3) # compensate for 1/2. Should actually be 1.5 *
 	}
+
 	colored_mana := to_text + {
 		  number_of_items(in: sort_text(order: "WUBRG"))     # colored mana
 		- number_of_items(in: sort_text(order:"/"))          # guild mana, W/U -> 2 - 1