From 67d6e3ecdf2f291e83710b6a027cdf6f429868f3 Mon Sep 17 00:00:00 2001 From: cajun <12363371+CajunAvenger@users.noreply.github.com> Date: Sat, 11 Jan 2025 22:27:36 -0600 Subject: [PATCH] 3.0.6 split improvements and locking in --- .../rooms/bottom_mask.png | Bin 0 -> 584 bytes .../rooms/image_mask_right_short.png | Bin 0 -> 2377 bytes .../rooms/roombar.png | Bin 1113 -> 2243 bytes data/magic-m15-split-fusable.mse-style/style | 50 ++++++++++++++---- 4 files changed, 40 insertions(+), 10 deletions(-) create mode 100644 data/magic-m15-split-fusable.mse-style/rooms/bottom_mask.png create mode 100644 data/magic-m15-split-fusable.mse-style/rooms/image_mask_right_short.png diff --git a/data/magic-m15-split-fusable.mse-style/rooms/bottom_mask.png b/data/magic-m15-split-fusable.mse-style/rooms/bottom_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..e0f6e2b84e28049be144ae05cbbc266948f7290d GIT binary patch literal 584 zcmV-O0=NB%P)EX>4Tx04R}tkv&MmP!xqvQ>7vmK?{mFWT;MdQ4z<|ibb$c+6t{Yn7s54nlvOS zE{=k0!NH%!s)LKOt`4q(Aov5~E;uQ=NQw6)g%&Yhc)XAE?m4`7A0RZVOf`F=fT~$W zIuR3d`BgFS3LkwC_*3MP$yEU( z#{z0lAvu2VKlnXcvp6&DCIw?a?~84JOaOshpw+PL?_=9;odEu4;7aTGYfWJOlk`SM z3m*Z4+rY(jN0aw}%N=0!NtX=Ck^HoTVi9;hqi@Os!?!^Hnmf1lIZhvdEX`{91~@nb zCQFpP?(y!v?z#Qj)1KcCOd)cYX@p=g00006P)t-s00030|No`gpWOfe010qNS#tmY z3ljhU3ljkVnw%H_000McNliru=>ZG`1R0Gdv-$u407XeeK~zY`W03z(9%x{&CsXGE zhI%q}KA=D+nHv9p7}Ytd6RL9{(k=P9jQpHEQULiOG^%q{=cvw6oufKOb&l#B<~jix Wn89{TTjl2f0000)U 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 literal 0 HcmV?d00001 diff --git a/data/magic-m15-split-fusable.mse-style/rooms/roombar.png b/data/magic-m15-split-fusable.mse-style/rooms/roombar.png index 3e5c4e3d2d85b6f2aa4b566ac7bac20b7d99a557..5a07d6ca896de0f76c7f5280dbf5557558e532cf 100644 GIT binary patch literal 2243 zcmeHGdoUDu9RF<|ZPsHeW#>G%w?|lyb`i20QQoz&r>*r$lJ{#_BrUN-g%m55w_2 zW1AU_hVl5xHq2pj$19q7nf;K&Bg0#D3o_YyyHqt(<9wQ$^4f|nCo@WQ`l)AhcS0m8bLBC5bNK>6&jVXR(=)+EL)OPMYsdK7OKUMVR zwZjrSJYGAPZQH)1(&xb~OIE~-7Sj*>af`f^3d#Py`Stb zpbdeje{y$EGcqe*YqM{L+Y%RkSDG?vg~)^MYot!E1R)2v*$X9 zoLXh_)Wpd6c%rPC=KVLL+_`~Y;~(o%qAYl9-HAY`koSN4H*TOT)lL3wE5oa2wW_|J z_%I_I?;Gsyo{x$idNeQ-pK;^Txtb;t3I3yIf$Y;!j;s9JW5fXplG-~RvRc+P8`d8^ zreqwskd~jH-65!a6i;)r9h}P4kPV9Qh(wvKn%f%`o zhq6f&KO{181xFlErS`r!%ZRKw)qa297q@atIXSuV0-pB(Qmoem)y_=cYnSa;P3fHt zn~7=6OK5RbxN7nKkxR8-2{z1~XAp3N~oaZ-8i6F*$Q*n8{=|7dw^4=-;+(4lz`$BXh?okY@wCFALuK!?kNbVxj{M!>HUOH z=;jge_~nU?w6?*)L6TuEE#6<1HlAhfpy8HcVBw?)&Xqp&#;$(p#7rsl^z`uh`uh4k zbe0#@sv4`%n1>lRQSGwszu4>qL!2PbdnGe<&Kj?}v$U?@@q+%YX7mX>{yjYhjxDPI z&-6DXeA|s^F0{)V_s}79=Gm1j8pE)V*qL212GeZ_982$BQBfvc)HoS{{++U4oR;=e zOB-qNYmX;XeP4&xyRLu$#RnN!2U%o0!trQC=GsR;Uw7B=@TD_&{Gzd!uoGNj)DJCZ zzS%I>)>c)pSE;obT^A!*5$==CG^q85#8!1+HM@0ApH6rpDOMgJhV~mF3swbRjn!eG zl0Y1AEq9hIWKC;zRivQWGaPA4bL=&iS{0j?HmO?Rg`}3%)DUhvg37)q6RiVibk+oy z&(81L=kMz);7+p&kL?usV5$uZ1%;^PMe;E29nAAfXrdu6EAQ`0{}M&fWttn zGXSj{fXa3N$^l3e`!oC#;xFLeBED<&Jz`zclZtcDvB+VeqNvO~qk{*d_-o|);s)t? i-n%i@cpO?^7zJ#bgtgZsR9eO4=T+ruSTQrz!Zq~JjS delta 953 zcmX>sc#~s-WIZzj1A|QGkJ}6kjJ^RrA+Bf6oH=>&Cc@t6Q(Ft*xb{rKzc@p`oF! zuCAu0rmCu{qN1X#tgNJ@q^PK4E+izx&(F`x%gf2h z$-%+F&d$!p#>UFZ%EH3J#KfedqvP!C92OQ^;7tFxQEz2kz>|I%0oz>dAV#V^sD`wYES-fJ|iseg} zEMK~G>GEaES1elwB$qE=v3$jf6)RV-+_-7u&SNJ}Ubu4Y@|ja-S8qRhbSqF|#frs1 zJwOvyEM2x@@10@=HZ_wr@;Q6sZ`5o+S6 zue`CJJ+Dr3){8@J#~)8N-t3ZI_2}ne_VrGmx6IqWBlq@F?d$9QO+OtyZSGp@=}ofc zW_Kd@{`z*e`g^?j#@6EM=ilTl3)jpNp17v$)s4oz)!Xjx*}AV%GbKIytIFx3N0U+` zXQ{N8$KMy2mAYZGs(Sr3iA%>CWu>pTs!6`g6Lns)$s}{moz0c58Ivxq+jeb^#nQ~6 zo7+=!HEKAX@|51-{&;HAtBtX(b#88dpTkDU%msqSRPkHap zk2@I{HZ&9|Eo0r%Aa;Q%%7HtBQFj3oFgggcv+s{an^LB{Ts52`kN= diff --git a/data/magic-m15-split-fusable.mse-style/style b/data/magic-m15-split-fusable.mse-style/style index b9cb19676..5713e4c44 100644 --- a/data/magic-m15-split-fusable.mse-style/style +++ b/data/magic-m15-split-fusable.mse-style/style @@ -398,10 +398,11 @@ init script: image_width := { clear := if input == "left" then left_clear() else if input == "right" then right_clear() else false bl := is_borderless() + sr := is_short_room() room_style := styling.room_images if is_room() then ( if room_style == "one image" and input == "left" - then if bl then 488 else if clear then 474 else 452 + then if bl then 488 else if clear then 474 else if sr then 444 else 452 else if room_style == "one image" then 0 else if bl and input == "left" @@ -410,6 +411,8 @@ init script: then 265 else if clear then 251 + else if sr + then 236 else 240 ) else if bl and input == "left" and room_style == "one image" @@ -422,6 +425,8 @@ init script: then 265 else if clear then 237 + else if contains(styling.other_options, match:"spillover image") + then if input == "left" then 444 else 0 else 203 } image_height := { @@ -430,6 +435,8 @@ init script: then 375 else if clear then 345 + else if is_short_room() + then 149 else if is_room() then 211 else 148 @@ -442,7 +449,8 @@ init script: room_style := styling.room_images rm := is_room() - if rm then ( + if is_short_room() then if input == "right" then "rooms/image_mask_right_short.png" else "" + else if rm then ( if room_style == "one image" and input == "left" then "rooms/image_mask{tag}.png" else "rooms/image_mask_{input}{tag}.png" @@ -470,6 +478,7 @@ init script: is_room := { chosen(styling.frames, choice:"room") or lang_setting("is_room")(card.sub_type) } + is_short_room := { chosen(styling.other_options, choice:"short room image") and is_room() } is_fuse := { card.rule_text_3 != "" and not is_room() } is_arrows := { chosen(styling.frames, choice:"arrows") } is_borderless := { chosen(styling.frames, choice:"borderless") } @@ -653,7 +662,14 @@ styling field: choice: ancestral generic mana choice: prerelease stamp choice: two illustrators + choice: spillover image + choice: short room image initial: two illustrators +styling field: + type: color + name: room backfill + default: rgb(0,0,0) + description: Sets the color of the room textbox on short rooms styling field: type: text name: popout image style @@ -883,11 +899,11 @@ card style: image: { card_symbol_image(face: 2) } ############################# Image image: - left: { if is_borderless() or left_clear() then 35 else if is_room() then 46 else 50 } + left: { if is_borderless() or left_clear() then 35 else if is_short_room() then 50 else if is_room() then 46 else 50 } top: { if is_borderless() then 0 else if left_clear() then 13 else 49 } width: { image_width("left") } height: { image_height("left") } - z index: 400 + z index: 510 default: {default_image(card.card_color)} mask: { image_mask("left") } image 2: @@ -895,7 +911,7 @@ card style: top: { if is_borderless() then 0 else if right_clear() then 13 else 49 } width: { image_width("right") } height: { image_height("right") } - z index: 401 + z index: 511 default: {default_image(card.card_color_2)} mask: { image_mask("right") } mainframe image: @@ -906,11 +922,11 @@ card style: z index: 1010 mainframe image 2: left: 245 - top: { if is_borderless() then 0 else 53 } + top: { if is_borderless() then 0 else 49 } width: { if (is_room() or is_borderless()) and styling.room_images == "three images" then 50 else 0 } - height: { if is_borderless() then 375 else 209 } - z index: 410 - mask: { "rooms/image_mask_middle" + (if not is_room() then "_fuse" else if is_borderless() then (if uses_fuse_arrows() then "_arrow" else "_bl") else "") + ".png" } + height: { if is_borderless() then 375 else if is_short_room() then 149 else 211 } + z index: 520 + mask: { if is_short_room() then "" else "rooms/image_mask_middle" + (if not is_room() then "_fuse" else if is_borderless() then (if uses_fuse_arrows() then "_arrow" else "_bl") else "") + ".png" } ############################# Card type indicator: left: 50 @@ -1187,7 +1203,13 @@ extra card field: choice: patch editable: false save value: false - +extra card field: + type: color + name: spillblock + script: styling.room_backfill + editable: false + save value: false + extra card style: fuse_bridge: left: 265 @@ -1319,3 +1341,11 @@ extra card style: render style: image image: rooms/patch.png visible: { borderless_frames() and is_room() and not left_clear() } + spillblock: + left: 46 + top: 202 + width: 452 + height: 58 + z index: 700 + visible: { is_short_room() } + mask: rooms/bottom_mask.png \ No newline at end of file