diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_chaos.png b/data/magic-mana-beveled.mse-symbol-font/mana_chaos.png new file mode 100644 index 00000000..fc113e95 Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_chaos.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/symbol-font b/data/magic-mana-beveled.mse-symbol-font/symbol-font index 4b18722f..fe3eaed4 100644 --- a/data/magic-mana-beveled.mse-symbol-font/symbol-font +++ b/data/magic-mana-beveled.mse-symbol-font/symbol-font @@ -1,5 +1,5 @@ -mse version: 0.3.7 -version: 2008-08-13 +mse version: 0.3.8 +version: 2009-08-10 short name: beveled style (firepenguinmaster) installer group: magic/Mana symbols/beveled style (FirePenguinMaster) position hint: 101 @@ -37,6 +37,10 @@ symbol: symbol: code: Q image: mana_q.png +symbol: + code: C + image: mana_chaos.png + image font size: 142.11 symbol: code: B/G/W image: mana_bgw.png @@ -285,6 +289,7 @@ symbol: insert symbol menu: item: T item: Q + item: C item: type: line item: X diff --git a/data/magic-mana-future.mse-symbol-font/mana_1_half_b.png b/data/magic-mana-future.mse-symbol-font/mana_1_half_b.png deleted file mode 100644 index 4debf431..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_1_half_b.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_1_half_g.png b/data/magic-mana-future.mse-symbol-font/mana_1_half_g.png deleted file mode 100644 index 4b8fa193..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_1_half_g.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_1_half_r.png b/data/magic-mana-future.mse-symbol-font/mana_1_half_r.png deleted file mode 100644 index dccbf279..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_1_half_r.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_1_half_u.png b/data/magic-mana-future.mse-symbol-font/mana_1_half_u.png deleted file mode 100644 index 48ba7498..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_1_half_u.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_1_half_w.png b/data/magic-mana-future.mse-symbol-font/mana_1_half_w.png deleted file mode 100644 index 318fcbd5..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_1_half_w.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_2b.png b/data/magic-mana-future.mse-symbol-font/mana_2b.png deleted file mode 100644 index 0ca6eb25..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_2b.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_2g.png b/data/magic-mana-future.mse-symbol-font/mana_2g.png deleted file mode 100644 index d6692f56..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_2g.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_2r.png b/data/magic-mana-future.mse-symbol-font/mana_2r.png deleted file mode 100644 index 672dceb4..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_2r.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_2u.png b/data/magic-mana-future.mse-symbol-font/mana_2u.png deleted file mode 100644 index d0be33c5..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_2u.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_2w.png b/data/magic-mana-future.mse-symbol-font/mana_2w.png deleted file mode 100644 index 33cfee87..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_2w.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_chaos.png b/data/magic-mana-future.mse-symbol-font/mana_chaos.png new file mode 100644 index 00000000..fc113e95 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_chaos.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_circle_mask.png b/data/magic-mana-future.mse-symbol-font/mana_circle_mask.png new file mode 100644 index 00000000..207443c7 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_circle_mask.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_infinite_b.png b/data/magic-mana-future.mse-symbol-font/mana_infinite_b.png deleted file mode 100644 index f8fabd6d..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_infinite_b.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_infinite_g.png b/data/magic-mana-future.mse-symbol-font/mana_infinite_g.png deleted file mode 100644 index dd4f3961..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_infinite_g.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_infinite_r.png b/data/magic-mana-future.mse-symbol-font/mana_infinite_r.png deleted file mode 100644 index 4a7583a2..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_infinite_r.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_infinite_u.png b/data/magic-mana-future.mse-symbol-font/mana_infinite_u.png deleted file mode 100644 index ad272abf..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_infinite_u.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_infinite_w.png b/data/magic-mana-future.mse-symbol-font/mana_infinite_w.png deleted file mode 100644 index 63ac2314..00000000 Binary files a/data/magic-mana-future.mse-symbol-font/mana_infinite_w.png and /dev/null differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_nb.png b/data/magic-mana-future.mse-symbol-font/mana_nb.png new file mode 100644 index 00000000..bf6c4778 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_nb.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_ng.png b/data/magic-mana-future.mse-symbol-font/mana_ng.png new file mode 100644 index 00000000..e9f3d22e Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_ng.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_nr.png b/data/magic-mana-future.mse-symbol-font/mana_nr.png new file mode 100644 index 00000000..d568e07c Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_nr.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_nu.png b/data/magic-mana-future.mse-symbol-font/mana_nu.png new file mode 100644 index 00000000..5427d357 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_nu.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_nw.png b/data/magic-mana-future.mse-symbol-font/mana_nw.png new file mode 100644 index 00000000..ada5c84d Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_nw.png differ diff --git a/data/magic-mana-future.mse-symbol-font/symbol-font b/data/magic-mana-future.mse-symbol-font/symbol-font index c5ba51b0..2b71a275 100644 --- a/data/magic-mana-future.mse-symbol-font/symbol-font +++ b/data/magic-mana-future.mse-symbol-font/symbol-font @@ -1,5 +1,5 @@ -mse version: 0.3.7 -version: 2008-08-13 +mse version: 0.3.8 +version: 2009-08-11 # Symbol font in the 'futuristic' style, used for casting costs on futureshift cards short name: Future Sight style installer group: magic/Mana symbols/Future Sight style @@ -15,20 +15,8 @@ symbol: code: Q image: mana_q.png symbol: - code: 2/W - image: mana_2w.png -symbol: - code: 2/U - image: mana_2u.png -symbol: - code: 2/B - image: mana_2b.png -symbol: - code: 2/R - image: mana_2r.png -symbol: - code: 2/G - image: mana_2g.png + code: C + image: mana_chaos.png symbol: code: W/U image: mana_guild_wu.png @@ -102,23 +90,23 @@ symbol: symbol: code: 1/2 enabled: { colorless_color() == "w" } - image: mana_1_half_w.png + image: {masked_blend(light: "mana_1_half.png", dark: "mana_circle_w.png", mask:"mana_circle_mask.png")} symbol: code: 1/2 enabled: { colorless_color() == "u" } - image: mana_1_half_u.png + image: {masked_blend(light: "mana_1_half.png", dark: "mana_circle_u.png", mask:"mana_circle_mask.png")} symbol: code: 1/2 enabled: { colorless_color() == "b" } - image: mana_1_half_b.png + image: {masked_blend(light: "mana_1_half.png", dark: "mana_circle_b.png", mask:"mana_circle_mask.png")} symbol: code: 1/2 enabled: { colorless_color() == "r" } - image: mana_1_half_r.png + image: {masked_blend(light: "mana_1_half.png", dark: "mana_circle_r.png", mask:"mana_circle_mask.png")} symbol: code: 1/2 enabled: { colorless_color() == "g" } - image: mana_1_half_g.png + image: {masked_blend(light: "mana_1_half.png", dark: "mana_circle_g.png", mask:"mana_circle_mask.png")} symbol: code: 1/2 image: mana_1_half.png @@ -164,26 +152,96 @@ symbol: symbol: code: I enabled: { colorless_color() == "w" } - image: mana_infinite_w.png + image: {masked_blend(light: "mana_infinite.png", dark: "mana_circle_w.png", mask:"mana_circle_mask.png")} symbol: code: I enabled: { colorless_color() == "u" } - image: mana_infinite_u.png + image: {masked_blend(light: "mana_infinite.png", dark: "mana_circle_u.png", mask:"mana_circle_mask.png")} symbol: code: I enabled: { colorless_color() == "b" } - image: mana_infinite_b.png + image: {masked_blend(light: "mana_infinite.png", dark: "mana_circle_b.png", mask:"mana_circle_mask.png")} symbol: code: I enabled: { colorless_color() == "r" } - image: mana_infinite_r.png + image: {masked_blend(light: "mana_infinite.png", dark: "mana_circle_r.png", mask:"mana_circle_mask.png")} symbol: code: I enabled: { colorless_color() == "g" } - image: mana_infinite_g.png + image: {masked_blend(light: "mana_infinite.png", dark: "mana_circle_g.png", mask:"mana_circle_mask.png")} symbol: code: I image: mana_infinite.png +symbol: + image: mana_nw.png + code: ([XYZ0-9])/W + regex: yes + draw text: 1 + text margin left: -.0 + text margin right: .44 + text margin top: -.0 + text margin bottom: .445 + text font: + name: MPlantin + size: .53 + color: rgb(0,0,0) + max stretch: 0.5 +symbol: + image: mana_nu.png + code: ([XYZ0-9])/U + regex: yes + draw text: 1 + text margin left: -.0 + text margin right: .44 + text margin top: -.0 + text margin bottom: .445 + text font: + name: MPlantin + size: .53 + color: rgb(0,0,0) + max stretch: 0.5 +symbol: + image: mana_nb.png + code: ([XYZ0-9])/B + regex: yes + draw text: 1 + text margin left: -.0 + text margin right: .44 + text margin top: -.0 + text margin bottom: .445 + text font: + name: MPlantin + size: .53 + color: rgb(0,0,0) + max stretch: 0.5 +symbol: + image: mana_nr.png + code: ([XYZ0-9])/R + regex: yes + draw text: 1 + text margin left: -.0 + text margin right: .44 + text margin top: -.0 + text margin bottom: .445 + text font: + name: MPlantin + size: .53 + color: rgb(0,0,0) + max stretch: 0.5 +symbol: + image: mana_ng.png + code: ([XYZ0-9])/G + regex: yes + draw text: 1 + text margin left: -.0 + text margin right: .44 + text margin top: -.0 + text margin bottom: .445 + text font: + name: MPlantin + size: .53 + color: rgb(0,0,0) + max stretch: 0.5 symbol: image: mana_circle_w.png enabled: { colorless_color() == "w" } @@ -374,6 +432,7 @@ symbol: insert symbol menu: item: T item: Q + item: C item: X item: Y item: Z diff --git a/data/magic-mana-large.mse-symbol-font/mana_chaos.png b/data/magic-mana-large.mse-symbol-font/mana_chaos.png new file mode 100644 index 00000000..fc113e95 Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_chaos.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 46294a71..8d85ed40 100644 --- a/data/magic-mana-large.mse-symbol-font/symbol-font +++ b/data/magic-mana-large.mse-symbol-font/symbol-font @@ -1,5 +1,5 @@ -mse version: 0.3.7 -version: 2008-08-13 +mse version: 0.3.8 +version: 2009-08-10 # Symbol font in the 'popup' style, used for casting costs on modern cards short name: popup style installer group: magic/Mana symbols/popup style @@ -30,6 +30,10 @@ symbol: symbol: code: Q image: mana_q.png +symbol: + code: C + image: mana_chaos.png + image font size: 151.69 symbol: code: B/G/W image: mana_bgw.png @@ -313,6 +317,7 @@ symbol: insert symbol menu: item: T item: Q + item: C item: type: line item: X diff --git a/data/magic-mana-small-grey.mse-symbol-font/mana_chaos.png b/data/magic-mana-small-grey.mse-symbol-font/mana_chaos.png new file mode 100644 index 00000000..fc113e95 Binary files /dev/null and b/data/magic-mana-small-grey.mse-symbol-font/mana_chaos.png differ diff --git a/data/magic-mana-small-grey.mse-symbol-font/symbol-font b/data/magic-mana-small-grey.mse-symbol-font/symbol-font index a9e448cf..99ef5869 100644 --- a/data/magic-mana-small-grey.mse-symbol-font/symbol-font +++ b/data/magic-mana-small-grey.mse-symbol-font/symbol-font @@ -1,5 +1,5 @@ -mse version: 0.3.7 -version: 2008-08-12 +mse version: 0.3.8 +version: 2009-08-10 short name: normal (colorless) position hint: 11 installer group: magic/Mana symbols/colorless normal style @@ -37,6 +37,10 @@ symbol: symbol: code: Q image: mana_q.png +symbol: + code: C + image: mana_chaos.png + image font size: 168.75 symbol: code: B/G/W image: mana_bgw.png @@ -320,6 +324,7 @@ symbol: insert symbol menu: item: T item: Q + item: C item: type: line item: X diff --git a/data/magic-mana-small.mse-symbol-font/mana_chaos.png b/data/magic-mana-small.mse-symbol-font/mana_chaos.png new file mode 100644 index 00000000..fc113e95 Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_chaos.png differ diff --git a/data/magic-mana-small.mse-symbol-font/symbol-font b/data/magic-mana-small.mse-symbol-font/symbol-font index 327386ee..e85b2281 100644 --- a/data/magic-mana-small.mse-symbol-font/symbol-font +++ b/data/magic-mana-small.mse-symbol-font/symbol-font @@ -1,5 +1,5 @@ -mse version: 0.3.7 -version: 2008-08-12 +mse version: 0.3.8 +version: 2009-08-10 short name: normal installer group: magic/Mana symbols/normal style position hint: 001 @@ -37,6 +37,10 @@ symbol: symbol: code: Q image: mana_q.png +symbol: + code: C + image: mana_chaos.png + image font size: 168.75 symbol: code: B/G/W image: mana_bgw.png @@ -320,6 +324,7 @@ symbol: insert symbol menu: item: T item: Q + item: C item: type: line item: X diff --git a/data/magic.mse-game/keywords b/data/magic.mse-game/keywords index 45c94a14..d571fe30 100644 --- a/data/magic.mse-game/keywords +++ b/data/magic.mse-game/keywords @@ -29,7 +29,7 @@ keyword mode: keyword parameter type: name: mana - match: [STQXYZI0-9WUBRG/|]+ + match: [SCTQXYZI0-9WUBRG/|]+ 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: [ ][STQXYZI0-9WUBRG/|]*|[-—][^(\n]* + match: [ ][SCTQXYZI0-9WUBRG/|]*|[-—][^(\n]* separator before is: [ —-] separator after is: [.] optional: false diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script index be955afe..b314bcfd 100644 --- a/data/magic.mse-game/script +++ b/data/magic.mse-game/script @@ -23,7 +23,7 @@ mana_filter := to_upper + { else mana_sort() } # Like mana filter, only also allow tap symbols: -tap_filter := sort_text@(order: "") +tap_filter := sort_text@(order: "") mana_filter_t := replace@( # Remove [] used for forcing mana symbols match: "[\\[\\]]", replace: "" @@ -53,7 +53,7 @@ mana_to_color := { count := number_of_items(in: colors) if hybrid == "" and contains(type, match:"Artifact") then # not a hybrid, but artifact - if count == 0 then "colorless" + if count == 0 then "artifact" else if count == 1 then color_names_1() + ", artifact" else if set.set_info.use_gradient_multicolor == "no" then "artifact, multicolor" # stop here else if count == 2 then color_names_2() + ", artifact, multicolor" @@ -323,7 +323,7 @@ add := "" # default is nothing for_mana_costs := format_cost := { if input.separator_before == "—" and contains(input.param, match: " ") then ( if contains(input.param, match:",") then ( - if match(match: "^[STQXYZIWUBRG0-9/|]+,", input.param) then + if match(match: "^[SCTQXYZIWUBRG0-9/|]+,", input.param) then "{add}{combined_cost(input.param)}" else "{combined_cost(input.param)}" ) else @@ -336,7 +336,7 @@ alternative_cost := replace@(match:"^[A-Z]", replace: { to_lower() }) # combined_cost := replace@(match:", [A-Z]", replace: { to_lower() })+ replace@(match:",", replace:" and")+ - replace@(match:"^[STQXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])", replace: "&")+ + replace@(match:"^[SCTQXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])", replace: "&")+ replace@(match:"^[A-Z]", replace: { to_lower() }) long_dash := replace@(match:"-", replace:"—") @@ -362,8 +362,8 @@ mana_context := |adds?|pay(ed)?[ ](with|using) ) ([ ]either)? # pay either X or Y - ([ ](]*>)?[STQXYZIWUBRG0-9/|]+(]*>)?,)* # pay X, Y or Z - ([ ](]*>)?[STQXYZIWUBRG0-9/|]+(]*>)?[ ](and|or|and/or))* # pay X or Y + ([ ](]*>)?[SCTQXYZIWUBRG0-9/|]+(]*>)?,)* # pay X, Y or Z + ([ ](]*>)?[SCTQXYZIWUBRG0-9/|]+(]*>)?[ ](and|or|and/or))* # pay X or Y [ ] ([,.)]|$ # (end of word) |[ ][^ .,]*$ # still typing... @@ -442,18 +442,34 @@ text_filter := ) + # step 4 : explict non mana symbols replace@( - match: "\\][STQXYZIWUBRG0-9/|]+\\[", + match: "\\][SCTQXYZIWUBRG0-9/|]+\\[", replace: {"" + mana_filter_t() + ""} ) + # step 5 : add mana & tap symbols replace@( - match: "\\b[STQXYZIWUBRG0-9/|]+\\b", + match: "\\b[SCTQXYZIWUBRG0-9/|]+\\b", in_context: mana_context, replace: {"" + mana_filter_t() + ""} ) + # step 5b : add explict mana symbols replace@( - match: "\\[[STQXYZIWUBRG0-9/|]+\\]", + match: "\\[[SCTQXYZIWUBRG0-9/|]+\\]", replace: {"" + mana_filter_t() + ""} ) + - # step 7 : italic reminder text + # step 6a : curly double quotes + replace@( + match: "[[.quotation-mark.]]|“", + in_context: "[“][A-Za-z,.!?+$<>:;-— 0-9\\\\]*", + replace: "”" )+ + replace@( + match: "[[.quotation-mark.]]", + replace: "“" )+ + # step 6b : curly single quotes + replace@( + match: "' |‘ ", + in_context: "[‘][A-Za-z,.!?+$<>:;-— 0-9\\\\]*", + replace: "’ " )+ + replace@( + match: " '", + replace: " ‘" )+ + # step 7 : ??? replace@( match: "[(]([^)\n]|[(][^)\n]*[)])*[)]?", in_context: "(^|[[:space:]])|