diff --git a/changelog.txt b/changelog.txt index 46f1e717f..b831f7e3d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -41,6 +41,7 @@ OTHER UPDATES • Added the up and down triangles as mainframe transform options. • Added support for dungeons with 8 levels. • Added option to remove backface rarity symbol to Mainframe DFC. +• Added option to remove the colored name banner from Unstable Basics. • Added omni and polyamory flags to Pride Pinlines. BUG FIXES diff --git a/data/magic-m15-art-lair.mse-style/card.png b/data/magic-m15-art-lair.mse-style/card.png index c9c033095..fdd45229a 100644 Binary files a/data/magic-m15-art-lair.mse-style/card.png and b/data/magic-m15-art-lair.mse-style/card.png differ diff --git a/data/magic-m15-art-lair.mse-style/mask.png b/data/magic-m15-art-lair.mse-style/mask.png deleted file mode 100644 index 7070fc008..000000000 Binary files a/data/magic-m15-art-lair.mse-style/mask.png and /dev/null differ diff --git a/data/magic-m15-art-lair.mse-style/style b/data/magic-m15-art-lair.mse-style/style index 790e2c873..eea118923 100644 --- a/data/magic-m15-art-lair.mse-style/style +++ b/data/magic-m15-art-lair.mse-style/style @@ -6,10 +6,13 @@ icon: card-sample.png installer group: magic/m15 style/normal cards position hint: 099 -version: 2021-06-01 +version: 2024-05-26 depends on: package: magic.mse-game version: 2014-06-25 +depends on: + package: magic-modules.mse-include + version: 2024-05-20 card width: 375 card height: 523 @@ -25,7 +28,11 @@ styling field: name: promo description: Is this card a promo card, with the "P" rarity? initial: no + ############################################################## Card fields +include file: /magic-modules.mse-include/information/card_fields +include file: /magic-modules.mse-include/stamps/card_fields +include file: /magic-modules.mse-include/corners/card_fields card style: ############################# Image image: @@ -33,106 +40,22 @@ card style: top: 0 width: 375 height: 486 - z index: 1 - mask: mask.png - ############################# Card sorting / numbering - set code: - left: 24 - top: 498 - width: 40 - height: 10 - z index: 1 - font: - name: Relay-Medium - size: 7 - color: white - weight: bold - ############################# Copyright stuff - illustrator: - left: { 44 + card_style.set_code.content_width } - top: 497.5 - width: 200 - height: 10 - z index: 1 - font: - name: Beleren Small Caps Bold - size: 7.25 - color: white - copyright: - right: 350 - top: { if card.pt != "" then 500 else 488 } - width: 140 - height: 10 - z index: 2 - visible: {not set.automatic_copyright} - alignment: middle right shrink-overflow - font: - name: Matrix - size: 7 - color: white - weight: bold + z index: 100 ############################################################## Extra card fields -extra card field: - type: text - name: card code - save value: false - script: - if set.automatic_card_numbers and not styling.remove_from_autocount then - forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text) - else - combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text) -extra card field: - type: choice - name: artist arrow - editable: false - save value: false - choice: white -extra card field: - type: text - name: auto copyright - script: set.copyright - save value: false - editable: false - show statistics: false extra card field: type: choice name: border editable: false save value: false choice: border +extra card field: + type: choice + name: stamp backing + choice: backing + editable: false + save value: false + extra card style: - card code: - left: 24 - top: 488 - width: 120 - height: 10 - z index: 1 - font: - name: Relay-Medium - size: 7 - color: white - weight: bold - artist arrow: - left: { 28 + card_style.set_code.content_width } - top: 500 - width: 12 - height: 7 - z index: 1 - render style: image - image: artist_arrow.png - auto copyright: - right: 350 - top: { if card.pt != "" then 500 else 488 } - width: 140 - height: 10 - z index: 2 - alignment: middle right shrink-overflow - visible: {set.automatic_copyright} - font: - name: Matrix - size: 7 - color: white - weight: bold border: left: 0 top: 0 @@ -140,4 +63,13 @@ extra card style: height: 523 z index: 0 render style: image - image: card.png \ No newline at end of file + image: card.png + stamp backing: + left: 165 + top: 472 + width: 46 + height: 26 + z index: 850 + visible: { card.card_stamp != "none" } + render style: image + image: { "/magic-modules.mse-include/stamps/backs/" + (if stamp_shape(field:1) == "triangle" then "triangle_stamp.png" else "stamp.png") } diff --git a/data/magic-m15-invocation.mse-style/bcard.png b/data/magic-m15-invocation.mse-style/bcard.png index 4490e2d07..9d076ccce 100644 Binary files a/data/magic-m15-invocation.mse-style/bcard.png and b/data/magic-m15-invocation.mse-style/bcard.png differ diff --git a/data/magic-m15-invocation.mse-style/ccard.png b/data/magic-m15-invocation.mse-style/ccard.png index 92cc7b147..7a0d472a4 100644 Binary files a/data/magic-m15-invocation.mse-style/ccard.png and b/data/magic-m15-invocation.mse-style/ccard.png differ diff --git a/data/magic-m15-invocation.mse-style/gcard.png b/data/magic-m15-invocation.mse-style/gcard.png index 4b426a78a..0f6c3c4e7 100644 Binary files a/data/magic-m15-invocation.mse-style/gcard.png and b/data/magic-m15-invocation.mse-style/gcard.png differ diff --git a/data/magic-m15-invocation.mse-style/mcard.png b/data/magic-m15-invocation.mse-style/mcard.png index c773cc0c5..6103e0433 100644 Binary files a/data/magic-m15-invocation.mse-style/mcard.png and b/data/magic-m15-invocation.mse-style/mcard.png differ diff --git a/data/magic-m15-invocation.mse-style/rcard.png b/data/magic-m15-invocation.mse-style/rcard.png index 496fbfb00..95fcf9f2e 100644 Binary files a/data/magic-m15-invocation.mse-style/rcard.png and b/data/magic-m15-invocation.mse-style/rcard.png differ diff --git a/data/magic-m15-invocation.mse-style/style b/data/magic-m15-invocation.mse-style/style index fe7ddc46c..02994b184 100644 --- a/data/magic-m15-invocation.mse-style/style +++ b/data/magic-m15-invocation.mse-style/style @@ -7,7 +7,7 @@ installer group: magic/m15 style/amonkhet/invocations position hint: 092 -version: 2018-01-10 +version: 2024-05-26 depends on: package: magic.mse-game version: 2015-04-08 @@ -17,6 +17,9 @@ depends on: depends on: package: magic-mana-small-invocation.mse-symbol-font version: 2017-03-31 +depends on: + package: magic-modules.mse-include + version: 2024-05-20 card width: 375 card height: 523 @@ -118,6 +121,7 @@ styling style: render style: checklist direction: vertical ############################################################## Card fields +include file: /magic-modules.mse-include/corners/card_fields card style: card color: left: 0 @@ -128,7 +132,6 @@ card style: render style: image popup style: in place image: { saturate(card_background(), amount: frame_saturation()) } - ############################# Background stuff ############################# Name line name: left: 35 @@ -302,11 +305,7 @@ extra card field: type: text name: card code save value: false - script: - if set.automatic_card_numbers and not styling.remove_from_autocount then - forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + ( set.set_code ) + " * " + set.set_language + " " + rarity_code() + " ", field: card.card_code_text) - else - combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text) + script: card_number_script_core() extra card field: type: choice name: artist arrow @@ -417,6 +416,7 @@ extra card field: choice: glowmaster initial: glowmaster editable: false + extra card style: artist arrow: left: 34 @@ -440,7 +440,7 @@ extra card style: top : 0 width: 375 height: 523 - z index: 3 + z index: 1050 render style: image image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"} mask: foil_mask.png diff --git a/data/magic-m15-invocation.mse-style/ucard.png b/data/magic-m15-invocation.mse-style/ucard.png index 70f0fb454..d80fe1623 100644 Binary files a/data/magic-m15-invocation.mse-style/ucard.png and b/data/magic-m15-invocation.mse-style/ucard.png differ diff --git a/data/magic-m15-invocation.mse-style/wcard.png b/data/magic-m15-invocation.mse-style/wcard.png index e54505fee..dd8c960fd 100644 Binary files a/data/magic-m15-invocation.mse-style/wcard.png and b/data/magic-m15-invocation.mse-style/wcard.png differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/acard.jpg b/data/magic-m15-showcase-dungeon-module.mse-style/acard.jpg deleted file mode 100644 index ffc51bd4f..000000000 Binary files a/data/magic-m15-showcase-dungeon-module.mse-style/acard.jpg and /dev/null differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/acard.png b/data/magic-m15-showcase-dungeon-module.mse-style/acard.png new file mode 100644 index 000000000..cda256e42 Binary files /dev/null and b/data/magic-m15-showcase-dungeon-module.mse-style/acard.png differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/artist_arrow.png b/data/magic-m15-showcase-dungeon-module.mse-style/artist_arrow.png deleted file mode 100644 index 10b116c24..000000000 Binary files a/data/magic-m15-showcase-dungeon-module.mse-style/artist_arrow.png and /dev/null differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/bcard.jpg b/data/magic-m15-showcase-dungeon-module.mse-style/bcard.jpg deleted file mode 100644 index 5fbf0211b..000000000 Binary files a/data/magic-m15-showcase-dungeon-module.mse-style/bcard.jpg and /dev/null differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/bcard.png b/data/magic-m15-showcase-dungeon-module.mse-style/bcard.png new file mode 100644 index 000000000..19ba7631f Binary files /dev/null and b/data/magic-m15-showcase-dungeon-module.mse-style/bcard.png differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/ccard.jpg b/data/magic-m15-showcase-dungeon-module.mse-style/ccard.jpg deleted file mode 100644 index 4738834e7..000000000 Binary files a/data/magic-m15-showcase-dungeon-module.mse-style/ccard.jpg and /dev/null differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/ccard.png b/data/magic-m15-showcase-dungeon-module.mse-style/ccard.png new file mode 100644 index 000000000..0eba3568b Binary files /dev/null and b/data/magic-m15-showcase-dungeon-module.mse-style/ccard.png differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/frame_mask.png b/data/magic-m15-showcase-dungeon-module.mse-style/frame_mask.png new file mode 100644 index 000000000..f97758559 Binary files /dev/null and b/data/magic-m15-showcase-dungeon-module.mse-style/frame_mask.png differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/gcard.jpg b/data/magic-m15-showcase-dungeon-module.mse-style/gcard.jpg deleted file mode 100644 index dfcf4834e..000000000 Binary files a/data/magic-m15-showcase-dungeon-module.mse-style/gcard.jpg and /dev/null differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/gcard.png b/data/magic-m15-showcase-dungeon-module.mse-style/gcard.png new file mode 100644 index 000000000..664fbb450 Binary files /dev/null and b/data/magic-m15-showcase-dungeon-module.mse-style/gcard.png differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/holo_stamp.png b/data/magic-m15-showcase-dungeon-module.mse-style/holo_stamp.png deleted file mode 100644 index 7eb60b437..000000000 Binary files a/data/magic-m15-showcase-dungeon-module.mse-style/holo_stamp.png and /dev/null differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/mcard.jpg b/data/magic-m15-showcase-dungeon-module.mse-style/mcard.jpg deleted file mode 100644 index 641b24146..000000000 Binary files a/data/magic-m15-showcase-dungeon-module.mse-style/mcard.jpg and /dev/null differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/mcard.png b/data/magic-m15-showcase-dungeon-module.mse-style/mcard.png new file mode 100644 index 000000000..b22009f84 Binary files /dev/null and b/data/magic-m15-showcase-dungeon-module.mse-style/mcard.png differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/rcard.jpg b/data/magic-m15-showcase-dungeon-module.mse-style/rcard.jpg deleted file mode 100644 index 2c4471e0c..000000000 Binary files a/data/magic-m15-showcase-dungeon-module.mse-style/rcard.jpg and /dev/null differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/rcard.png b/data/magic-m15-showcase-dungeon-module.mse-style/rcard.png new file mode 100644 index 000000000..fd4b9f813 Binary files /dev/null and b/data/magic-m15-showcase-dungeon-module.mse-style/rcard.png differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/style b/data/magic-m15-showcase-dungeon-module.mse-style/style index 6829b085f..9319a0e8c 100644 --- a/data/magic-m15-showcase-dungeon-module.mse-style/style +++ b/data/magic-m15-showcase-dungeon-module.mse-style/style @@ -6,7 +6,7 @@ icon: card-sample.png position hint: 095 installer group: magic/new style/normal cards -version: 2021-02-16 +version: 2024-05-26 depends on: package: magic.mse-game version: 2014-06-25 @@ -14,11 +14,8 @@ depends on: package: magic-default-image.mse-include version: 2007-09-23 depends on: - package: magic-watermarks.mse-include - version: 2007-09-23 -depends on: - package: magic-identity-new.mse-include - version: 2012-01-22 + package: magic-modules.mse-include + version: 2024-05-20 depends on: package: magic-mana-large.mse-symbol-font version: 2007-09-23 @@ -55,8 +52,8 @@ init script: ) else input } - template_prefix := [card:"" identity: "/magic-identity-new.mse-include/"] - template_suffix := [card:"card.jpg" identity: "identity.png"] + template_prefix := [card:"" identity: "/magic-modules.mse-include/identity/"] + template_suffix := [card:"card.png" identity: "identity.png"] template := { template_prefix[type] + input + template_suffix[type] } land_template := { template_prefix[type] + input + template_suffix[type] } # Use land templates for previews because they show more contrast @@ -80,7 +77,6 @@ init script: guild_mana := { styling.use_guild_mana_symbols } ancestral_mana := { styling.ancestral_mana_symbols } - has_identity := { styling.color_indicator_dot } is_unsorted := {styling.remove_from_autocount} chop_top := {to_number(pull_comma_array(styling.text_chops, cell:0, end:false))} @@ -88,8 +84,6 @@ init script: chop_correction := { chop_bot() } shrink_type := {if styling.shrink_typeline_text != "" then to_number(styling.shrink_typeline_text) else 0} shrink_name := {if styling.shrink_name_text != "" then to_number(styling.shrink_name_text) else 0} - use_main_rarity := { contains(set.mainframe_rarity_name, match: ".png")} - un_png := replace@(match:".png", replace: "") break_name := { words := split_text(card.name, match:" ") @@ -154,15 +148,7 @@ styling field: choice: all breaks +2 choice: all breaks +3 description: Do dice levels normally, off, on all linebreaks, on all but the first linebreak, etc. -styling field: - type: boolean - name: use holofoil stamps - description: Change to no to disable rare holofoil stamps -styling field: - type: boolean - name: color indicator dot - description: Use the color indicator dot - initial: no +include file: /magic-modules.mse-include/stamps/styling_fields styling field: type: boolean name: remove from autocount @@ -213,11 +199,6 @@ styling field: name: promo description: Is this card a promo card, with the "P" rarity? initial: no -styling field: - type: boolean - name: masterpiece - description: Is this card a Masterpiece? - initial: no styling field: type: boolean name: inverted common symbol @@ -252,6 +233,9 @@ styling style: yes: { symbol_variation(symbol: set.symbol, variation: "invertedcommon") } ############################################################## Card fields +include file: /magic-modules.mse-include/corners/card_fields +include file: /magic-modules.mse-include/stamps/card_fields +include file: /magic-modules.mse-include/information/card_fields card style: ############################# Background stuff card color: @@ -259,11 +243,11 @@ card style: top: 0 width: 375 height: 523 - z index: -2 + z index: 200 render style: image popup style: in place image: { card_background() } - + mask: frame_mask.png ############################# Name line name: left: 57 @@ -272,7 +256,7 @@ card style: height: 30 alignment: center shrink-overflow padding bottom: 0 - z index: 1 + z index: 900 font: name: ITC Souvenir size: 20 @@ -292,7 +276,7 @@ card style: size: 15 alignment: middle right always symbol: true - z index: 4 + z index: 920 padding top: 0 ############################# Image image: @@ -300,7 +284,7 @@ card style: top: 99 width: 342 height: 212 - z index: 1 + z index: 100 ############################# Card type type: left: 33 @@ -308,7 +292,7 @@ card style: width: { 291 - max(23,card_style.rarity.content_width) } height: 19 alignment: top shrink-overflow - z index: 1 + z index: 900 padding top: 2 font: name: ITC Souvenir Demi @@ -320,47 +304,16 @@ card style: top: 317 width: 44 height: 22 - z index: 2 + z index: 950 render style: image alignment: middle right - choice images: - # Images based on the set symbol - basic land: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "c.png" - else if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon") - else symbol_variation(symbol: set.symbol, variation: "common") - common: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "c.png" - else if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon") - else symbol_variation(symbol: set.symbol, variation: "common") - uncommon: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "u.png" - else symbol_variation(symbol: set.symbol, variation: "uncommon") - rare: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "r.png" - else symbol_variation(symbol: set.symbol, variation: "rare") - mythic rare: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "m.png" - else symbol_variation(symbol: set.symbol, variation: "mythic rare") - special: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "s.png" - else symbol_variation(symbol: set.symbol, variation: "special") - masterpiece: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "mp.png" - else symbol_variation(symbol: set.masterpiece_symbol, variation: "mythic rare") + include file: /magic-modules.mse-include/rarities/choice_images ############################# Text box text: left: 28 top : {348-(-chop_top())} width: 311 - bottom: {483-chop_bot()-(if is_rare() and styling.use_holofoil_stamps then 3 else 0)} + bottom: {483-chop_bot()-(if is_rare() and has_identity() then 3 else 0)} font: name: ITC Souvenir size: 14 @@ -380,7 +333,7 @@ card style: styling.center_text == "always" then "center" else "left") - z index: 3 + z index: 900 padding left: 6 padding right: 4 line height hard: {if is_modal(card.rule_text) then 0.9 else 1.2 } @@ -390,7 +343,7 @@ card style: line height line max: 1.6 ############################# PT pt: - z index: 4 + z index: 900 left: 320 top: 456 width: 55 @@ -401,58 +354,7 @@ card style: size: 15 color: white separator color: red - ############################# Card sorting / numbering - set code: - left: 24 - top: 498 - width: 40 - height: 10 - z index: 2 - font: - name: Relay-Medium - size: 7 - color: white - weight: bold - ############################# Copyright stuff - illustrator: - left: { 44 + card_style.set_code.content_width } - top: 497.5 - width: 200 - height: 10 - z index: 2 - font: - name: Beleren Small Caps Bold - size: 7.25 - color: white - copyright: - right: 350 - top: { if card.pt != "" then 500 else 488 } - width: 140 - height: 10 - z index: 2 - visible: {not set.automatic_copyright} - alignment: middle right shrink-overflow - font: - name: Matrix - size: 7 - color: white - weight: bold ############################################################## Extra card fields -extra card field: - type: text - name: card code - save value: false - script: - if set.automatic_card_numbers and not styling.remove_from_autocount then - forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text) - else - combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text) -extra card field: - type: choice - name: artist arrow - editable: false - save value: false - choice: white extra card field: type: text name: module title @@ -508,49 +410,14 @@ extra card field: choice: mask editable: false show statistics: false -extra card field: - type: text - name: auto copyright - script: set.copyright - save value: false - editable: false - show statistics: false extra card field: type: choice - name: foil stamp - choice: stamp - save value: false + name: stamp backing + choice: backing editable: false + save value: false extra card style: - card code: - left: 24 - top: 488 - width: 120 - height: 10 - z index: 2 - font: - name: Relay-Medium - size: 7 - color: white - weight: bold - artist arrow: - left: { 28 + card_style.set_code.content_width } - top: 500 - width: 12 - height: 7 - z index: 1 - render style: image - image: artist_arrow.png - foil stamp: - left: 165 - top: 472 - width: 46 - height: 26 - z index: 2 - visible: { is_rare() and styling.use_holofoil_stamps } - render style: image - image: holo_stamp.png module title: left: 100 top: 7 @@ -558,7 +425,7 @@ extra card style: height: 20 alignment: center shrink-overflow padding bottom: 0 - z index: 1 + z index: 900 font: name: ITC Souvenir Bold size: 12 @@ -570,7 +437,7 @@ extra card style: height: 10 alignment: right shrink-overflow padding bottom: 0 - z index: 1 + z index: 900 font: name: ITC Souvenir Bold size: 7 @@ -582,7 +449,7 @@ extra card style: height: 15 alignment: center shrink-overflow padding bottom: 0 - z index: 1 + z index: 900 font: name: ITC Souvenir Demi size: 10 @@ -595,7 +462,7 @@ extra card style: angle: 45 alignment: center shrink-overflow padding bottom: 0 - z index: 1 + z index: 900 font: name: ITC Souvenir Bold size: 7.5 @@ -607,7 +474,7 @@ extra card style: height: 38 alignment: middle center shrink-overflow padding bottom: 0 - z index: 1 + z index: 700 font: name: ITC Souvenir size: 18 @@ -621,7 +488,7 @@ extra card style: height: 38 alignment: middle center shrink-overflow padding bottom: 0 - z index: 1 + z index: 700 font: name: ITC Souvenir size: 18 @@ -633,7 +500,7 @@ extra card style: top: { top_of_para(rolls_start(card.text))} height: { height_of_para(rolls_start(card.text))} width: 314 - z index: 2 + z index: 640 render style: image image: d20slice.png visible: {is_d20() and number_of_rolls(card.text) > 0} @@ -642,7 +509,7 @@ extra card style: top: { top_of_para(rolls_start(card.text)+2)} height: { height_of_para(rolls_start(card.text)+2)} width: 314 - z index: 2 + z index: 640 render style: image image: d20slice.png visible: {is_d20() and number_of_rolls(card.text) > 2} @@ -651,20 +518,16 @@ extra card style: top: { top_of_para(rolls_start(card.text)+4)} height: { height_of_para(rolls_start(card.text)+4)} width: 314 - z index: 2 + z index: 640 render style: image image: d20slice.png visible: {is_d20() and number_of_rolls(card.text) > 4} - auto copyright: - right: 350 - top: { if card.pt != "" then 500 else 488 } - width: 140 - height: 10 - z index: 2 - alignment: middle right shrink-overflow - visible: {set.automatic_copyright} - font: - name: Matrix - size: 7 - color: white - weight: bold + stamp backing: + left: 165 + top: 472 + width: 46 + height: 26 + z index: 850 + visible: { card.card_stamp != "none" } + render style: image + image: { "/magic-modules.mse-include/stamps/backs/" + (if stamp_shape(field:1) == "triangle" then "triangle_stamp.png" else "stamp.png") } diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/ucard.jpg b/data/magic-m15-showcase-dungeon-module.mse-style/ucard.jpg deleted file mode 100644 index f44206c59..000000000 Binary files a/data/magic-m15-showcase-dungeon-module.mse-style/ucard.jpg and /dev/null differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/ucard.png b/data/magic-m15-showcase-dungeon-module.mse-style/ucard.png new file mode 100644 index 000000000..0a3e22d5d Binary files /dev/null and b/data/magic-m15-showcase-dungeon-module.mse-style/ucard.png differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/wcard.jpg b/data/magic-m15-showcase-dungeon-module.mse-style/wcard.jpg deleted file mode 100644 index 5518fe59a..000000000 Binary files a/data/magic-m15-showcase-dungeon-module.mse-style/wcard.jpg and /dev/null differ diff --git a/data/magic-m15-showcase-dungeon-module.mse-style/wcard.png b/data/magic-m15-showcase-dungeon-module.mse-style/wcard.png new file mode 100644 index 000000000..012130f39 Binary files /dev/null and b/data/magic-m15-showcase-dungeon-module.mse-style/wcard.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_card.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_card.png index d9ecede2e..aa0471555 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_card.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_card.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_identity.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_identity.png index aa9aeeec0..977832363 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_identity.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_identity.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_nonpt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_nonpt.png deleted file mode 100644 index 3a1fd0f20..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_nonpt.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_nonstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_triangle_stamp.png similarity index 100% rename from data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_nonstamp.png rename to data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_triangle_stamp.png diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type1.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type1.png index 03be23090..adcdab614 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type1.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type1.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type2.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type2.png index d9d0e748d..ad9f275a4 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type2.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type2.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type3.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type3.png index 063251526..e1e833350 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type3.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/artifact_blend_type3.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/border_mask.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/border_mask.png index 358670798..bbd52c177 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/border_mask.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/border_mask.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/border_mask_pt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/border_mask_pt.png index 7ff867128..a1a91e7a4 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/border_mask_pt.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/border_mask_pt.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/acard.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/acard.png index 9f40392df..0a153c3b0 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/acard.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/acard.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/bcard.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/bcard.png index 9d90221cc..feb0ff61b 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/bcard.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/bcard.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/ccard.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/ccard.png index acd82d595..ce36126bf 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/ccard.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/ccard.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/gcard.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/gcard.png index b8b2476b6..2ef743a22 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/gcard.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/gcard.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/mcard.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/mcard.png index 07d430474..a3332e592 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/mcard.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/mcard.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/rcard.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/rcard.png index eab0a4049..5c23712ef 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/rcard.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/rcard.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/ucard.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/ucard.png index 735eb5890..b67ae177e 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/ucard.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/ucard.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/wcard.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/wcard.png index 02346c0de..5feb60d90 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/card/wcard.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/card/wcard.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_card.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_card.png index 892578654..275271f6e 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_card.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_card.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_nonpt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_nonpt.png deleted file mode 100644 index 803e98f42..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_nonpt.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_nonstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_triangle_stamp.png similarity index 100% rename from data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_nonstamp.png rename to data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_triangle_stamp.png diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type1.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type1.png index f92132140..df1a3ff02 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type1.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type1.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type2.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type2.png index 160439171..b06a2f615 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type2.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type2.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type3.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type3.png index fb6758aea..3b839eea3 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type3.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/hybrid_blend_type3.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/image_mask.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/image_mask.png deleted file mode 100644 index 09e77824b..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/image_mask.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_card.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_card.png index 42a6be2f4..3dc98a230 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_card.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_card.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_nonpt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_nonpt.png deleted file mode 100644 index 803e98f42..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_nonpt.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_nonstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_triangle_stamp.png similarity index 100% rename from data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_nonstamp.png rename to data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_triangle_stamp.png diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type1.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type1.png index b48db8f86..e5151ab57 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type1.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type1.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type2.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type2.png index 8dfdb0c35..be9bc3fcf 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type2.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type2.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type3.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type3.png index 2427f0471..f15edeba5 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type3.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/multicolor_blend_type3.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/anonpt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/anonpt.png deleted file mode 100644 index 3c5d817bd..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/anonpt.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/bnonpt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/bnonpt.png deleted file mode 100644 index 081b050f3..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/bnonpt.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/cnonpt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/cnonpt.png deleted file mode 100644 index e1ef27bed..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/cnonpt.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/gnonpt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/gnonpt.png deleted file mode 100644 index 98941c1ab..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/gnonpt.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/mnonpt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/mnonpt.png deleted file mode 100644 index dd76ab28c..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/mnonpt.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/rnonpt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/rnonpt.png deleted file mode 100644 index 6e95e0f21..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/rnonpt.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/wnonpt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/wnonpt.png deleted file mode 100644 index 8affbc008..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/wnonpt.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/cnonstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/cnonstamp.png deleted file mode 100644 index 6f893318d..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/cnonstamp.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/mnonstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/mnonstamp.png deleted file mode 100644 index 44fef0c18..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/mnonstamp.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/rnonstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/rnonstamp.png deleted file mode 100644 index 4d43538bd..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/rnonstamp.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/wnonstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/wnonstamp.png deleted file mode 100644 index 097a8eaf4..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/wnonstamp.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/astamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/astamp.png index 084e16bee..e6437a05a 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/astamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/astamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/bstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/bstamp.png index 9585922ba..94670aa14 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/bstamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/bstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/cstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/cstamp.png index 535fece76..e7b5070c1 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/cstamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/cstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/gstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/gstamp.png index 767e8ee68..bddd6fd17 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/gstamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/gstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/mstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/mstamp.png index 89d7fb14e..279d710a6 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/mstamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/mstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/round_mask.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/round_mask.png new file mode 100644 index 000000000..fea5388aa Binary files /dev/null and b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/round_mask.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/rstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/rstamp.png index f5dd6188c..128125287 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/rstamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/rstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/triangle_mask.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/triangle_mask.png new file mode 100644 index 000000000..a6374573b Binary files /dev/null and b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/triangle_mask.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/ustamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/ustamp.png index 88da571f9..3825cab74 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/ustamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/ustamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/wstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/wstamp.png index 92be929b6..58b321ab6 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/wstamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp/wstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp_mask.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp_mask.png deleted file mode 100644 index c3cfefae7..000000000 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/stamp_mask.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/style b/data/magic-m15-showcase-strixhaven-jp.mse-style/style index 4b70c2c14..a5bcb6090 100644 --- a/data/magic-m15-showcase-strixhaven-jp.mse-style/style +++ b/data/magic-m15-showcase-strixhaven-jp.mse-style/style @@ -16,8 +16,8 @@ depends on: package: magic-watermarks.mse-include version: 2007-09-23 depends on: - package: magic-identity-new.mse-include - version: 2012-01-22 + package: magic-modules.mse-include + version: 2024-05-20 depends on: package: magic-mana-large.mse-symbol-font version: 2007-09-23 @@ -38,8 +38,34 @@ init script: # Load scripts for image box include file: /magic-default-image.mse-include/scripts - template_prefix := [card: "card/", name1: "name/", name2: "name/", name3: "name/", type1: "type/", type2: "type/", type3: "type/", pt: "pt/", nonpt: "nonpt/", textbox: "textbox/", stamp: "stamp/", nonstamp: "nonstamp/", identity: "/magic-identity-new.mse-include/"] - template_suffix := [card: "card.png", name1: "cap.png", name2: "name.png", name3: "cap.png", type1: "cap.png", type2: "type.png", type3: "cap.png", pt: "pt.png", nonpt: "nonpt.png", textbox: "textbox.png", stamp: "stamp.png", nonstamp: "nonstamp.png", identity: "identity.png"] + template_prefix := [ + card: "card/", + name1: "name/", + name2: "name/", + name3: "name/", + type1: "type/", + type2: "type/", + type3: "type/", + pt: "pt/", + textbox: "textbox/", + stamp: "stamp/", + triangle_stamp: "triangle/", + identity: "/magic-modules.mse-include/identity" + ] + template_suffix := [ + card: "card.png", + name1: "cap.png", + name2: "name.png", + name3: "cap.png", + type1: "cap.png", + type2: "type.png", + type3: "cap.png", + pt: "pt.png", + textbox: "textbox.png", + stamp: "stamp.png", + triangle_stamp: "stamp.png", + identity: "identity.png" + ] template := { template_prefix[type] + input + template_suffix[type] } land_template := { template_prefix[type] + (if input == "a" then "c" else input) + template_suffix[type] } # Use land templates for previews because they show more contrast @@ -241,6 +267,7 @@ init script: card_ptbox := { color_background(type: "pt", base_hybrid: card_hybrid) }@(offset:0 ) card_nonptbox := { color_background(type: "nonpt", base_hybrid: card_hybrid) }@(offset:0 ) card_stamp := { color_background(type: "stamp", base_hybrid: card_hybrid) }@(offset:0 ) + card_stamp_triangle := { color_background(type: "triangle_stamp", base_hybrid: stamp_hybrid) }@(offset:0 ) card_nonstamp := { color_background(type: "nonstamp", base_hybrid: card_hybrid) }@(offset:0 ) card_textbox := { color_background(type: "textbox", base_hybrid: textbox_hybrid) }@(offset:0 ) @@ -264,7 +291,6 @@ init script: sort_text@(order: "XYZI[0123456789]HSCA(WUBRG)")() } ancestral_mana := { styling.ancestral_mana_symbols } - has_identity := { styling.color_indicator_dot } is_unsorted := {styling.remove_from_autocount} chop_top := {to_number(pull_comma_array(styling.text_chops, cell:0, end:false))} @@ -275,6 +301,7 @@ init script: use_main_rarity := { contains(set.mainframe_rarity_name, match: ".png")} un_png := replace@(match:".png", replace: "") jp_name_length := {card_style.name.content_height * length(card.name)} + ## TODO shown_cr := {if set.automatic_copyright then set.copyright != "" else card.copyright != ""} enlarge_in_pixels := @@ -323,6 +350,17 @@ init script: enlarge_in_pixels(cropped, current_width: 375, current_height: height, left: 0, right: 0, top: top, bottom: 64) } + mask_background := { + img := card_background() + shape := stamp_shape() + if shape == "round" then + img := set_mask(image:img, mask:"textbox_masks/round.png") + else if shape == "triangle" then + img := set_mask(image:img, mask:"textbox_masks/triangle.png") + if card.pt != "" then img := set_mask(image:img, mask:"textbox_masks/pt.png") + img + } + ############################################################## Set info fields set info style: symbol: @@ -358,15 +396,6 @@ styling field: type: text name: popout image style description: The styling instructions for the popout image field, formatted as "left,top,width,height,". The text MUST end with a comma. -styling field: - type: boolean - name: use holofoil stamps - description: Change to no to disable rare holofoil stamps -styling field: - type: boolean - name: color indicator dot - description: Use the color indicator dot - initial: no styling field: type: boolean name: remove from autocount @@ -400,6 +429,11 @@ styling field: name: text box mana symbols match: magic-mana-*.mse-symbol-font initial: magic-mana-small.mse-symbol-font +styling field: + type: package choice + name: casting cost mana symbols + match: magic-mana-*.mse-symbol-font + initial: magic-mana-small-strixhaven.mse-symbol-font styling field: type: choice name: center text @@ -413,11 +447,6 @@ styling field: name: promo description: Is this card a promo card, with the "P" rarity? initial: no -styling field: - type: boolean - name: masterpiece - description: Is this card a Masterpiece? - initial: no styling field: type: boolean name: inverted common symbol @@ -431,6 +460,7 @@ styling field: choice: black initial: white allow custom: true +include file: /magic-modules.mse-include/fonts/styling_fields styling field: type: package choice name: overlay @@ -459,6 +489,9 @@ styling style: no: { symbol_variation(symbol: set.symbol, variation: "common") } yes: { symbol_variation(symbol: set.symbol, variation: "invertedcommon") } ############################################################## Card fields +include file: /magic-modules.mse-include/corners/card_fields +include file: /magic-modules.mse-include/information/card_fields +include file: /magic-modules.mse-include/stamps/card_fields card style: ############################# Background stuff border color: @@ -466,17 +499,17 @@ card style: top : 0 width: 375 height: 523 - z index: -1 + z index: 500 mask: { "border_mask" + (if card.pt != "" then "_pt" else "") + ".png" } card color: left: 0 top: 0 width: 375 height: 523 - z index: 0 + z index: 200 render style: image popup style: in place - image: { card_background() } + image: { mask_background() } mask: frame_mask.png ############################# Name line name: @@ -486,7 +519,7 @@ card style: height: 22 alignment: top shrink-overflow padding bottom: 0 - z index: 2 + z index: 900 font: name: Beleren Bold size: {13 - shrink_name()} @@ -510,7 +543,7 @@ card style: size: 15 alignment: middle right always symbol: true - z index: 2 + z index: 920 padding top: 0 ############################# Image image: @@ -518,9 +551,8 @@ card style: top: 0 width: 375 height: 494 - z index: -2 + z index: 100 default: {default_image(card.card_color)} - mask: image_mask.png 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"} @@ -534,17 +566,17 @@ card style: top: { 296 + shorten_textbox_amount() } width: 17 height: 17 - z index: 2 + z index: 800 render style: image visible: { has_identity() } image: { card_identity() } type: - left: { if styling.color_indicator_dot then 51 else 32 } + left: { if has_identity() then 51 else 32 } top: { 292 + shrink_type() + shorten_textbox_amount() } - width: { min(263-if styling.color_indicator_dot then 19 else 0,max(105, card_style.type.content_width)) } + width: { min(263-if has_identity() then 19 else 0,max(105, card_style.type.content_width)) } height: { 19 - shrink_type() } alignment: top center shrink-overflow - z index: 3 + z index: 900 padding top: 2 font: name: Beleren Bold @@ -556,41 +588,10 @@ card style: top: { 298 + shorten_textbox_amount() } width: 44 height: 22 - z index: 2 + z index: 950 render style: image alignment: middle right - choice images: - # Images based on the set symbol - basic land: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "c.png" - else if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon") - else symbol_variation(symbol: set.symbol, variation: "common") - common: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "c.png" - else if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon") - else symbol_variation(symbol: set.symbol, variation: "common") - uncommon: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "u.png" - else symbol_variation(symbol: set.symbol, variation: "uncommon") - rare: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "r.png" - else symbol_variation(symbol: set.symbol, variation: "rare") - mythic rare: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "m.png" - else symbol_variation(symbol: set.symbol, variation: "mythic rare") - special: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "s.png" - else symbol_variation(symbol: set.symbol, variation: "special") - masterpiece: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "mp.png" - else symbol_variation(symbol: set.masterpiece_symbol, variation: "mythic rare") + include file: /magic-modules.mse-include/rarities/choice_images ############################# Text box text: left: 32 @@ -616,7 +617,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 } @@ -629,14 +630,15 @@ card style: top: { 338 + shorten_textbox_amount() } width: 344 height: { 139 - shorten_textbox_amount() } - z index: 1 render style: image popup style: in place alignment: middle center - include file: /magic-watermarks.mse-include/watermarks - ############################# PT + include file: /magic.mse-game/watermarks/menu_choice_images + image: { watermark_scripts[card.watermark](face:watermark_face_1()) } + z index: 720 +############################# PT pt: - z index: 2 + z index: 900 left: 302 top: 467 width: 41 @@ -647,58 +649,7 @@ card style: size: 15 color: black separator color: red - ############################# Card sorting / numbering - set code: - left: 24 - top: 498 - width: 40 - height: 10 - z index: 1 - font: - name: Relay-Medium - size: 7 - color: { styling.copyright_text_color } - weight: bold - ############################# Copyright stuff - illustrator: - left: { 44 + card_style.set_code.content_width } - top: 497.5 - width: 200 - height: 10 - z index: 1 - font: - name: Beleren Small Caps Bold - size: 7.25 - color: { styling.copyright_text_color } - copyright: - right: 350 - top: { if card.pt != "" then 500 else 493 } - width: 140 - height: 10 - z index: 2 - visible: {not set.automatic_copyright} - alignment: middle right shrink-overflow - font: - name: Matrix - size: 7 - color: { styling.copyright_text_color } - weight: bold ############################################################## Extra card fields -extra card field: - type: text - name: card code - save value: false - script: - if set.automatic_card_numbers and not styling.remove_from_autocount then - forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text) - else - combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text) -extra card field: - type: choice - name: artist arrow - editable: false - save value: false - choice: white extra card field: type: choice name: pt box @@ -753,23 +704,16 @@ extra card field: choice: foil save value: false editable: false -extra card field: - type: color - name: stamp border - script: card.border_color - editable: false - show statistics: false extra card field: type: choice - name: stamp + name: stamp border script: card.card_color editable: false show statistics: false extra card field: - type: text - name: auto copyright - script: set.copyright - save value: false + type: color + name: stamp filler + script: card.border_color editable: false show statistics: false extra card field: @@ -789,34 +733,17 @@ extra card field: save value: true editable: true description: Where they put mtgstory.com on story spotlights. + extra card style: - card code: - left: 24 - top: 488 - width: 120 - height: 10 - z index: 1 - font: - name: Relay-Medium - size: 7 - color: { styling.copyright_text_color } - weight: bold - artist arrow: - left: { 28 + card_style.set_code.content_width } - top: 500 - width: 12 - height: 7 - z index: 1 - render style: image - image: { recolor_image("artist_arrow.png", color: styling.copyright_text_color) } pt box: left: 0 top: 0 width: 375 height: 523 - z index: 1 + z index: 840 render style: image - image: { if card.pt != "" then card_ptbox() else card_nonptbox() } + visible: {card.pt != ""} + image: { card_ptbox() } text box: #left: 27 #top: { 320 + shorten_textbox_amount() } @@ -826,7 +753,7 @@ extra card style: top: 0 width: 375 height: 523 - z index: 1 + z index: 600 render style: image image:{ card_textbox() } name bar 1: @@ -834,7 +761,7 @@ extra card style: top: 24 width: 22 height: 56 - z index: 1 + z index: 600 render style: image image: {name1_background()} angle: {if styling.language == "Japanese" then -90 else 0} @@ -843,7 +770,7 @@ extra card style: top: {if styling.language == "Japanese" then 46 else 24} width: {if styling.language == "Japanese" then max(34, jp_name_length()-20) else card_style.name.content_width} height: 56 - z index: 1 + z index: 600 render style: image image: {name2_background()} angle: {if styling.language == "Japanese" then -90 else 0} @@ -852,7 +779,7 @@ extra card style: top: {if styling.language == "Japanese" then 46 + max(34, jp_name_length()-20)-0.5 else 24} width: 22 height: 56 - z index: 1 + z index: 600 render style: image image: {flip_horizontal(name3_background())} angle: {if styling.language == "Japanese" then -90 else 0} @@ -861,23 +788,23 @@ extra card style: top: { 289 + shorten_textbox_amount() } width: 15 height: 30 - z index: 1 + z index: 600 render style: image image: {type1_background()} type bar 2: left: 37 top: { 289 + shorten_textbox_amount() } - width: {min(254,max(96, card_style.type.content_width+(if styling.color_indicator_dot then 19 else 0)))} + width: {min(254,max(96, card_style.type.content_width+(if has_identity() then 19 else 0)))} height: 30 - z index: 1 + z index: 600 render style: image image: {type2_background()} type bar 3: - left: {37+min(254,max(96, card_style.type.content_width+(if styling.color_indicator_dot then 19 else 0)))-0.4} + left: {37+min(254,max(96, card_style.type.content_width+(if has_identity() then 19 else 0)))-0.4} top: { 289 + shorten_textbox_amount() } width: 15 height: 30 - z index: 1 + z index: 600 render style: image image: {flip_horizontal(type3_background())} foil layer: @@ -885,45 +812,33 @@ extra card style: top : 0 width: 375 height: 523 - z index: 3 + z index: 1050 render style: image image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"} - mask: { "foil_mask" + (if card.pt != "" then "_pt" else "") + (if is_rare() and styling.use_holofoil_stamps then "_rare" else "") + ".png" } + mask: { "foil_mask" + (if card.pt != "" then "_pt" else "") + (if is_stamped() then "_rare" else "") + ".png" } stamp border: left: 0 top: 0 width: 375 height: 523 - z index: 1 - visible: { is_rare() and styling.use_holofoil_stamps } - mask: stamp_mask.png - stamp: + z index: 600 + render style: image + visible: { card.card_stamp != "none" } + image: { if stamp_shape() == "triangle" then card_stamp_triangle() else card_stamp() } + stamp filler: left: 0 - top: 0 + top: 4 width: 375 height: 523 - z index: 1 - render style: image - image: { if is_rare() and styling.use_holofoil_stamps then card_stamp() else card_nonstamp() } - auto copyright: - right: 350 - top: { if card.pt != "" then 500 else 493 } - width: 140 - height: 10 - z index: 2 - alignment: middle right shrink-overflow - visible: {set.automatic_copyright} - font: - name: Matrix - size: 7 - color: { styling.copyright_text_color } - weight: bold + z index: 850 + visible: { card.card_stamp != "none" } + mask: { "stamp/" + (if stamp_shape() == "triangle" then "triangle" else "round") + "_mask.png" } flavor bar: left: 0 top: { bar_equation() } width: 375 height: 1 - z index: 1 + z index: 740 render style: image image: bar.png visible: { card.rule_text != "" and remove_tags(card.flavor_text) != "" and set.use_flavor_bar } @@ -935,7 +850,7 @@ extra card style: direction: vertical alignment: top center shrink-overflow padding bottom: 0 - z index: 2 + z index: 900 font: name: Beleren Bold size: {13 - shrink_name()} @@ -950,7 +865,7 @@ extra card style: top: {if card.pt == "" and shown_cr() then 502 else 488} width: { 70 } height: 10 - z index: 3 + z index: 900 alignment: middle right font: name: Relay-Medium diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/textbox_masks/pt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/textbox_masks/pt.png new file mode 100644 index 000000000..83bc9a4cf Binary files /dev/null and b/data/magic-m15-showcase-strixhaven-jp.mse-style/textbox_masks/pt.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/textbox_masks/round.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/textbox_masks/round.png new file mode 100644 index 000000000..cadbc155b Binary files /dev/null and b/data/magic-m15-showcase-strixhaven-jp.mse-style/textbox_masks/round.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/textbox_masks/triangle.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/textbox_masks/triangle.png new file mode 100644 index 000000000..b64cc051e Binary files /dev/null and b/data/magic-m15-showcase-strixhaven-jp.mse-style/textbox_masks/triangle.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/gnonstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/astamp.png similarity index 58% rename from data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/gnonstamp.png rename to data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/astamp.png index 76475003a..860a7312a 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/gnonstamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/astamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/anonstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/bstamp.png similarity index 58% rename from data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/anonstamp.png rename to data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/bstamp.png index 5ec4a307b..730a32341 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/anonstamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/bstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/unonpt.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/cstamp.png similarity index 58% rename from data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/unonpt.png rename to data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/cstamp.png index c2171df48..9f5c3c0f9 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonpt/unonpt.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/cstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/bnonstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/gstamp.png similarity index 58% rename from data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/bnonstamp.png rename to data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/gstamp.png index a426deece..6a0bfe952 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/bnonstamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/gstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/unonstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/mstamp.png similarity index 58% rename from data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/unonstamp.png rename to data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/mstamp.png index 21cf4010a..f5028fbb5 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/nonstamp/unonstamp.png and b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/mstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/rstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/rstamp.png new file mode 100644 index 000000000..64dde40ba Binary files /dev/null and b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/rstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/ustamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/ustamp.png new file mode 100644 index 000000000..5c0cba78a Binary files /dev/null and b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/ustamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/wstamp.png b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/wstamp.png new file mode 100644 index 000000000..57a5ac010 Binary files /dev/null and b/data/magic-m15-showcase-strixhaven-jp.mse-style/triangle/wstamp.png differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/acard.png b/data/magic-m15-showcase-strixhaven.mse-style/acard.png index ab9a2b15b..9f339a877 100644 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/acard.png and b/data/magic-m15-showcase-strixhaven.mse-style/acard.png differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/artist_arrow.png b/data/magic-m15-showcase-strixhaven.mse-style/artist_arrow.png deleted file mode 100644 index ea39aa438..000000000 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/artist_arrow.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/bcard.png b/data/magic-m15-showcase-strixhaven.mse-style/bcard.png index 8504f9847..cb873986d 100644 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/bcard.png and b/data/magic-m15-showcase-strixhaven.mse-style/bcard.png differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/ccard.png b/data/magic-m15-showcase-strixhaven.mse-style/ccard.png index 1bd13e0f6..f745f8379 100644 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/ccard.png and b/data/magic-m15-showcase-strixhaven.mse-style/ccard.png differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/foil_stamp.png b/data/magic-m15-showcase-strixhaven.mse-style/foil_stamp.png deleted file mode 100644 index 375256851..000000000 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/foil_stamp.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/gcard.png b/data/magic-m15-showcase-strixhaven.mse-style/gcard.png index bbc88f17f..36097428b 100644 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/gcard.png and b/data/magic-m15-showcase-strixhaven.mse-style/gcard.png differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/mcard.png b/data/magic-m15-showcase-strixhaven.mse-style/mcard.png index 3211ce91c..208266c7f 100644 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/mcard.png and b/data/magic-m15-showcase-strixhaven.mse-style/mcard.png differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/rcard.png b/data/magic-m15-showcase-strixhaven.mse-style/rcard.png index a85e40aa7..917dba3f1 100644 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/rcard.png and b/data/magic-m15-showcase-strixhaven.mse-style/rcard.png differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/stamp_mask.png b/data/magic-m15-showcase-strixhaven.mse-style/stamp_mask.png deleted file mode 100644 index 3a640c886..000000000 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/stamp_mask.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/style b/data/magic-m15-showcase-strixhaven.mse-style/style index 91e008be1..a85aaa49e 100644 --- a/data/magic-m15-showcase-strixhaven.mse-style/style +++ b/data/magic-m15-showcase-strixhaven.mse-style/style @@ -6,7 +6,7 @@ icon: card-sample.png installer group: magic/m15 style/normal cards position hint: 095 -version: 2021-06-01 +version: 2024-05-25 depends on: package: magic.mse-game version: 2014-06-25 @@ -14,8 +14,8 @@ depends on: package: magic-default-image.mse-include version: 2007-09-23 depends on: - package: magic-watermarks.mse-include - version: 2007-09-23 + package: magic-modules.mse-include + version: 2024-05-20 depends on: package: magic-identity-new.mse-include version: 2012-01-22 @@ -28,6 +28,9 @@ depends on: depends on: package: magic-mainframe-extras.mse-include version: 2007-09-23 +depends on: + package: magic-watermarks.mse-include + version: 2007-09-23 card width: 375 card height: 523 @@ -47,14 +50,27 @@ init script: #Should multicolor lands with basic land types have a colored name? mask_multi_land_with_color := { styling.colored_multicolor_land_name } - template_prefix := [card: "" card2:"back/" crown:"crown/" pt: "" stamp: "" identity: "/magic-identity-new.mse-include/"] - template_suffix := [card: "card.png" card2:"card.png" crown:"crown.png" pt: "pt.png" stamp: "stamp.jpg" identity: "identity.png"] + template_prefix := [ + card: "", + card2:"back/", + crown:"crown/", + pt: "", + stamp: "", + identity: "/magic-modules.mse-include/indicators/" + ] + template_suffix := [ + card: "card.png", + card2:"card.png", + crown:"crown.png", + pt: "pt.png", + stamp: "stamp.jpg", + identity: "identity.png" + ] template := { template_prefix[type] + input + template_suffix[type] } land_template := { template_prefix[type] + (if input == "a" then "c" else input) + template_suffix[type] } # Use land templates for previews because they show more contrast hybrid_previews := "land,hybrid" crown_background := { color_background(type:"crown", base_hybrid:card_hybrid) } - hedron_background := { color_background(type:"card2", base_hybrid:card_hybrid) } # Use the normal tap symbol mana_t := { @@ -68,7 +84,6 @@ init script: # Is the card a promo card? is_promo := { styling.promo } - is_legend := {set.auto_legends and contains(card.super_type, match:"Legendary") } mana_sort := { if styling.unsorted_casting_cost then input @@ -76,7 +91,6 @@ init script: sort_text@(order: "XYZI[0123456789]HSCA(WUBRG)")() } ancestral_mana := { styling.ancestral_mana_symbols } - has_identity := { styling.color_indicator_dot } is_unsorted := {styling.remove_from_autocount} chop_top := {to_number(pull_comma_array(styling.text_chops, cell:0, end:false))} @@ -84,10 +98,16 @@ init script: chop_correction := { chop_bot() } shrink_type := {if styling.shrink_typeline_text != "" then to_number(styling.shrink_typeline_text) else 0} shrink_name := {if styling.shrink_name_text != "" then to_number(styling.shrink_name_text) else 0} - use_main_rarity := { contains(set.mainframe_rarity_name, match: ".png")} - un_png := replace@(match:".png", replace: "") - is_vehicle := {contains(card.type, match:"Vehicle")} + typeline_offset_top_1 := {2} + indicator_offset_left_1 := {-3} + type_offset_left_1 := {3} + + default_partition := { + if styling.default_partition != "no override" + then styling.default_partition + else "A" + } ############################################################## Set info fields set info style: symbol: @@ -110,20 +130,18 @@ styling field: type: text name: shrink typeline text description: Shrinks type X pixels -styling field: - type: boolean - name: use holofoil stamps - description: Change to no to disable rare holofoil stamps -styling field: - type: boolean - name: color indicator dot - description: Use the color indicator dot - initial: no styling field: type: boolean name: remove from autocount description: Removes the automatic card number for specific cards, to allow for overcounted cards like in Planeswalker Decks. initial: no +styling field: + type: choice + name: default partition + description: Should this template use a different default parition? + choice: no override + include file: /magic-modules.mse-include/information/choices_partition +include file: /magic-modules.mse-include/stamps/styling_fields styling field: type: boolean name: grey hybrid name @@ -160,6 +178,11 @@ styling field: name: text box mana symbols match: magic-mana-*.mse-symbol-font initial: magic-mana-small.mse-symbol-font +styling field: + type: package choice + name: casting cost mana symbols + match: magic-mana-*.mse-symbol-font + initial: magic-mana-small-strixhaven.mse-symbol-font styling field: type: choice name: center text @@ -183,6 +206,13 @@ styling field: name: inverted common symbol description: Should the common rarity symbol be inverted, like in Coldsnap? initial: no +styling field: + type: choice + name: corners + description: What should the corners of the card look like? + include file: /magic-modules.mse-include/corners/choices + initial: rounded and antialiased +include file: /magic-modules.mse-include/fonts/styling_fields styling field: type: package choice name: overlay @@ -211,6 +241,12 @@ styling style: no: { symbol_variation(symbol: set.symbol, variation: "common") } yes: { symbol_variation(symbol: set.symbol, variation: "invertedcommon") } ############################################################## Card fields +include file: /magic-modules.mse-include/corners/card_fields +include file: /magic-modules.mse-include/namelines/card_fields +include file: /magic-modules.mse-include/typelines/card_fields +include file: /magic-modules.mse-include/watermarks/card_fields +include file: /magic-modules.mse-include/information/card_fields +include file: /magic-modules.mse-include/stamps/card_fields card style: ############################# Background stuff card color: @@ -218,112 +254,20 @@ card style: top: 0 width: 375 height: 523 - z index: 0 + z index: 200 render style: image popup style: in place image: { card_background() } mask: frame_mask.png - ############################# Name line - name: - left: 32 - top: 30 - right: { 341 - card_style.casting_cost.content_width } - height: {23 - 0.5*shrink_name()} - alignment: bottom shrink-overflow - padding bottom: 0 - z index: 1 - font: - name: Beleren Bold - size: {16 - shrink_name()} - color: black - casting cost: - right: 346 - top: 29 - width: { max(30, card_style.casting_cost.content_width) + 5 } - height: 23 - alignment: middle right - font: - name: MPlantin - size: 15 - symbol font: - name: magic-mana-small-strixhaven - size: 15 - alignment: middle right - always symbol: true - z index: 2 - padding top: 0 ############################# Image image: left: 0 top: 64 width: 375 height: 397 - z index: -1 + z index: 100 default: {default_image(card.card_color)} mask: imagemask.png - ############################# Card type - indicator: - left: 28 - top: 301 - width: 17 - height: 17 - z index: 1 - render style: image - visible: { has_identity() } - image: { card_identity() } - type: - left: { if has_identity() then 50 else 30 } - top: {shrink_type() + 297 } - 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 - padding top: 2 - font: - name: Beleren Bold - size: {13 - shrink_type()} - color: black - separator color: red - rarity: - right: 344 - top: 298 - width: 44 - height: 22 - z index: 2 - render style: image - alignment: middle right - choice images: - # Images based on the set symbol - basic land: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "c.png" - else if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon") - else symbol_variation(symbol: set.symbol, variation: "common") - common: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "c.png" - else if styling.inverted_common_symbol then symbol_variation(symbol: set.symbol, variation: "invertedcommon") - else symbol_variation(symbol: set.symbol, variation: "common") - uncommon: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "u.png" - else symbol_variation(symbol: set.symbol, variation: "uncommon") - rare: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "r.png" - else symbol_variation(symbol: set.symbol, variation: "rare") - mythic rare: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "m.png" - else symbol_variation(symbol: set.symbol, variation: "mythic rare") - special: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "s.png" - else symbol_variation(symbol: set.symbol, variation: "special") - masterpiece: - script: - if use_main_rarity() then "/magic-mainframe-extras.mse-include/" + un_png(set.mainframe_rarity_name) + "mp.png" - else symbol_variation(symbol: set.masterpiece_symbol, variation: "mythic rare") ############################# Text box text: left: 29 @@ -342,14 +286,14 @@ card style: scale down to: 6 alignment: script: - if (styling.center_text == "short text only" and - not contains(match:"\n", card.rule_text) and - card.flavor_text == "" and - card_style.text.content_lines <= 2) or - styling.center_text == "always" + if (styling.center_text == "short text only" and + not contains(match:"\n", card.rule_text) and + card.flavor_text == "" and + card_style.text.content_lines <= 2) or + 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 } @@ -357,93 +301,26 @@ card style: line height soft: 0.9 line height hard max: {if is_modal(card.rule_text) then 1.0 else 1.3 } line height line max: 1.6 - watermark: - left: 25 - top: 338 - width: 324 - height: 139 - z index: 1 - render style: image - popup style: in place - alignment: middle center - include file: /magic-watermarks.mse-include/watermarks ############################# PT pt: - z index: 2 left: 292 top: 467 width: 60 height: 28 + z index: 900 alignment: center middle shrink-overflow font: name: Beleren Bold size: 15 color: black separator color: red - ############################# Card sorting / numbering - set code: - left: 24 - top: 498 - width: 40 - height: 10 - z index: 1 - font: - name: Relay-Medium - size: 7 - color: white - weight: bold - ############################# Copyright stuff - illustrator: - left: { 44 + card_style.set_code.content_width } - top: 497.5 - width: 200 - height: 10 - z index: 1 - font: - name: Beleren Small Caps Bold - size: 7.25 - color: white - copyright: - right: 350 - top: { if card.pt != "" then 500 else 493 } - width: 140 - height: 10 - z index: 2 - visible: {not set.automatic_copyright} - alignment: middle right shrink-overflow - font: - name: Matrix - size: 7 - color: white - weight: bold ############################################################## Extra card fields -extra card field: - type: text - name: card code - save value: false - script: - if set.automatic_card_numbers and not styling.remove_from_autocount then - forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text) - else - combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text) -extra card field: - type: choice - name: artist arrow - editable: false - save value: false - choice: white extra card field: type: choice name: pt box script: card.card_color editable: false save value: false -extra card field: - type: choice - name: foil stamp - choice: stamp - save value: false - editable: false extra card field: type: choice name: foil layer @@ -455,13 +332,7 @@ extra card field: name: stamp script: card.card_color show statistics: false -extra card field: - type: text - name: auto copyright - script: set.copyright - save value: false editable: false - show statistics: false extra card field: type: choice name: flavor bar @@ -469,32 +340,14 @@ extra card field: editable: false save value: false show statistics: false + extra card style: - card code: - left: 24 - top: 488 - width: 120 - height: 10 - z index: 1 - font: - name: Relay-Medium - size: 7 - color: white - weight: bold - artist arrow: - left: { 28 + card_style.set_code.content_width } - top: 500 - width: 12 - height: 7 - z index: 1 - render style: image - image: artist_arrow.png pt box: left: 263 top: 467 width: 83 height: 27 - z index: 1 + z index: 840 visible: { card.pt != "" } render style: image image: pt.png @@ -503,7 +356,7 @@ extra card style: top : 0 width: 375 height: 523 - z index: 3 + z index: 1050 render style: image image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"} mask: { if is_rare() then "foil_mask_rare.png" else "foil_mask.png" } @@ -512,38 +365,16 @@ extra card style: top: 472 width: 46 height: 26 - z index: 1 - visible: { is_rare() and styling.use_holofoil_stamps } + z index: 850 + visible: { card.card_stamp != "none" } render style: image - image: stamp.png - foil stamp: - left: 165 - top: 472 - width: 46 - height: 26 - z index: 2 - visible: { is_rare() and styling.use_holofoil_stamps } - render style: image - image: foil_stamp.png - auto copyright: - right: 350 - top: { if card.pt != "" then 500 else 493 } - width: 140 - height: 10 - z index: 2 - alignment: middle right shrink-overflow - visible: {set.automatic_copyright} - font: - name: Matrix - size: 7 - color: white - weight: bold + image: { "/magic-modules.mse-include/stamps/backs/" + (if stamp_shape(field:1) == "triangle" then "triangle_stamp.png" else "stamp.png") } flavor bar: left: 0 top: { bar_equation() } width: 375 height: 1 - z index: 1 + z index: 740 render style: image image: bar.png visible: { card.rule_text != "" and remove_tags(card.flavor_text) != "" and set.use_flavor_bar } diff --git a/data/magic-m15-showcase-strixhaven.mse-style/ucard.png b/data/magic-m15-showcase-strixhaven.mse-style/ucard.png index 3aad02f76..7591c4e8a 100644 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/ucard.png and b/data/magic-m15-showcase-strixhaven.mse-style/ucard.png differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/ustamp.png b/data/magic-m15-showcase-strixhaven.mse-style/ustamp.png deleted file mode 100644 index 2688b4260..000000000 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/ustamp.png and /dev/null differ diff --git a/data/magic-m15-showcase-strixhaven.mse-style/wcard.png b/data/magic-m15-showcase-strixhaven.mse-style/wcard.png index f8312d02f..9f425d3a0 100644 Binary files a/data/magic-m15-showcase-strixhaven.mse-style/wcard.png and b/data/magic-m15-showcase-strixhaven.mse-style/wcard.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/acard.png b/data/magic-m15-unstable-basics.mse-style/acard.png index d8f2d8dfd..7ef24f672 100644 Binary files a/data/magic-m15-unstable-basics.mse-style/acard.png and b/data/magic-m15-unstable-basics.mse-style/acard.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/acard2.png b/data/magic-m15-unstable-basics.mse-style/acard2.png deleted file mode 100644 index 6f1d9257e..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/acard2.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/artifact_blend_card2.png b/data/magic-m15-unstable-basics.mse-style/artifact_blend_card2.png deleted file mode 100644 index 6d373f3d2..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/artifact_blend_card2.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/artifact_blend_stamp.png b/data/magic-m15-unstable-basics.mse-style/artifact_blend_stamp.png new file mode 100644 index 000000000..baa9e705a Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/artifact_blend_stamp.png differ diff --git a/data/magic-m15-showcase-strixhaven-jp.mse-style/artist_arrow.png b/data/magic-m15-unstable-basics.mse-style/artifact_blend_triangle_stamp.png similarity index 59% rename from data/magic-m15-showcase-strixhaven-jp.mse-style/artist_arrow.png rename to data/magic-m15-unstable-basics.mse-style/artifact_blend_triangle_stamp.png index 12faa8735..94c484cad 100644 Binary files a/data/magic-m15-showcase-strixhaven-jp.mse-style/artist_arrow.png and b/data/magic-m15-unstable-basics.mse-style/artifact_blend_triangle_stamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/artist_arrow.png b/data/magic-m15-unstable-basics.mse-style/artist_arrow.png deleted file mode 100644 index ea39aa438..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/artist_arrow.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/bcard.png b/data/magic-m15-unstable-basics.mse-style/bcard.png index 3f6f36829..4d4701557 100644 Binary files a/data/magic-m15-unstable-basics.mse-style/bcard.png and b/data/magic-m15-unstable-basics.mse-style/bcard.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/bcard2.png b/data/magic-m15-unstable-basics.mse-style/bcard2.png deleted file mode 100644 index 590488018..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/bcard2.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/card-sample2.png b/data/magic-m15-unstable-basics.mse-style/card-sample2.png deleted file mode 100644 index cd19868f5..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/card-sample2.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/ccard.png b/data/magic-m15-unstable-basics.mse-style/ccard.png index 70261f2b0..38c248409 100644 Binary files a/data/magic-m15-unstable-basics.mse-style/ccard.png and b/data/magic-m15-unstable-basics.mse-style/ccard.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/ccard2.png b/data/magic-m15-unstable-basics.mse-style/ccard2.png deleted file mode 100644 index 6f1d9257e..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/ccard2.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/correct.png b/data/magic-m15-unstable-basics.mse-style/correct.png deleted file mode 100644 index 99405a4d5..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/correct.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/frame_mask.png b/data/magic-m15-unstable-basics.mse-style/frame_mask.png index ceeecd357..ca2ba769c 100644 Binary files a/data/magic-m15-unstable-basics.mse-style/frame_mask.png and b/data/magic-m15-unstable-basics.mse-style/frame_mask.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/frame_mask_gold.png b/data/magic-m15-unstable-basics.mse-style/frame_mask_gold.png deleted file mode 100644 index 0d7bdb7f1..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/frame_mask_gold.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/frame_mask_no_top.png b/data/magic-m15-unstable-basics.mse-style/frame_mask_no_top.png new file mode 100644 index 000000000..63cd580d1 Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/frame_mask_no_top.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/frame_mask_rare.png b/data/magic-m15-unstable-basics.mse-style/frame_mask_rare.png deleted file mode 100644 index 6db18298c..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/frame_mask_rare.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/frame_mask_rare_gold.png b/data/magic-m15-unstable-basics.mse-style/frame_mask_rare_gold.png deleted file mode 100644 index d5fa49af8..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/frame_mask_rare_gold.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/gcard.png b/data/magic-m15-unstable-basics.mse-style/gcard.png index 27fa9d4bd..258472dce 100644 Binary files a/data/magic-m15-unstable-basics.mse-style/gcard.png and b/data/magic-m15-unstable-basics.mse-style/gcard.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/gcard2.png b/data/magic-m15-unstable-basics.mse-style/gcard2.png deleted file mode 100644 index f5d656f2c..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/gcard2.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/hybrid_blend_card2.png b/data/magic-m15-unstable-basics.mse-style/hybrid_blend_card2.png deleted file mode 100644 index 8ed84a3d5..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/hybrid_blend_card2.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/hybrid_blend_stamp.png b/data/magic-m15-unstable-basics.mse-style/hybrid_blend_stamp.png new file mode 100644 index 000000000..66edc442b Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/hybrid_blend_stamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/hybrid_blend_triangle_stamp.png b/data/magic-m15-unstable-basics.mse-style/hybrid_blend_triangle_stamp.png new file mode 100644 index 000000000..8b8158681 Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/hybrid_blend_triangle_stamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/image_mask.png b/data/magic-m15-unstable-basics.mse-style/image_mask.png index eb2fbcb1f..04c04d399 100644 Binary files a/data/magic-m15-unstable-basics.mse-style/image_mask.png and b/data/magic-m15-unstable-basics.mse-style/image_mask.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/image_mask_rare.png b/data/magic-m15-unstable-basics.mse-style/image_mask_rare.png index d409bbb16..c6a983040 100644 Binary files a/data/magic-m15-unstable-basics.mse-style/image_mask_rare.png and b/data/magic-m15-unstable-basics.mse-style/image_mask_rare.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/mcard.png b/data/magic-m15-unstable-basics.mse-style/mcard.png index e2f30ed40..ac30e2ffc 100644 Binary files a/data/magic-m15-unstable-basics.mse-style/mcard.png and b/data/magic-m15-unstable-basics.mse-style/mcard.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/mcard2.png b/data/magic-m15-unstable-basics.mse-style/mcard2.png deleted file mode 100644 index d0636e62a..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/mcard2.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/multicolor_blend_card2.png b/data/magic-m15-unstable-basics.mse-style/multicolor_blend_card2.png deleted file mode 100644 index 3a7e80420..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/multicolor_blend_card2.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/multicolor_blend_stamp.png b/data/magic-m15-unstable-basics.mse-style/multicolor_blend_stamp.png new file mode 100644 index 000000000..549f569df Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/multicolor_blend_stamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/multicolor_blend_triangle_stamp.png b/data/magic-m15-unstable-basics.mse-style/multicolor_blend_triangle_stamp.png new file mode 100644 index 000000000..a166488be Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/multicolor_blend_triangle_stamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/rcard.png b/data/magic-m15-unstable-basics.mse-style/rcard.png index b3b044920..d1cbd4818 100644 Binary files a/data/magic-m15-unstable-basics.mse-style/rcard.png and b/data/magic-m15-unstable-basics.mse-style/rcard.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/rcard2.png b/data/magic-m15-unstable-basics.mse-style/rcard2.png deleted file mode 100644 index 7ec6d76bc..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/rcard2.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/stamp/astamp.png b/data/magic-m15-unstable-basics.mse-style/stamp/astamp.png new file mode 100644 index 000000000..b8f1a6acd Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/stamp/astamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/stamp/bstamp.png b/data/magic-m15-unstable-basics.mse-style/stamp/bstamp.png new file mode 100644 index 000000000..f07dd4422 Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/stamp/bstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/stamp/cstamp.png b/data/magic-m15-unstable-basics.mse-style/stamp/cstamp.png new file mode 100644 index 000000000..5606f9e8d Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/stamp/cstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/stamp/gstamp.png b/data/magic-m15-unstable-basics.mse-style/stamp/gstamp.png new file mode 100644 index 000000000..1e2ebd5e9 Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/stamp/gstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/stamp/mstamp.png b/data/magic-m15-unstable-basics.mse-style/stamp/mstamp.png new file mode 100644 index 000000000..105860ccf Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/stamp/mstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/stamp/rstamp.png b/data/magic-m15-unstable-basics.mse-style/stamp/rstamp.png new file mode 100644 index 000000000..e776e8cce Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/stamp/rstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/stamp/ustamp.png b/data/magic-m15-unstable-basics.mse-style/stamp/ustamp.png new file mode 100644 index 000000000..740fbe5f4 Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/stamp/ustamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/stamp/wstamp.png b/data/magic-m15-unstable-basics.mse-style/stamp/wstamp.png new file mode 100644 index 000000000..4fd4b23a4 Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/stamp/wstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/style b/data/magic-m15-unstable-basics.mse-style/style index cfe5dee0c..2708e78b1 100644 --- a/data/magic-m15-unstable-basics.mse-style/style +++ b/data/magic-m15-unstable-basics.mse-style/style @@ -6,7 +6,7 @@ icon: card-sample.png installer group: magic/m15 style/normal cards position hint: 900 -version: 2018-02-08 +version: 2024-05-26 depends on: package: magic.mse-game version: 2014-06-25 @@ -17,8 +17,8 @@ depends on: package: magic-watermarks.mse-include version: 2007-09-23 depends on: - package: magic-identity-new.mse-include - version: 2012-01-22 + package: magic-modules.mse-include + version: 2024-05-20 depends on: package: magic-mana-large.mse-symbol-font version: 2007-09-23 @@ -39,13 +39,14 @@ init script: #Should multicolor lands with basic land types have a colored name? - template_prefix := [card: "" card2: "" pt: ""] - template_suffix := [card: "card.png" card2: "card2.png" pt: "pt.png"] + template_prefix := [card: "" stamp: "stamp/" triangle_stamp:"triangle/" pt: ""] + template_suffix := [card: "card.png" stamp: "stamp.png" triangle_stamp: "stamp.png" pt: "pt.png"] template := { template_prefix[type] + input + template_suffix[type] } + land_template := { template_prefix[type] + input + template_suffix[type] } # Use land templates for previews because they show more contrast hybrid_previews := "land,hybrid" - card_background2 := { color_background(type:"card2", base_hybrid:card_hybrid) } + card_stamp_triangle := { color_background(type:"triangle_stamp", base_hybrid:stamp_hybrid) } # Use the normal tap symbol mana_t := { @@ -61,8 +62,6 @@ init script: is_promo := { styling.promo } is_stamped := { styling.holofoil_stamps } - template := { input + "{type}.png" } - land_template := { input + "{type}.png" } is_unsorted := {styling.remove_from_autocount} ############################################################## Set info fields @@ -79,6 +78,10 @@ styling field: type: boolean name: holofoil stamps description: Toggles the holofoil stamp +styling field: + type: boolean + name: name background + description: Toggles the background behind the name styling field: type: boolean name: black names @@ -161,6 +164,9 @@ styling style: no: { symbol_variation(symbol: set.symbol, variation: "common") } yes: { symbol_variation(symbol: set.symbol, variation: "invertedcommon") } ############################################################## Card fields +include file: /magic-modules.mse-include/corners/card_fields +include file: /magic-modules.mse-include/information/card_fields +include file: /magic-modules.mse-include/stamps/card_fields card style: ############################# Background stuff card color: @@ -168,11 +174,12 @@ card style: top: 0 width: 375 height: 523 - z index: 1 + z index: 200 render style: image popup style: in place - image: { if is_stamped() then card_background2() else card_background() } + image: { card_background() } mask: { if is_stamped() then "frame_mask_rare.png" else "frame_mask.png" } + mask: { "frame_mask" + (if styling.name_background then "" else "_no_top") + ".png" } ############################# Name line name: left: 60 @@ -181,7 +188,7 @@ card style: height: 23 alignment: center bottom shrink-overflow padding bottom: 0 - z index: 4 + z index: 900 font: name: Beleren Bold size: 15 @@ -191,62 +198,11 @@ card style: left: 0 top: 0 width: 375 - height: 523 - z index: 0 + height: 482 + z index: 100 default: {default_image(card.card_color)} - mask: { if is_stamped() then "image_mask_rare.png" else "image_mask.png" } - ############################# Card sorting / numbering - set code: - left: 24 - top: 498 - width: 40 - height: 10 - z index: 3 - font: - name: Relay-Medium - size: 7 - color: white - weight: bold - ############################# Copyright stuff - illustrator: - left: { 44 + card_style.set_code.content_width } - top: 497.5 - width: 200 - height: 10 - z index: 3 - font: - name: Beleren Small Caps Bold - size: 7.25 - color: white - copyright: - right: 350 - top: 489 - width: 140 - height: 12 - z index: 3 - visible: {not set.automatic_copyright} - alignment: middle right shrink-overflow - font: - name: Matrix - size: 7.5 - color: white - weight: bold + mask: image_mask.png ############################################################## Extra card fields -extra card field: - type: text - name: card code - save value: false - script: - if set.automatic_card_numbers and not styling.remove_from_autocount then - forward_editor(prefix: card_number_m15() + "/" + card_count_m15() + " " + rarity_code() + " ", field: card.card_code_text) - else - combined_editor(field1: card.custom_card_number, separator: " " + rarity_code() + " ", field2: card.card_code_text) -extra card field: - type: choice - name: artist arrow - editable: false - save value: false - choice: white extra card field: type: choice name: pt box @@ -255,82 +211,32 @@ extra card field: save value: false extra card field: type: choice - name: stamp + name: stamp backing script: card.card_color editable: false save value: false -extra card field: - type: choice - name: foil stamp - choice: stamp - save value: false - editable: false extra card field: type: choice name: foil layer choice: foil save value: false editable: false -extra card field: - type: choice - name: corner patch - choice: patch - save value: false - editable: false -extra card field: - type: text - name: auto copyright - script: set.copyright - save value: false - editable: false - show statistics: false + extra card style: - card code: - left: 24 - top: 488 - width: 120 - height: 10 - z index: 3 - font: - name: Relay-Medium - size: 7 - color: white - weight: bold - artist arrow: - left: { 28 + card_style.set_code.content_width } - top: 500 - width: 12 - height: 7 - z index: 3 - render style: image - image: artist_arrow.png foil layer: left: 0 top : 0 width: 375 height: 523 - z index: 3 + z index: 1050 render style: image image: {if styling.overlay == "" then nil else styling.overlay + "/overlay.png"} mask: { if is_rare() then "foil_mask_rare.png" else "foil_mask.png" } - corner patch: - left: 0 - top: 0 - width: 375 - height: 523 - z index: 1 + stamp backing: + left: 160 + top: 468 + width: 55 + height: 35 render style: image - image: correct.png - auto copyright: - right: 350 - top: { if card.pt != "" then 500 else 488 } - width: 140 - height: 10 - z index: 2 - alignment: middle right shrink-overflow - visible: {set.automatic_copyright} - font: - name: Matrix - size: 7 - color: white - weight: bold + z index: 840 + image: {if stamp_shape() == "triangle" then card_stamp_triangle() else card_stamp() } \ No newline at end of file diff --git a/data/magic-m15-unstable-basics.mse-style/triangle/astamp.png b/data/magic-m15-unstable-basics.mse-style/triangle/astamp.png new file mode 100644 index 000000000..af544de6c Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/triangle/astamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/triangle/bstamp.png b/data/magic-m15-unstable-basics.mse-style/triangle/bstamp.png new file mode 100644 index 000000000..d1bb0d328 Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/triangle/bstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/triangle/cstamp.png b/data/magic-m15-unstable-basics.mse-style/triangle/cstamp.png new file mode 100644 index 000000000..65aacf57b Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/triangle/cstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/triangle/gstamp.png b/data/magic-m15-unstable-basics.mse-style/triangle/gstamp.png new file mode 100644 index 000000000..cd6cb723e Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/triangle/gstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/triangle/mstamp.png b/data/magic-m15-unstable-basics.mse-style/triangle/mstamp.png new file mode 100644 index 000000000..0d4d82a58 Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/triangle/mstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/triangle/rstamp.png b/data/magic-m15-unstable-basics.mse-style/triangle/rstamp.png new file mode 100644 index 000000000..5d721a74f Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/triangle/rstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/triangle/ustamp.png b/data/magic-m15-unstable-basics.mse-style/triangle/ustamp.png new file mode 100644 index 000000000..9a616a122 Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/triangle/ustamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/triangle/wstamp.png b/data/magic-m15-unstable-basics.mse-style/triangle/wstamp.png new file mode 100644 index 000000000..bc5807f1d Binary files /dev/null and b/data/magic-m15-unstable-basics.mse-style/triangle/wstamp.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/ucard.png b/data/magic-m15-unstable-basics.mse-style/ucard.png index 1369273b0..bbaeab72f 100644 Binary files a/data/magic-m15-unstable-basics.mse-style/ucard.png and b/data/magic-m15-unstable-basics.mse-style/ucard.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/ucard2.png b/data/magic-m15-unstable-basics.mse-style/ucard2.png deleted file mode 100644 index 1a5c4efa5..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/ucard2.png and /dev/null differ diff --git a/data/magic-m15-unstable-basics.mse-style/wcard.png b/data/magic-m15-unstable-basics.mse-style/wcard.png index bf0b6391e..cd929d27c 100644 Binary files a/data/magic-m15-unstable-basics.mse-style/wcard.png and b/data/magic-m15-unstable-basics.mse-style/wcard.png differ diff --git a/data/magic-m15-unstable-basics.mse-style/wcard2.png b/data/magic-m15-unstable-basics.mse-style/wcard2.png deleted file mode 100644 index 3a09caca1..000000000 Binary files a/data/magic-m15-unstable-basics.mse-style/wcard2.png and /dev/null differ diff --git a/data/magic-modules.mse-include/information/choices_partition b/data/magic-modules.mse-include/information/choices_partition new file mode 100644 index 000000000..ddad577a4 --- /dev/null +++ b/data/magic-modules.mse-include/information/choices_partition @@ -0,0 +1,52 @@ +choice: + name: before normal + choice: 0 + choice: 1 + choice: 2 + choice: 3 + choice: 4 + choice: 5 + choice: 6 + choice: 7 + choice: 8 + choice: 9 +choice: A +choice: + name: after normal, main set + choice: B + choice: C + choice: D + choice: E + choice: F + choice: G + choice: H + choice: I + choice: J + choice: K + choice: L + choice: M +choice: + name: after main set + choice: N + choice: O + choice: P + choice: Q + choice: R + choice: S + choice: T + choice: U + choice: V + choice: W + choice: X + choice: Y + choice: Z +choice: + name: help + choice: This is the partition selecter + choice: You can use this to sort cards in different sublayers + choice: 0-9 go before the main count, like face commanders + choice: A is the main count + choice: B-M go after, but still count in the set total + choice: N-Z go over the set total, like #301/300 + choice: You can change the flip point in the Set tab if you need to + choice: with option "Last main partition", which defaults to M \ No newline at end of file diff --git a/data/magic-m15-showcase-strixhaven.mse-style/stamp.png b/data/magic-modules.mse-include/stamps/backs/stamp.png similarity index 100% rename from data/magic-m15-showcase-strixhaven.mse-style/stamp.png rename to data/magic-modules.mse-include/stamps/backs/stamp.png diff --git a/data/magic-modules.mse-include/stamps/backs/triangle_stamp.png b/data/magic-modules.mse-include/stamps/backs/triangle_stamp.png new file mode 100644 index 000000000..7aa411d0c Binary files /dev/null and b/data/magic-modules.mse-include/stamps/backs/triangle_stamp.png differ diff --git a/data/magic-modules.mse-include/stamps/styling_fields b/data/magic-modules.mse-include/stamps/styling_fields new file mode 100644 index 000000000..1925a227b --- /dev/null +++ b/data/magic-modules.mse-include/stamps/styling_fields @@ -0,0 +1,15 @@ +styling field: + type: choice + name: default stamp + description: Should this template use a different default stamp? + include file: /magic-modules.mse-include/stamps/style_choices +styling field: + type: choice + name: stamp behavior + description: Should this template use a different stamp behavior? + choice: default + include file: /magic-modules.mse-include/stamps/behavior_choices + +styling style: + default stamp: + include file: /magic.mse-game/stamps/menu_choice_images \ No newline at end of file diff --git a/data/magic.mse-game/card_fields b/data/magic.mse-game/card_fields index dfac518bc..7abdce5b1 100644 --- a/data/magic.mse-game/card_fields +++ b/data/magic.mse-game/card_fields @@ -2597,59 +2597,8 @@ card field: card list name: Partition Select card list column: 620 card list width: 100 - choice: - name: before normal - choice: 0 - choice: 1 - choice: 2 - choice: 3 - choice: 4 - choice: 5 - choice: 6 - choice: 7 - choice: 8 - choice: 9 - choice: A - choice: - name: after normal, main set - choice: B - choice: C - choice: D - choice: E - choice: F - choice: G - choice: H - choice: I - choice: J - choice: K - choice: L - choice: M - choice: - name: after main set - choice: N - choice: O - choice: P - choice: Q - choice: R - choice: S - choice: T - choice: U - choice: V - choice: W - choice: X - choice: Y - choice: Z - choice: - name: help - choice: This is the partition selecter - choice: You can use this to sort cards in different sublayers - choice: 0-9 go before the main count, like face commanders - choice: A is the main count - choice: B-M go after, but still count in the set total - choice: N-Z go over the set total, like #301/300 - choice: You can change the flip point in the Set tab if you need to - choice: with option "Last main partition", which defaults to M - initial: A + include file: /magic-modules.mse-include/information/choices_partition + default: default_partition() card field: type: text name: partition diff --git a/data/magic.mse-game/script b/data/magic.mse-game/script index 15b9493a2..2b70bb517 100644 --- a/data/magic.mse-game/script +++ b/data/magic.mse-game/script @@ -32,7 +32,7 @@ include file: language include file: statistics_script include file: /magic-blends.mse-include/new-blends ############################################################## Versioning -version_date := {"2024-05-24 Mainframe 1.3.b Showcase Catchup: Include Modules"} +version_date := {"2024-05-24 Mainframe 1.3.c Showcase Catchup: Showcase Corners"} version := version_date ############################################################## Common filters ############################################################## Utility @@ -633,10 +633,11 @@ partition_index := { if ind == "" then ind := "A" ind } +default_partition := {"A"} #### determine if a card is "over-partition", ie should be excluded from the main set count over_partition := { mn_pos := if set.last_main_partition == "" then "M" else to_upper(substring(set.last_main_partition, end:1)) - partition_scores[partition_index()] > partition_scores[mn_pos] + (partition_scores[partition_index()] or else 10) > (partition_scores[mn_pos] or else 22) } partition_scores := [ 0:0, 1:1, 2:2, 3:3, 4:4, 5:5, 6:6, 7:7, 8:8, 9:9, @@ -3702,7 +3703,7 @@ nameline_offset_height_3 := { 0 } card_stamp_default := { shape := styling.default_stamp or else set.default_stamp stamp_behavior := styling.stamp_behavior or else set.stamp_behavior - if stamp_behavior == "default" then stamp_behavior := set.stamp_behavior + if stamp_behavior == "default" or stamp_behavior == "flatstamped default" then stamp_behavior := set.stamp_behavior rare_face := is_rare(field:field) stamp_behavior_checks[stamp_behavior](rare_face:rare_face, shape:shape) @@ -3721,12 +3722,10 @@ stamp_behavior_checks := [ ] ### The image to use for custom stamp custom_stamp := { - flat := not is_foil_stamped(field:field) if set.custom_stamp_name != "" and has_png(set.custom_stamp_name) then "/magic-mainframe-extras.mse-include/" + un_png(set.custom_stamp_name) + (if flat then " flat" else "") + ".png" else "/magic-modules.mse-include/stamps/375x523 " + (if flat then "flatstamped " else "") + "heart.png" -}@(field:1) - +}@(flat:false) ### The shape of the background stamp for templates ### This can be overwritten to give a template a special stamp for the heart stamp, for example stamp_shape := { @@ -3759,8 +3758,9 @@ card_stamp_image := dimensions := map.width + "x" + map.height dimensions := card_stamp_possible_dimensions[dimensions] or else (if map.width > map.height then "1039x744" else "744x1039") shape := card_stamp_field(field) + if shape == "default" then shape := set.default_stamp if shape == "custom" or shape == "flatstamped custom" - then custom_stamp(field: field) + then custom_stamp(flat:not is_foil_stamped(field:field)) else "/magic-modules.mse-include/stamps/" + dimensions + " " + shape + ".png" ) ) diff --git a/data/magic.mse-game/stamps/menu_choice_images b/data/magic.mse-game/stamps/menu_choice_images index 134d43817..a6fb9a64d 100644 --- a/data/magic.mse-game/stamps/menu_choice_images +++ b/data/magic.mse-game/stamps/menu_choice_images @@ -6,11 +6,11 @@ choice images: universes beyond: /magic.mse-game/stamps/ub.png alchemy: /magic.mse-game/stamps/alchemy.png alchemy old: /magic.mse-game/stamps/alchemy_old.png - custom: { custom_stamp() } + custom: { custom_stamp(flat:false) } flatstamped standard: /magic.mse-game/stamps/flat_oval.png flatstamped acorn: /magic.mse-game/stamps/flat_acorn.png flatstamped heart: /magic.mse-game/stamps/flat_heart.png flatstamped universes beyond: /magic.mse-game/stamps/flat_ub.png flatstamped alchemy: /magic.mse-game/stamps/flat_alchemy.png flatstamped alchemy old: /magic.mse-game/stamps/flat_alchemy_old.png - flatstamped custom: { custom_stamp() } \ No newline at end of file + flatstamped custom: { custom_stamp(flat:true) } \ No newline at end of file