diff --git a/changelog.txt b/changelog.txt index 2c6870321..afde9702a 100644 --- a/changelog.txt +++ b/changelog.txt @@ -35,6 +35,7 @@ Bug Fixes: • Fixed a bug where some Unicode, such as Kanji and Cryllic characters, were unable to be typed. • Fixed a bug where the Add Multiple Cards scripts didn't load until you switched to another tab first. • Fixed a bug where long typelines would get squished during printing. +• Fixed several bugs that caused typing in the name and type to lag on larger set files. SHOWCASE FRAMES The main focus of this update was catching up on all the Showcase frames that Genevensis had been working on. As you'll see, it grew past that a bit, but the Full and M15 Packs now contain... @@ -125,6 +126,7 @@ MAINFRAME SUITE UPDATES • M15 Mainframe's Lesson frame is now accessed by clicking the big square to the left of the name, with the empty tombstone/alchemy box moving further left. Note you will need to re-assign Lesson symbols, either with the neocities patcher or doing it by hand. • M15 Mainframe now has Miracle support for Legendary, FNM, Inverted, Conspiracy, and Universes Beyond frames. • M15 Mainframe now has an option to prevent trim frames like Snow and Nyx from covering the Devoid texture. +• Mainframe Planeswalkers now has a setting to change its popout art to "popunder" art, which layers underneath the text, casting cost, and rarity symbol, but over the other frame elements. • Mainframe Planes has been updated to the version of the frame from MOM. The old frame is retained behind a style option. The code has been updated so the two textboxes are connected, and it now automates the divider. OTHER UPDATES diff --git a/data/magic-m15-mainframe-planeswalker.mse-style/style b/data/magic-m15-mainframe-planeswalker.mse-style/style index d29371aa5..b192dadc5 100644 --- a/data/magic-m15-mainframe-planeswalker.mse-style/style +++ b/data/magic-m15-mainframe-planeswalker.mse-style/style @@ -305,7 +305,12 @@ init script: (if use_full_art() then "_mythic" + (if is_stamped() then "_stamp" else "") else "") + ".png" } card_stamp_offset_top_1 := {if stamp_shape() == "triangle" then -3 else 0} - + popout_left := { popout_coord(0, field:styling.popout_image_style or else "") } + popout_top := { popout_coord(1, field:styling.popout_image_style or else "") } + popout_width := { popout_coord(2, field:styling.popout_image_style or else "") } + 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") } ############################################################## Set info fields set info style: symbol: @@ -373,6 +378,7 @@ styling field: choice: adventure choice: reversed adventure choice: pride pinlines + choice: popunder art initial: un-indent nonloyalty abilities styling field: type: text @@ -549,11 +555,20 @@ card style: z index: 100 mask: {if contains(styling.custom_mask, match:".png") then "" else "guidelines/" + (if is_clear() then "clear_" else if is_normal_size() or use_full_art() then "" else "wide_") + (if not force_short() and max_level() > 3 or force_tall() then "four_" else "") + (if is_clear() then "frame_mask" else if use_full_art() then (if is_stamped() then "mythic_image_rare_mask" else "mythic_mask") else "frame_mask") + ".png"} 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 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: 1010 + left: { popout_left() } + top: { popout_top() } + width: { if use_popunder() then 0 else popout_width() } + height: { popout_height() } + angle: { popout_angle() } + z index: 1010 + mainframe image: + left: { popout_left() } + top: { popout_top() } + width: { if use_popunder() then popout_width() else 0 } + height: { popout_height() } + angle: { popout_angle() } + z index: 899 + ############################# Card type indicator: left: 30 diff --git a/data/magic-modules.mse-include/symbol-fonts/small/menu_choices_loyalty b/data/magic-modules.mse-include/symbol-fonts/small/menu_choices_loyalty index 78c0fb096..28a0e4c34 100644 --- a/data/magic-modules.mse-include/symbol-fonts/small/menu_choices_loyalty +++ b/data/magic-modules.mse-include/symbol-fonts/small/menu_choices_loyalty @@ -2,41 +2,41 @@ name: loyalty item: name: +N - item: +1 - item: +2 - item: +3 - item: +4 - item: +5 - item: +6 - item: +7 - item: +8 - item: +9 - item: +10 - item: +X + item: l+1 + item: l+2 + item: l+3 + item: l+4 + item: l+5 + item: l+6 + item: l+7 + item: l+8 + item: l+9 + item: l+10 + item: l+X item: name: -N - item: -1 - item: -2 - item: -3 - item: -4 - item: -5 - item: -6 - item: -7 - item: -8 - item: -9 - item: -10 - item: -X + item: l-1 + item: l-2 + item: l-3 + item: l-4 + item: l-5 + item: l-6 + item: l-7 + item: l-8 + item: l-9 + item: l-10 + item: l-X item: name: N - item: =0 - item: =1 - item: =2 - item: =3 - item: =4 - item: =5 - item: =6 - item: =7 - item: =8 - item: =9 - item: =10 - item: =X \ No newline at end of file + item: l=0 + item: l=1 + item: l=2 + item: l=3 + item: l=4 + item: l=5 + item: l=6 + item: l=7 + item: l=8 + item: l=9 + item: l=10 + item: l=X \ No newline at end of file diff --git a/data/magic-modules.mse-include/symbol-fonts/small/symbol_fields_loyalty b/data/magic-modules.mse-include/symbol-fonts/small/symbol_fields_loyalty index 03d6d2cd9..2f642fe9d 100644 --- a/data/magic-modules.mse-include/symbol-fonts/small/symbol_fields_loyalty +++ b/data/magic-modules.mse-include/symbol-fonts/small/symbol_fields_loyalty @@ -1,4 +1,240 @@ -symbol: +#### Duplicate fields with an l in front, because having an entry that starts with a + or - in the insert symbol menu messes things up when the user presses ctrl+r :surejan: +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_15.png") } + image font size: 127 + code: l+15 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_14.png") } + image font size: 127 + code: l+14 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_13.png") } + image font size: 127 + code: l+13 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_12.png") } + image font size: 127 + code: l+12 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_11.png") } + image font size: 127 + code: l+11 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_10.png") } + image font size: 127 + code: l+10 + +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up.png") } + code: l([+][XYZ1-9][0-9]) + regex: yes + draw text: 1 + text margin left: -0.10 + text margin right: 0.00 + text margin top: 0.21 + text margin bottom: 0.05 + text font: + name: Beleren Bold + size: .70 + color: { symbol_font_small_color() } + max stretch: 0.5 + image font size: 127 + +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_9.png") } + image font size: 127 + code: l+9 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_8.png") } + image font size: 127 + code: l+8 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_7.png") } + image font size: 127 + code: l+7 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_6.png") } + image font size: 127 + code: l+6 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_5.png") } + image font size: 127 + code: l+5 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_4.png") } + image font size: 127 + code: l+4 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_3.png") } + image font size: 127 + code: l+3 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_2.png") } + image font size: 127 + code: l+2 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_1.png") } + image font size: 127 + code: l+1 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up_x.png") } + image font size: 127 + code: l+X + +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_up.png") } + code: l([+][XYZ1-9]) + regex: yes + draw text: 1 + text margin left: -0.10 + text margin right: 0.00 + text margin top: 0.21 + text margin bottom: 0.05 + text font: + name: Beleren Bold + size: .70 + color: { symbol_font_small_color() } + max stretch: 0.5 + image font size: 127 + +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_15.png") } + image font size: 127 + code: l-15 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_14.png") } + image font size: 127 + code: l-14 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_13.png") } + image font size: 127 + code: l-13 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_12.png") } + image font size: 127 + code: l-12 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_11.png") } + image font size: 127 + code: l-11 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_10.png") } + image font size: 127 + code: l-10 + +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down.png") } + code: l([-][XYZ1-9][0-9]) + regex: yes + draw text: 1 + text margin left: -0.10 + text margin right: 0.00 + text margin top: 0.09 + text margin bottom: 0.16 + text font: + name: Beleren Bold + size: .70 + color: { symbol_font_small_color() } + max stretch: 0.5 + image font size: 127 + +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_9.png") } + image font size: 127 + code: l-9 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_8.png") } + image font size: 127 + code: l-8 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_7.png") } + image font size: 127 + code: l-7 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_6.png") } + image font size: 127 + code: l-6 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_5.png") } + image font size: 127 + code: l-5 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_4.png") } + image font size: 127 + code: l-4 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_3.png") } + image font size: 127 + code: l-3 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_2.png") } + image font size: 127 + code: l-2 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_1.png") } + image font size: 127 + code: l-1 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down_x.png") } + image font size: 127 + code: l-X + +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_down.png") } + code: l([-][XYZ1-9]) + regex: yes + draw text: 1 + text margin left: -0.10 + text margin right: 0.00 + text margin top: 0.10 + text margin bottom: 0.15 + text font: + name: Beleren Bold + size: .70 + color: { symbol_font_small_color() } + max stretch: 0.5 + image font size: 127 + +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_naught_0.png") } + image font size: 127 + code: l=0 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_naught_0.png") } + image font size: 127 + code: l+0 + +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_naught.png") } + code: l[+=]([0-9XYZ][0-9]) + regex: yes + draw text: 1 + text margin left: -0.03 + text margin right: 0.00 + text margin top: 0.15 + text margin bottom: 0.10 + text font: + name: Beleren Bold + size: .70 + color: { symbol_font_small_color() } + max stretch: 0.5 + image font size: 127 +symbol: + image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty/loyalty_naught.png") } + code: l[+=]([0-9XYZ]) + regex: yes + draw text: 1 + text margin left: 0.01 + text margin right: 0.00 + text margin top: 0.15 + text margin bottom: 0.10 + text font: + name: Beleren Bold + size: .70 + color: { symbol_font_small_color() } + max stretch: 0.5 + image font size: 127 +symbol: image: { recolor_image(color: symbol_font_small_color(), "/magic-modules.mse-include/symbol-fonts/small/loyalty_up_15.png") } image font size: 127 code: +15