Add custom mana symbols for casting time

.gitignore

@@ -6,18 +6,3 @@
 /sets/*
 /files/*
 /set symbols/*
-
-# ignore everything with magic-mainframe-extras
-/data/magic-mainframe-extras.mse-include/*
-
-# include the include file and readme
-!/data/magic-mainframe-extras.mse-include/include
-!/data/magic-mainframe-extras.mse-include/readme.txt
-
-# include the specific example files
-!/data/magic-mainframe-extras.mse-include/examples
-!/data/magic-mainframe-extras.mse-include/examples/*
-
-# include mainframe shared files until we relocate them
-!/data/magic-mainframe-extras.mse-include/mfsfiles
-!/data/magic-mainframe-extras.mse-include/mfsfiles/*

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

@@ -31,7 +31,6 @@ watermark_colors := {
 	else if trim_colors(check_colors) == "black"			then	"bb"
 	else if trim_colors(check_colors) == "red"			then	"rr"
 	else if trim_colors(check_colors) == "green"			then	"gg"
-	else if trim_colors(check_colors) == "orange"			then	"oo"
 	else if contains(check_colors, match:"multi")		or
 			contains(check_colors, match:"hybrid")	or
 			contains(check_colors, match:", land")	then	hybrid_color(face:face)
@@ -42,37 +41,27 @@ hybrid_color := {
 	check_colors := card.card_color
 	if face != "" then check_colors := face
 	trimmed := trim_colors(check_colors)
-	if		trimmed == "white, blue"				then	"wu"
-	else if	trimmed == "white, black"				then	"wb"
-	else if	trimmed == "white, red"					then	"rw"
-	else if	trimmed == "white, green"				then	"gw"
-	else if	trimmed == "white, orange"				then	"wo"
-	else if	trimmed == "blue, black"				then	"ub"
-	else if	trimmed == "blue, red"					then	"ur"
-	else if	trimmed == "blue, green"				then	"gu"
-	else if	trimmed == "blue, orange"				then	"uo"
-	else if	trimmed == "black, red"					then	"br"
-	else if	trimmed == "black, green"				then	"bg"
-	else if	trimmed == "black, orange"				then	"bo"
-	else if	trimmed == "red, green"					then	"rg"
-	else if	trimmed == "red, orange"				then	"ro"
-	else if	trimmed == "green, orange"				then	"go"
-	else if	trimmed == "white, blue, reversed"		then	"uw"
-	else if	trimmed == "white, black, reversed"		then	"bw"
-	else if	trimmed == "white, red, reversed"		then	"wr"
-	else if	trimmed == "white, green, reversed"		then	"wg"
-	else if	trimmed == "white, orange, reversed"	then	"ow"
-	else if	trimmed == "blue, black, reversed"		then	"bu"
-	else if	trimmed == "blue, red, reversed"		then	"ru"
-	else if	trimmed == "blue, green, reversed"		then	"ug"
-	else if	trimmed == "blue, orange, reversed"		then	"ou"
-	else if	trimmed == "black, red, reversed"		then	"rb"
-	else if	trimmed == "black, green, reversed"		then	"gb"
-	else if	trimmed == "black, orange, reversed"	then	"ob"
-	else if	trimmed == "red, green, reversed"		then	"gr"
-	else if	trimmed == "red, orange, reversed"		then	"or"
-	else if	trimmed == "green, orange, reversed"	then	"og"
-	else													"mm"
+	if		trimmed == "white, blue"			then	"wu"
+	else if	trimmed == "white, black"			then	"wb"
+	else if	trimmed == "white, red"				then	"rw"
+	else if	trimmed == "white, green"			then	"gw"
+	else if	trimmed == "blue, black"			then	"ub"
+	else if	trimmed == "blue, red"				then	"ur"
+	else if	trimmed == "blue, green"			then	"gu"
+	else if	trimmed == "black, red"				then	"br"
+	else if	trimmed == "black, green"			then	"bg"
+	else if	trimmed == "red, green"				then	"rg"
+	else if	trimmed == "white, blue, reversed"	then	"uw"
+	else if	trimmed == "white, black, reversed"	then	"bw"
+	else if	trimmed == "white, red, reversed"	then	"wr"
+	else if	trimmed == "white, green, reversed"	then	"wg"
+	else if	trimmed == "blue, black, reversed"	then	"bu"
+	else if	trimmed == "blue, red, reversed"	then	"ru"
+	else if	trimmed == "blue, green, reversed"	then	"ug"
+	else if	trimmed == "black, red, reversed"	then	"rb"
+	else if	trimmed == "black, green, reversed"	then	"bg"
+	else if	trimmed == "red, green, reversed"	then	"gr"
+	else												"mm"
 }@(face:"")
 ########################################################################
 # Combining multiple colors (hybrids)
@@ -829,14 +818,12 @@ stamp_hybrid := [
 # Putting it all together.
 ########################################################################
 blend_colors := {
-	colors := sort_text( order: if card_is_wedge(input) then "(wbguro)" else "(wubrgo)"
+	colors := sort_text( order: if card_is_wedge(input) then "(wbgur)" else "(wubrg)"
 					, (if chosen(choice:"white"	)	then "w")
 					+ (if chosen(choice:"blue"	)	then "u")
 					+ (if chosen(choice:"black"	)	then "b")
 					+ (if chosen(choice:"red"	)	then "r")
-					+ (if chosen(choice:"green"	)	then "g")
-					+ (if chosen(choice:"orange")	then "o")
-	)
+					+ (if chosen(choice:"green"	)	then "g"))
 	if multi and (hybrid or colors == "") then (
 		colors := colors + "m"
 	)
@@ -1116,14 +1103,13 @@ font_color_positions := [
 font_white	:= {
 	hybrid :=		chosen(choice:"hybrid"	)
 	artifact :=		chosen(choice:"artifact"	)
-	colors :=		sort_text( order: "(wubrgo)"
+	colors :=		sort_text( order: "(wubrg)"
 				,	(if chosen(choice:"white"	)	then "w")
 				+	(if chosen(choice:"blue"	)	then "u")
 				+	(if chosen(choice:"black"	)	then "b")
 				+	(if chosen(choice:"red"		)	then "r")
-				+	(if chosen(choice:"green"	)	then "g")
-				+	(if chosen(choice:"orange"	)	then "o")
-	)			+	(if artifact					then "a")
+				+	(if chosen(choice:"green"	)	then "g"))
+				+	(if artifact				then "a")
 	font_colors_white(
 		if		chosen(choice:"land")			then "l"
 		else if	input == "artifact, multicolor"	then "a"

data/magic-default-image.mse-include/scripts

@@ -10,7 +10,6 @@ default_images := [
  b: "/magic-default-image.mse-include/black.jpg"
  r: "/magic-default-image.mse-include/red.jpg"
  g: "/magic-default-image.mse-include/green.jpg"
- o: "/magic-default-image.mse-include/orange.jpg"
  l: "/magic-default-image.mse-include/land.jpg"
 ]
 

data/magic-m15-bigtext.mse-style/style

@@ -22,6 +22,9 @@ depends on:
 depends on:
 	package: magic-mana-small.mse-symbol-font
 	version: 2007-09-23
+depends on:
+	package: magic-mainframe-extras.mse-include
+	version: 2018-01-01
 
 
 card width: 375

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

@@ -790,9 +790,6 @@ symbol:
 symbol:
 	code: G
 	image: mana_g.png
-symbol:
-	code: O
-	image: mana_o.png
 symbol:
 	code: C
 	image: mana_c.png
@@ -806,7 +803,7 @@ symbol:
 	text margin right:  .21
 	text margin top:    -.15
 	text margin bottom: -.06
-	code: [0-9](?!/[WUBRGOCSTQ2])|.
+	code: [0-9](?!/[WUBRGCSTQ2])|.
 	regex: yes
 	draw text: 0
 	text font:
@@ -864,7 +861,6 @@ insert symbol menu:
 	item: B
 	item: R
 	item: G
-	item: O
 	item: S
 	item:
 		type: line