[required] card fields

data/magic.mse-game/game_script

@@ -7,11 +7,11 @@ card list color script:
 	else if input == "black"  then rgb(0,0,0)
 	else if input == "red"    then rgb(168,0,0)
 	else if input == "green"  then rgb(0,168,0)
+	else if input == "orange" then rgb(253,196,41)
 	else if input == "pink"   then rgb(210,60,140)
 	else if input == "purple" then rgb(150,100,160)
 	else if input == "yellow" then rgb(190,200,50)
 	else if input == "brown"  then rgb(51, 10, 0)
-	else if input == "orange" then rgb(255, 51, 0)
 	else (
 		artifact := chosen(choice:"artifact")
 		land     := chosen(choice:"land")

data/magic.mse-game/language_map

@@ -819,6 +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_wastes         : match@(match: "(?i)Wastes")
 
 		is_class		  : match@(match: "(?i)Class")
@@ -858,10 +859,10 @@ languages := [
 		black             : "Black"
 		red               : "Red"
 		green             : "Green"
+		orange            : "Orange"
 		purple            : "Purple"
 		pink              : "Pink"
 		yellow            : "Yellow"
-		orange            : "Orange"
 		brown             : "Brown"
 		multicolor        : "Multicolor"
 		hybrid            : "Hybrid"

data/magic.mse-game/script

@@ -832,30 +832,32 @@ color_of_card := {
 	#type := card.super_type
 	artifact := chosen(card_color, choice:"artifact")
 	if	contains(card.shape, match: "split") and
-		card_color != card.card_color_2 then "I"                         #### Diff Color Splits
+		card_color != card.card_color_2 then "K"                         #### Diff Color Splits
 	else if chosen(choice: "land", card_color) then (                    #### Lands
-		if card.rarity != "basic land" then "L"                          #### Nonbasic Land
+		if card.rarity != "basic land" then "M"                          #### Nonbasic Land
 		else basic_land_sort()                                           #### Basic Land
 	) else if is_null_cost(casting_cost) then (                          #### Non-Land Cards with no or zero costs.
 		if chosen(choice: "colorless", card_color) then "A"              #### Clear Colorless
-		else if chosen(choice: "hybrid", card_color)    then "HK"        #### Hybrids
-		else if is_multicolor(card_color)          then "GK"             #### Multicolor
+		else if chosen(choice: "hybrid", card_color)    then "IL"        #### Hybrids
+		else if is_multicolor(card_color)          then "HL"             #### Multicolor
 		else if chosen(choice:"white", card_color) then "B"              #### White
 		else if chosen(choice:"blue", card_color)  then "C"              #### Blue
 		else if chosen(choice:"black", card_color) then "D"              #### Black
 		else if chosen(choice:"red", card_color)   then "E"              #### Red
 		else if chosen(choice:"green", card_color) then "F"              #### Green
-		else                                            "J"              #### Artifact
+		else if chosen(choice:"orange", card_color) then "G"              #### Orange
+		else                                            "K"              #### Artifact
 	) else (
 		                                                                 #### Cards with costs.
-		colors := sort_text(casting_cost, order: "<WUBRG>")
-		if colors == "" and artifact then "J"    						#### Artifact
+		colors := sort_text(casting_cost, order: "<WUBRGO>")
+		if colors == "" and artifact then "K"    						#### Artifact
 		else if colors == ""  then "A"                                   #### Clear Colorless
 		else if colors == "W" then "B"                                   #### White
 		else if colors == "U" then "C"                                   #### Blue
 		else if colors == "B" then "D"                                   #### Black
 		else if colors == "R" then "E"                                   #### Red
 		else if colors == "G" then "F"                                   #### Green
+		else if colors == "O" then "G"                                   #### Orange
 		else if is_hybrid_cost() then hybrid_color_pair_sort()           #### Hybrid (by pairs)
 		else if contains(casting_cost, match:"/") and artifact then "I"  #### Hybrid Artifacts
 		else                       multi_color_pair_sort()               #### Multicolor (by pairs)
@@ -874,6 +876,7 @@ basic_land_sort := {
 	else if contains(name, match:"Swamp")    then "MD"      #### Swamps
 	else if contains(name, match:"Mountain") then "ME"      #### Mountains
 	else if contains(name, match:"Forest")   then "MF"      #### Forests
+	else if contains(name, match:"Desert")   then "MG"      #### Desert
 	else                                               "MA"      #### other basic lands
 }
 hybrid_color_pair_sort := {
@@ -889,7 +892,12 @@ hybrid_color_pair_sort := {
 	else if colors == "BG" then "HH"
 	else if colors == "WR" then "HI"
 	else if colors == "UG" then "HJ"
-	else "HK"
+	else if colors == "WO" then "HK"
+	else if colors == "UO" then "HL"
+	else if colors == "BO" then "HM"
+	else if colors == "RO" then "HN"
+	else if colors == "GO" then "HO"
+	else "HP"
 }
 multi_color_pair_sort := {
 	colors := sort_text(casting_cost, order: "<WUBRGO>")
@@ -904,8 +912,13 @@ multi_color_pair_sort := {
 	else if colors == "BG" then "GH"
 	else if colors == "WR" then "GI"
 	else if colors == "UG" then "GJ"
-	else if contains(card.casting_cost, match:"/") then "GL"
-	else "GK"
+	else if colors == "WO" then "GK"
+	else if colors == "UO" then "GL"
+	else if colors == "BO" then "GM"
+	else if colors == "RO" then "GN"
+	else if colors == "GO" then "GO"
+	else if contains(card.casting_cost, match:"/") then "GQ"
+	else "GP"
 }
 
 #### Sort the card into its rarity tier
@@ -5792,10 +5805,10 @@ apply_index := {
 			           ,[lang_setting("black")]
 			           ,[lang_setting("red")]
 			           ,[lang_setting("green")]
+			           ,[lang_setting("orange")]
 			           ,[lang_setting("purple")]
 			           ,[lang_setting("pink")]
 			           ,[lang_setting("yellow")]
-			           ,[lang_setting("orange")]
 			           ,[lang_setting("brown")]
 			           ,[lang_setting("multicolor")]
 			           ,[lang_setting("hybrid")]
@@ -5925,10 +5938,10 @@ skeleton_runner := {
 #### outside to make singleton scripts easier
 blank_list_5 := ["","","","",""]
 blank_list_10 := ["","","","","","","","","",""]
-mana_list_ally := ["WU","UB","BR","RG","GW"]
-mana_list_enemy := ["WB","UR","BG","RW","GU"]
-mana_list_shard := ["WUB","UBR","BRG","RGW","GWU"]
-mana_list_wedge := ["WBG","URW","BGU","RWB","GUR"]
+mana_list_ally := ["WU","UB","BR","RG","GW","GO","OW"]
+mana_list_enemy := ["WB","UR","BG","RW","GU","UO","BO","RO"]
+mana_list_shard := ["WUB","UBR","BRG","RGW","GWU"] # TODO: Add shard triplets for orange
+mana_list_wedge := ["WBG","URW","BGU","RWB","GUR"] # TODO: Add wedge triples for orange
 skeleton_script := {
 	cards := [];
 	cards := cards + skeleton_runner(count:skeleton_commons);

data/magic.mse-game/statistics_en

@@ -1322,10 +1322,10 @@ statistics dimension:
 	group: Black
 	group: Red
 	group: Green
+	group: Orange
 	group: Purple
 	group: Pink
 	group: Yellow
-	group: Orange
 	group: Brown
 	group: Multicolor
 	group: Hybrid
@@ -1335,10 +1335,10 @@ statistics dimension:
 		Black		: rgb(33,33,33)
 		Red		: rgb(156,15,15)
 		Green		: rgb(68,144,15)
+		Orange		: rgb(253,196,41)
 		Purple		: rgb(150,100,160)
 		Pink		: rgb(255,175,200)
 		Yellow		: rgb(242,247,94)
-		Orange		: rgb(255,181,121)
 		Brown		: rgb(191,171,144)
 		Colorless	: rgb(101,104,94)
 		Artifact	: rgb(109,132,158)

data/magic.mse-game/statistics_script

@@ -263,7 +263,7 @@ face_omniverse_color_statistic :=
 {
 	if		chosen(choice: "land")											then	all_en_space_statistic(lang_setting("land"))
 	else if chosen(choice: "multicolor")									then	all_en_space_statistic(lang_setting("multicolor"))
-	else if count_chosen(choices: "white, blue, black, red, green, pink, purple, yellow, orange, brown") == 2
+	else if count_chosen(choices: "white, blue, black, red, green, orange, pink, purple, yellow, brown") == 2
 		and	chosen(choice: "artifact")										then	all_en_space_statistic(lang_setting("hybrid"))		##hybrid artifacts would show as their first color
 	else if chosen(choice: "hybrid")										then	all_en_space_statistic(lang_setting("hybrid"))
 	else if (chosen(choice: "artifact")
@@ -272,20 +272,20 @@ face_omniverse_color_statistic :=
 					or	chosen(choice: "black")
 					or	chosen(choice: "red")
 					or	chosen(choice: "green")
+					or	chosen(choice: "orange")
 					or	chosen(choice: "pink")
 					or	chosen(choice: "purple")
 					or	chosen(choice: "yellow")
-					or	chosen(choice: "orange")
 					or	chosen(choice: "brown")))							then	all_en_space_statistic(lang_setting("artifact"))
 	else if chosen(choice: "white")											then	all_en_space_statistic(lang_setting("white"))
 	else if chosen(choice: "blue")											then	all_en_space_statistic(lang_setting("blue"))
 	else if chosen(choice: "black")											then	all_en_space_statistic(lang_setting("black"))
 	else if chosen(choice: "red")											then	all_en_space_statistic(lang_setting("red"))
 	else if chosen(choice: "green")											then	all_en_space_statistic(lang_setting("green"))
+	else if chosen(choice: "orange")										then	all_en_space_statistic(lang_setting("orange"))
 	else if chosen(choice: "pink")											then	all_en_space_statistic(lang_setting("pink"))
 	else if chosen(choice: "purple")										then	all_en_space_statistic(lang_setting("purple"))
 	else if chosen(choice: "yellow")										then	all_en_space_statistic(lang_setting("yellow"))
-	else if chosen(choice: "orange")										then	all_en_space_statistic(lang_setting("orange"))
 	else if chosen(choice: "brown")											then	all_en_space_statistic(lang_setting("brown"))
 	else																			input
 }
@@ -481,6 +481,7 @@ face_mana_production_list_statistic :=
 	(if lang_setting("is_swamp")(sub)		or contains_element(produced_symbols, element:"B")	then ",B" else "") +
 	(if lang_setting("is_mountain")(sub)	or contains_element(produced_symbols, element:"R")	then ",R" else "") +
 	(if lang_setting("is_forest")(sub)		or contains_element(produced_symbols, element:"G")	then ",G" else "") +
+	(if lang_setting("is_desert")(sub)		or contains_element(produced_symbols, element:"O")	then ",O" else "") +
 	(if lang_setting("is_wastes")(name)		or contains_element(produced_symbols, element:"C")	then ",C" else "") +
 	(if can_Any																					then ","+all_en_space_statistic(lang_setting("mana_any")) else "") +
 	(if can_Chosen																				then ","+all_en_space_statistic(lang_setting("mana_chosen")) else "")