gaztin/magic-set-editor-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing TK symbol

Browse Source 
split TK out of mana filter
add its own step after loyalty symbols
add you get N to mana_context
add mana value to mana_uncontext
tweak mana_context formatting
---------

Co-authored-by: cajun <12363371+CajunAvenger@users.noreply.github.com>
This commit is contained in:
GenevensiS
2024-01-18 17:12:53 +01:00
committed by GitHub
parent 8fb6d6e78a
commit d3984b48bd
11 changed files with 82 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/magic-genevensis-00-main.mse-style/style
View File

@@ -43,10 +43,10 @@ init script:
mana_t := { "new" } mana_t := { "new" }
mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WUBRG)")
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WBGUR)")
mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIE[TK]PWUBRG]") mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIEPWUBRG]")
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIE[TK]PWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIEPWUBRG/|]") +
replace@( replace@(
match: "./.|././.|./././.|.[|]", match: "./.|././.|./././.|.[|]",
in_context: "(^|[^/])<match>($|[^/])", in_context: "(^|[^/])<match>($|[^/])",

8
data/magic-genevensis-01-planeswalker.mse-style/style
View File

@@ -49,10 +49,10 @@ init script:
mana_t := { "new" } mana_t := { "new" }
mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WUBRG)")
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WBGUR)")
mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIE[TK]PWUBRG]") mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIEPWUBRG]")
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIE[TK]PWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIEPWUBRG/|]") +
replace@( replace@(
match: "./.|././.|./././.|.[|]", match: "./.|././.|./././.|.[|]",
in_context: "(^|[^/])<match>($|[^/])", in_context: "(^|[^/])<match>($|[^/])",

8
data/magic-genevensis-02-leveler.mse-style/style
View File

@@ -46,10 +46,10 @@ init script:
mana_t := { "new" } mana_t := { "new" }
mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WUBRG)")
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WBGUR)")
mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIE[TK]PWUBRG]") mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIEPWUBRG]")
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIE[TK]PWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIEPWUBRG/|]") +
replace@( replace@(
match: "./.|././.|./././.|.[|]", match: "./.|././.|./././.|.[|]",
in_context: "(^|[^/])<match>($|[^/])", in_context: "(^|[^/])<match>($|[^/])",

8
data/magic-genevensis-03-adventure.mse-style/style
View File

@@ -46,10 +46,10 @@ init script:
mana_t := { "new" } mana_t := { "new" }
mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WUBRG)")
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WBGUR)")
mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIE[TK]PWUBRG]") mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIEPWUBRG]")
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIE[TK]PWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIEPWUBRG/|]") +
replace@( replace@(
match: "./.|././.|./././.|.[|]", match: "./.|././.|./././.|.[|]",
in_context: "(^|[^/])<match>($|[^/])", in_context: "(^|[^/])<match>($|[^/])",

8
data/magic-genevensis-10-saga.mse-style/style
View File

@@ -46,10 +46,10 @@ init script:
mana_t := { "new" } mana_t := { "new" }
mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WUBRG)")
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WBGUR)")
mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIE[TK]PWUBRG]") mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIEPWUBRG]")
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIE[TK]PWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIEPWUBRG/|]") +
replace@( replace@(
match: "./.|././.|./././.|.[|]", match: "./.|././.|./././.|.[|]",
in_context: "(^|[^/])<match>($|[^/])", in_context: "(^|[^/])<match>($|[^/])",

8
data/magic-genevensis-11-class.mse-style/style
View File

@@ -49,10 +49,10 @@ init script:
mana_t := { "new" } mana_t := { "new" }
mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WUBRG)")
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WBGUR)")
mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIE[TK]PWUBRG]") mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIEPWUBRG]")
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIE[TK]PWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIEPWUBRG/|]") +
replace@( replace@(
match: "./.|././.|./././.|.[|]", match: "./.|././.|./././.|.[|]",
in_context: "(^|[^/])<match>($|[^/])", in_context: "(^|[^/])<match>($|[^/])",

8
data/magic-genevensis-20-battle.mse-style/style
View File

@@ -49,10 +49,10 @@ init script:
mana_t := { "new" } mana_t := { "new" }
mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WUBRG)")
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WBGUR)")
mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIE[TK]PWUBRG]") mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIEPWUBRG]")
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIE[TK]PWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIEPWUBRG/|]") +
replace@( replace@(
match: "./.|././.|./././.|.[|]", match: "./.|././.|./././.|.[|]",
in_context: "(^|[^/])<match>($|[^/])", in_context: "(^|[^/])<match>($|[^/])",

8
data/magic-genevensis-70-token.mse-style/style
View File

@@ -46,10 +46,10 @@ init script:
mana_t := { "new" } mana_t := { "new" }
mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WUBRG)")
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WBGUR)")
mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIE[TK]PWUBRG]") mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIEPWUBRG]")
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIE[TK]PWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIEPWUBRG/|]") +
replace@( replace@(
match: "./.|././.|./././.|.[|]", match: "./.|././.|./././.|.[|]",
in_context: "(^|[^/])<match>($|[^/])", in_context: "(^|[^/])<match>($|[^/])",

8
data/magic-genevensis-80-planechase.mse-style/style
View File

@@ -49,10 +49,10 @@ init script:
mana_t := { "new" } mana_t := { "new" }
mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WUBRG)")
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WBGUR)")
mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIE[TK]PWUBRG]") mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIEPWUBRG]")
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIE[TK]PWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIEPWUBRG/|]") +
replace@( replace@(
match: "./.|././.|./././.|.[|]", match: "./.|././.|./././.|.[|]",
in_context: "(^|[^/])<match>($|[^/])", in_context: "(^|[^/])<match>($|[^/])",

8
data/magic-genevensis-90-counter.mse-style/style
View File

@@ -46,10 +46,10 @@ init script:
mana_t := { "new" } mana_t := { "new" }
mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WUBRG)")
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIE[TK]P(WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHFDSCAIEP(WBGUR)")
mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIE[TK]PWUBRG]") mana_unsort := sort_text@(order: "[/\\?XYZI0123456789VLHFDSCAIEPWUBRG]")
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIE[TK]PWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHFDSCAIEPWUBRG/|]") +
replace@( replace@(
match: "./.|././.|./././.|.[|]", match: "./.|././.|./././.|.[|]",
in_context: "(^|[^/])<match>($|[^/])", in_context: "(^|[^/])<match>($|[^/])",

32
data/magic.mse-game/script
View File

@@ -11,12 +11,12 @@ version_date := {"2023-02-21"}
############################################################## Sorting mana symbols ############################################################## Sorting mana symbols
# correctly sort a mana symbol (no guild mana) # correctly sort a mana symbol (no guild mana)
mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHSFCAIE[TK](WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHSFCAIE(WUBRG)")
# correctly sort wedge mana # correctly sort wedge mana
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHSFCAIE[TK](WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHSFCAIE(WBGUR)")
mana_unsort := sort_text@(order:"[/\\?XYZI0123456789VLHSCAIETKWUBRG]") mana_unsort := sort_text@(order:"[/\\?XYZI0123456789VLHSCAIEWUBRG]")
# correctly sort guild mana # correctly sort guild mana
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHSFCAIETKWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHSFCAIEWUBRG/|]") +
replace@( replace@(
# No lookbehind :( # No lookbehind :(
#match: "(?<!/)(./.|././.|./././.|.[|])(?!/)", #match: "(?<!/)(./.|././.|./././.|.[|])(?!/)",
@@ -55,10 +55,12 @@ mana_filter := to_upper + {
} }
# Like mana filter, only also allow tap symbols: # Like mana filter, only also allow tap symbols:
tap_reduction := tap_reduction :=
replace@(match:"(TK)+", replace:"")+
replace@(match:"T+", replace:"T")+ replace@(match:"T+", replace:"T")+
replace@(match:"Q+", replace:"Q") replace@(match:"Q+", replace:"Q")
tap_filter := filter_text@(match: "[TKQ]") ticket_filter :=
ticket_isolate := filter_text@(match:"(TK)+")
tap_filter := replace@(match:"(TK)+", replace:"")+
sort_text@(order: "<TQ>")
mana_filter_t := replace@( # Remove [] used for forcing mana symbols mana_filter_t := replace@( # Remove [] used for forcing mana symbols
match: "[\\[\\]]", match: "[\\[\\]]",
replace: "" replace: ""
@@ -777,6 +779,7 @@ mana_context :=
| <match>, # G, tap: something | <match>, # G, tap: something
| or[ ]<match> # Add X, Y, or Z. | or[ ]<match> # Add X, Y, or Z.
| <match>[ ]to[ ]your # Add X, Y, or Z to your mana pool. | <match>[ ]to[ ]your # Add X, Y, or Z to your mana pool.
| you[ ]get[ ]<match> # You get E, you get TK
| <match>[ ]was[ ]spent # if G was spent to cast | <match>[ ]was[ ]spent # if G was spent to cast
| <match>[ ]can[ ]be[ ]paid | <match>[ ]can[ ]be[ ]paid
| (pays?|additional|costs?|the|adds?|pay(ed)?[ ](with|using)) # pay X. creatures cost 1 less. pay an additional G. | (pays?|additional|costs?|the|adds?|pay(ed)?[ ](with|using)) # pay X. creatures cost 1 less. pay an additional G.
@@ -784,7 +787,8 @@ mana_context :=
([ ](<sym[^>]*>)?[-+=]?[VLHSCETKQ\\?XYZIEWUBRG0-9/|]+(</sym[^>]*>)?,)* # pay X, Y or Z ([ ](<sym[^>]*>)?[-+=]?[VLHSCETKQ\\?XYZIEWUBRG0-9/|]+(</sym[^>]*>)?,)* # pay X, Y or Z
([ ](<sym[^>]*>)?[-+=]?[VLHSCETKQ\\?XYZIEWUBRG0-9/|]+(</sym[^>]*>)?[ ](and|or|and/or))* # pay X or Y ([ ](<sym[^>]*>)?[-+=]?[VLHSCETKQ\\?XYZIEWUBRG0-9/|]+(</sym[^>]*>)?[ ](and|or|and/or))* # pay X or Y
[ ]<match> [ ]<match>
([,.)\"”]|$ # (end of word) (
[,.)\"”]|$ # (end of word)
| [ ][^ .,]*$ # still typing... | [ ][^ .,]*$ # still typing...
| [ ]( or | and | in | less | more | to ) # or next word is ... | [ ]( or | and | in | less | more | to ) # or next word is ...
) )
@@ -793,7 +797,7 @@ mana_context :=
| <param-cost>[ ]*<match></param-cost> # keyword argument that is declared as cost | <param-cost>[ ]*<match></param-cost> # keyword argument that is declared as cost
| <param-cost><match>, # keyword argument that is declared as cost | <param-cost><match>, # keyword argument that is declared as cost
"; ";
mana_un_context := "(converted mana costs? <match>|<match> life)" mana_un_context := "(mana values? <match>|converted mana costs? <match>|<match> life)"
# truncates the name of legends # truncates the name of legends
legend_filter := replace@(match:"(, | of | the | \"| “).*", replace: "" ) legend_filter := replace@(match:"(, | of | the | \"| “).*", replace: "" )
@@ -1011,7 +1015,7 @@ text_filter :=
} + } +
# step 4 : explict non mana symbols # step 4 : explict non mana symbols
replace@( replace@(
match: "\\][-+=]?[VLHSCETKQ\\?XYZIWUBRG0-9/|]+\\[", match: "\\][-+=]?[VLHSCETQ\\?XYZIWUBRG0-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@(
@@ -1019,17 +1023,21 @@ text_filter :=
in_context: mana_context, in_context: mana_context,
replace: {"<sym-auto>" + _1 + "</sym-auto>"} ) + replace: {"<sym-auto>" + _1 + "</sym-auto>"} ) +
replace@( replace@(
match: "\\b[VLHSCETKQ\\?XYZIWUBRG0-9/|]+\\b", match: "\\b((TK)+)(T)?\\b",
in_context: mana_context,
replace: {"<sym-auto>" + _1 + "</sym-auto>" + _3}) +
replace@(
match: "\\b[VLHSCETQ\\?XYZIWUBRG0-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 : remove false positive mana & tap symbols # step 5b : remove false positive mana & tap symbols
replace@( replace@(
match: "<sym-auto>([VLHSCETKQ\\?XYZIWUBRG0-9/|]+)</sym-auto>", match: "<sym-auto>([VLHSCETQ\\?XYZIWUBRG0-9/|]+)</sym-auto>",
in_context: mana_un_context, in_context: mana_un_context,
replace: "\\1" ) + replace: "\\1" ) +
# step 5c : add explicit mana symbols # step 5c : add explicit mana symbols
replace@( replace@(
match: "\\[[-+=]?[VLHSCETKQE\\?XYZIWUBRG0-9/|]+\\]", match: "\\[[-+=]?[VLHSCETQE\\?XYZIWUBRG0-9/|]+\\]",
replace: {"<sym>" + mana_filter_t() + "</sym>"} ) + replace: {"<sym>" + mana_filter_t() + "</sym>"} ) +
# step 6 : curly quotes # step 6 : curly quotes
{if set.curly_quotes then curly_quotes(input) else input} + {if set.curly_quotes then curly_quotes(input) else input} +