Revert renaming write_wubrg to write_wubrgo

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

@@ -830,13 +830,12 @@ stamp_hybrid := [
 ########################################################################
 blend_colors := {
 	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 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"
 	)
@@ -1122,8 +1121,8 @@ font_white	:= {
 				+	(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:"orange"	)	then "o"))
+				+	(if artifact					then "a")
 	font_colors_white(
 		if		chosen(choice:"land")			then "l"
 		else if	input == "artifact, multicolor"	then "a"

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

@@ -806,7 +806,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:

data/magic.mse-game/language_map

@@ -819,7 +819,7 @@ languages := [
 		is_swamp          : match@(match: "(?i)Swamp")
 		is_mountain       : match@(match: "(?i)Mountain")
 		is_forest         : match@(match: "(?i)Forest")
-		is_desert         : match@(match: "(?i)Desert")
+		is_derast         : match@(match: "(?i)Desert")
 		is_wastes         : match@(match: "(?i)Wastes")
 
 		is_class		  : match@(match: "(?i)Class")

data/magic.mse-game/script

@@ -1074,12 +1074,13 @@ remove_type := replace@(match: "(Artifact|Creature|Enchantment|Instant|Land|Plan
 	replace@(match: "[ ]+", in_context: "^<match>", replace: "")+
 	replace@(match: "[ ]+", in_context: "<match>$", replace: "")
 
-write_wubrg := {(if match(input, match:"white") then "W" else "")
-	+			(if match(input, match:"blue") then "U" else "")
-	+			(if match(input, match:"black") then "B" else "")
-	+			(if match(input, match:"red") then "R" else "")
-	+			(if match(input, match:"green") then "G" else "")
-	+			(if match(input, match:"orange") then "O" else "")
+write_wubrg := {
+	(if match(input, match:"white") then "W" else "")+
+	(if match(input, match:"blue") then "U" else "")+
+	(if match(input, match:"black") then "B" else "")+
+	(if match(input, match:"red") then "R" else "")+
+	(if match(input, match:"green") then "G" else "")+
+	(if match(input, match:"orange") then "O" else "")
 }
 colored_mana := {to_number(
 	for each sym in cmc_split(to_text()) do (
@@ -1099,14 +1100,7 @@ generic_mana := {to_number(
 }
 
 primary_card_color := {
-	artifact :=    chosen(choice:"artifact")
-		and not (	chosen(choice:"white")
-			or		chosen(choice:"blue")
-			or		chosen(choice:"black")
-			or		chosen(choice:"red")
-			or		chosen(choice:"green")
-			or		chosen(choice:"orange")
-		)
+	artifact :=    chosen(choice:"artifact") and not (chosen(choice:"white") or chosen(choice:"blue") or chosen(choice:"black") or chosen(choice:"red") or chosen(choice:"green") or chosen(choice:"orange"))
 	land :=        chosen(choice:"land")
 	multi :=       chosen(choice:"multicolor")
 	hybrid :=      chosen(choice:"hybrid")
@@ -1131,14 +1125,7 @@ primary_card_color := {
 	else                                                        input
 }
 sparker_card_color := {
-	artifact :=    chosen(choice:"artifact")
-		and not (	chosen(choice:"white")
-			or		chosen(choice:"blue")
-			or		chosen(choice:"black")
-			or		chosen(choice:"red")
-			or		chosen(choice:"green")
-			or		chosen(choice:"orange")
-		)
+	artifact :=    chosen(choice:"artifact") and not (chosen(choice:"white") or chosen(choice:"blue") or chosen(choice:"black") or chosen(choice:"red") or chosen(choice:"green") or chosen(choice:"orange"))
 	land :=        chosen(choice:"land")
 	multi :=       chosen(choice:"multicolor")
 	hybrid :=      chosen(choice:"hybrid")
@@ -1175,12 +1162,12 @@ contains_target := match@(match:"(?i)([^a-z]|^)targets?([^a-z]|$)")
 is_targeted :=     { contains_target(card.rule_text) }
 
 #### convert color word to mana symbol
-color_to_mana :=	replace@(match: "white", replace: "[W]")
-	+				replace@(match: "blue", 	replace: "[U]")
-	+				replace@(match: "black", 	replace: "[B]")
-	+				replace@(match: "red", 		replace: "[R]")
-	+				replace@(match: "green", 	replace: "[G]")
-	+				replace@(match: "orange", 	replace: "[O]")
+color_to_mana := replace@(match: "white", replace: "[W]")+
+	replace@(match: "blue", 	replace: "[U]")+
+	replace@(match: "black", 	replace: "[B]")+
+	replace@(match: "red", 		replace: "[R]")+
+	replace@(match: "green", 	replace: "[G]")+
+	replace@(match: "orange", 	replace: "[O]")
 
 #### convert number word to digit
 digital_number := {
@@ -5799,20 +5786,7 @@ apply_index := {
 		}
 		color: {fill_len(color_of_card(), lead:"A")},
 		"color category": {
-			indexes := [[lang_setting("colorless")]
-			           ,[lang_setting("white")]
-			           ,[lang_setting("blue")]
-			           ,[lang_setting("black")]
-			           ,[lang_setting("red")]
-			           ,[lang_setting("green")]
-			           ,[lang_setting("orange")]
-			           ,[lang_setting("purple")]
-			           ,[lang_setting("pink")]
-			           ,[lang_setting("yellow")]
-			           ,[lang_setting("brown")]
-			           ,[lang_setting("multicolor")]
-			           ,[lang_setting("hybrid")]
-			]
+			indexes := [[lang_setting("colorless")], [lang_setting("white")], [lang_setting("blue")], [lang_setting("black")], [lang_setting("red")], [lang_setting("green")], [lang_setting("orange")], [lang_setting("purple")], [lang_setting("pink")], [lang_setting("yellow")], [lang_setting("brown")], [lang_setting("multicolor")], [lang_setting("hybrid")]]
 			fill_len(position(of:[card.color_category], in:indexes, lead:"0", fill_to:2))
 		},
 		"exact color": {
@@ -5914,27 +5888,7 @@ skeleton_runner := {
 				(cards := cards + [new_card([name:prefix+letter_list[x]+fill_len(y, lead:"0"), rarity:rarity, super_type:super_type, casting_cost:mana_list[x]])];)
 	)
 	cards
-}@(count:1
-  ,rarity:"common"
-  ,type:""
-  ,prefix:"C"
-  ,super_type:""
-  ,color_list:["white"
-              ,"blue"
-              ,"black"
-              ,"red"
-              ,"green"
-              ,"orange"
-   ]
-  ,letter_list:["W"
-               ,"U"
-               ,"B"
-               ,"R"
-               ,"G"
-               ,"O"
-   ]
-  ,mana_list:"nope"
-)
+}@(count:1, rarity:"common", type:"", prefix:"C", super_type:"", color_list:["white", "blue", "black", "red", "green", "orange"], letter_list:["W", "U", "B", "R", "G", "O"], mana_list:"nope")
 #### outside to make singleton scripts easier
 blank_list_5 := ["","","","",""]
 blank_list_10 := ["","","","","","","","","",""]

data/magic.mse-game/statistics_script

@@ -219,14 +219,7 @@ color_category_statistic :=
 }
 face_color_category_statistic :=
 {
-	artifact := (chosen(choice:"artifact"))
-		and not (	chosen(choice:"white")
-			or		chosen(choice:"blue")
-			or		chosen(choice:"black")
-			or		chosen(choice:"red")
-			or		chosen(choice:"green")
-			or		chosen(choice:"orange")
-		)
+	artifact := chosen(choice:"artifact") and not (chosen(choice:"white") or chosen(choice:"blue") or chosen(choice:"black") or chosen(choice:"red") or chosen(choice:"green") or chosen(choice:"orange"))
 	land :=			chosen(choice:"land")
 	multi :=		chosen(choice:"multicolor")
 	hybrid :=		chosen(choice:"hybrid")
@@ -318,7 +311,7 @@ cc_colored_pips_totals_statistic :=
 {
 	cc := card.casting_cost + (if check_2_statistic() then " " + card.casting_cost_2 else "")
 	
-	join(color_code_break_statistic(cc), sep:",")
+	join(wubrgoc_break_statistic(cc), sep:",")
 }
 
 # Count how many cards have one white pip in their ability costs. Repeat for two white pips. Repeat for three, then four+, then again for other colors.
@@ -348,7 +341,7 @@ ability_colored_pips_totals_statistic :=
 	count := length(costs) - 1
 	result := for x from 0 to count do
 	(
-		"," + join(color_code_break_statistic(costs[x]), sep:",")
+		"," + join(wubrgoc_break_statistic(costs[x]), sep:",")
 	)
 	substring(result, begin: 1))
 }
@@ -399,7 +392,7 @@ devotion_filters_statistic := [
 	C: filter_text@(match:"C")
 ]
 color_pip_break_statistic := break_text@(match:"([A-Z0-9]/|[|])*[WUBRGO]")
-color_code_break_statistic := break_text@(match:"[WUBRGOC]")
+wubrgoc_break_statistic := break_text@(match:"[WUBRGOC]")
 symbol_aggregate_statistic :=
 {
 	devotion := devotion_filters_statistic[symbol](input)
@@ -474,7 +467,7 @@ face_mana_production_list_statistic :=
 	can_Chosen := lang_setting("chosen_mana_production")(combined_text) != ""
 
 	# the mana symbols we can produce
-	produced_symbols := color_code_break_statistic(lang_setting("mana_symbol_production")(combined_text))
+	produced_symbols := wubrgoc_break_statistic(lang_setting("mana_symbol_production")(combined_text))
 	
 	(if lang_setting("is_plains")(sub)		or contains_element(produced_symbols, element:"W")	then ",W" else "") +
 	(if lang_setting("is_island")(sub)		or contains_element(produced_symbols, element:"U")	then ",U" else "") +