Skip to content

M
magicseteditor
Commit b9cee599 authored by pichoro's avatar pichoro
Browse files
Options

Adding chaos symbol to mana fonts - set to "C". 

Magic-mana-future updates by Shiv2503.
Also, changing how curly quotes are handled until curly_quotes is better.
parent b794188c
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 48 deletions
data/magic-mana-beveled.mse-symbol-font/symbol-font
View file @ b9cee599
mse version: 0.3.7 mse version: 0.3.8
version: 2008-08-13 version: 2009-08-10
short name: beveled style (firepenguinmaster) short name: beveled style (firepenguinmaster)
installer group: magic/Mana symbols/beveled style (FirePenguinMaster) installer group: magic/Mana symbols/beveled style (FirePenguinMaster)
position hint: 101 position hint: 101
...@@ -37,6 +37,10 @@ symbol: ...@@ -37,6 +37,10 @@ symbol:
symbol: symbol:
code: Q code: Q
image: mana_q.png image: mana_q.png
symbol:
code: C
image: mana_chaos.png
image font size: 142.11
symbol: symbol:
code: B/G/W code: B/G/W
image: mana_bgw.png image: mana_bgw.png
...@@ -285,6 +289,7 @@ symbol: ...@@ -285,6 +289,7 @@ symbol:
insert symbol menu: insert symbol menu:
item: T item: T
item: Q item: Q
item: C
item: item:
type: line type: line
item: X item: X
......
data/magic-mana-future.mse-symbol-font/symbol-font
View file @ b9cee599
mse version: 0.3.7 mse version: 0.3.8
version: 2008-08-13 version: 2009-08-11
# Symbol font in the 'futuristic' style, used for casting costs on futureshift cards # Symbol font in the 'futuristic' style, used for casting costs on futureshift cards
short name: Future Sight style short name: Future Sight style
installer group: magic/Mana symbols/Future Sight style installer group: magic/Mana symbols/Future Sight style
...@@ -15,20 +15,8 @@ symbol: ...@@ -15,20 +15,8 @@ symbol:
code: Q code: Q
image: mana_q.png image: mana_q.png
symbol: symbol:
code: 2/W code: C
image: mana_2w.png image: mana_chaos.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: symbol:
code: W/U code: W/U
image: mana_guild_wu.png image: mana_guild_wu.png
...@@ -102,23 +90,23 @@ symbol: ...@@ -102,23 +90,23 @@ symbol:
symbol: symbol:
code: 1/2 code: 1/2
enabled: { colorless_color() == "w" } 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: symbol:
code: 1/2 code: 1/2
enabled: { colorless_color() == "u" } 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: symbol:
code: 1/2 code: 1/2
enabled: { colorless_color() == "b" } 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: symbol:
code: 1/2 code: 1/2
enabled: { colorless_color() == "r" } 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: symbol:
code: 1/2 code: 1/2
enabled: { colorless_color() == "g" } 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: symbol:
code: 1/2 code: 1/2
image: mana_1_half.png image: mana_1_half.png
...@@ -164,26 +152,96 @@ symbol: ...@@ -164,26 +152,96 @@ symbol:
symbol: symbol:
code: I code: I
enabled: { colorless_color() == "w" } 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: symbol:
code: I code: I
enabled: { colorless_color() == "u" } 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: symbol:
code: I code: I
enabled: { colorless_color() == "b" } 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: symbol:
code: I code: I
enabled: { colorless_color() == "r" } 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: symbol:
code: I code: I
enabled: { colorless_color() == "g" } 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: symbol:
code: I code: I
image: mana_infinite.png 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: symbol:
image: mana_circle_w.png image: mana_circle_w.png
enabled: { colorless_color() == "w" } enabled: { colorless_color() == "w" }
...@@ -374,6 +432,7 @@ symbol: ...@@ -374,6 +432,7 @@ symbol:
insert symbol menu: insert symbol menu:
item: T item: T
item: Q item: Q
item: C
item: X item: X
item: Y item: Y
item: Z item: Z
......
data/magic-mana-large.mse-symbol-font/symbol-font
View file @ b9cee599
mse version: 0.3.7 mse version: 0.3.8
version: 2008-08-13 version: 2009-08-10
# Symbol font in the 'popup' style, used for casting costs on modern cards # Symbol font in the 'popup' style, used for casting costs on modern cards
short name: popup style short name: popup style
installer group: magic/Mana symbols/popup style installer group: magic/Mana symbols/popup style
...@@ -30,6 +30,10 @@ symbol: ...@@ -30,6 +30,10 @@ symbol:
symbol: symbol:
code: Q code: Q
image: mana_q.png image: mana_q.png
symbol:
code: C
image: mana_chaos.png
image font size: 151.69
symbol: symbol:
code: B/G/W code: B/G/W
image: mana_bgw.png image: mana_bgw.png
...@@ -313,6 +317,7 @@ symbol: ...@@ -313,6 +317,7 @@ symbol:
insert symbol menu: insert symbol menu:
item: T item: T
item: Q item: Q
item: C
item: item:
type: line type: line
item: X item: X
......
data/magic-mana-small-grey.mse-symbol-font/symbol-font
View file @ b9cee599
mse version: 0.3.7 mse version: 0.3.8
version: 2008-08-12 version: 2009-08-10
short name: normal (colorless) short name: normal (colorless)
position hint: 11 position hint: 11
installer group: magic/Mana symbols/colorless normal style installer group: magic/Mana symbols/colorless normal style
...@@ -37,6 +37,10 @@ symbol: ...@@ -37,6 +37,10 @@ symbol:
symbol: symbol:
code: Q code: Q
image: mana_q.png image: mana_q.png
symbol:
code: C
image: mana_chaos.png
image font size: 168.75
symbol: symbol:
code: B/G/W code: B/G/W
image: mana_bgw.png image: mana_bgw.png
...@@ -320,6 +324,7 @@ symbol: ...@@ -320,6 +324,7 @@ symbol:
insert symbol menu: insert symbol menu:
item: T item: T
item: Q item: Q
item: C
item: item:
type: line type: line
item: X item: X
......
data/magic-mana-small.mse-symbol-font/symbol-font
View file @ b9cee599
mse version: 0.3.7 mse version: 0.3.8
version: 2008-08-12 version: 2009-08-10
short name: normal short name: normal
installer group: magic/Mana symbols/normal style installer group: magic/Mana symbols/normal style
position hint: 001 position hint: 001
...@@ -37,6 +37,10 @@ symbol: ...@@ -37,6 +37,10 @@ symbol:
symbol: symbol:
code: Q code: Q
image: mana_q.png image: mana_q.png
symbol:
code: C
image: mana_chaos.png
image font size: 168.75
symbol: symbol:
code: B/G/W code: B/G/W
image: mana_bgw.png image: mana_bgw.png
...@@ -320,6 +324,7 @@ symbol: ...@@ -320,6 +324,7 @@ symbol:
insert symbol menu: insert symbol menu:
item: T item: T
item: Q item: Q
item: C
item: item:
type: line type: line
item: X item: X
......
data/magic.mse-game/keywords
View file @ b9cee599
...@@ -29,7 +29,7 @@ keyword mode: ...@@ -29,7 +29,7 @@ keyword mode:
keyword parameter type: keyword parameter type:
name: mana name: mana
match: [STQXYZI0-9WUBRG/|]+ match: [SCTQXYZI0-9WUBRG/|]+
refer script: refer script:
name: normal name: normal
description: No changes made description: No changes made
...@@ -48,7 +48,7 @@ keyword parameter type: ...@@ -48,7 +48,7 @@ keyword parameter type:
# By pichoro and bunnierein # By pichoro and bunnierein
keyword parameter type: keyword parameter type:
name: cost name: cost
match: [ ][STQXYZI0-9WUBRG/|]*|[-—][^(\n]* match: [ ][SCTQXYZI0-9WUBRG/|]*|[-—][^(\n]*
separator before is: [ —-] separator before is: [ —-]
separator after is: [.] separator after is: [.]
optional: false optional: false
......
data/magic.mse-game/script
View file @ b9cee599
...@@ -23,7 +23,7 @@ mana_filter := to_upper + { ...@@ -23,7 +23,7 @@ mana_filter := to_upper + {
else mana_sort() else mana_sort()
} }
# Like mana filter, only also allow tap symbols: # Like mana filter, only also allow tap symbols:
tap_filter := sort_text@(order: "<TQ>") tap_filter := sort_text@(order: "<CTQ>")
mana_filter_t := replace@( # Remove [] used for forcing mana symbols mana_filter_t := replace@( # Remove [] used for forcing mana symbols
match: "[\\[\\]]", match: "[\\[\\]]",
replace: "" replace: ""
...@@ -53,7 +53,7 @@ mana_to_color := { ...@@ -53,7 +53,7 @@ mana_to_color := {
count := number_of_items(in: colors) count := number_of_items(in: colors)
if hybrid == "" and contains(type, match:"Artifact") then if hybrid == "" and contains(type, match:"Artifact") then
# not a hybrid, but artifact # 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 count == 1 then color_names_1() + ", artifact"
else if set.set_info.use_gradient_multicolor == "no" then "artifact, multicolor" # stop here else if set.set_info.use_gradient_multicolor == "no" then "artifact, multicolor" # stop here
else if count == 2 then color_names_2() + ", artifact, multicolor" else if count == 2 then color_names_2() + ", artifact, multicolor"
...@@ -323,7 +323,7 @@ add := "" # default is nothing ...@@ -323,7 +323,7 @@ add := "" # default is nothing
for_mana_costs := format_cost := { for_mana_costs := format_cost := {
if input.separator_before == "—" and contains(input.param, match: " ") then ( if input.separator_before == "—" and contains(input.param, match: " ") then (
if 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}<param-cost>{combined_cost(input.param)}</param-cost>" "{add}<param-cost>{combined_cost(input.param)}</param-cost>"
else "<param-cost>{combined_cost(input.param)}</param-cost>" else "<param-cost>{combined_cost(input.param)}</param-cost>"
) else ) else
...@@ -336,7 +336,7 @@ alternative_cost := replace@(match:"^[A-Z]", replace: { to_lower() }) ...@@ -336,7 +336,7 @@ alternative_cost := replace@(match:"^[A-Z]", replace: { to_lower() })
# #
combined_cost := replace@(match:", [A-Z]", replace: { to_lower() })+ combined_cost := replace@(match:", [A-Z]", replace: { to_lower() })+
replace@(match:",", replace:" and")+ replace@(match:",", replace:" and")+
replace@(match:"^[STQXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+ replace@(match:"^[SCTQXYZIWUBRG0-9/|]", in_context: "(^|[[:space:]])<match>", replace: "<sym-auto>&</sym-auto>")+
replace@(match:"^[A-Z]", replace: { to_lower() }) replace@(match:"^[A-Z]", replace: { to_lower() })
long_dash := replace@(match:"-", replace:"—") long_dash := replace@(match:"-", replace:"—")
...@@ -362,8 +362,8 @@ mana_context := ...@@ -362,8 +362,8 @@ mana_context :=
|adds?|pay(ed)?[ ](with|using) |adds?|pay(ed)?[ ](with|using)
) )
([ ]either)? # pay either X or Y ([ ]either)? # pay either X or Y
([ ](<sym[^>]*>)?[STQXYZIWUBRG0-9/|]+(</sym[^>]*>)?,)* # pay X, Y or Z ([ ](<sym[^>]*>)?[SCTQXYZIWUBRG0-9/|]+(</sym[^>]*>)?,)* # pay X, Y or Z
([ ](<sym[^>]*>)?[STQXYZIWUBRG0-9/|]+(</sym[^>]*>)?[ ](and|or|and/or))* # pay X or Y ([ ](<sym[^>]*>)?[SCTQXYZIWUBRG0-9/|]+(</sym[^>]*>)?[ ](and|or|and/or))* # pay X or Y
[ ]<match> [ ]<match>
([,.)]|$ # (end of word) ([,.)]|$ # (end of word)
|[ ][^ .,]*$ # still typing... |[ ][^ .,]*$ # still typing...
...@@ -442,18 +442,34 @@ text_filter := ...@@ -442,18 +442,34 @@ text_filter :=
) + ) +
# step 4 : explict non mana symbols # step 4 : explict non mana symbols
replace@( replace@(
match: "\\][STQXYZIWUBRG0-9/|]+\\[", match: "\\][SCTQXYZIWUBRG0-9/|]+\\[",
replace: {"<nosym>" + mana_filter_t() + "</nosym>"} ) + replace: {"<nosym>" + mana_filter_t() + "</nosym>"} ) +
# step 5 : add mana & tap symbols # step 5 : add mana & tap symbols
replace@( replace@(
match: "\\b[STQXYZIWUBRG0-9/|]+\\b", match: "\\b[SCTQXYZIWUBRG0-9/|]+\\b",
in_context: mana_context, in_context: mana_context,
replace: {"<sym-auto>" + mana_filter_t() + "</sym-auto>"} ) + replace: {"<sym-auto>" + mana_filter_t() + "</sym-auto>"} ) +
# step 5b : add explict mana symbols # step 5b : add explict mana symbols
replace@( replace@(
match: "\\[[STQXYZIWUBRG0-9/|]+\\]", match: "\\[[SCTQXYZIWUBRG0-9/|]+\\]",
replace: {"<sym>" + mana_filter_t() + "</sym>"} ) + replace: {"<sym>" + mana_filter_t() + "</sym>"} ) +
# step 7 : italic reminder text # step 6a : curly double quotes
replace@(
match: "[[.quotation-mark.]]|“",
in_context: "[“][A-Za-z,.!?+$<>:;-— 0-9\\\\]*<match>",
replace: "”" )+
replace@(
match: "[[.quotation-mark.]]",
replace: "“" )+
# step 6b : curly single quotes
replace@(
match: "' |‘ ",
in_context: "[‘][A-Za-z,.!?+$<>:;-— 0-9\\\\]*<match>",
replace: "’ " )+
replace@(
match: " '",
replace: " ‘" )+
# step 7 : ???
replace@( replace@(
match: "[(]([^)\n]|[(][^)\n]*[)])*[)]?", match: "[(]([^)\n]|[(][^)\n]*[)])*[)]?",
in_context: "(^|[[:space:]])<match>|<atom-keyword><match></", in_context: "(^|[[:space:]])<match>|<atom-keyword><match></",
...@@ -464,7 +480,7 @@ text_filter := ...@@ -464,7 +480,7 @@ text_filter :=
+ "([[:lower:]])" # match this + "([[:lower:]])" # match this
+ "(?![)])", # not followed by this + "(?![)])", # not followed by this
replace: { _1 + to_upper(_2) }) + replace: { _1 + to_upper(_2) }) +
curly_quotes + #curly_quotes +
# step 9 : spellcheck # step 9 : spellcheck
{ if set.mark_errors then { if set.mark_errors then
check_spelling( check_spelling(
...@@ -584,7 +600,7 @@ colorless_color := { "c" } ...@@ -584,7 +600,7 @@ colorless_color := { "c" }
is_half_mana := match@(match: "1/2|[|][WUBRGS]") is_half_mana := match@(match: "1/2|[|][WUBRGS]")
is_colored_mana := match@(match: "[WUBRG]") is_colored_mana := match@(match: "[WUBRG]")
only_numbers := filter_text@(match: "^[0123456789]+") only_numbers := filter_text@(match: "^[0123456789]+")
cmc_split := break_text@(match: "(?ix) 1/2 | [|][WUBRG] | [0-9]+(?!/[WUBRGSTQ2]) | [WUBRGS0-9](/[WUBRGS])\{0,4} ") cmc_split := break_text@(match: "(?ix) 1/2 | [|][WUBRG] | [0-9]+(?!/[WUBRGSCTQ2]) | [WUBRGS0-9](/[WUBRGS])\{0,4} ")
cmc := {to_number( cmc := {to_number(
for each sym in cmc_split(to_text()) do ( for each sym in cmc_split(to_text()) do (
numbers := only_numbers(sym) numbers := only_numbers(sym)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment