diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_nb.png b/data/magic-mana-beveled.mse-symbol-font/mana_nb.png new file mode 100644 index 00000000..2259b14a Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_nb.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_ng.png b/data/magic-mana-beveled.mse-symbol-font/mana_ng.png new file mode 100644 index 00000000..a582130e Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_ng.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_nr.png b/data/magic-mana-beveled.mse-symbol-font/mana_nr.png new file mode 100644 index 00000000..be87b677 Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_nr.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_nu.png b/data/magic-mana-beveled.mse-symbol-font/mana_nu.png new file mode 100644 index 00000000..98633765 Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_nu.png differ diff --git a/data/magic-mana-beveled.mse-symbol-font/mana_nw.png b/data/magic-mana-beveled.mse-symbol-font/mana_nw.png new file mode 100644 index 00000000..0013d5a7 Binary files /dev/null and b/data/magic-mana-beveled.mse-symbol-font/mana_nw.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 b16b3337..a4f603d7 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.6 -version: 2008-04-01 +version: 2008-05-18 short name: beveled style (firepenguinmaster) position hint: 101 icon: mana_r.png @@ -188,6 +188,76 @@ symbol: symbol: code: S image: mana_s.png +symbol: + image: mana_nw.png + code: ([XYZ0-9])+/W + regex: yes + draw text: 1 + text margin left: -.05 + text margin right: .2 + text margin top: -.14 + text margin bottom: .35 + text font: + name: MPlantin + size: .5 + 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: -.05 + text margin right: .2 + text margin top: -.14 + text margin bottom: .35 + text font: + name: MPlantin + size: .5 + 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: -.05 + text margin right: .2 + text margin top: -.14 + text margin bottom: .35 + text font: + name: MPlantin + size: .5 + 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: -.05 + text margin right: .2 + text margin top: -.14 + text margin bottom: .35 + text font: + name: MPlantin + size: .5 + 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: -.05 + text margin right: .2 + text margin top: -.14 + text margin bottom: .35 + text font: + name: MPlantin + size: .5 + color: rgb(0,0,0) + max stretch: 0.5 symbol: code: X image: mana_x.png @@ -203,6 +273,8 @@ symbol: symbol: image: mana_circle.png code: [0-9]+|. + regex: yes + draw text: 0 text font: name: MPlantin size: 1 @@ -274,3 +346,12 @@ insert symbol menu: item: B/G/W item: R/W/U item: G/U/B + item: + type: line + item: + name: number hybrids + item: 2/W + item: 2/U + item: 2/B + item: 2/R + item: 2/G 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 new file mode 100644 index 00000000..4debf431 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_1_half_b.png 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 new file mode 100644 index 00000000..4b8fa193 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_1_half_g.png 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 new file mode 100644 index 00000000..dccbf279 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_1_half_r.png 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 new file mode 100644 index 00000000..48ba7498 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_1_half_u.png 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 new file mode 100644 index 00000000..318fcbd5 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_1_half_w.png 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 new file mode 100644 index 00000000..0ca6eb25 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_2b.png 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 new file mode 100644 index 00000000..d6692f56 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_2g.png 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 new file mode 100644 index 00000000..672dceb4 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_2r.png 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 new file mode 100644 index 00000000..d0be33c5 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_2u.png 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 new file mode 100644 index 00000000..33cfee87 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_2w.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_b_half.png b/data/magic-mana-future.mse-symbol-font/mana_b_half.png index ba56d527..bf812f3d 100644 Binary files a/data/magic-mana-future.mse-symbol-font/mana_b_half.png and b/data/magic-mana-future.mse-symbol-font/mana_b_half.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_g_half.png b/data/magic-mana-future.mse-symbol-font/mana_g_half.png index 81a409a2..68f062cc 100644 Binary files a/data/magic-mana-future.mse-symbol-font/mana_g_half.png and b/data/magic-mana-future.mse-symbol-font/mana_g_half.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 new file mode 100644 index 00000000..f8fabd6d Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_infinite_b.png 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 new file mode 100644 index 00000000..dd4f3961 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_infinite_g.png 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 new file mode 100644 index 00000000..4a7583a2 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_infinite_r.png 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 new file mode 100644 index 00000000..ad272abf Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_infinite_u.png 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 new file mode 100644 index 00000000..63ac2314 Binary files /dev/null and b/data/magic-mana-future.mse-symbol-font/mana_infinite_w.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_r_half.png b/data/magic-mana-future.mse-symbol-font/mana_r_half.png index 7790d9f4..b9e2a513 100644 Binary files a/data/magic-mana-future.mse-symbol-font/mana_r_half.png and b/data/magic-mana-future.mse-symbol-font/mana_r_half.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_s_half.png b/data/magic-mana-future.mse-symbol-font/mana_s_half.png index 4dd1ebb5..3399e949 100644 Binary files a/data/magic-mana-future.mse-symbol-font/mana_s_half.png and b/data/magic-mana-future.mse-symbol-font/mana_s_half.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_u_half.png b/data/magic-mana-future.mse-symbol-font/mana_u_half.png index 06cd2fac..13b24dbc 100644 Binary files a/data/magic-mana-future.mse-symbol-font/mana_u_half.png and b/data/magic-mana-future.mse-symbol-font/mana_u_half.png differ diff --git a/data/magic-mana-future.mse-symbol-font/mana_w_half.png b/data/magic-mana-future.mse-symbol-font/mana_w_half.png index bb5625cf..f16e8b0e 100644 Binary files a/data/magic-mana-future.mse-symbol-font/mana_w_half.png and b/data/magic-mana-future.mse-symbol-font/mana_w_half.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 bff124a5..9fb95bfa 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.6 -version: 2008-04-01 +version: 2008-05-18 # Symbol font in the 'futuristic' style, used for casting costs on futureshift cards short name: Future Sight style position hint: 005 @@ -13,6 +13,21 @@ symbol: 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 symbol: code: W/U image: mana_guild_wu.png @@ -83,6 +98,26 @@ symbol: symbol: code: G/U image: mana_gu.png +symbol: + code: 1/2 + enabled: { colorless_color() == "w" } + image: mana_1_half_w.png +symbol: + code: 1/2 + enabled: { colorless_color() == "u" } + image: mana_1_half_u.png +symbol: + code: 1/2 + enabled: { colorless_color() == "b" } + image: mana_1_half_b.png +symbol: + code: 1/2 + enabled: { colorless_color() == "r" } + image: mana_1_half_r.png +symbol: + code: 1/2 + enabled: { colorless_color() == "g" } + image: mana_1_half_g.png symbol: code: 1/2 image: mana_1_half.png @@ -125,13 +160,35 @@ symbol: symbol: code: S image: mana_s.png +symbol: + code: I + enabled: { colorless_color() == "w" } + image: mana_infinite_w.png +symbol: + code: I + enabled: { colorless_color() == "u" } + image: mana_infinite_u.png +symbol: + code: I + enabled: { colorless_color() == "b" } + image: mana_infinite_b.png +symbol: + code: I + enabled: { colorless_color() == "r" } + image: mana_infinite_r.png +symbol: + code: I + enabled: { colorless_color() == "g" } + image: mana_infinite_g.png symbol: code: I image: mana_infinite.png symbol: image: mana_circle_w.png enabled: { colorless_color() == "w" } - code: .|[0-9]+(?!/) + code: .|[0-9]+|. + regex: yes + draw text: 0 text font: name: MPlantin weight: bold @@ -145,7 +202,9 @@ symbol: symbol: image: mana_circle_u.png enabled: { colorless_color() == "u" } - code: .|[0-9]+(?!/) + code: .|[0-9]+|. + regex: yes + draw text: 0 text font: name: MPlantin weight: bold @@ -159,7 +218,9 @@ symbol: symbol: image: mana_circle_b.png enabled: { colorless_color() == "b" } - code: .|[0-9]+(?!/) + code: .|[0-9]+|. + regex: yes + draw text: 0 text font: name: MPlantin weight: bold @@ -173,7 +234,9 @@ symbol: symbol: image: mana_circle_r.png enabled: { colorless_color() == "r" } - code: .|[0-9]+(?!/) + code: .|[0-9]+|. + regex: yes + draw text: 0 text font: name: MPlantin weight: bold @@ -187,7 +250,9 @@ symbol: symbol: image: mana_circle_g.png enabled: { colorless_color() == "g" } - code: .|[0-9]+(?!/) + code: .|[0-9]+|. + regex: yes + draw text: 0 text font: name: MPlantin weight: bold @@ -200,8 +265,9 @@ symbol: text margin bottom: 0.1 symbol: image: mana_circle.png - enabled: { colorless_color() == "c" } - code: .|[0-9]+(?!/) + code: .|[0-9]+|. + regex: yes + draw text: 0 text font: name: MPlantin weight: bold @@ -218,6 +284,9 @@ symbol: insert symbol menu: item: T item: Q + item: X + item: Y + item: Z item: type: line item: I @@ -257,3 +326,12 @@ insert symbol menu: item: B/G item: R/W item: G/U + item: + type: line + item: + name: number hybrids + item: 2/W + item: 2/U + item: 2/B + item: 2/R + item: 2/G diff --git a/data/magic-mana-large.mse-symbol-font/mana_nb.png b/data/magic-mana-large.mse-symbol-font/mana_nb.png new file mode 100644 index 00000000..9e750f8b Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_nb.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_ng.png b/data/magic-mana-large.mse-symbol-font/mana_ng.png new file mode 100644 index 00000000..5c13d351 Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_ng.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_nr.png b/data/magic-mana-large.mse-symbol-font/mana_nr.png new file mode 100644 index 00000000..c9ca2cc8 Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_nr.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_nu.png b/data/magic-mana-large.mse-symbol-font/mana_nu.png new file mode 100644 index 00000000..07610358 Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_nu.png differ diff --git a/data/magic-mana-large.mse-symbol-font/mana_nw.png b/data/magic-mana-large.mse-symbol-font/mana_nw.png new file mode 100644 index 00000000..d046e5bd Binary files /dev/null and b/data/magic-mana-large.mse-symbol-font/mana_nw.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 e66e86be..4b6c0681 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.6 -version: 2008-04-01 +version: 2008-05-18 # Symbol font in the 'popup' style, used for casting costs on modern cards short name: popup style position hint: 002 @@ -201,6 +201,76 @@ symbol: symbol: code: S image: mana_s.png +symbol: + image: mana_nw.png + code: ([XYZ0-9])+/W + regex: yes + draw text: 1 + text margin left: -.25 + text margin right: .2 + text margin top: -.14 + text margin bottom: .4 + text font: + name: MPlantin + size: .6 + 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: -.25 + text margin right: .2 + text margin top: -.14 + text margin bottom: .4 + text font: + name: MPlantin + size: .6 + 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: -.25 + text margin right: .2 + text margin top: -.14 + text margin bottom: .4 + text font: + name: MPlantin + size: .6 + 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: -.25 + text margin right: .2 + text margin top: -.14 + text margin bottom: .4 + text font: + name: MPlantin + size: .6 + 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: -.25 + text margin right: .2 + text margin top: -.14 + text margin bottom: .4 + text font: + name: MPlantin + size: .6 + color: rgb(0,0,0) + max stretch: 0.5 symbol: code: X image: mana_x.png @@ -289,3 +359,12 @@ insert symbol menu: item: B/G/W item: R/W/U item: G/U/B + item: + type: line + item: + name: number hybrids + item: 2/W + item: 2/U + item: 2/B + item: 2/R + item: 2/G diff --git a/data/magic-mana-small-grey.mse-symbol-font/mana_nb.png b/data/magic-mana-small-grey.mse-symbol-font/mana_nb.png new file mode 100644 index 00000000..9cd3cab8 Binary files /dev/null and b/data/magic-mana-small-grey.mse-symbol-font/mana_nb.png differ diff --git a/data/magic-mana-small-grey.mse-symbol-font/mana_ng.png b/data/magic-mana-small-grey.mse-symbol-font/mana_ng.png new file mode 100644 index 00000000..74b9e315 Binary files /dev/null and b/data/magic-mana-small-grey.mse-symbol-font/mana_ng.png differ diff --git a/data/magic-mana-small-grey.mse-symbol-font/mana_nr.png b/data/magic-mana-small-grey.mse-symbol-font/mana_nr.png new file mode 100644 index 00000000..6a8d39e9 Binary files /dev/null and b/data/magic-mana-small-grey.mse-symbol-font/mana_nr.png differ diff --git a/data/magic-mana-small-grey.mse-symbol-font/mana_nu.png b/data/magic-mana-small-grey.mse-symbol-font/mana_nu.png new file mode 100644 index 00000000..399ebe79 Binary files /dev/null and b/data/magic-mana-small-grey.mse-symbol-font/mana_nu.png differ diff --git a/data/magic-mana-small-grey.mse-symbol-font/mana_nw.png b/data/magic-mana-small-grey.mse-symbol-font/mana_nw.png new file mode 100644 index 00000000..f1e47d00 Binary files /dev/null and b/data/magic-mana-small-grey.mse-symbol-font/mana_nw.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 d0958303..cffce52f 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.6 -version: 2008-04-01 +version: 2008-05-18 short name: normal (colorless) position hint: 21 icon: mana_r.png @@ -208,6 +208,76 @@ symbol: symbol: code: S image: mana_s.png +symbol: + image: mana_nw.png + code: ([XYZ0-9])+/W + regex: yes + draw text: 1 + text margin left: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + 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: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + 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: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + 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: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + 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: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + color: rgb(0,0,0) + max stretch: 0.5 symbol: code: X image: mana_x.png @@ -222,16 +292,18 @@ symbol: image: mana_infinite.png symbol: image: mana_circle.png - code: .|[0-9]+(?!/) + code: [0-9]+|. + regex: yes + draw text: 0 + text margin left: .26 + text margin right: .2 + text margin top: -.14 + text margin bottom: -.14 text font: name: MPlantin size: 1 color: rgb(0,0,0) max stretch: 0.5 - text margin left: .26 - text margin right: .2 - text margin top: -.14 - text margin bottom: -.14 ############################################################## # Insert-symbol menu @@ -294,3 +366,12 @@ insert symbol menu: item: B/G/W item: R/W/U item: G/U/B + item: + type: line + item: + name: number hybrids + item: 2/W + item: 2/U + item: 2/B + item: 2/R + item: 2/G diff --git a/data/magic-mana-small.mse-symbol-font/mana_gw.png b/data/magic-mana-small.mse-symbol-font/mana_gw.png index 86d409cf..7b8b3a9d 100644 Binary files a/data/magic-mana-small.mse-symbol-font/mana_gw.png and b/data/magic-mana-small.mse-symbol-font/mana_gw.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_nb.png b/data/magic-mana-small.mse-symbol-font/mana_nb.png new file mode 100644 index 00000000..898925c6 Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_nb.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_ng.png b/data/magic-mana-small.mse-symbol-font/mana_ng.png new file mode 100644 index 00000000..fac0910f Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_ng.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_nr.png b/data/magic-mana-small.mse-symbol-font/mana_nr.png new file mode 100644 index 00000000..a8480435 Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_nr.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_nu.png b/data/magic-mana-small.mse-symbol-font/mana_nu.png new file mode 100644 index 00000000..2e881093 Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_nu.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_nw.png b/data/magic-mana-small.mse-symbol-font/mana_nw.png new file mode 100644 index 00000000..04feb285 Binary files /dev/null and b/data/magic-mana-small.mse-symbol-font/mana_nw.png differ diff --git a/data/magic-mana-small.mse-symbol-font/mana_rw.png b/data/magic-mana-small.mse-symbol-font/mana_rw.png index 12e455f9..a9f187d8 100644 Binary files a/data/magic-mana-small.mse-symbol-font/mana_rw.png and b/data/magic-mana-small.mse-symbol-font/mana_rw.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 3b49578f..6b3494fc 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.6 -version: 2008-04-01 +version: 2008-05-18 short name: normal position hint: 001 icon: mana_r.png @@ -208,6 +208,79 @@ symbol: symbol: code: S image: mana_s.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: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + 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: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + 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: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + 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: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + 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: -.30 + text margin right: .2 + text margin top: -.14 + text margin bottom: .34 + text font: + name: MPlantin + size: .6 + color: rgb(0,0,0) + max stretch: 0.5 symbol: code: X image: mana_x.png @@ -217,9 +290,6 @@ symbol: symbol: code: Z image: mana_z.png -symbol: - code: I - image: mana_infinite.png symbol: image: mana_circle.png code: [0-9]+|. @@ -295,3 +365,12 @@ insert symbol menu: item: B/G/W item: R/W/U item: G/U/B + item: + type: line + item: + name: number hybrids + item: 2/W + item: 2/U + item: 2/B + item: 2/R + item: 2/G diff --git a/data/magic-new.mse-style/acard.jpg b/data/magic-new.mse-style/acard.jpg index e1a414e6..67c086bc 100644 Binary files a/data/magic-new.mse-style/acard.jpg and b/data/magic-new.mse-style/acard.jpg differ diff --git a/data/magic-new.mse-style/apt.jpg b/data/magic-new.mse-style/apt.jpg index 94198d3f..7d3ea5ea 100644 Binary files a/data/magic-new.mse-style/apt.jpg and b/data/magic-new.mse-style/apt.jpg differ diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 0fd46122..10744899 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -5,7 +5,7 @@ installer group: magic/game files icon: card-back.png position hint: 01 -version: 2008-04-14 +version: 2008-05-18 depends on: package: magic-blends.mse-include version: 2007-09-23 @@ -75,7 +75,9 @@ init script: else "multicolor" else # hybrid - if count == 2 then color_names_2() + ", hybrid" + if count == 0 then "colorless" + else if count == 1 then color_names_1() + else if count == 2 then color_names_2() + ", hybrid" else if count == 3 then color_names_3() + ", hybrid" else "multicolor" } @@ -194,6 +196,7 @@ init script: is_multicolor := { chosen(choice: "multicolor") and input != "artifact, multicolor" } is_null_cost := { input == "" or input == "0" } + is_hybrid_cost := { contains(card.casting_cost, match: "W/") or contains(card.casting_cost, match: "U/") or contains(card.casting_cost, match: "B/") or contains(card.casting_cost, match: "R/") or contains(card.casting_cost, match: "G/") } basic_land_sort := { if contains(card.name, match:"Plains") then "LB" # Plains else if contains(card.name, match:"Island") then "LC" # Islands @@ -242,7 +245,8 @@ init script: else if colors == "B" then "C" # Black else if colors == "R" then "D" # Red else if colors == "G" then "E" # Green - else if contains(casting_cost, match:"/") then hybrid_cost_sort() #Hybrid + else if is_hybrid_cost() then hybrid_cost_sort() #Hybrid + else if contains(casting_cost, match:"/") and contains(card_color, match:"artifact") then "I" # Colorless/Artifact else "F" # Multicolor ) } @@ -490,6 +494,7 @@ init script: + 1 * filter_text(match: "^[0123456789]+(?!/)") # colorless mana, but not 1/2 + 1 * (length(sort_text(order:"compound(1/2)")) / 3) # compensate for 1/2. Should actually be 1.5 * } + colored_mana := to_text + { number_of_items(in: sort_text(order: "WUBRG")) # colored mana - number_of_items(in: sort_text(order:"/")) # guild mana, W/U -> 2 - 1