diff --git a/data/magic-m15-adventure.mse-style/style b/data/magic-m15-adventure.mse-style/style index e329493d4..00fa84fdb 100644 --- a/data/magic-m15-adventure.mse-style/style +++ b/data/magic-m15-adventure.mse-style/style @@ -48,6 +48,7 @@ init script: template_prefix := [ card: "/magic-modules.mse-include/cards/375 m15 simple/", + ubcard: "/magic-modules.mse-include/cards/375 m15 simple/beyond/", double_page: "/magic-modules.mse-include/pages/double_page/", single_page: "/magic-modules.mse-include/pages/single_page/", null_page: "/magic-modules.mse-include/pages/null_page/", @@ -69,6 +70,7 @@ init script: ] template_suffix := [ card: "card.jpg", + ubcard: "card.jpg", double_page: "page.png", single_page: "page.png", null_page: "page.png", @@ -89,12 +91,12 @@ init script: identity: "identity.png" ] template := { - if type_name(harder_script[type] or else nil) != "nothing" + if type_name(harder_script[type] or else nil) != type_name(nil) then harder_script[type](input, land:false) else template_prefix[type] + input + template_suffix[type] } land_template := { - if type_name(harder_script[type] or else nil) != "nothing" + if type_name(harder_script[type] or else nil) != type_name(nil) then harder_script[type](input, land:true) else template_prefix[type] + input + (if landless(type) or input == "a" then "" else "l") + template_suffix[type] } @@ -132,6 +134,7 @@ init script: spot_pt := { color_background(type:"spotpt", base_hybrid:card_hybrid, folder:"blend_masks/") } crown_background := { color_background(type:"crown", base_hybrid: card_hybrid, folder:"blend_masks/")} + beyond_background := { color_background(type:"ubcard", base_hybrid: card_hybrid, folder:template_prefix["ubcard"], blend_type:"card")} # Use the normal tap symbol mana_t := { @@ -151,10 +154,12 @@ init script: is_vehicle := { not is_spot() and (auto_vehicle() or contains(styling.frames, match:"vehicle")) } is_nyx := { not is_spot() and (auto_nyx() or contains(styling.frames, match:"nyx")) } is_snow := { not is_spot() and (auto_snow() or contains(styling.frames, match:"snow")) } + is_beyond := { not is_spot() and (auto_ub() or contains(styling.frames, match:"universes beyond")) } auto_legend := { set.auto_legends and lang_setting("is_legendary")(card.super_type) } auto_vehicle := { contains(styling.auto_frames, match:"vehicle") and lang_setting("is_vehicle")(card.sub_type) } auto_nyx := { contains(styling.auto_frames, match:"nyx") and lang_setting("is_enchantment")(card.super_type) } auto_snow := { contains(styling.auto_frames, match:"snow") and lang_setting("is_snow")(card.super_type) } + auto_ub := { contains(styling.auto_frames, match:"universes beyond") and (card.card_stamp == "universes beyond" or card.card_stamp == "flatstamped universes beyond") } ##### flavor bar stuff chop_correction := { chop_bot() } @@ -444,6 +449,7 @@ styling field: choice: nyx choice: vehicle choice: snow + choice: universes beyond choice: custom border styling field: type: text @@ -456,7 +462,8 @@ styling field: choice: nyx choice: vehicle choice: snow - initial: nyx, vehicle, snow + choice: universes beyond + initial: nyx, vehicle, snow, universes beyond styling field: type: multiple choice name: other options @@ -636,7 +643,7 @@ card style: z index: -1 render style: image popup style: in place - image: { if is_spot() then spot_background() else module_card() } + image: { if is_spot() then spot_background() else if is_beyond() then beyond_background() else module_card() } card color 2: left: {if is_spot() then 21 else page_coords[page_2_side()]["page"]} top: {if is_spot() then 319 else 327} @@ -1200,7 +1207,7 @@ extra card style: width: 375 height: 523 render style: image - image: /magic-modules.mse-include/trims/vehicle.png + image: { "/magic-modules.mse-include/trims/" + (if is_beyond() then "beyond/vbeyond.png" else "vehicle.png") } mask: {"/magic-modules.mse-include/trims/375x523 trim mask.png"} z index: 0 visible: {is_vehicle()} diff --git a/data/magic-m15-altered.mse-style/beyond_mask.png b/data/magic-m15-altered.mse-style/beyond_mask.png new file mode 100644 index 000000000..0fbd42e71 Binary files /dev/null and b/data/magic-m15-altered.mse-style/beyond_mask.png differ diff --git a/data/magic-m15-altered.mse-style/beyond_mask_miracle.png b/data/magic-m15-altered.mse-style/beyond_mask_miracle.png new file mode 100644 index 000000000..85f8fca87 Binary files /dev/null and b/data/magic-m15-altered.mse-style/beyond_mask_miracle.png differ diff --git a/data/magic-m15-altered.mse-style/style b/data/magic-m15-altered.mse-style/style index 0fe255300..0fc40ce12 100644 --- a/data/magic-m15-altered.mse-style/style +++ b/data/magic-m15-altered.mse-style/style @@ -105,7 +105,9 @@ init script: miracle_shifted: "/magic-modules.mse-include/trims/miracle/shifted/" miracle_inv: "/magic-modules.mse-include/trims/miracle/inverted/" miracle_fnm: "/magic-modules.mse-include/trims/miracle/fnm/" + miracle_beyond: "/magic-modules.mse-include/trims/miracle/beyond/" miracle_snow: "/magic-modules.mse-include/trims/miracle/snow/" + beyond: "/magic-modules.mse-include/trims/beyond/" draft: "/magic-modules.mse-include/trims/draft/" node: "nodes/" node_shifted: "nodes/shifted/" @@ -141,9 +143,11 @@ init script: miracle_inv: "miracle.png" miracle_fnm: "miracle.png" miracle_snow: "miracle.png" + miracle_beyond: "miracle.png" node: "node.png" node_shifted: "node.png" curtains: "card.png" + beyond:"beyond.png" slide: "slide.png" slide2: "slide.png" @@ -161,12 +165,12 @@ init script: ] template := { - if type_name(harder_script[type] or else nil) != "nothing" + if type_name(harder_script[type] or else nil) != type_name(nil) then harder_script[type](input, land:false) else template_prefix[type] + input + template_suffix[type] } land_template := { - if type_name(harder_script[type] or else nil) != "nothing" + if type_name(harder_script[type] or else nil) != type_name(nil) then harder_script[type](input, land:true) else template_prefix[type] + input + (if landless(type) or input == "a" then "" else "l") + template_suffix[type] } @@ -186,6 +190,7 @@ init script: miracle_snow: true, miracle_inv: true, miracle_fnm: true, + miracle_beyond: true, alias: true, devoid: true, energy: true, @@ -267,6 +272,10 @@ init script: chosen(styling.frames, choice:"conspiracy") or chosen(styling.frames, choice:"draft matters") } + is_beyond := { + chosen(styling.frames, choice:"universes beyond") + or (chosen(styling.other_options, choice:"auto ub") and card.card_stamp == "universes beyond") + } is_miracle := { chosen(styling.frames, choice:"miracle") } @@ -311,13 +320,16 @@ init script: then "inverted" else if is_planeshifted() then "shifted" + else if is_beyond() + then "beyond" else if is_snow() and not is_leveler() then "snow" else "standard" } #### trims - curtain_plate := { color_background(type:"curtains", base_hybrid: card_hybrid)} + curtain_plate := { color_background(type:"curtains", base_hybrid: card_hybrid) } + ub_background := { color_background(type:"beyond", base_hybrid: card_hybrid, folder:template_prefix["ub"]) } draft_trim := { color_background(type:"draft", base_hybrid: card_hybrid, folder:template_prefix["draft"])} module_nyx := { type := "nyx" @@ -340,6 +352,7 @@ init script: miracle_plate_shift := { color_background(type:"miracle_shifted", base_hybrid:card_hybrid, folder:template_prefix["miracle"], blend_type:"miracle")} miracle_plate_invert := { color_background(type:"miracle_inv", base_hybrid:card_hybrid, folder:template_prefix["miracle"], blend_type:"miracle")} miracle_plate_fnm := { color_background(type:"miracle_fnm", base_hybrid:card_hybrid, folder:template_prefix["miracle"], blend_type:"miracle")} + miracle_plate_beyond := { color_background(type:"miracle_beyond", base_hybrid:card_hybrid, folder:template_prefix["miracle"], blend_type:"miracle")} miracle_plate := { type := if is_fnm() then "miracle_fnm" @@ -347,6 +360,8 @@ init script: then "miracle_inv" else if is_planeshifted() then "miracle_shifted" + else if is_beyond() + then "miracle_beyond" else if base_card() == "snow" then "miracle_snow" else "miracle" @@ -423,7 +438,7 @@ init script: then color_background(type:"shifted_pt", base_hybrid:pt_hybrid, folder:template_prefix["shifted_pt"], blend_type:"pt") else module_ptbox() } - + #### crown handling crowns_folder := { "/magic-modules.mse-include/crowns/375/" + (if is_planeshifted() then "shifted/" else "") @@ -463,6 +478,7 @@ init script: fnm: "fnm/" + input + "card.png" inverted: "inverted/" + (if land and input == "a" then "cl" else if land then input + "l" else input) + "card.png" shifted: "/magic-modules.mse-include/cards/375 m15 simple/shifted/" + (if land and input == "a" then "cl" else if land then input + "l" else input) + "card.jpg" + beyond: "/magic-modules.mse-include/cards/375 m15 simple/beyond/" + (if land and input == "a" then "cl" else if land then input + "l" else input) + "card.jpg" snow: "/magic-modules.mse-include/cards/375 m15 simple/snow/" + (if land and input == "a" then "cl" else if land then input + "l" else input) + "card.jpg" standard: "/magic-modules.mse-include/cards/375 m15 simple/" + (if land and input == "a" then "cl" else if land then input + "l" else input) + "card.jpg" ][base_card()] @@ -903,6 +919,7 @@ styling field: choice: season choice: conspiracy choice: draft matters + choice: universes beyond choice: miracle choice: nyx choice: vehicle @@ -933,12 +950,13 @@ styling field: choice: auto vehicles choice: auto snow choice: auto nyx crowns + choice: auto ub choice: text watermarks choice: clear tops choice: vorthos box choice: pride pinlines choice: inverted d20 - initial: avoid covering devoid, auto vehicles, auto snow, auto nyx crowns + initial: avoid covering devoid, auto vehicles, auto snow, auto nyx crowns, auto ub styling field: type: text name: custom symbol @@ -1710,6 +1728,13 @@ extra card field: save value: false editable: false script: card.card_color +extra card field: + type: choice + name: beyond overlay + choice: beyond + save value: false + editable: false + script: card.card_color extra card field: type: choice name: custom overlay @@ -2065,7 +2090,7 @@ extra card style: width: 375 height: 523 render style: image - image: {devoid_mask("/magic-modules.mse-include/trims/vehicle.png")} + image: {if is_beyond() then devoid_mask("/magic-modules.mse-include/trims/beyond/vtrim.png") else devoid_mask("/magic-modules.mse-include/trims/vehicle.png")} z index: 310 visible: { not is_map() and not uses_expanded_art() and is_vehicle() } mask: { main_trim_mask() } diff --git a/data/magic-m15-mainframe-planeswalker.mse-style/style b/data/magic-m15-mainframe-planeswalker.mse-style/style index faf85eed9..d29371aa5 100644 --- a/data/magic-m15-mainframe-planeswalker.mse-style/style +++ b/data/magic-m15-mainframe-planeswalker.mse-style/style @@ -57,6 +57,7 @@ init script: double_flat: "/magic-modules.mse-include/pages/double_flat/", single_flat: "/magic-modules.mse-include/pages/single_flat/", star: "/magic-modules.mse-include/trims/star/", + ub: "/magic-modules.mse-include/trims/beyond/", identity: "/magic-modules.mse-include/indicators/" ] template_suffix := [ @@ -78,15 +79,16 @@ init script: double_flat: "page.png", single_flat: "page.png", star: "star.png", + beyond: "beyond.png", identity: "identity.png" ] template := { - if type_name(harder_script[type] or else nil) != "nothing" + if type_name(harder_script[type] or else nil) != type_name(nil) then harder_script[type](input, land:false) else template_prefix[type] + input + template_suffix[type] } land_template := { - if type_name(harder_script[type] or else nil) != "nothing" + if type_name(harder_script[type] or else nil) != type_name(nil) then harder_script[type](input, land:true) else template_prefix[type] + input + template_suffix[type] } diff --git a/data/magic-m15-saga.mse-style/acard.jpg b/data/magic-m15-saga.mse-style/acard.jpg deleted file mode 100644 index 5dd4ff55a..000000000 Binary files a/data/magic-m15-saga.mse-style/acard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/artifact_blend_card.png b/data/magic-m15-saga.mse-style/artifact_blend_card.png deleted file mode 100644 index 3ee8ef37b..000000000 Binary files a/data/magic-m15-saga.mse-style/artifact_blend_card.png and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/bcard.jpg b/data/magic-m15-saga.mse-style/bcard.jpg deleted file mode 100644 index c6d9314f8..000000000 Binary files a/data/magic-m15-saga.mse-style/bcard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/beyond_mask.png b/data/magic-m15-saga.mse-style/beyond_mask.png new file mode 100644 index 000000000..f73def04b Binary files /dev/null and b/data/magic-m15-saga.mse-style/beyond_mask.png differ diff --git a/data/magic-m15-saga.mse-style/blcard.jpg b/data/magic-m15-saga.mse-style/blcard.jpg deleted file mode 100644 index 70b448c09..000000000 Binary files a/data/magic-m15-saga.mse-style/blcard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/ccard.jpg b/data/magic-m15-saga.mse-style/ccard.jpg deleted file mode 100644 index f369cc60e..000000000 Binary files a/data/magic-m15-saga.mse-style/ccard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/clcard.jpg b/data/magic-m15-saga.mse-style/clcard.jpg deleted file mode 100644 index c1303078a..000000000 Binary files a/data/magic-m15-saga.mse-style/clcard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/gcard.jpg b/data/magic-m15-saga.mse-style/gcard.jpg deleted file mode 100644 index 183adf62d..000000000 Binary files a/data/magic-m15-saga.mse-style/gcard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/glcard.jpg b/data/magic-m15-saga.mse-style/glcard.jpg deleted file mode 100644 index 136c0971f..000000000 Binary files a/data/magic-m15-saga.mse-style/glcard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/hybrid_blend_card.png b/data/magic-m15-saga.mse-style/hybrid_blend_card.png deleted file mode 100644 index 9136006cb..000000000 Binary files a/data/magic-m15-saga.mse-style/hybrid_blend_card.png and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/mcard.jpg b/data/magic-m15-saga.mse-style/mcard.jpg deleted file mode 100644 index 08666b9a8..000000000 Binary files a/data/magic-m15-saga.mse-style/mcard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/mlcard.jpg b/data/magic-m15-saga.mse-style/mlcard.jpg deleted file mode 100644 index 9146b246c..000000000 Binary files a/data/magic-m15-saga.mse-style/mlcard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/multicolor_blend_card.png b/data/magic-m15-saga.mse-style/multicolor_blend_card.png deleted file mode 100644 index edc3415b5..000000000 Binary files a/data/magic-m15-saga.mse-style/multicolor_blend_card.png and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/rcard.jpg b/data/magic-m15-saga.mse-style/rcard.jpg deleted file mode 100644 index 9b7f50332..000000000 Binary files a/data/magic-m15-saga.mse-style/rcard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/rlcard.jpg b/data/magic-m15-saga.mse-style/rlcard.jpg deleted file mode 100644 index 4dd1ca9cb..000000000 Binary files a/data/magic-m15-saga.mse-style/rlcard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/style b/data/magic-m15-saga.mse-style/style index 5a05af5ee..2118a1f39 100644 --- a/data/magic-m15-saga.mse-style/style +++ b/data/magic-m15-saga.mse-style/style @@ -34,12 +34,13 @@ init script: mask_hybrid_with_land := { styling.grey_hybrid_name } template_prefix := [ - card: "" + card: "/magic-modules.mse-include/cards/375 m15 saga/" pt: "/magic-modules.mse-include/pts/375 m15/" mark: "bookmark/" nyx:"/magic-modules.mse-include/trims/nyx/", snow:"/magic-modules.mse-include/trims/snow/", - crown:"/magic-modules.mse-include/crowns/375/" + beyond:"/magic-modules.mse-include/trims/beyond/", + crown:"/magic-modules.mse-include/crowns/375/", identity: "/magic-identity-new.mse-include/" ] template_suffix := [ @@ -49,6 +50,7 @@ init script: mark: "mark.png" stamp: "stamp.png" nyx:"nyx.png" + beyond:"beyond.png" crown:"crown.png" identity: "identity.png" ] @@ -231,10 +233,14 @@ init script: auto_vehicle := { contains(styling.auto_frames, match:"vehicle") and lang_setting("is_vehicle")(card.sub_type) } auto_nyx := { (contains(styling.auto_frames, match:"nyx") or set.auto_nyx) and lang_setting("is_enchantment")(card.super_type) } auto_snow := { contains(styling.auto_frames, match:"snow") and lang_setting("is_snow")(card.super_type) } - + is_beyond := { + chosen(styling.other_options, choice:"universes beyond") + or (chosen(styling.auto_frames, choice:"universes beyond") and card.card_stamp == "universes beyond") + } nyx_background := { color_background(type:"nyx", base_hybrid:card_hybrid) } snow_background := { color_background(type:"snowtexture", base_hybrid:card_hybrid) } bookmark_background := { color_background(type:"mark", base_hybrid:card_hybrid) } + beyond_background := { color_background(type:"beyond", base_hybrid:card_hybrid, folder:template_prefix["beyond"]) } crown_background := { color_background(type:"crown", base_hybrid: card_hybrid)} custom_border_blend := { color_background(type:"custom_border", base_hybrid:card_hybrid) } alt_loc := { if styling.replacement_chapter_location != "" then styling.replacement_chapter_location else "no"} @@ -354,7 +360,8 @@ styling field: choice: nyx choice: vehicle choice: snow - initial: nyx, vehicle, snow + choice: universes beyond + initial: nyx, vehicle, snow, universes beyond styling field: type: multiple choice name: other options @@ -363,6 +370,7 @@ styling field: choice: snow choice: class choice: case + choice: universes beyond choice: custom border choice: use starting loyalty choice: remove bookmark @@ -524,17 +532,17 @@ card style: right width: 17 top width: 17 bottom width: 18 - z index: 4 + z index: 500 mask: { (if is_legend() then "crown_border" else "border_mask") + (if card.border_color == rgb(200,200,200) then "_silver" else "") + ".png" } card color: left: 0 top: 0 width: 375 height: 523 - z index: 0 + z index: 100 render style: image popup style: in place - image: { card_background() } + image: { module_card() } ############################# Name line name: left: { if card.card_symbol=="none" then 32 else 50 } @@ -543,7 +551,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: {16 - shrink_name()} @@ -562,14 +570,14 @@ card style: size: 15 alignment: middle right always symbol: true - z index: 2 + z index: 920 padding top: 0 level 9 text: left: 190 width: {if not is_class() or card.level_2_text == "​" then 0 else 80} top: {lev2()+4} height: 20 - z index: 7 + z index: 900 font: name: MPlantin size: 12 @@ -582,7 +590,7 @@ card style: width: {if not is_class() or card.level_2_text == "​" then 0 else 70} top: {lev2()+3} height: 20 - z index: 7 + z index: 900 font: name: MPlantin size: {level_label_font_size()} @@ -596,7 +604,7 @@ card style: width: {if not is_class() or card.level_3_text == "​" then 0 else 80} top: {lev3()+4} height: 20 - z index: 7 + z index: 900 font: name: MPlantin size: 12 @@ -609,7 +617,7 @@ card style: width: {if not is_class() or card.level_3_text == "​" then 0 else 70} top: {lev3()+3} height: 20 - z index: 7 + z index: 900 font: name: MPlantin size: {level_label_font_size()} @@ -623,7 +631,7 @@ card style: width: {if not is_class() or card.level_4_text == "" then 0 else 80} top: {lev4()+4} height: 20 - z index: 7 + z index: 900 font: name: MPlantin size: 12 @@ -636,7 +644,7 @@ card style: width: {if not is_class() or card.level_4_text == "" then 0 else 70} top: {lev4()+3} height: 20 - z index: 7 + z index: 900 font: name: MPlantin size: {level_label_font_size()} @@ -651,7 +659,7 @@ card style: top : 31 height: 21 width: 23 - z index: 5 + z index: 810 render style: image include file: /magic.mse-game/card-symbols/menu_choice_images image: { card_symbol_image(face: 1) } @@ -661,20 +669,20 @@ card style: top: 59 width: 157 height: 379 - z index: 1 + z index: 200 mainframe image: 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: 8 + z index: 1010 ############################# Card type indicator: left: 30 top: 449 width: 17 height: 17 - z index: 2 + z index: 810 render style: image visible: { has_identity()} image: { module_identity() } @@ -684,7 +692,7 @@ card style: width: { 309 - rare_width() } height: { 20 - shrink_type() } alignment: top shrink-overflow - z index: 2 + z index: 900 padding top: 2 font: name: Beleren Bold @@ -696,7 +704,7 @@ card style: top: 445 width: 42 height: 21 - z index: 2 + z index: 950 render style: image alignment: middle right include file: /magic-modules.mse-include/rarities/choice_images @@ -706,7 +714,7 @@ card style: top: 60 width: { if styling.wider_watermarks then 157 else 133 } height: 378 - z index: 4 + z index: 720 render style: image popup style: in place alignment: middle center @@ -717,7 +725,7 @@ card style: top: 60 width: {if is_saga() then 0 else 153} bottom: 437 - z index: 5 + z index: 900 font: name: MPlantin italic name: MPlantin-Italic @@ -748,7 +756,7 @@ card style: top: 60 width: {if is_case() then 0 else 153} bottom: {if un_marked() then 60 else chapter0()} - z index: 3 + z index: 900 font: name: MPlantin italic name: MPlantin-Italic @@ -798,7 +806,7 @@ card style: styling.center_text == "always" then "middle center" else "middle left" - z index: 5 + z index: 900 padding left: 6 padding right: 4 padding top: 3 @@ -830,7 +838,7 @@ card style: styling.center_text == "always" then "middle center" else "middle left" - z index: 5 + z index: 900 padding left: 6 padding right: 4 padding top: 3 @@ -862,7 +870,7 @@ card style: styling.center_text == "always" then "middle center" else "middle left" - z index: 5 + z index: 900 padding left: 6 padding right: 4 padding top: 3 @@ -894,7 +902,7 @@ card style: styling.center_text == "always" then "middle center" else "middle left" - z index: 5 + z index: 900 padding left: 6 padding right: 4 padding top: 3 @@ -906,7 +914,7 @@ card style: line height line max: 1.6 ############################# PT pt: - z index: 4 + z index: 900 left: 286 top: 469 width: {if starting_loyalty() then 0 else 60} @@ -918,7 +926,7 @@ card style: color: black separator color: red loyalty: - z index: 7 + z index: 900 left: 326 top: 468 width: {if starting_loyalty() then 13.16 else 0} @@ -1143,13 +1151,25 @@ extra card field: script: card.card_color save value: false editable: false +extra card field: + type: choice + name: ub tweaker + choice: white + save value: false + editable: false +extra card field: + type: choice + name: ub overlay + script: card.card_color + editable: false + save value: false extra card style: pt box: left: 273 top: 466 width: 81 height: 42 - z index: 3 + z index: 840 visible: { card.pt != "" and not starting_loyalty() } render style: image image: { module_ptbox() } @@ -1158,7 +1178,7 @@ extra card style: top: 466 width: 60 height: 38 - z index: 6 + z index: 840 render style: image visible: { starting_loyalty() and card.loyalty != "" } choice images: @@ -1249,7 +1269,7 @@ extra card style: width: 156 height: {if is_case() or is_class() then 2 else 3} render style: image - z index: 30 + z index: 720 image: {if is_case() then "bar.png" else if is_class() then class_bar() else "line.png"} visible: {is_class() or is_case() or not un_marked()} linebreak 2: @@ -1258,7 +1278,7 @@ extra card style: width: {if is_class() and card.level_2_text == "​" then 0 else 156} height: {if is_class() or is_case() then 25 else 3} render style: image - z index: 3 + z index: 720 image: {if is_case() then "levelline.png" else if is_class() then class_bar() else "line.png"} linebreak 3: left: {30+if is_class() then 158 else 0} @@ -1266,7 +1286,7 @@ extra card style: width: {if is_class() and card.level_3_text == "​" then 0 else 156} height: {if is_class() then 25 else 3} render style: image - z index: 3 + z index: 720 image: {if is_class() then class_bar() else "line.png"} visible: {three_boxes() or four_boxes() and not is_case()} linebreak 4: @@ -1275,7 +1295,7 @@ extra card style: width: {if is_class() and card.level_4_text == "" then 0 else 156} height: {if is_class() then 25 else 3} render style: image - z index: 3 + z index: 720 image: {if is_class() then class_bar() else "line.png"} visible: {is_class() or four_boxes() and not is_case()} linebreak 5: @@ -1284,7 +1304,7 @@ extra card style: width: 156 height: 3 render style: image - z index: 3 + z index: 720 image: line.png visible: {four_boxes()} linebreak 6: @@ -1293,7 +1313,7 @@ extra card style: width: 156 height: 3 render style: image - z index: 3 + z index: 720 image: line.png visible: {four_boxes()} linebreak 7: @@ -1302,7 +1322,7 @@ extra card style: width: 156 height: 3 render style: image - z index: 3 + z index: 720 image: line.png visible: {four_boxes()} nyx overlay: @@ -1312,7 +1332,7 @@ extra card style: height: 523 render style: image image: {module_nyx()} - z index: 0 + z index: 330 visible: {is_nyx()} mask: {"trim_masks/" + (if is_vehicle() or is_snow() then "double_") + "mask.png"} custom overlay: @@ -1322,7 +1342,7 @@ extra card style: height: 523 render style: image image: { custom_border_blend() } - z index: 0 + z index: 320 visible: {is_custom()} mask: {"trim_masks/" + (if is_vehicle() or is_snow() then "double_") + "mask.png"} snow overlay: @@ -1332,7 +1352,7 @@ extra card style: height: 523 render style: image image: {module_snow()} - z index: 0 + z index: 310 visible: {is_snow()} mask: trim_masks/mask.png vehicle overlay: @@ -1341,9 +1361,9 @@ extra card style: width: 375 height: 523 render style: image - image: /magic-modules.mse-include/trims/vehicle.png + image: { if is_beyond() then "/magic-modules.mse-include/trims/" + (if is_beyond() then "beyond/vbeyond.png" else "vehicle.png") } mask: trim_masks/mask.png - z index: 0 + z index: 300 visible: {is_vehicle()} crown: left: 0 @@ -1426,4 +1446,23 @@ extra card style: size: 11 alignment: middle right visible: {is_class() and card.level_4 == ""} - + ub tweaker: + left: 0 + top: 0 + width: 375 + height: 523 + z index: 110 + render style: image + visible: { is_beyond() } + image: { card_background() } + mask: {invert_image(template_prefix["card"] + "hybrid_blend_card.png") } + ub overlay: + left: 0 + top: 0 + width: 375 + height: 523 + z index: 290 + render style: image + image: { beyond_background() } + mask: beyond_mask.png + visible: { is_beyond() } diff --git a/data/magic-m15-saga.mse-style/ucard.jpg b/data/magic-m15-saga.mse-style/ucard.jpg deleted file mode 100644 index 38baab906..000000000 Binary files a/data/magic-m15-saga.mse-style/ucard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/ulcard.jpg b/data/magic-m15-saga.mse-style/ulcard.jpg deleted file mode 100644 index 5ff69856d..000000000 Binary files a/data/magic-m15-saga.mse-style/ulcard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/wcard.jpg b/data/magic-m15-saga.mse-style/wcard.jpg deleted file mode 100644 index cfa94efc4..000000000 Binary files a/data/magic-m15-saga.mse-style/wcard.jpg and /dev/null differ diff --git a/data/magic-m15-saga.mse-style/wlcard.jpg b/data/magic-m15-saga.mse-style/wlcard.jpg deleted file mode 100644 index 911301e98..000000000 Binary files a/data/magic-m15-saga.mse-style/wlcard.jpg and /dev/null differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/acard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/acard.jpg new file mode 100644 index 000000000..cfbbe5737 Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/acard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/bcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/bcard.jpg new file mode 100644 index 000000000..b6af5604b Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/bcard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/blcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/blcard.jpg new file mode 100644 index 000000000..609141abb Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/blcard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/ccard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/ccard.jpg new file mode 100644 index 000000000..2828ab0ab Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/ccard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/clcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/clcard.jpg new file mode 100644 index 000000000..2828ab0ab Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/clcard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/gcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/gcard.jpg new file mode 100644 index 000000000..3363cf88e Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/gcard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/glcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/glcard.jpg new file mode 100644 index 000000000..2f7d9a605 Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/glcard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/mcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/mcard.jpg new file mode 100644 index 000000000..c2104f64f Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/mcard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/mlcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/mlcard.jpg new file mode 100644 index 000000000..99b6b1cbb Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/mlcard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/rcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/rcard.jpg new file mode 100644 index 000000000..a17b7d75c Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/rcard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/rlcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/rlcard.jpg new file mode 100644 index 000000000..5cc238c45 Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/rlcard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/ucard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/ucard.jpg new file mode 100644 index 000000000..3848ba081 Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/ucard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/ulcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/ulcard.jpg new file mode 100644 index 000000000..ad2ef308b Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/ulcard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/wcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/wcard.jpg new file mode 100644 index 000000000..69e904264 Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/wcard.jpg differ diff --git a/data/magic-modules.mse-include/cards/375 m15 simple/beyond/wlcard.jpg b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/wlcard.jpg new file mode 100644 index 000000000..ecff5949b Binary files /dev/null and b/data/magic-modules.mse-include/cards/375 m15 simple/beyond/wlcard.jpg differ diff --git a/data/magic-modules.mse-include/trims/750x1047 trim mask walker.png b/data/magic-modules.mse-include/trims/750x1047 trim mask walker.png index a1530203d..f98f391fe 100644 Binary files a/data/magic-modules.mse-include/trims/750x1047 trim mask walker.png and b/data/magic-modules.mse-include/trims/750x1047 trim mask walker.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/abeyond.png b/data/magic-modules.mse-include/trims/beyond/abeyond.png new file mode 100644 index 000000000..8e9c12ebd Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/abeyond.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/artifact_blend_beyond.png b/data/magic-modules.mse-include/trims/beyond/artifact_blend_beyond.png new file mode 100644 index 000000000..0bd73520d Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/artifact_blend_beyond.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/bbeyond.png b/data/magic-modules.mse-include/trims/beyond/bbeyond.png new file mode 100644 index 000000000..721c67d93 Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/bbeyond.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/cbeyond.png b/data/magic-modules.mse-include/trims/beyond/cbeyond.png new file mode 100644 index 000000000..13ddd0b87 Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/cbeyond.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/gbeyond.png b/data/magic-modules.mse-include/trims/beyond/gbeyond.png new file mode 100644 index 000000000..704501ee3 Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/gbeyond.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/hybrid_blend_beyond.png b/data/magic-modules.mse-include/trims/beyond/hybrid_blend_beyond.png new file mode 100644 index 000000000..297a003ef Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/hybrid_blend_beyond.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/mbeyond.png b/data/magic-modules.mse-include/trims/beyond/mbeyond.png new file mode 100644 index 000000000..fb956326c Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/mbeyond.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/multicolor_blend_beyond.png b/data/magic-modules.mse-include/trims/beyond/multicolor_blend_beyond.png new file mode 100644 index 000000000..e7e8532dc Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/multicolor_blend_beyond.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/rbeyond.png b/data/magic-modules.mse-include/trims/beyond/rbeyond.png new file mode 100644 index 000000000..ce82c0b77 Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/rbeyond.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/ubeyond.png b/data/magic-modules.mse-include/trims/beyond/ubeyond.png new file mode 100644 index 000000000..c35366cc8 Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/ubeyond.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/vbeyond.png b/data/magic-modules.mse-include/trims/beyond/vbeyond.png new file mode 100644 index 000000000..e5ed1f83c Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/vbeyond.png differ diff --git a/data/magic-modules.mse-include/trims/beyond/wbeyond.png b/data/magic-modules.mse-include/trims/beyond/wbeyond.png new file mode 100644 index 000000000..c65a2e8a5 Binary files /dev/null and b/data/magic-modules.mse-include/trims/beyond/wbeyond.png differ diff --git a/data/magic-modules.mse-include/trims/miracle/beyond/amiracle.png b/data/magic-modules.mse-include/trims/miracle/beyond/amiracle.png new file mode 100644 index 000000000..c593be104 Binary files /dev/null and b/data/magic-modules.mse-include/trims/miracle/beyond/amiracle.png differ diff --git a/data/magic-modules.mse-include/trims/miracle/beyond/bmiracle.png b/data/magic-modules.mse-include/trims/miracle/beyond/bmiracle.png new file mode 100644 index 000000000..12c349beb Binary files /dev/null and b/data/magic-modules.mse-include/trims/miracle/beyond/bmiracle.png differ diff --git a/data/magic-modules.mse-include/trims/miracle/beyond/cmiracle.png b/data/magic-modules.mse-include/trims/miracle/beyond/cmiracle.png new file mode 100644 index 000000000..6083bc39e Binary files /dev/null and b/data/magic-modules.mse-include/trims/miracle/beyond/cmiracle.png differ diff --git a/data/magic-modules.mse-include/trims/miracle/beyond/gmiracle.png b/data/magic-modules.mse-include/trims/miracle/beyond/gmiracle.png new file mode 100644 index 000000000..57d9e3eed Binary files /dev/null and b/data/magic-modules.mse-include/trims/miracle/beyond/gmiracle.png differ diff --git a/data/magic-modules.mse-include/trims/miracle/beyond/mmiracle.png b/data/magic-modules.mse-include/trims/miracle/beyond/mmiracle.png new file mode 100644 index 000000000..b16ddc7e8 Binary files /dev/null and b/data/magic-modules.mse-include/trims/miracle/beyond/mmiracle.png differ diff --git a/data/magic-modules.mse-include/trims/miracle/beyond/rmiracle.png b/data/magic-modules.mse-include/trims/miracle/beyond/rmiracle.png new file mode 100644 index 000000000..ab1bbeb4d Binary files /dev/null and b/data/magic-modules.mse-include/trims/miracle/beyond/rmiracle.png differ diff --git a/data/magic-modules.mse-include/trims/miracle/beyond/umiracle.png b/data/magic-modules.mse-include/trims/miracle/beyond/umiracle.png new file mode 100644 index 000000000..758542ec3 Binary files /dev/null and b/data/magic-modules.mse-include/trims/miracle/beyond/umiracle.png differ diff --git a/data/magic-modules.mse-include/trims/miracle/beyond/wmiracle.png b/data/magic-modules.mse-include/trims/miracle/beyond/wmiracle.png new file mode 100644 index 000000000..61691dc17 Binary files /dev/null and b/data/magic-modules.mse-include/trims/miracle/beyond/wmiracle.png differ diff --git a/data/magic-modules.mse-include/trims/miracle/beyond_mask_miracle.png b/data/magic-modules.mse-include/trims/miracle/beyond_mask_miracle.png new file mode 100644 index 000000000..1c74ea38a Binary files /dev/null and b/data/magic-modules.mse-include/trims/miracle/beyond_mask_miracle.png differ