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

popunder, atom-name fix

Browse Source
This commit is contained in:
cajun
2025-06-10 23:16:24 -05:00
parent ca430e9574
commit 895d006c8c
3 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/magic-cockatrice-v2.mse-export-template/export-template
View File

@@ -1,6 +1,6 @@
mse version: 2.5.0 mse version: 2.5.0
short name: Cockatrice short name: Cockatrice
full name: Exporter v2.1 full name: Exporter v2.2
position hint: 100 position hint: 100
icon: icon.png icon: icon.png
version: 2024-09-23 version: 2024-09-23
@@ -100,6 +100,7 @@ script:
replace@(match:";", replace:"")+ #remove semicolons replace@(match:";", replace:"")+ #remove semicolons
replace@(match:"\n", replace:"")+ #remove linebreaks replace@(match:"\n", replace:"")+ #remove linebreaks
replace@(match:"\\.", replace:"")+ #remove periods replace@(match:"\\.", replace:"")+ #remove periods
replace@(match:"\"", replace:"")+ #remove quotes
remove_tags remove_tags
# escape special xml characters # escape special xml characters

51
data/magic-m15-altered.mse-style/style
View File

@@ -964,6 +964,7 @@ styling field:
choice: vorthos box choice: vorthos box
choice: pride pinlines choice: pride pinlines
choice: inverted d20 choice: inverted d20
choice: popunder art
initial: avoid covering devoid, auto vehicles, auto snow, auto nyx crowns, auto ub initial: avoid covering devoid, auto vehicles, auto snow, auto nyx crowns, auto ub
styling field: styling field:
type: text type: text
@@ -1268,9 +1269,15 @@ card style:
mainframe image: mainframe image:
left: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).0 else 0} left: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).0 else 0}
top: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).1 else 0} top: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).1 else 0}
width: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).2 else 0} width: {if contains(styling.other_options, match:"popunder art") then 0 else if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).2 else 0}
height: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).3 else 0} height: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).3 else 0}
z index: 1010 z index: 1010
image 2:
left: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).0 else 0}
top: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).1 else 0}
width: {if not contains(styling.other_options, match:"popunder art") then 0 else if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).2 else 0}
height: {if comma_count(styling.popout_image_style) == ",,,," then split_text(match:",", styling.popout_image_style).3 else 0}
z index: 899
############################# Card type ############################# Card type
indicator: indicator:
left: { if is_map() then 18 else 31 + (if is_season() then 12 else 0) + (if is_clear() then 2 else 0) + (if use_flash_dot() then 3 else 0) } left: { if is_map() then 18 else 31 + (if is_season() then 12 else 0) + (if is_clear() then 2 else 0) + (if use_flash_dot() then 3 else 0) }
@@ -1348,7 +1355,7 @@ card style:
level 1 text: level 1 text:
left: { if is_leveler() and card.level_0 != "" then (if loy_leveler() then 57 else if box_leveler() then 78 else 75) else if is_map() then 40 else 29} left: { if is_leveler() and card.level_0 != "" then (if loy_leveler() then 57 else if box_leveler() then 78 else 75) else if is_map() then 40 else 29}
top: { if is_dka() and is_mutate() then 359 else if is_mutate() then 329 else top_of_textbox() } top: { if is_dka() and is_mutate() then 359 else if is_mutate() then 329 else top_of_textbox() }
right: { if is_leveler() then (if lone_pt() or card.pt == "" then 342 else 277) else if is_mutate() then 342 else if is_map() then 40 else 29} right: { if is_leveler() then (if lone_pt() or card.pt == "" then 342 else 287) else if is_mutate() then 342 else if is_map() then 40 else 29}
bottom: { if is_mutate() then 392 else if is_leveler() then (327+lv_1_height()) else bottom_of_textbox() } bottom: { if is_mutate() then 392 else if is_leveler() then (327+lv_1_height()) else bottom_of_textbox() }
font: font:
font: font:
@@ -1382,7 +1389,7 @@ card style:
level 2 text: level 2 text:
left: { if is_leveler() then (if card.level_1 != "" then (if loy_leveler() then 57 else if box_leveler() then 78 else 75) else if is_map() then 40 else 29) else 0} left: { if is_leveler() then (if card.level_1 != "" then (if loy_leveler() then 57 else if box_leveler() then 78 else 75) else if is_map() then 40 else 29) else 0}
top: { if is_leveler() then (329 + lv_2_coordinate()) else 0 } top: { if is_leveler() then (329 + lv_2_coordinate()) else 0 }
right: { if is_leveler() then (if card.pt_2 != "" then 277 else 342) else 0 } right: { if is_leveler() then (if card.pt_2 != "" then 287 else 342) else 0 }
bottom: { if is_leveler() then (329 + lv_2_coordinate()) + lv_2_height()-2 else 0 } bottom: { if is_leveler() then (329 + lv_2_coordinate()) + lv_2_height()-2 else 0 }
font: font:
name: { body_font() } name: { body_font() }
@@ -1415,7 +1422,7 @@ card style:
level 3 text: level 3 text:
left: {if card.level_2 != "" then (if loy_leveler() then 57 else if box_leveler() then 78 else 75) else if is_map() then 40 else 29} left: {if card.level_2 != "" then (if loy_leveler() then 57 else if box_leveler() then 78 else 75) else if is_map() then 40 else 29}
top: {331 + lv_3_coordinate()} top: {331 + lv_3_coordinate()}
right: {if card.pt_3 != "" then 277 else 342} right: {if card.pt_3 != "" then 287 else 342}
height: {if not is_leveler()then 0 else lv_3_height()-2} height: {if not is_leveler()then 0 else lv_3_height()-2}
font: font:
name: { body_font() } name: { body_font() }
@@ -1448,7 +1455,7 @@ card style:
level 4 text: level 4 text:
left: {if card.level_3 != "" then (if loy_leveler() then 57 else if box_leveler() then 78 else 75) else if is_map() then 40 else 29} left: {if card.level_3 != "" then (if loy_leveler() then 57 else if box_leveler() then 78 else 75) else if is_map() then 40 else 29}
top: {331 + lv_4_coordinate()} top: {331 + lv_4_coordinate()}
right: {if card.pt_7 != "" then 277 else 342} right: {if card.pt_7 != "" then 287 else 342}
height: {if not is_leveler() then 0 else lv_4_height()-2} height: {if not is_leveler() then 0 else lv_4_height()-2}
font: font:
name: { body_font() } name: { body_font() }
@@ -1561,9 +1568,9 @@ card style:
############################# PT ############################# PT
pt: pt:
z index: 900 z index: 900
left: {if is_leveler() and not lone_pt() then 291 else 286} left: {if is_leveler() and not lone_pt() then 301 else 286}
top: { (if is_leveler() and not lone_pt() then (l1_center() - 14) else if is_map() then 467 else 469)+(pt_font_vertical())} top: { (if is_leveler() and not lone_pt() then (l1_center() - 14) else if is_map() then 467 else 469)+(pt_font_vertical())}
width: {if starting_loyalty() and not is_leveler() then 0 else 60} width: {if starting_loyalty() and not is_leveler() then 0 else if is_leveler() then 50 else 60}
height: 28 height: 28
alignment: center middle shrink-overflow alignment: center middle shrink-overflow
font: font:
@@ -1577,9 +1584,9 @@ card style:
shadow displacement y: 1 shadow displacement y: 1
pt 2: pt 2:
z index: 900 z index: 900
left: 291 left: 301
top: {(l2_center() - 12)+(if is_map() then -1 else 0)+(pt_font_vertical())} top: {(l2_center() - 12)+(if is_map() then -1 else 0)+(pt_font_vertical())}
width: {if is_leveler() and not lone_pt() or card.pt_2 != "" then 60 else 0} width: {if is_leveler() and not lone_pt() or card.pt_2 != "" then 50 else 0}
height: 28 height: 28
alignment: center middle shrink-overflow alignment: center middle shrink-overflow
font: font:
@@ -1593,9 +1600,9 @@ card style:
shadow displacement y: 1 shadow displacement y: 1
pt 3: pt 3:
z index: 900 z index: 900
left: 291 left: 301
top: {(l3_center() - 12)+(if is_map() then -1 else 0)+(pt_font_vertical())} top: {(l3_center() - 12)+(if is_map() then -1 else 0)+(pt_font_vertical())}
width: {if is_leveler() and not lone_pt() or card.pt_3 != "" then 60 else 0} width: {if is_leveler() and not lone_pt() or card.pt_3 != "" then 50 else 0}
height: 28 height: 28
alignment: center middle shrink-overflow alignment: center middle shrink-overflow
font: font:
@@ -1609,9 +1616,9 @@ card style:
shadow displacement y: 1 shadow displacement y: 1
pt 7: pt 7:
z index: 900 z index: 900
left: 291 left: 301
top: {(l4_center() - 12)+(if is_map() then -1 else 0)+(pt_font_vertical())} top: {(l4_center() - 12)+(if is_map() then -1 else 0)+(pt_font_vertical())}
width: {if is_leveler() and not lone_pt() or card.pt_7 != "" then 60 else 0} width: {if is_leveler() and not lone_pt() or card.pt_7 != "" then 50 else 0}
height: {if card_style.level_4_text.height < 10 and card.pt_7 == "" then 0 else 28} height: {if card_style.level_4_text.height < 10 and card.pt_7 == "" then 0 else 28}
alignment: center middle shrink-overflow alignment: center middle shrink-overflow
font: font:
@@ -1919,36 +1926,36 @@ extra card field:
extra card style: extra card style:
pt box: pt box:
left: { if is_leveler() and not lone_pt() then 278 else if is_map() then 270 else 273 } left: { if is_leveler() and not lone_pt() then 288 else if is_map() then 270 else 273 }
top: { if is_leveler() and not lone_pt() then (l1_center() - (if is_map() then 26 else 18)) else if is_map() then 453 else 466} top: { if is_leveler() and not lone_pt() then (l1_center() - (if is_map() then 26 else 18)) else if is_map() then 453 else 466}
width: { if starting_loyalty() and not is_leveler() then 0 else if is_map() then 90 else 81} width: { if starting_loyalty() and not is_leveler() then 0 else if is_map() then 90 else if is_leveler() then 70 else 81}
height: { if is_map() then 54 else 42} height: { if is_map() then 54 else 42}
z index: 840 z index: 840
visible: { card.pt != "" } visible: { card.pt != "" }
render style: image render style: image
image: { choose_ptbox() } image: { choose_ptbox() }
pt box 2: pt box 2:
left: 278 left: 288
top: { l2_center() - (if is_map() then 26 else 15)} top: { l2_center() - (if is_map() then 26 else 15)}
width: { if (is_leveler() and not lone_pt()) or card.pt_2 != "" then (if is_map() then 90 else 81) else 0} width: { if (is_leveler() and not lone_pt()) or card.pt_2 != "" then (if is_map() then 90 else 70) else 0}
height: { if (is_leveler() and not lone_pt()) or card.pt_2 != "" then (if is_map() then 54 else 42) else 0} height: { if (is_leveler() and not lone_pt()) or card.pt_2 != "" then (if is_map() then 54 else 42) else 0}
z index: 840 z index: 840
visible: { card.pt_2 != "" } visible: { card.pt_2 != "" }
render style: image render style: image
image: {if is_map() then mappt_background() else combine_blend(image1: choose_ptbox(), image2: template_prefix["pt"]+"ptbox_multiply_1.png", combine: "multiply")} image: {if is_map() then mappt_background() else combine_blend(image1: choose_ptbox(), image2: template_prefix["pt"]+"ptbox_multiply_1.png", combine: "multiply")}
pt box 3: pt box 3:
left: 278 left: 288
top: { l3_center() - (if is_map() then 26 else 15)} top: { l3_center() - (if is_map() then 26 else 15)}
width: { if (is_leveler() and not lone_pt()) or card.pt_3 != "" then (if is_map() then 90 else 81) else 0} width: { if (is_leveler() and not lone_pt()) or card.pt_3 != "" then (if is_map() then 90 else 70) else 0}
height: { if (is_leveler() and not lone_pt()) or card.pt_3 != "" then (if is_map() then 54 else 42) else 0} height: { if (is_leveler() and not lone_pt()) or card.pt_3 != "" then (if is_map() then 54 else 42) else 0}
z index: 840 z index: 840
visible: { card.pt_3 != "" } visible: { card.pt_3 != "" }
render style: image render style: image
image: {if is_map() then mappt_background() else combine_blend(image1: choose_ptbox(), image2: template_prefix["pt"]+"ptbox_multiply_2.png", combine: "multiply")} image: {if is_map() then mappt_background() else combine_blend(image1: choose_ptbox(), image2: template_prefix["pt"]+"ptbox_multiply_2.png", combine: "multiply")}
pt box 4: pt box 4:
left: 278 left: 298
top: { l4_center() - (if is_map() then 26 else 15)} top: { l4_center() - (if is_map() then 26 else 15)}
width: { if (is_leveler() and not lone_pt()) or card.pt_3 != "" then (if is_map() then 90 else 81) else 0} width: { if (is_leveler() and not lone_pt()) or card.pt_3 != "" then (if is_map() then 90 else 60) else 0}
height: { if (is_leveler() and not lone_pt()) or card.pt_3 != "" then (if is_map() then 54 else 42) else 0} height: { if (is_leveler() and not lone_pt()) or card.pt_3 != "" then (if is_map() then 54 else 42) else 0}
z index: 840 z index: 840
visible: { card.pt_7 != "" } visible: { card.pt_7 != "" }
@@ -2298,7 +2305,7 @@ extra card style:
top: 58 top: 58
width: {if not is_pinned() then 0 else if is_legend() then 338 else 325} width: {if not is_pinned() then 0 else if is_legend() then 338 else 325}
height: {if not is_pinned() then 0 else 234} height: {if not is_pinned() then 0 else 234}
z index: 420 z index: 810
render style: image render style: image
popup style: in place popup style: in place
mask: {"/magic-pride.mse-include/masks/m15" + if is_legend() then " legend.png" else ".png"} mask: {"/magic-pride.mse-include/masks/m15" + if is_legend() then " legend.png" else ".png"}

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

