From 02de1629ceb1dfa9bb4542375213edeaec7ded69 Mon Sep 17 00:00:00 2001 From: pichoro Date: Fri, 29 Jun 2007 05:09:50 +0000 Subject: [PATCH] Moved superfluous fields out of magic-game and into firepenguinmaster tokens, new tokens, and futureshifts. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@444 0fc631ac-6414-0410-93d0-97cfa31319b6 --- .../style | 63 +++++++----- data/magic-new-token.mse-style/style | 98 +++++++++++-------- data/magic.mse-game/game | 53 ---------- 3 files changed, 97 insertions(+), 117 deletions(-) diff --git a/data/magic-firepenguinmastertokens.mse-style/style b/data/magic-firepenguinmastertokens.mse-style/style index bedafb48..86c087ae 100644 --- a/data/magic-firepenguinmastertokens.mse-style/style +++ b/data/magic-firepenguinmastertokens.mse-style/style @@ -194,8 +194,8 @@ card style: rarity: left: - { if card.type_image == "" then 20 - else 75 } + { if card.type != "" or card.illustrator != "" or card.copyright != "" then 75 + else 23 } top : 468 width: 22 height: 22 @@ -245,29 +245,6 @@ card style: alignment: middle center visible: { card.rule_text != "" and card.flavor_text != "" } include file: magic-watermarks.mse-include/watermarks - textbox: - left: 52 - top: 405 - width: 299 - height: 55 - render style: image - popup style: in place - visible: - { if card.rule_text != "" then 1 - else if number_of_items(in:"" + card.flavor_text) > 21 then 1 - else 0 } - include file: magic-blends.mse-include/card-textboxes - z index: 2 - type image: - left: 53 - top: 463 - width: 304 - height: 41 - render style: image - popup style: in place - visible: { card.type != "" or card.illustrator != "" or card.copyright != "" } - include file: magic-blends.mse-include/card-typelines - z index: 2 ############################# PT power: @@ -339,6 +316,19 @@ extra card field: name: pt symbols script: "shieldsword" editable: false +extra card field: + type: choice + name: textbox + include file: magic-blends.mse-include/card-colors + default: card.card_color + show statistics: false +extra card field: + type: choice + name: type image + include file: magic-blends.mse-include/card-colors + default: card.card_color + show statistics: false + extra card style: pt symbols: left: 25 @@ -350,3 +340,26 @@ extra card style: render style: image choice images: shieldsword: ptshieldsword.png + textbox: + left: 52 + top: 405 + width: 299 + height: 55 + render style: image + popup style: in place + visible: + { if card.rule_text != "" then 1 + else if number_of_items(in:"" + card.flavor_text) > 21 then 1 + else 0 } + include file: magic-blends.mse-include/card-textboxes + z index: 2 + type image: + left: 53 + top: 463 + width: 304 + height: 41 + render style: image + popup style: in place + visible: { card.type != "" or card.illustrator != "" or card.copyright != "" } + include file: magic-blends.mse-include/card-typelines + z index: 2 diff --git a/data/magic-new-token.mse-style/style b/data/magic-new-token.mse-style/style index 977c0591..9dbda055 100644 --- a/data/magic-new-token.mse-style/style +++ b/data/magic-new-token.mse-style/style @@ -180,45 +180,6 @@ card style: alignment: bottom center always symbol: true -# name box: -# left: script: card_style.name.content_width * -.5 + 172 -# top: 25 -# width: script: card_style.name.content_width + 1 -# height: 35 -# z index: 2 -# visible: -# script: card.name != "" -# render style: image -# mask: name_mask.png -# choice images: -# black: name.jpg - -# name box left: -# right: script: card_style.name.content_width * -.5 + 172 -# top: 25 -# width: 15 -# height: 35 -# z index: 2 -# visible: -# script: card.name != "" -# render style: image -# mask: name_l_mask.png -# choice images: -# black: name_l.jpg - -# name box right: -# left: script: card_style.name.content_width * .5 + 173 -# top: 25 -# width: 15 -# height: 35 -# z index: 2 -# visible: -# script: card.name != "" -# render style: image -# mask: name_r_mask.png -# choice images: -# black: name_r.jpg - ############################# Image image: left: 30 @@ -387,6 +348,27 @@ extra card field: name: pt box script: card.card_color editable: false +extra card field: + type: choice + name: name box + choice: black + editable: false + save value: false + show statistics: false +extra card field: + type: choice + name: name box left + choice: black + editable: false + save value: false + show statistics: false +extra card field: + type: choice + name: name box right + choice: black + editable: false + save value: false + show statistics: false extra card style: pt box: @@ -400,3 +382,41 @@ extra card style: render style: image mask: mask_pt.png include file: magic-blends.mse-include/card-ptboxes +# name box: +# left: script: card_style.name.content_width * -.5 + 172 +# top: 25 +# width: script: card_style.name.content_width + 1 +# height: 35 +# z index: 2 +# visible: +# script: card.name != "" +# render style: image +# mask: name_mask.png +# choice images: +# black: name.jpg + +# name box left: +# right: script: card_style.name.content_width * -.5 + 172 +# top: 25 +# width: 15 +# height: 35 +# z index: 2 +# visible: +# script: card.name != "" +# render style: image +# mask: name_l_mask.png +# choice images: +# black: name_l.jpg + +# name box right: +# left: script: card_style.name.content_width * .5 + 173 +# top: 25 +# width: 15 +# height: 35 +# z index: 2 +# visible: +# script: card.name != "" +# render style: image +# mask: name_r_mask.png +# choice images: +# black: name_r.jpg diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 0908a6b3..f2768588 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -557,44 +557,6 @@ card field: choice: none choice: tombstone description: Symbol for this card (tombstone) -#for use in futureshifts -card field: - type: choice - name: type symbol - choice: none - choice: creature - choice: enchantment - choice: sorcery - choice: instant - choice: artifact - choice: land - choice: multitype - description: Symbol for the type of this card (claw marks, chalice, lightning bolt) - show statistics: false -# Part of Name box for new token template -card field: - type: choice - name: name box - choice: black - editable: false - save value: false - show statistics: false -# Part of Name box for new token template -card field: - type: choice - name: name box left - choice: black - editable: false - save value: false - show statistics: false -# Part of Name box for new token template -card field: - type: choice - name: name box right - choice: black - editable: false - save value: false - show statistics: false ############################# Image card field: @@ -678,21 +640,6 @@ card field: icon: stats/watermark.png include file: magic-watermarks.mse-include/watermark-names description: A watermark for below the textbox, this can be a big mana symbol used on basic lands, or a guild symbol -#Required for FPM temps; tried moving to stylesheet; caused errors -card field: - type: choice - name: textbox - include file: magic-blends.mse-include/card-colors - default: card.card_color - save value: false - show statistics: false -#Required for FPM temps; tried moving to stylesheet; caused errors -card field: - type: choice - name: type image - include file: magic-blends.mse-include/card-colors - default: card.card_color - show statistics: false ############################# PT card field: