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

Minor symbol fonts update (#27)

Browse Source 
- Adjusted energy symbol size in `magic-mana-large`
- Added unfinity tickets in `magic-mana-large` and `magic-mana-small`, symbol TK
- Added defense in `magic-mana-small`, symbols D0-D99, D-99 - D+99
- Added a few `insert symbol menu` entries

---------

Co-authored-by: cajun <12363371+CajunAvenger@users.noreply.github.com>
This commit is contained in:
GenevensiS
2024-01-10 21:26:16 +01:00
committed by GitHub
parent 3726d63b82
commit 0960b3d694
8 changed files with 108 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/magic-mana-large.mse-symbol-font/energy.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 11 KiB

17
data/magic-mana-large.mse-symbol-font/symbol-font
View File

@@ -146,7 +146,11 @@ symbol:
image: {"/magic-mainframe-extras.mse-include/" + v_mana_loc() + "large/" + v_mana_name() + ".png"} image: {"/magic-mainframe-extras.mse-include/" + v_mana_loc() + "large/" + v_mana_name() + ".png"}
image font size: 120 image font size: 120
enabled: {use_large_v_mana()} enabled: {use_large_v_mana()}
#######Normal Mana Symbols ####### Miscellaneous Symbols
symbol:
code: TK
image: ticket.png
image font size: 178
symbol: symbol:
code: T code: T
image: mana_t_older.png image: mana_t_older.png
@@ -172,8 +176,9 @@ symbol:
symbol: symbol:
code: E code: E
image: Energy.png image: Energy.png
image font size: 230
symbol: symbol:
code: chaos code: A
image: mana_chaos.png image: mana_chaos.png
image font size: 151.69 image font size: 151.69
###################################################################################### Phy Hybrid ###################################################################################### Phy Hybrid
@@ -440,9 +445,6 @@ symbol:
symbol: symbol:
code: |S code: |S
image: mana_s_half.png image: mana_s_half.png
symbol:
code: A
image: mana_chaos.png
symbol: symbol:
code: H/W code: H/W
image: mana_phyw.png image: mana_phyw.png
@@ -826,7 +828,9 @@ symbol:
insert symbol menu: insert symbol menu:
item: T item: T
item: Q item: Q
item: chaos item: E
item: TK
item: A
item: item:
type: line type: line
item: X item: X
@@ -909,3 +913,4 @@ insert symbol menu:
item: 2/R item: 2/R
item: 2/G item: 2/G
item: 2/C item: 2/C
item: 2/S

BIN
data/magic-mana-large.mse-symbol-font/ticket.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 29 KiB

BIN
data/magic-mana-small.mse-symbol-font/defense.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
data/magic-mana-small.mse-symbol-font/defense_wide.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

82
data/magic-mana-small.mse-symbol-font/symbol-font
View File

@@ -314,6 +314,53 @@ symbol:
color: black color: black
max stretch: 0.5 max stretch: 0.5
image font size: 100 image font size: 100
###################################################################################### Defense Symbols
symbol:
image: defense_wide.png
code: D([+-][XYZ0-9][0-9])
regex: yes
draw text: 1
text margin left: .41
text margin right: .48
text margin top: .00
text margin bottom: .00
text font:
name: Beleren Bold
size: .45
color: black
max stretch: 0.5
image font size: 115
symbol:
image: defense_wide.png
code: D([XYZ0-9+-][0-9])
regex: yes
draw text: 1
text margin left: .47
text margin right: .45
text margin top: .02
text margin bottom: .00
text font:
name: Beleren Bold
size: .58
color: black
max stretch: 0.5
image font size: 115
symbol:
image: defense.png
code: D([XYZ0-9])
regex: yes
draw text: 1
text margin left: .0
text margin right: .0
text margin top: .02
text margin bottom: .0
text font:
name: Beleren Bold
size: .58
color: black
max stretch: 0.5
image font size: 115
###################################################################################### Symbols That Actually Appear on Cards ###################################################################################### Symbols That Actually Appear on Cards
symbol: symbol:
code: phi code: phi
@@ -324,10 +371,18 @@ symbol:
image: energy_inverse.png image: energy_inverse.png
image font size: 300 image font size: 300
enabled: {white_text()} enabled: {white_text()}
symbol:
code: energy
image: energy.png
image font size: 300
symbol: symbol:
code: E code: E
image: energy.png image: energy.png
image font size: 300 image font size: 300
symbol:
code: TK
image: ticket.png
image font size: 240
symbol: symbol:
code: .5 code: .5
image: one_half.png image: one_half.png
@@ -1029,8 +1084,10 @@ symbol:
insert symbol menu: insert symbol menu:
item: T item: T
item: Q item: Q
item: C
item: E item: E
item: TK
item: A
item: phi
item: item:
type: custom type: custom
name: colorless name: colorless
@@ -1043,7 +1100,6 @@ insert symbol menu:
item: G item: G
item: C item: C
item: S item: S
item: A
item: item:
type: line type: line
item: item:
@@ -1113,6 +1169,7 @@ insert symbol menu:
item: 2/R item: 2/R
item: 2/G item: 2/G
item: 2/C item: 2/C
item: 2/S
item: item:
type: line type: line
item: item:
@@ -1156,3 +1213,24 @@ insert symbol menu:
item: 8 loyalty item: 8 loyalty
item: 9 loyalty item: 9 loyalty
item: X loyalty item: X loyalty
item:
name: defense
item: D0
item: D1
item: D2
item: D3
item: D4
item: D5
item: D6
item: D7
item: D8
item: D9
item: DX
item:
name: saga chapters
item: r1
item: r2
item: r3
item: r4
item: r5
item: r6

BIN
data/magic-mana-small.mse-symbol-font/ticket.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

33
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(WUBRG)") mana_sort := sort_text@(order: "\\?XYZI[0123456789]VLHSFCAIE[TK](WUBRG)")
# correctly sort wedge mana # correctly sort wedge mana
mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHSFCAIE(WBGUR)") mana_sort_wedge := sort_text@(order: "\\?XYZI[0123456789]VLHSFCAIE[TK](WBGUR)")
mana_unsort := sort_text@(order:"[/\\?XYZI0123456789VLHSCAIEWUBRG]") mana_unsort := sort_text@(order:"[/\\?XYZI0123456789VLHSCAIETKWUBRG]")
# correctly sort guild mana # correctly sort guild mana
mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHSFCAIEWUBRG/|]") + mana_sort_guild := sort_text@(order: "[\\?XYZI01234567890VLHSFCAIETKWUBRG/|]") +
replace@( replace@(
# No lookbehind :( # No lookbehind :(
#match: "(?<!/)(./.|././.|./././.|.[|])(?!/)", #match: "(?<!/)(./.|././.|./././.|.[|])(?!/)",
@@ -55,9 +55,10 @@ 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 := sort_text@(order: "<TQ>") tap_filter := filter_text@(match: "[TKQ]")
mana_filter_t := replace@( # Remove [] used for forcing mana symbols mana_filter_t := replace@( # Remove [] used for forcing mana symbols
match: "[\\[\\]]", match: "[\\[\\]]",
replace: "" replace: ""
@@ -432,16 +433,16 @@ trim_reminder_x := replace@(match: ". X can’t be 0.", replace: "")
for_mana_costs := { for_mana_costs := {
if input.separator_before == "—" and contains(input.param, match: " ") then ( ##multi word if input.separator_before == "—" and contains(input.param, match: " ") then ( ##multi word
if comma_count(input.param) == "," then ( ##two part if comma_count(input.param) == "," then ( ##two part
if match(match: "^[VLHSCAIETQ\\?XYZIWUBRG0-9/|]+,", input.param) then ##starts with mana if match(match: "^[VLHSCAIETKQ\\?XYZIWUBRG0-9/|]+,", input.param) then ##starts with mana
"{add}<param-cost>{alternative_cost(input.param, trim:combined_cost, s:action)}</param-cost>" ##"add" mana "{add}<param-cost>{alternative_cost(input.param, trim:combined_cost, s:action)}</param-cost>" ##"add" mana
else "<param-cost>{alternative_cost(input.param, trim:combined_cost, s:action)}</param-cost>{non}" ## else cost "non" else "<param-cost>{alternative_cost(input.param, trim:combined_cost, s:action)}</param-cost>{non}" ## else cost "non"
) else if contains(input.param, match: ",") then ( ##three+ parts ) else if contains(input.param, match: ",") then ( ##three+ parts
if match(match: "^[VLHSCAIETQ\\?XYZIWUBRG0-9/|]+,", input.param) then ##starts with mana if match(match: "^[VLHSCAIETKQ\\?XYZIWUBRG0-9/|]+,", input.param) then ##starts with mana
"{add}<param-cost>{alternative_cost(input.param, trim:long_cost, s:action)}</param-cost>" ##"add" mana with long formatting "{add}<param-cost>{alternative_cost(input.param, trim:long_cost, s:action)}</param-cost>" ##"add" mana with long formatting
else "<param-cost>{alternative_cost(input.param, trim:long_nomana_cost, s:action)}</param-cost>{non}" ## else cost "non" with long formatting else "<param-cost>{alternative_cost(input.param, trim:long_nomana_cost, s:action)}</param-cost>{non}" ## else cost "non" with long formatting
) else ) else
"<param-cost>{alternative_cost(input.param, s:action, trim:lower_first)}{non}</param-cost>" ##one, nonmana, part "<param-cost>{alternative_cost(input.param, s:action, trim:lower_first)}{non}</param-cost>" ##one, nonmana, part
) else if match(match: "^[VLHSCAIETQ\\?XYZIWUBRG0-9/|]+$", input.param) then ##one word ) else if match(match: "^[VLHSCAIETKQ\\?XYZIWUBRG0-9/|]+$", input.param) then ##one word
"{add}<param-mana>{input.param}</param-mana>" ##mana "{add}<param-mana>{input.param}</param-mana>" ##mana
else else
"<param-cost>{alternative_cost(input.param, trim:combined_cost, s:action)}</param-cost>{non}" ##nonmana "<param-cost>{alternative_cost(input.param, trim:combined_cost, s:action)}</param-cost>{non}" ##nonmana
@@ -454,7 +455,7 @@ long_nomana_cost := replace@(match:"[A-Z]", replace: { to_lower() })
lower_first := 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() })+ combined_cost := replace@(match:", [A-Z]", replace: { to_lower() })+
replace@(match:",", replace:" and")+ replace@(match:",", replace:" and")+
replace@(match:"^[VLHSCETQ\\?XYZIWUBRG0-9/|]+", in_context: "(^|[[:space:]])<match>(?![a-z])", replace: "<sym-auto>&</sym-auto>")+ replace@(match:"^[VLHSCETKQ\\?XYZIWUBRG0-9/|]+", in_context: "(^|[[:space:]])<match>(?![a-z])", replace: "<sym-auto>&</sym-auto>")+
replace@(match:"^[A-Z]", replace: { to_lower() }) replace@(match:"^[A-Z]", replace: { to_lower() })
alternative_cost := { alternative_cost := {
input := trim(input) input := trim(input)
@@ -780,8 +781,8 @@ mana_context :=
| <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.
([ ]either)? # pay either X or Y ([ ]either)? # pay either X or Y
([ ](<sym[^>]*>)?[-+=]?[VLHSCETQ\\?XYZIEWUBRG0-9/|]+(</sym[^>]*>)?,)* # pay X, Y or Z ([ ](<sym[^>]*>)?[-+=]?[VLHSCETKQ\\?XYZIEWUBRG0-9/|]+(</sym[^>]*>)?,)* # pay X, Y or Z
([ ](<sym[^>]*>)?[-+=]?[VLHSCETQ\\?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...
@@ -1009,7 +1010,7 @@ text_filter :=
} + } +
# step 4 : explict non mana symbols # step 4 : explict non mana symbols
replace@( replace@(
match: "\\][-+=]?[VLHSCETQ\\?XYZIWUBRG0-9/|]+\\[", match: "\\][-+=]?[VLHSCETKQ\\?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@(
@@ -1017,17 +1018,17 @@ 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[VLHSCETQ\\?XYZIWUBRG0-9/|]+\\b", match: "\\b[VLHSCETKQ\\?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>([VLHSCETQ\\?XYZIWUBRG0-9/|]+)</sym-auto>", match: "<sym-auto>([VLHSCETKQ\\?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: "\\[[-+=]?[VLHSCETQE\\?XYZIWUBRG0-9/|]+\\]", match: "\\[[-+=]?[VLHSCETKQE\\?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} +
@@ -1229,7 +1230,7 @@ is_half_mana := match@(match: "1/2|[|][WUBRGS]")
is_half_generic := match@(match: "1/2") is_half_generic := match@(match: "1/2")
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 | [|][WUBRGC] | [0-9](/[WUBRGCVLHSCETQ2]) | [0-9]+(?!/[WUBRGCVLHSCETQ2]) | [WUBRGCVLHS0-9](/[WUBRGCVLHS])\{0,4} ") cmc_split := break_text@(match: "(?ix) 1/2 | [|][WUBRGC] | TK | [0-9](/[WUBRGCVLHSCETQ2]) | [0-9]+(?!/[WUBRGCVLHSCETQ2]) | [WUBRGCVLHS0-9](/[WUBRGCVLHS])\{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)