Custom Symbol links will now detect if they are smaller than 512px wide, and add padding if they are not. This will do the padding for any old custom symbols without needing to update them. If you need to disable the autopadding, replace the "+" MSE inserts into the link to a "-".
    Fixed a bug where generic mana symbols were misaligned on HD frames.
    Fixed spree +s indenting like modals when they should not.
    Fix layering conflicts with the Lesson symbol and the Alchemy symbol.
    Fix layering conflict with Kaldheim Showcase watermark.
    Fix Mainframe Planeswalker watermark dependency warning.
    Fix Clear Tops looking in the wrong folder.
    Fix blending error on clear cards with colored mana costs.
    Fixed the alignment of the red Star nyx replacement.
    Improved the text on VOW Showcase.
This commit is contained in:
cajun
2024-10-03 13:11:35 -05:00
committed by GitHub
parent 4d4a2cdaba
commit 859b1dcbc6
14 changed files with 91 additions and 59 deletions

View File

@@ -258,6 +258,7 @@ init script:
}
is_snow := {
chosen(styling.frames, choice:"snow")
or (lang_setting("is_snow")(card.super_type) and chosen(styling.other_options, choice:"auto snow"))
}
#### Pieces
is_season := {
@@ -464,7 +465,10 @@ init script:
}
card_background := {
color_background(
bc := base_card()
if bc == "clear"
then "/magic-modules.mse-include/cards/375 m15 simple/xcard.png"
else color_background(
type:"card",
base_hybrid:card_hybrid,
folder: if is_map() then "/magic-modules.mse-include/cards/746 maps/" else if is_thbland() then "energies/" else if is_dka() then "dka/" else template_prefix["card"]
@@ -1988,7 +1992,7 @@ extra card style:
z index: 199
render style: image
popup style: in place
image: xcard.png
image: /magic-modules.mse-include/cards/375 m15 simple/xcard.png
mask: { if is_dka() then "frame_masks/clear_tops_dka_mask2.png" }
evobar:
left: {if is_map() then 15 else 27}

View File

@@ -1396,7 +1396,9 @@ init script:
else if is_modal_dfc()
then "/magic-modules.mse-include/cards/375 m15 cut/"
else "/magic-modules.mse-include/cards/375 m15 cut/notched/"
color_background(
if front_clear() and not a_saga()
then front_card_img()
else color_background(
type: "card",
base_hybrid: card_hybrid,
folder: folder
@@ -1432,7 +1434,9 @@ init script:
else if back_map()
then "/magic-modules.mse-include/cards/746 maps/"
else "/magic-modules.mse-include/cards/375 m15 cut/" + (if not norm then "back/" else "")
color_background(
if back_clear() and not b_saga()
then back_card_img()
else color_background(
type: "card2",
base_hybrid: card_hybrid,
folder: folder,

View File

@@ -311,6 +311,7 @@ init script:
popout_height := { popout_coord(3, field:styling.popout_image_style or else "") }
popout_angle := { popout_coord(4, field:styling.popout_image_style or else "", lim:4) }
use_popunder := { chosen(styling.other_options, choice:"popunder art") }
watermark_include := "/magic-modules.mse-include/watermarks"
############################################################## Set info fields
set info style:
symbol:

View File

@@ -56,7 +56,7 @@ init script:
swap_fonts_type_default :=
[
name: {"Beleren Bold"},
size: {30.0},
size: {27.0},
color: {"black"},
vertical: {0},
italic: {""}
@@ -246,8 +246,8 @@ card style:
right: 690
bottom: { 966 - chop_bot() }
z index: 900
padding left: 6
padding right: 4
padding left: 18
padding right: 8
line height hard: { if is_modal(card.rule_text) then 0.9 else 1.2 }
line height line: 1.5
line height soft: 0.9

View File

@@ -353,7 +353,7 @@ card style:
height: {23 - 0.5*shrink_name()}
alignment: bottom shrink-overflow
padding bottom: 0
z index: 1
z index: 900
font:
name: Beleren Bold
size: {15 - shrink_name()}
@@ -365,7 +365,7 @@ card style:
height: {23 - 0.5*shrink_name2()}
alignment: bottom shrink-overflow
padding bottom: 0
z index: 1
z index: 900
font:
name: Beleren Bold
size: {15 - shrink_name2()}
@@ -384,7 +384,7 @@ card style:
size: 15
alignment: middle right
always symbol: true
z index: 2
z index: 920
padding top: 0
casting cost 2:
right: 723
@@ -400,7 +400,7 @@ card style:
size: 15
alignment: middle right
always symbol: true
z index: 2
z index: 920
padding top: 0
############################# Image
image:
@@ -425,7 +425,7 @@ card style:
top: 308
width: 17
height: 17
z index: 1
z index: 940
render style: image
visible: { has_identity() }
image: { module_identity() }
@@ -434,7 +434,7 @@ card style:
top: 308
width: 17
height: 17
z index: 1
z index: 940
render style: image
visible: { has_identity_2() }
image: { module_identity() }
@@ -444,7 +444,7 @@ card style:
width: { (if has_identity() then "290" else "310") - max(22,card_style.rarity.content_width) }
height: { 20 - shrink_type() }
alignment: top shrink-overflow
z index: 2
z index: 900
padding top: 2
font:
name: Beleren Bold
@@ -457,7 +457,7 @@ card style:
width: { (if has_identity_2() then "290" else "310") - max(22,card_style.rarity.content_width) }
height: { 20 - shrink_type2() }
alignment: top shrink-overflow
z index: 2
z index: 900
padding top: 2
font:
name: Beleren Bold
@@ -469,7 +469,7 @@ card style:
top: 308
width: 44
height: 22
z index: 2
z index: 950
render style: image
alignment: middle right
include file: /magic-modules.mse-include/rarities/choice_images
@@ -478,7 +478,7 @@ card style:
top: 308
width: 44
height: 22
z index: 2
z index: 950
render style: image
alignment: middle right
include file: /magic-modules.mse-include/rarities/choice_images
@@ -549,7 +549,7 @@ card style:
line height line max: 1.6
############################# PT
pt:
z index: 2
z index: 900
left: 293
top: 468
width: 60
@@ -561,7 +561,7 @@ card style:
color: black
separator color: red
pt 2:
z index: 2
z index: 900
left: 670
top: 468
width: 60
@@ -655,7 +655,7 @@ extra card style:
top: 460
width: 77
height: 43
z index: 1
z index: 840
visible: { card.pt != "" }
render style: image
image: { if is_vehicle() then "vpt.png" else card_ptbox() }
@@ -664,7 +664,7 @@ extra card style:
top: 460
width: 77
height: 43
z index: 1
z index: 840
visible: { card.pt_2 != "" }
render style: image
image: { if back_vehicle() then "vpt.png" else card_ptbox() }

View File

@@ -250,7 +250,7 @@ card style:
height: {23 - 0.5*shrink_name()}
alignment: bottom shrink-overflow
padding bottom: 0
z index: 1
z index: 900
font:
name: Beleren Bold
size: {15 - shrink_name()}
@@ -269,7 +269,7 @@ card style:
size: 15
alignment: middle right
always symbol: true
z index: 2
z index: 920
padding top: 0
############################# Image
image:
@@ -286,7 +286,7 @@ card style:
top: 308
width: 17
height: 17
z index: 1
z index: 920
render style: image
visible: { has_identity() }
image: { module_identity() }
@@ -296,7 +296,7 @@ card style:
width: { (if has_identity() then "290" else "310") - max(22,card_style.rarity.content_width) }
height: { 20 - shrink_type() }
alignment: top shrink-overflow
z index: 2
z index: 900
padding top: 2
font:
name: Beleren Bold
@@ -308,7 +308,7 @@ card style:
top: 308
width: 44
height: 22
z index: 2
z index: 950
render style: image
alignment: middle right
include file: /magic-modules.mse-include/rarities/choice_images
@@ -337,7 +337,7 @@ card style:
styling.center_text == "always"
then "middle center"
else "middle left"
z index: 2
z index: 900
padding left: 6
padding right: 4
line height hard: {if is_modal(card.rule_text) then 0.9 else 1.2 }
@@ -347,7 +347,7 @@ card style:
line height line max: 1.6
############################# PT
pt:
z index: 2
z index: 900
left: 293
top: 468
width: 60
@@ -385,7 +385,7 @@ extra card style:
top: 460
width: 77
height: 43
z index: 1
z index: 840
visible: { card.pt != "" }
render style: image
image: { if is_vehicle() then "vpt.png" else module_ptbox() }

View File

@@ -632,8 +632,8 @@ symbol:
code: [XYZ]
regex: yes
draw text: 0
text margin left: .23
text margin right: .21
text margin left: .26
text margin right: .18
text margin top: -.15
text margin bottom: -.06
text font:
@@ -799,7 +799,7 @@ symbol:
symbol:
image: mana_circle.png
text margin left: .23
text margin left: .28
text margin right: .21
text margin top: -.15
text margin bottom: -.06

View File

@@ -9,4 +9,4 @@ card style:
include file: /magic.mse-game/card-symbols/menu_choice_images
render style: image
image: { card_symbol_image(face: 1) }
z index: 870
z index: 880

View File

@@ -10,4 +10,4 @@ card style:
include file: /magic.mse-game/card-symbols/menu_choice_images
render style: image
image: { card_symbol_image(face: 2) }
z index: 870
z index: 880

View File

@@ -10,4 +10,4 @@ card style:
include file: /magic.mse-game/card-symbols/menu_choice_images
render style: image
image: { card_symbol_image(face: 3) }
z index: 870
z index: 880

View File

@@ -70,12 +70,12 @@ Specific z indexes
800 Indicators
800 Legend crown
810 Tombstone/alchemy symbol
830 Loyalty boxes
840 PT Box, Leveler arrows, Flash dot
850 Color stamp
860 Holofoil stamp
870 Transform symbol
880 Tombstone/alchemy symbol
880 Alias box
900 Loyalty cost colons

Binary file not shown.

Before

Width:  |  Height:  |  Size: 392 KiB

After

Width:  |  Height:  |  Size: 468 KiB

View File

@@ -33,7 +33,7 @@ include file: language
include file: statistics_script
include file: /magic-blends.mse-include/new-blends
############################################################## Versioning
version_date := {"2024-10-01 Template Pack 3.0.2: Magic Modules & Showcase Catchup - DFC bugfixes"}
version_date := {"2024-10-01 Template Pack 3.0.4: Magic Modules & Showcase Catchup - Custom Symbol padding"}
version := version_date
############################################################## Common filters
############################################################## Utility
@@ -1755,7 +1755,7 @@ text_filter :=
) +
#### step 7b : indent bullets
replace@(
match: "^(• |[+] ?)([^\n]+\n?)",
match: "^(• )([^\n]+\n?)",
replace: {"<li><bullet>" + _1 + "</bullet>" + _2 + "</li>"}
) +
#### step 7c : clean up modals
@@ -4082,7 +4082,7 @@ name_height :=
name_transform_symbol_shift :=
{
if transform_symbol_field(face) == "none" or disabled
if transform_symbol_field(face) == "none" or card_symbol_field(face) == "none" or disabled
then 0
else (
map := face_coordinates_map(face)
@@ -4468,33 +4468,52 @@ chop_bottom := { module_chop(1) }
chop_right := { module_chop(2) }
############################################################## Custom corner symbols
verify_symbol_image := {
array := split_comma(input)
if not has_png(array.0)
then array.0
else (
sym_link := array.0
sym_pad := array.3 or else ""
sym_exists := exists_in_package("/magic-mainframe-extras.mse-include/"+sym_link)
if not sym_exists then (
sym_link + ",Not found,Ensure the file name is correct in /data/magic-mainframe-extras and reload," + sym_pad
) else (
sym_width := width_of("/magic-mainframe-extras.mse-include/"+sym_link)
sym_pad := array.3 or else ""
if (sym_width <= 512) then (
if sym_pad == "" then sym_pad := "+"
)
sym_link + ",File found,{sym_width},{sym_pad}"
)
)
}
custom_symbol_image := {
src := if style_src != "" then style_src else set["custom_symbol_"+input]
array := split_comma(src)
if not has_png(array.0) or array.1 == "Not found"
then "/magic-modules.mse-include/symbols/aetherprint.png"
else (
link := "/magic-mainframe-extras.mse-include/" + array.0
if array.3 == "+" then link := enlarge(link, border_size:0.189)
link
)
}@(style_src:"")
custom_symbol_1 := {
style_src := styling.custom_symbol_1 or else styling.custom_symbol_one or else styling.custom_symbol or else ""
src := if style_src != "" then style_src else set.custom_symbol_1
if has_png(src)
then "/magic-mainframe-extras.mse-include/" + src
else "/magic-modules.mse-include/symbols/aetherprint.png"
custom_symbol_image(1, style_src:style_src)
}
custom_symbol_2 := {
style_src := styling.custom_symbol_2 or else styling.custom_symbol_two or else styling.custom_symbol or else ""
src := if style_src != "" then style_src else set.custom_symbol_2
if has_png(src)
then "/magic-mainframe-extras.mse-include/" + src
else "/magic-modules.mse-include/symbols/aetherprint.png"
custom_symbol_image(2, style_src:style_src)
}
custom_symbol_3 := {
style_src := styling.custom_symbol_3 or else styling.custom_symbol_three or else styling.custom_symbol or else ""
src := if style_src != "" then style_src else set.custom_symbol_3
if has_png(src)
then "/magic-mainframe-extras.mse-include/" + src
else "/magic-modules.mse-include/symbols/aetherprint.png"
custom_symbol_image(3, style_src:style_src)
}
custom_symbol_4 := {
style_src := styling.custom_symbol_4 or else styling.custom_symbol_four or else styling.custom_symbol or else ""
src := if style_src != "" then style_src else set.custom_symbol_4
if has_png(src)
then "/magic-mainframe-extras.mse-include/" + src
else "/magic-modules.mse-include/symbols/aetherprint.png"
custom_symbol_image(4, style_src:style_src)
}
############################################################## Custom fonts
swap_font := {styling.apply_custom_fonts or else false}

View File

@@ -381,19 +381,23 @@ set field:
set field:
type: text
name: custom symbol 1
description: Set this image in magic-symbols.mse-include as Custom Symbol 1
description: Set this image in magic-symbols.mse-include as Custom Symbol 1. Symbols less than 512px wide will be padded by 19%, change + to - to disable.
script: verify_symbol_image(value)
set field:
type: text
name: custom symbol 2
description: Set this image in magic-symbols.mse-include as Custom Symbol 2
description: Set this image in magic-symbols.mse-include as Custom Symbol 2. Symbols less than 512px wide will be padded by 19%, change + to - to disable.
script: verify_symbol_image(value)
set field:
type: text
name: custom symbol 3
description: Set this image in magic-symbols.mse-include as Custom Symbol 3
description: Set this image in magic-symbols.mse-include as Custom Symbol 3. Symbols less than 512px wide will be padded by 19%, change + to - to disable.
script: verify_symbol_image(value)
set field:
type: text
name: custom symbol 4
description: Set this image in magic-symbols.mse-include as Custom Symbol 4
description: Set this image in magic-symbols.mse-include as Custom Symbol 4. Symbols less than 512px wide will be padded by 19%, change + to - to disable.
script: verify_symbol_image(value)
set field: