diff --git a/data/magic.mse-game/game_script b/data/magic.mse-game/game_script index 718026b52..6142ce4ba 100644 --- a/data/magic.mse-game/game_script +++ b/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") diff --git a/data/magic.mse-game/language_map b/data/magic.mse-game/language_map index 3d254f229..cc19ab400 100644 --- a/data/magic.mse-game/language_map +++ b/data/magic.mse-game/language_map @@ -857,10 +857,10 @@ languages := [ black : "Black" red : "Red" green : "Green" + orange : "Orange" purple : "Purple" pink : "Pink" yellow : "Yellow" - orange : "Orange" brown : "Brown" multicolor : "Multicolor" hybrid : "Hybrid" diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script index d483348cc..cfd883e32 100644 --- a/data/magic.mse-game/script +++ b/data/magic.mse-game/script @@ -5790,10 +5790,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")] diff --git a/data/magic.mse-game/statistics_en b/data/magic.mse-game/statistics_en index 0ea3e72c5..8af46ed40 100644 --- a/data/magic.mse-game/statistics_en +++ b/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) diff --git a/data/magic.mse-game/statistics_script b/data/magic.mse-game/statistics_script index c3f94acd0..2a3f5dcab 100644 --- a/data/magic.mse-game/statistics_script +++ b/data/magic.mse-game/statistics_script @@ -262,7 +262,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") @@ -271,20 +271,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 }