Revert renaming write_wubrg to write_wubrgo

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

@@ -31,6 +31,7 @@ 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)
@@ -41,27 +42,37 @@ 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 == "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"
+	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"
 }@(face:"")
 ########################################################################
 # Combining multiple colors (hybrids)
@@ -818,12 +829,13 @@ stamp_hybrid := [
 # Putting it all together.
 ########################################################################
 blend_colors := {
-	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"))
+	colors := sort_text( order: if card_is_wedge(input) then "(wbguro)" else "(wubrgo)"
+					, (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 multi and (hybrid or colors == "") then (
 		colors := colors + "m"
 	)
@@ -1103,13 +1115,14 @@ font_color_positions := [
 font_white	:= {
 	hybrid :=		chosen(choice:"hybrid"	)
 	artifact :=		chosen(choice:"artifact"	)
-	colors :=		sort_text( order: "(wubrg)"
+	colors :=		sort_text( order: "(wubrgo)"
 				,	(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 artifact				then "a")
+				+	(if chosen(choice:"green"	)	then "g")
+				+	(if chosen(choice:"orange"	)	then "o"))
+				+	(if artifact					then "a")
 	font_colors_white(
 		if		chosen(choice:"land")			then "l"
 		else if	input == "artifact, multicolor"	then "a"