diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..83bbcd17a --- /dev/null +++ b/.gitignore @@ -0,0 +1,23 @@ +**/.DS_Store + +# ignore everything except the main files so the user can put whatever other files in here +*.mse-set +*.mse-set.bak +/sets/* +/files/* +/set symbols/* + +# ignore everything with magic-mainframe-extras +/data/magic-mainframe-extras.mse-include/* + +# include the include file and readme +!/data/magic-mainframe-extras.mse-include/include +!/data/magic-mainframe-extras.mse-include/readme.txt + +# include the specific example files +!/data/magic-mainframe-extras.mse-include/examples +!/data/magic-mainframe-extras.mse-include/examples/* + +# include mainframe shared files until we relocate them +!/data/magic-mainframe-extras.mse-include/mfsfiles +!/data/magic-mainframe-extras.mse-include/mfsfiles/* diff --git a/data/magic-m15-altered.mse-style/devoid/acard.png b/data/magic-m15-altered.mse-style/devoid/acard.png index 2b87eddff..fcaf68346 100644 Binary files a/data/magic-m15-altered.mse-style/devoid/acard.png and b/data/magic-m15-altered.mse-style/devoid/acard.png differ diff --git a/data/magic-m15-altered.mse-style/style b/data/magic-m15-altered.mse-style/style index ccbde1024..7245144a7 100644 --- a/data/magic-m15-altered.mse-style/style +++ b/data/magic-m15-altered.mse-style/style @@ -258,7 +258,6 @@ 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 := { diff --git a/data/magic-m15-showcase-innistrad-vow.mse-style/frame_mask.png b/data/magic-m15-showcase-innistrad-vow.mse-style/frame_mask.png new file mode 100644 index 000000000..4847e6222 Binary files /dev/null and b/data/magic-m15-showcase-innistrad-vow.mse-style/frame_mask.png differ diff --git a/data/magic-m15-showcase-innistrad-vow.mse-style/style b/data/magic-m15-showcase-innistrad-vow.mse-style/style index 70570066e..56a6893cd 100644 --- a/data/magic-m15-showcase-innistrad-vow.mse-style/style +++ b/data/magic-m15-showcase-innistrad-vow.mse-style/style @@ -224,6 +224,7 @@ card style: render style: image popup style: in place image: { card_background() } + mask: frame_mask.png ############################# Image image: left: { if styling.stretch_image_to_whole_card then 0 else 58 } diff --git a/data/magic-modules.mse-include/trims/vbeyond.png b/data/magic-modules.mse-include/trims/vbeyond.png new file mode 100644 index 000000000..bb7630533 Binary files /dev/null and b/data/magic-modules.mse-include/trims/vbeyond.png differ diff --git a/data/magic.mse-game/card_fields b/data/magic.mse-game/card_fields index 3bf640a36..496a465c6 100644 --- a/data/magic.mse-game/card_fields +++ b/data/magic.mse-game/card_fields @@ -3104,6 +3104,24 @@ card field: card list column: 1222 card list width: 150 default: stylesheet; secondary_copyright_default(value, margin_code:"copyrightb3") +card field: + type: text + name: vorthos box + description: The magic story/pronoun box. + show statistics: false + card list name: Vorthos Box + card list column: 1223 + card list width: 150 + script: extra_card.vorthos_box or else "" +card field: + type: text + name: vorthos box 2 + description: The magic story/pronoun box. + show statistics: false + card list name: Vorthos Box 2 + card list column: 1224 + card list width: 150 + script: extra_card.vorthos_box_2 or else "" ############################################################## Old frame copyright line card field: