diff --git a/data/magic-default-image.mse-include/orange.jpg b/data/magic-default-image.mse-include/orange.jpg
new file mode 100644
index 000000000..0d05a75fc
Binary files /dev/null and b/data/magic-default-image.mse-include/orange.jpg differ
diff --git a/data/magic-default-image.mse-include/scripts b/data/magic-default-image.mse-include/scripts
index e8d0c2921..7c985219a 100644
--- a/data/magic-default-image.mse-include/scripts
+++ b/data/magic-default-image.mse-include/scripts
@@ -10,6 +10,7 @@ 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"
]
diff --git a/data/magic-mana-large.mse-symbol-font/mana_o.png b/data/magic-mana-large.mse-symbol-font/mana_o.png
new file mode 100644
index 000000000..7741c1655
Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_o.png differ
diff --git a/data/magic-mana-large.mse-symbol-font/symbol-font b/data/magic-mana-large.mse-symbol-font/symbol-font
index c79a10afb..30d74d17c 100644
--- a/data/magic-mana-large.mse-symbol-font/symbol-font
+++ b/data/magic-mana-large.mse-symbol-font/symbol-font
@@ -790,6 +790,9 @@ symbol:
symbol:
code: G
image: mana_g.png
+symbol:
+ code: O
+ image: mana_o.png
symbol:
code: C
image: mana_c.png
@@ -861,6 +864,7 @@ insert symbol menu:
item: B
item: R
item: G
+ item: O
item: S
item:
type: line
diff --git a/data/magic.mse-game/card_fields b/data/magic.mse-game/card_fields
index 705cdbef2..26a867383 100644
--- a/data/magic.mse-game/card_fields
+++ b/data/magic.mse-game/card_fields
@@ -114,8 +114,9 @@ card field:
choice: blue
choice: black
choice: red
+ choice: green
choice:
- name: green
+ name: orange
line below: true
choice: artifact
choice: land
@@ -159,8 +160,9 @@ card field:
choice: blue
choice: black
choice: red
+ choice: green
choice:
- name: green
+ name: orange
line below: true
choice: artifact
choice: land
@@ -204,8 +206,9 @@ card field:
choice: blue
choice: black
choice: red
+ choice: green
choice:
- name: green
+ name: orange
line below: true
choice: artifact
choice: land
@@ -249,8 +252,9 @@ card field:
choice: blue
choice: black
choice: red
+ choice: green
choice:
- name: green
+ name: orange
line below: true
choice: artifact
choice: land
@@ -738,8 +742,9 @@ card field:
choice: blue
choice: black
choice: red
+ choice: green
choice:
- name: green
+ name: orange
line below: true
choice: artifact
choice: land
@@ -784,8 +789,9 @@ card field:
choice: blue
choice: black
choice: red
+ choice: green
choice:
- name: green
+ name: orange
line below: true
choice: artifact
choice: land
@@ -830,8 +836,9 @@ card field:
choice: blue
choice: black
choice: red
+ choice: green
choice:
- name: green
+ name: orange
line below: true
choice: artifact
choice: land
diff --git a/data/magic.mse-game/keywords_ch-t b/data/magic.mse-game/keywords_ch-t
index 82ee3355a..187899cea 100644
--- a/data/magic.mse-game/keywords_ch-t
+++ b/data/magic.mse-game/keywords_ch-t
@@ -40,7 +40,7 @@ keyword mode:
keyword parameter type:
name: 費用
- match: [ ]?[HSVECTQXYZI0-9WUBRG/|]+|[-—―～][^(\r\n\.。:：]*
+ match: [ ]?[HSVECTQXYZI0-9WUBRGO/|]+|[-—―～][^(\r\n\.。:：]*
optional: true
script: cost_parameter_script_nonspace()
reminder script: cost_parameter_script_nonspace()
diff --git a/data/magic.mse-game/keywords_da b/data/magic.mse-game/keywords_da
index dda50d47b..bdd66975d 100644
--- a/data/magic.mse-game/keywords_da
+++ b/data/magic.mse-game/keywords_da
@@ -29,7 +29,7 @@ keyword mode:
keyword parameter type:
name: mana
- match: [HSVCTQXYZI0-9WUBRG/|]+
+ match: [HSVCTQXYZI0-9WUBRGO/|]+
refer script:
name: normal
description: No changes made
@@ -48,7 +48,7 @@ keyword parameter type:
# By pichoro and bunnierein
keyword parameter type:
name: cost
- match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—][^(\r\n]*
+ match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—][^(\r\n]*
separator before is: [ —-]
separator after is: [.]
optional: false
diff --git a/data/magic.mse-game/keywords_de b/data/magic.mse-game/keywords_de
index cab2eddd5..5a81b20f7 100644
--- a/data/magic.mse-game/keywords_de
+++ b/data/magic.mse-game/keywords_de
@@ -40,7 +40,7 @@ keyword mode:
keyword parameter type:
name: Kosten
- match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
+ match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
optional: false
script: cost_parameter_script()
reminder script: cost_parameter_script()
diff --git a/data/magic.mse-game/keywords_en b/data/magic.mse-game/keywords_en
index e1127e75a..a6d721dca 100644
--- a/data/magic.mse-game/keywords_en
+++ b/data/magic.mse-game/keywords_en
@@ -29,7 +29,7 @@ keyword mode:
keyword parameter type:
name: mana
- match: [HSVCTQXYZI0-9WUBRG/|]+
+ match: [HSVCTQXYZI0-9WUBRGO/|]+
refer script:
name: normal
description: No changes made
@@ -48,7 +48,7 @@ keyword parameter type:
# By pichoro and bunnierein
keyword parameter type:
name: cost
- match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—][^(\r\n]*
+ match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—][^(\r\n]*
separator before is: [ —-]
separator after is: [.]
optional: false
diff --git a/data/magic.mse-game/keywords_es b/data/magic.mse-game/keywords_es
index 7df279379..c1eebe569 100644
--- a/data/magic.mse-game/keywords_es
+++ b/data/magic.mse-game/keywords_es
@@ -40,7 +40,7 @@ keyword mode:
keyword parameter type:
name: coste
- match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
+ match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
optional: false
script: cost_parameter_script()
reminder script: cost_parameter_script()
diff --git a/data/magic.mse-game/keywords_fr b/data/magic.mse-game/keywords_fr
index 59a0a6d1a..35500e116 100644
--- a/data/magic.mse-game/keywords_fr
+++ b/data/magic.mse-game/keywords_fr
@@ -40,7 +40,7 @@ keyword mode:
keyword parameter type:
name: coût
- match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
+ match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
script: cost_parameter_script()
reminder script: cost_parameter_script()
separator before is: ( |- ?|— ?|― ?|～)
diff --git a/data/magic.mse-game/keywords_it b/data/magic.mse-game/keywords_it
index d7e336aef..e24502d04 100644
--- a/data/magic.mse-game/keywords_it
+++ b/data/magic.mse-game/keywords_it
@@ -40,7 +40,7 @@ keyword mode:
keyword parameter type:
name: costo
- match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
+ match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
optional: false
script: cost_parameter_script()
reminder script: cost_parameter_script()
diff --git a/data/magic.mse-game/keywords_jp b/data/magic.mse-game/keywords_jp
index a79460dcf..95a475558 100644
--- a/data/magic.mse-game/keywords_jp
+++ b/data/magic.mse-game/keywords_jp
@@ -40,7 +40,7 @@ keyword mode:
keyword parameter type:
name: コスト
- match: [ ]?[HSVECTQXYZI0-9WUBRG/|]+|[-—―～][^(\r\n\.。:：]*
+ match: [ ]?[HSVECTQXYZI0-9WUBRGO/|]+|[-—―～][^(\r\n\.。:：]*
optional: true
script: cost_parameter_script_nonspace()
reminder script: cost_parameter_script_nonspace()
diff --git a/data/magic.mse-game/keywords_ko b/data/magic.mse-game/keywords_ko
index 6deeb20f9..d1ec00261 100644
--- a/data/magic.mse-game/keywords_ko
+++ b/data/magic.mse-game/keywords_ko
@@ -40,7 +40,7 @@ keyword mode:
keyword parameter type:
name: 비용
- match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
+ match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
optional: false
script: cost_parameter_script()
reminder script: cost_parameter_script()
diff --git a/data/magic.mse-game/keywords_pl b/data/magic.mse-game/keywords_pl
index dc5bbccbf..1741c5c25 100644
--- a/data/magic.mse-game/keywords_pl
+++ b/data/magic.mse-game/keywords_pl
@@ -29,7 +29,7 @@ keyword mode:
keyword parameter type:
name: mana
- match: [HSVCTQXYZI0-9WUBRG/|]+
+ match: [HSVCTQXYZI0-9WUBRGO/|]+
refer script:
name: normal
description: No changes made
@@ -48,7 +48,7 @@ keyword parameter type:
# By pichoro and bunnierein
keyword parameter type:
name: cost
- match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—][^(\r\n]*
+ match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—][^(\r\n]*
separator before is: [ —-]
separator after is: [.]
optional: false
diff --git a/data/magic.mse-game/keywords_pt-br b/data/magic.mse-game/keywords_pt-br
index 9a942bf86..3afd39997 100644
--- a/data/magic.mse-game/keywords_pt-br
+++ b/data/magic.mse-game/keywords_pt-br
@@ -40,7 +40,7 @@ keyword mode:
keyword parameter type:
name: custo
- match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
+ match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
optional: false
script: cost_parameter_script()
reminder script: cost_parameter_script()
diff --git a/data/magic.mse-game/keywords_ru b/data/magic.mse-game/keywords_ru
index 785848837..92ac2de98 100644
--- a/data/magic.mse-game/keywords_ru
+++ b/data/magic.mse-game/keywords_ru
@@ -40,7 +40,7 @@ keyword mode:
keyword parameter type:
name: стоимость
- match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
+ match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
optional: false
script: cost_parameter_script()
reminder script: cost_parameter_script()
diff --git a/data/magic.mse-game/language b/data/magic.mse-game/language
index 58871276f..016b8151b 100644
--- a/data/magic.mse-game/language
+++ b/data/magic.mse-game/language
@@ -1304,12 +1304,12 @@ reverse_list :=
cost_parameter_script :=
{
input := remove_tag(input, tag:"")
- replace(input, match:"\\b([HSVECTQXYZI0-9WUBRG/|]+)\\b(，|,|<|$)", replace:"\\1\\2")
+ replace(input, match:"\\b([HSVECTQXYZI0-9WUBRGO/|]+)\\b(，|,|<|$)", replace:"\\1\\2")
}
cost_parameter_script_nonspace :=
{
input := remove_tag(input, tag:"")
- replace(input, match:"(?\\1")
+ replace(input, match:"(?\\1")
}
cost_parameter_dash :=
{
@@ -1318,7 +1318,7 @@ cost_parameter_dash :=
}
localized_phy_reminder :=
{
- phy_matches := break_text(card.casting_cost, match:"H(/[WUBRGC])*")
+ phy_matches := break_text(card.casting_cost, match:"H(/[WUBRGOC])*")
if length(phy_matches) < 1 then "" else (
multiple := length(phy_matches) > 1
phy_matches := make_list_unique(reverse_list(sort_list(phy_matches, order_by: length))) #First symbol is used for reminder text. Prefer using hybrid mana.
diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script
index 6589c07e9..c94672abb 100644
--- a/data/magic.mse-game/script
+++ b/data/magic.mse-game/script
@@ -312,7 +312,7 @@ get_alpha_percentage :=
############################################################## For the user
#### Remove card codes
-cc_filter := replace@(match:"^[CURMSL][WUBRGMZACL][0-9]+ ?[-—]? ?", replace:"")
+cc_filter := replace@(match:"^[CURMSL][WUBRGOMZACL][0-9]+ ?[-—]? ?", replace:"")
has_alchemy := contains@(match:"alchemy")
strip_card_codes := {
save := input
@@ -506,25 +506,25 @@ crop_multi_image := {
############################################################## Sorting mana symbols
#### correctly sort a mana symbol (no guild mana)
-mana_sort := sort_text@(order: "\\?XYZI[0123456789]VHSFCAI(EKPLO)(WUBRG)")
+mana_sort := sort_text@(order: "\\?XYZI[0123456789]VHSFCAI(EKPLO)(WUBRGO)")
#### correctly sort wedge mana
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VHSFCAI(EPOKL)(WBGUR)")
#### sort nothing
-mana_unsort := sort_text@(order:"[/\\?XYZI0123456789VHSCAIEKPLOMWUBRG]")
+mana_unsort := sort_text@(order:"[/\\?XYZI0123456789VHSCAIEKPLOMWUBRGO]")
#### correctly sort guild mana
-mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VHSFCAIEKPLOWUBRG/|]") +
+mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VHSFCAIEKPLOWUBRGO/|]") +
replace@(
#### No lookbehind :(
#match: "(?($|[^/])",
- replace: {sort_text(order:"in_place((WUBRG))")}
+ replace: {sort_text(order:"in_place((WUBRGO))")}
)
#### mana filter helpers
mana_has_guild := match@(match: "[/|]") #### Is there guild or half mana in the input?
-mana_is_wedge := { chosen(set.mana_cost_sorting, choice: "tarkir wedge sorting") and ( number_of_items(in: sort_text(order:"", input), filter: "") == 3 ) }
+mana_is_wedge := { chosen(set.mana_cost_sorting, choice: "tarkir wedge sorting") and ( number_of_items(in: sort_text(order:"", input), filter: "") == 3 ) }
mana_has_wedge := {
- wedge_check := sort_text(order:"", input)
+ wedge_check := sort_text(order:"", input)
mana_is_wedge() and (wedge_check == "WUR" or wedge_check == "WBR" or wedge_check == "WBG" or wedge_check == "UBG" or wedge_check == "URG")
}
@@ -636,7 +636,7 @@ color_names_3 := { color_name(colors.0) + ", " + color_name(colors.1) + ", " + c
color_names_4 := { color_name(colors.0) + ", " + color_name(colors.1) + ", " + color_name(colors.2) + ", " + color_name(colors.3) }
color_names_5 := { color_name(colors.0) + ", " + color_name(colors.1) + ", " + color_name(colors.2) + ", " + color_name(colors.3) + ", " + color_name(colors.4) }
#### color based on mana cost, input == a mana cost
-color_filter := sort_text@(order: "")
+color_filter := sort_text@(order: "")
color_filterH := sort_text@(order: "")
mana_to_color := {
count := number_of_items(in: colors)
@@ -686,7 +686,7 @@ color_text_filter :=
) +
#### keep only mana
filter_text@(match: "]*>([^<]+)") + color_filter;
-#### get the land frame for a "WUBRG"-style input.
+#### get the land frame for a "WUBRGO"-style input.
land_multicolor := {
count := number_of_items(in: colors)
if count == 0 then "land"
@@ -711,7 +711,7 @@ text_to_color := {
text := filter_text(match: "is (colorless|all colors|((blue|white|green|red|black)((,|,? and) (blue|white|green|red|black))*))", in_context: regex_escape(card_name)+"()* \\.")
if text != "" then (
if contains(text, match: "all colors") then (
- colors := "WUBRG"
+ colors := "WUBRGO"
if land == true then land_multicolor()
else mana_to_color(hybrid: "")
) else (
@@ -769,7 +769,7 @@ list_colors := {
list := replace(list, match:", ", replace:", and ", in_context:"[^ ]+$")
list
}
-#### convert card_color to WUBRG
+#### convert card_color to WUBRGO
card_color_to_letters := {
color_string := trim_colors(input)
(if contains(color_string, match:"white") then "W" else "")
@@ -841,7 +841,7 @@ color_of_card := {
else "J" #### Artifact
) else (
#### Cards with costs.
- colors := sort_text(casting_cost, order: "")
+ colors := sort_text(casting_cost, order: "")
if colors == "" and artifact then "J" #### Artifact
else if colors == "" then "A" #### Clear Colorless
else if colors == "W" then "B" #### White
@@ -870,7 +870,7 @@ basic_land_sort := {
else "MA" #### other basic lands
}
hybrid_color_pair_sort := {
- colors := sort_text(casting_cost, order: "")
+ colors := sort_text(casting_cost, order: "")
if not set.sort_hybrid_in_pairs then "HK"
else if colors == "WU" then "HA"
else if colors == "UB" then "HB"
@@ -885,7 +885,7 @@ hybrid_color_pair_sort := {
else "HK"
}
multi_color_pair_sort := {
- colors := sort_text(casting_cost, order: "")
+ colors := sort_text(casting_cost, order: "")
if not set.sort_multicolor_in_pairs then "GK"
else if colors == "WU" then "GA"
else if colors == "UB" then "GB"
@@ -1032,11 +1032,11 @@ rarity_code := {
is_unsorted := { false }
############################################################## Statistics utilities
#### Converted mana cost
-is_half_mana := match@(match: "1/2|[|][WUBRGS]")
+is_half_mana := match@(match: "1/2|[|][WUBRGOS]")
is_half_generic := match@(match: "1/2")
-is_colored_mana := match@(match: "[WUBRG]")
+is_colored_mana := match@(match: "[WUBRGO]")
only_numbers := filter_text@(match: "^[0123456789]+")
-cmc_split := break_text@(match: "(?ix) 1/2 | [|][WUBRGC] | TK | [0-9](/[WUBRGCVHSCEKPLOTQ2]) | [0-9]+(?!/[WUBRGCVHSCEKPLOTQ2]) | [WUBRGCVHS0-9](/[WUBRGCVHS])\{0,4} ")
+cmc_split := break_text@(match: "(?ix) 1/2 | [|][WUBRGOC] | TK | [0-9](/[WUBRGOCVHSCEKPLOTQ2]) | [0-9]+(?!/[WUBRGOCVHSCEKPLOTQ2]) | [WUBRGOCVHS0-9](/[WUBRGOCVHS])\{0,4} ")
cmc := {to_number(
for each sym in cmc_split(to_text()) do (
numbers := only_numbers(sym)
@@ -1212,11 +1212,11 @@ digital_map := [
for_mana_costs := {
if input.separator_before == "—" and contains(input.param, match: " ") then ( #### multi word
if comma_count(input.param) == "," then ( #### two part
- if match(match: "^[VHSCAIETKPLOQ\\?XYZIWUBRG0-9/|]+,", input.param) then #### starts with mana
+ if match(match: "^[VHSCAIETKPLOQ\\?XYZIWUBRGO0-9/|]+,", input.param) then #### starts with mana
"{add}{alternative_cost(input.param, trim:combined_cost, s:action)}" #### "add" mana
else "{alternative_cost(input.param, trim:combined_cost, s:action)}{non}" #### else cost "non"
) else if contains(input.param, match: ",") then ( #### three+ parts
- if match(match: "^[VHSCAIETKPLOQ\\?XYZIWUBRG0-9/|]+,", input.param) then #### starts with mana
+ if match(match: "^[VHSCAIETKPLOQ\\?XYZIWUBRGO0-9/|]+,", input.param) then #### starts with mana
"{add}{alternative_cost(input.param, trim:long_cost, s:action)}" #### "add" mana with long formatting
else "{alternative_cost(input.param, trim:long_nomana_cost, s:action)}{non}" #### else cost "non" with long formatting
) else
@@ -1228,7 +1228,7 @@ for_mana_costs := {
}@(non:" in addition to any other costs", action:false, add:"")
#### return bool; is the input is a simple mana cost?
is_mana_cost := {
- match(match: "^[VHSCAIETKPLOQ\\?XYZIWUBRG0-9/|]+$", input.param)
+ match(match: "^[VHSCAIETKPLOQ\\?XYZIWUBRGO0-9/|]+$", input.param)
}
#### Convert extra costs
long_cost := replace@(match:", [A-Z]", replace: { to_lower() } )
@@ -1237,7 +1237,7 @@ long_nomana_cost := replace@(match:"[A-Z]", replace: { to_lower() })
lower_first := replace@(match:"^[A-Z]", replace: { to_lower() })
combined_cost := replace@(match:", [A-Z]", replace: { to_lower() })+
replace@(match:",", replace:" and")+
- replace@(match:"^[VHSCETKPLOQ\\?XYZIWUBRG0-9/|]+", in_context: "(^|[[:space:]])(?![a-z])", replace: "&")+
+ replace@(match:"^[VHSCETKPLOQ\\?XYZIWUBRGO0-9/|]+", in_context: "(^|[[:space:]])(?![a-z])", replace: "&")+
replace@(match:"^[A-Z]", replace: { to_lower() })
alternative_cost := {
input := trim(input)
@@ -1324,7 +1324,7 @@ protection_code := {
output
}
phy_reminder := {
- phy_match := filter_text(input, match:"(/[WUBRG])+", in_context:"H")
+ phy_match := filter_text(input, match:"(/[WUBRGO])+", in_context:"H")
letters := split_text(phy_match, match:"/")
reminder_text := ""
if length(letters) == 2 then
@@ -1508,8 +1508,8 @@ mana_context :=
| [ ]can[ ]be[ ]paid
| (pays?|additional|costs?|the|adds?|pay(ed)?[ ](with|using)) #### pay X. creatures cost 1 less. pay an additional G.
([ ]either)? #### pay either X or Y
- ([ ](]*>)?[-+=]?[VHSCETKPLOQ\\?XYZIEWUBRG0-9/|]+(]*>)?,)* #### pay X, Y or Z
- ([ ](]*>)?[-+=]?[VHSCETKPLOQ\\?XYZIEWUBRG0-9/|]+(]*>)?[ ](and|or|and/or))* #### pay X or Y
+ ([ ](]*>)?[-+=]?[VHSCETKPLOQ\\?XYZIEWUBRGO0-9/|]+(]*>)?,)* #### pay X, Y or Z
+ ([ ](]*>)?[-+=]?[VHSCETKPLOQ\\?XYZIEWUBRGO0-9/|]+(]*>)?[ ](and|or|and/or))* #### pay X or Y
[ ]
(
[,.)\"”]|$ #### (end of word)
@@ -1869,7 +1869,7 @@ text_filter :=
} +
#### step 4 : explict non mana symbols
replace@(
- match: "\\][-+=]?[VHSCEKPLOTQINF\\?XYZIWUBRG0-9/|]+\\[",
+ match: "\\][-+=]?[VHSCEKPLOTQINF\\?XYZIWUBRGO0-9/|]+\\[",
replace: {"" + mana_filter_t() + ""}
) +
#### step 5 : add mana & tap symbols
@@ -1884,13 +1884,13 @@ text_filter :=
replace: {"" + _1 + "" + _3}
) +
replace@(
- match: "\\b[VHSCEKPLOTQ\\?XYZIWUBRG0-9/|]+\\b",
+ match: "\\b[VHSCEKPLOTQ\\?XYZIWUBRGO0-9/|]+\\b",
in_context: mana_context,
replace: {"" + mana_filter_t() + ""}
) +
#### step 5b : remove false positive mana & tap symbols
replace@(
- match: "([VHSCEKPLOTQ\\?XYZIWUBRG0-9/|]+)",
+ match: "([VHSCEKPLOTQ\\?XYZIWUBRGO0-9/|]+)",
in_context: mana_un_context,
replace: "\\1"
) +
@@ -1900,7 +1900,7 @@ text_filter :=
replace: {"INF" }
) +
replace@(
- match: "\\[[-+=]?[VHSCEKPLOTQ\\?XYZIWUBRG0-9/|]+\\]",
+ match: "\\[[-+=]?[VHSCEKPLOTQ\\?XYZIWUBRGO0-9/|]+\\]",
replace: {"" + mana_filter_t() + ""}
) +
#### step 6a : auto reminder
diff --git a/data/magic.mse-game/statistics_en b/data/magic.mse-game/statistics_en
index 0ea3e72c5..e97d4e38d 100644
--- a/data/magic.mse-game/statistics_en
+++ b/data/magic.mse-game/statistics_en
@@ -20,6 +20,7 @@ statistics dimension:
group: Black
group: Red
group: Green
+ group: Orange
group: Multicolor
group: Hybrid
colors:
@@ -28,6 +29,7 @@ statistics dimension:
Black : rgb(33,33,33)
Red : rgb(156,15,15)
Green : rgb(68,144,15)
+ Orange : rgb(253,196,41)
Colorless : rgb(101,104,94)
Artifact : rgb(109,132,158)
Multicolor : rgb(244,177,10)
@@ -48,32 +50,33 @@ statistics dimension:
B : rgb(22,22,22)
R : rgb(156,15,15)
G : rgb(68,144,15)
- WU : rgb(254,192,80)
- WB : rgb(254,192,80)
- WR : rgb(254,192,80)
- WG : rgb(254,192,80)
- UB : rgb(254,192,80)
- UR : rgb(254,192,80)
- UG : rgb(254,192,80)
- BR : rgb(254,192,80)
- BG : rgb(254,192,80)
- RG : rgb(254,192,80)
- WUB : rgb(244,177,10)
- WUR : rgb(244,177,10)
- WUG : rgb(244,177,10)
- WBR : rgb(244,177,10)
- WBG : rgb(244,177,10)
- WRG : rgb(244,177,10)
- UBR : rgb(244,177,10)
- UBG : rgb(244,177,10)
- URG : rgb(244,177,10)
- BRG : rgb(244,177,10)
- WUBR : rgb(232,154,9)
- WUBG : rgb(232,154,9)
- WURG : rgb(232,154,9)
- WBRG : rgb(232,154,9)
- UBRG : rgb(232,154,9)
- WUBRG : rgb(224,133,8)
+ O : rgb(253,196,41)
+ WU : rgb(254,192,80)
+ WB : rgb(254,192,80)
+ WR : rgb(254,192,80)
+ WG : rgb(254,192,80)
+ UB : rgb(254,192,80)
+ UR : rgb(254,192,80)
+ UG : rgb(254,192,80)
+ BR : rgb(254,192,80)
+ BG : rgb(254,192,80)
+ RG : rgb(254,192,80)
+ WUB : rgb(244,177,10)
+ WUR : rgb(244,177,10)
+ WUG : rgb(244,177,10)
+ WBR : rgb(244,177,10)
+ WBG : rgb(244,177,10)
+ WRG : rgb(244,177,10)
+ UBR : rgb(244,177,10)
+ UBG : rgb(244,177,10)
+ URG : rgb(244,177,10)
+ BRG : rgb(244,177,10)
+ WUBR : rgb(232,154,9)
+ WUBG : rgb(232,154,9)
+ WURG : rgb(232,154,9)
+ WBRG : rgb(232,154,9)
+ UBRG : rgb(232,154,9)
+ WUBRG : rgb(224,133,8)
statistics dimension:
name: color identity
@@ -89,32 +92,33 @@ statistics dimension:
B : rgb(22,22,22)
R : rgb(156,15,15)
G : rgb(68,144,15)
- WU : rgb(254,192,80)
- WB : rgb(254,192,80)
- WR : rgb(254,192,80)
- WG : rgb(254,192,80)
- UB : rgb(254,192,80)
- UR : rgb(254,192,80)
- UG : rgb(254,192,80)
- BR : rgb(254,192,80)
- BG : rgb(254,192,80)
- RG : rgb(254,192,80)
- WUB : rgb(244,177,10)
- WUR : rgb(244,177,10)
- WUG : rgb(244,177,10)
- WBR : rgb(244,177,10)
- WBG : rgb(244,177,10)
- WRG : rgb(244,177,10)
- UBR : rgb(244,177,10)
- UBG : rgb(244,177,10)
- URG : rgb(244,177,10)
- BRG : rgb(244,177,10)
- WUBR : rgb(232,154,9)
- WUBG : rgb(232,154,9)
- WURG : rgb(232,154,9)
- WBRG : rgb(232,154,9)
- UBRG : rgb(232,154,9)
- WUBRG : rgb(224,133,8)
+ O : rgb(253,196,41)
+ WU : rgb(254,192,80)
+ WB : rgb(254,192,80)
+ WR : rgb(254,192,80)
+ WG : rgb(254,192,80)
+ UB : rgb(254,192,80)
+ UR : rgb(254,192,80)
+ UG : rgb(254,192,80)
+ BR : rgb(254,192,80)
+ BG : rgb(254,192,80)
+ RG : rgb(254,192,80)
+ WUB : rgb(244,177,10)
+ WUR : rgb(244,177,10)
+ WUG : rgb(244,177,10)
+ WBR : rgb(244,177,10)
+ WBG : rgb(244,177,10)
+ WRG : rgb(244,177,10)
+ UBR : rgb(244,177,10)
+ UBG : rgb(244,177,10)
+ URG : rgb(244,177,10)
+ BRG : rgb(244,177,10)
+ WUBR : rgb(232,154,9)
+ WUBG : rgb(232,154,9)
+ WURG : rgb(232,154,9)
+ WBRG : rgb(232,154,9)
+ UBRG : rgb(232,154,9)
+ WUBRG : rgb(224,133,8)
statistics dimension:
name: casting cost
@@ -713,6 +717,7 @@ statistics dimension:
B : rgb(33,33,33)
R : rgb(156,15,15)
G : rgb(68,144,15)
+ O : rgb(253,196,41)
Any : rgb(112,38,128)
Chosen : rgb(112,38,128)
@@ -730,6 +735,7 @@ statistics dimension:
group: B
group: R
group: G
+ group: O
group: Any
group: Chosen
colors:
@@ -739,6 +745,7 @@ statistics dimension:
B : rgb(33,33,33)
R : rgb(156,15,15)
G : rgb(68,144,15)
+ O : rgb(253,196,41)
Any : rgb(112,38,128)
Chosen : rgb(112,38,128)
@@ -765,6 +772,7 @@ statistics dimension:
B : rgb(33,33,33)
R : rgb(156,15,15)
G : rgb(68,144,15)
+ O : rgb(253,196,41)
Any : rgb(112,38,128)
Chosen : rgb(112,38,128)
@@ -829,6 +837,10 @@ statistics dimension:
GG : rgb(63,139,10)
GGG : rgb(46,123,0)
GGGG+ : rgb(18,102,0)
+ O : rgb(253,196,41)
+ OO : rgb(180,162,31)
+ OOO : rgb(112,128,21)
+ OOOO+ : rgb(80,90,14)
statistics dimension:
name: total pips (Casting Costs)
@@ -844,6 +856,7 @@ statistics dimension:
group: B
group: R
group: G
+ group: O
colors:
C : rgb(101,104,94)
W : rgb(255,231,185)
@@ -851,6 +864,7 @@ statistics dimension:
B : rgb(33,33,33)
R : rgb(156,15,15)
G : rgb(68,144,15)
+ O : rgb(253,196,41)
statistics dimension:
name: pip count (Ability Costs)
@@ -913,6 +927,10 @@ statistics dimension:
GG : rgb(63,139,10)
GGG : rgb(46,123,0)
GGGG+ : rgb(18,102,0)
+ O : rgb(253,196,41)
+ OO : rgb(180,162,31)
+ OOO : rgb(112,128,21)
+ OOOO+ : rgb(80,90,14)
statistics dimension:
name: total pips (Ability Costs)
@@ -928,6 +946,7 @@ statistics dimension:
group: B
group: R
group: G
+ group: O
colors:
C : rgb(101,104,94)
W : rgb(255,231,185)
@@ -935,6 +954,7 @@ statistics dimension:
B : rgb(33,33,33)
R : rgb(156,15,15)
G : rgb(68,144,15)
+ O : rgb(253,196,41)
statistics dimension:
name: pip count (All Costs)
@@ -997,6 +1017,10 @@ statistics dimension:
GG : rgb(63,139,10)
GGG : rgb(46,123,0)
GGGG+ : rgb(18,102,0)
+ O : rgb(253,196,41)
+ OO : rgb(180,162,31)
+ OOO : rgb(112,128,21)
+ OOOO+ : rgb(80,90,14)
statistics dimension:
name: total pips (All Costs)
@@ -1012,6 +1036,7 @@ statistics dimension:
group: B
group: R
group: G
+ group: O
colors:
C : rgb(101,104,94)
W : rgb(255,231,185)
@@ -1019,6 +1044,7 @@ statistics dimension:
B : rgb(33,33,33)
R : rgb(156,15,15)
G : rgb(68,144,15)
+ O : rgb(253,196,41)
statistics dimension:
name: word count
@@ -1197,32 +1223,63 @@ statistics dimension:
B : rgb(22,22,22)
R : rgb(156,15,15)
G : rgb(68,144,15)
- WU : rgb(254,192,80)
- WB : rgb(254,192,80)
- WR : rgb(254,192,80)
- WG : rgb(254,192,80)
- UB : rgb(254,192,80)
- UR : rgb(254,192,80)
- UG : rgb(254,192,80)
- BR : rgb(254,192,80)
- BG : rgb(254,192,80)
- RG : rgb(254,192,80)
- WUB : rgb(244,177,10)
- WUR : rgb(244,177,10)
- WUG : rgb(244,177,10)
- WBR : rgb(244,177,10)
- WBG : rgb(244,177,10)
- WRG : rgb(244,177,10)
- UBR : rgb(244,177,10)
- UBG : rgb(244,177,10)
- URG : rgb(244,177,10)
- BRG : rgb(244,177,10)
- WUBR : rgb(232,154,9)
- WUBG : rgb(232,154,9)
- WURG : rgb(232,154,9)
- WBRG : rgb(232,154,9)
- UBRG : rgb(232,154,9)
- WUBRG : rgb(224,133,8)
+ O : rgb(253,196,41)
+ WU : rgb(254,192,80)
+ WB : rgb(254,192,80)
+ WR : rgb(254,192,80)
+ WG : rgb(254,192,80)
+ WO : rgb(254,192,80)
+ UB : rgb(254,192,80)
+ UR : rgb(254,192,80)
+ UG : rgb(254,192,80)
+ UO : rgb(254,192,80)
+ BR : rgb(254,192,80)
+ BG : rgb(254,192,80)
+ BO : rgb(254,192,80)
+ RG : rgb(254,192,80)
+ RO : rgb(254,192,80)
+ GO : rgb(254,192,80)
+ WUB : rgb(244,177,10)
+ WUR : rgb(244,177,10)
+ WUG : rgb(244,177,10)
+ WUO : rgb(244,177,10)
+ WBR : rgb(244,177,10)
+ WBG : rgb(244,177,10)
+ WBO : rgb(244,177,10)
+ WRG : rgb(244,177,10)
+ WRO : rgb(244,177,10)
+ WGO : rgb(244,177,10)
+ UBR : rgb(244,177,10)
+ UBG : rgb(244,177,10)
+ UBO : rgb(244,177,10)
+ URG : rgb(244,177,10)
+ URO : rgb(244,177,10)
+ UGO : rgb(244,177,10)
+ BRG : rgb(244,177,10)
+ BRO : rgb(244,177,10)
+ BGO : rgb(244,177,10)
+ RGO : rgb(244,177,10)
+ WUBR : rgb(232,154,9)
+ WUBG : rgb(232,154,9)
+ WUBO : rgb(232,154,9)
+ WURG : rgb(232,154,9)
+ WURO : rgb(232,154,9)
+ WUGO : rgb(232,154,9)
+ WBRG : rgb(232,154,9)
+ WBRO : rgb(232,154,9)
+ WBGO : rgb(232,154,9)
+ WRGO : rgb(232,154,9)
+ UBRG : rgb(232,154,9)
+ UBRO : rgb(232,154,9)
+ UBGO : rgb(232,154,9)
+ URGO : rgb(232,154,9)
+ WUBRG : rgb(224,133,8)
+ WUBRO : rgb(224,133,8)
+ WUBGO : rgb(224,133,8)
+ WURGO : rgb(224,133,8)
+ WBRGO : rgb(224,133,8)
+ UBRGO : rgb(224,133,8)
+ WUBRGO : rgb(210,122,7)
statistics dimension:
name: color (All Faces)
@@ -1238,32 +1295,63 @@ statistics dimension:
B : rgb(22,22,22)
R : rgb(156,15,15)
G : rgb(68,144,15)
- WU : rgb(254,192,80)
- WB : rgb(254,192,80)
- WR : rgb(254,192,80)
- WG : rgb(254,192,80)
- UB : rgb(254,192,80)
- UR : rgb(254,192,80)
- UG : rgb(254,192,80)
- BR : rgb(254,192,80)
- BG : rgb(254,192,80)
- RG : rgb(254,192,80)
- WUB : rgb(244,177,10)
- WUR : rgb(244,177,10)
- WUG : rgb(244,177,10)
- WBR : rgb(244,177,10)
- WBG : rgb(244,177,10)
- WRG : rgb(244,177,10)
- UBR : rgb(244,177,10)
- UBG : rgb(244,177,10)
- URG : rgb(244,177,10)
- BRG : rgb(244,177,10)
- WUBR : rgb(232,154,9)
- WUBG : rgb(232,154,9)
- WURG : rgb(232,154,9)
- WBRG : rgb(232,154,9)
- UBRG : rgb(232,154,9)
- WUBRG : rgb(224,133,8)
+ O : rgb(253,196,41)
+ WU : rgb(254,192,80)
+ WB : rgb(254,192,80)
+ WR : rgb(254,192,80)
+ WG : rgb(254,192,80)
+ WO : rgb(254,192,80)
+ UB : rgb(254,192,80)
+ UR : rgb(254,192,80)
+ UG : rgb(254,192,80)
+ UO : rgb(254,192,80)
+ BR : rgb(254,192,80)
+ BG : rgb(254,192,80)
+ BO : rgb(254,192,80)
+ RG : rgb(254,192,80)
+ RO : rgb(254,192,80)
+ GO : rgb(254,192,80)
+ WUB : rgb(244,177,10)
+ WUR : rgb(244,177,10)
+ WUG : rgb(244,177,10)
+ WUO : rgb(244,177,10)
+ WBR : rgb(244,177,10)
+ WBG : rgb(244,177,10)
+ WBO : rgb(244,177,10)
+ WRG : rgb(244,177,10)
+ WRO : rgb(244,177,10)
+ WGO : rgb(244,177,10)
+ UBR : rgb(244,177,10)
+ UBG : rgb(244,177,10)
+ UBO : rgb(244,177,10)
+ URG : rgb(244,177,10)
+ URO : rgb(244,177,10)
+ UGO : rgb(244,177,10)
+ BRG : rgb(244,177,10)
+ BRO : rgb(244,177,10)
+ BGO : rgb(244,177,10)
+ RGO : rgb(244,177,10)
+ WUBR : rgb(232,154,9)
+ WUBG : rgb(232,154,9)
+ WUBO : rgb(232,154,9)
+ WURG : rgb(232,154,9)
+ WURO : rgb(232,154,9)
+ WUGO : rgb(232,154,9)
+ WBRG : rgb(232,154,9)
+ WBRO : rgb(232,154,9)
+ WBGO : rgb(232,154,9)
+ WRGO : rgb(232,154,9)
+ UBRG : rgb(232,154,9)
+ UBRO : rgb(232,154,9)
+ UBGO : rgb(232,154,9)
+ URGO : rgb(232,154,9)
+ WUBRG : rgb(224,133,8)
+ WUBRO : rgb(224,133,8)
+ WUBGO : rgb(224,133,8)
+ WURGO : rgb(224,133,8)
+ WBRGO : rgb(224,133,8)
+ UBRGO : rgb(224,133,8)
+ WUBRGO : rgb(210,122,7)
statistics dimension:
name: color (Promos)
@@ -1279,32 +1367,63 @@ statistics dimension:
B : rgb(22,22,22)
R : rgb(156,15,15)
G : rgb(68,144,15)
- WU : rgb(254,192,80)
- WB : rgb(254,192,80)
- WR : rgb(254,192,80)
- WG : rgb(254,192,80)
- UB : rgb(254,192,80)
- UR : rgb(254,192,80)
- UG : rgb(254,192,80)
- BR : rgb(254,192,80)
- BG : rgb(254,192,80)
- RG : rgb(254,192,80)
- WUB : rgb(244,177,10)
- WUR : rgb(244,177,10)
- WUG : rgb(244,177,10)
- WBR : rgb(244,177,10)
- WBG : rgb(244,177,10)
- WRG : rgb(244,177,10)
- UBR : rgb(244,177,10)
- UBG : rgb(244,177,10)
- URG : rgb(244,177,10)
- BRG : rgb(244,177,10)
- WUBR : rgb(232,154,9)
- WUBG : rgb(232,154,9)
- WURG : rgb(232,154,9)
- WBRG : rgb(232,154,9)
- UBRG : rgb(232,154,9)
- WUBRG : rgb(224,133,8)
+ O : rgb(253,196,41)
+ WU : rgb(254,192,80)
+ WB : rgb(254,192,80)
+ WR : rgb(254,192,80)
+ WG : rgb(254,192,80)
+ WO : rgb(254,192,80)
+ UB : rgb(254,192,80)
+ UR : rgb(254,192,80)
+ UG : rgb(254,192,80)
+ UO : rgb(254,192,80)
+ BR : rgb(254,192,80)
+ BG : rgb(254,192,80)
+ BO : rgb(254,192,80)
+ RG : rgb(254,192,80)
+ RO : rgb(254,192,80)
+ GO : rgb(254,192,80)
+ WUB : rgb(244,177,10)
+ WUR : rgb(244,177,10)
+ WUG : rgb(244,177,10)
+ WUO : rgb(244,177,10)
+ WBR : rgb(244,177,10)
+ WBG : rgb(244,177,10)
+ WBO : rgb(244,177,10)
+ WRG : rgb(244,177,10)
+ WRO : rgb(244,177,10)
+ WGO : rgb(244,177,10)
+ UBR : rgb(244,177,10)
+ UBG : rgb(244,177,10)
+ UBO : rgb(244,177,10)
+ URG : rgb(244,177,10)
+ URO : rgb(244,177,10)
+ UGO : rgb(244,177,10)
+ BRG : rgb(244,177,10)
+ BRO : rgb(244,177,10)
+ BGO : rgb(244,177,10)
+ RGO : rgb(244,177,10)
+ WUBR : rgb(232,154,9)
+ WUBG : rgb(232,154,9)
+ WUBO : rgb(232,154,9)
+ WURG : rgb(232,154,9)
+ WURO : rgb(232,154,9)
+ WUGO : rgb(232,154,9)
+ WBRG : rgb(232,154,9)
+ WBRO : rgb(232,154,9)
+ WBGO : rgb(232,154,9)
+ WRGO : rgb(232,154,9)
+ UBRG : rgb(232,154,9)
+ UBRO : rgb(232,154,9)
+ UBGO : rgb(232,154,9)
+ URGO : rgb(232,154,9)
+ WUBRG : rgb(224,133,8)
+ WUBRO : rgb(224,133,8)
+ WUBGO : rgb(224,133,8)
+ WURGO : rgb(224,133,8)
+ WBRGO : rgb(224,133,8)
+ UBRGO : rgb(224,133,8)
+ WUBRGO : rgb(210,122,7)
statistics dimension:
name: omniverse color
@@ -1322,10 +1441,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 +1454,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)