@@ -1703,6 +1703,15 @@ text_filter :=
in_context: "(^|[[:space:]]|\\(|,|\\.|:|“|\"|'|‘|/|​)<match>", #### TODO: Allow any punctuation before in_context: "(^|[[:space:]]|\\(|,|\\.|:|“|\"|'|‘|/|​)<match>", #### TODO: Allow any punctuation before
replace: "<atom-autorem></atom-autorem>" replace: "<atom-autorem></atom-autorem>"
) + ) +
#### step 3bb : debug atom fields
replace@(
match: "<atom-name>([^<]+)</atom-(card|print)",
replace: "<atom-\\2name>\\1</atom-\\2"
) +
replace@(
match: "<atom-name>",
replace: ""
) +
#### step 3c : fill in atom fields #### step 3c : fill in atom fields
tag_contents@( tag_contents@(
tag: "<atom-cardname>", tag: "<atom-cardname>",
@@ -1723,7 +1732,7 @@ text_filter :=
) + ) +
replace@( replace@(
match:"^<atom-(card|print)name><nospellcheck>this", match:"^<atom-(card|print)name><nospellcheck>this",
replace:"<atom-\\2name><nospellcheck>This" replace:"<atom-\\1name><nospellcheck>This"
) + ) +
tag_contents@( tag_contents@(
tag: "<atom-legname>", tag: "<atom-legname>",