From 59d0aee4e72a46433e95c3769537cf99fc613a83 Mon Sep 17 00:00:00 2001 From: coppro Date: Sun, 17 Jun 2007 01:56:15 +0000 Subject: [PATCH] Fixed line heights on styles Added tournament pack entry for pack generation. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@426 0fc631ac-6414-0410-93d0-97cfa31319b6 --- Makefile.am | 90 +++++++++---------- data/magic-extended-art.mse-style/style | 1 + .../style | 1 + data/magic-firepenguinmaster.mse-style/style | 1 + .../style | 1 + .../style | 1 + .../style | 1 + data/magic-new-flip.mse-style/style | 1 + data/magic-new-promo.mse-style/style | 1 + data/magic-new.mse-style/style | 1 + data/magic-old-split.mse-style/style | 1 + data/magic-old-token.mse-style/style | 1 + data/magic-old.mse-style/style | 1 + data/magic-planeshifted.mse-style/style | 1 + data/magic.mse-game/game | 42 ++++++++- 15 files changed, 96 insertions(+), 49 deletions(-) diff --git a/Makefile.am b/Makefile.am index 85041145..f8a69730 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,7 +14,7 @@ AM_LDFLAGS = @WX_LIBS@ magicseteditor_SOURCES = -# The script used to generate is MakeAM. +# The script used to generate is MakeAM.sh magicseteditor_SOURCES += ./src/render/text/viewer.cpp magicseteditor_SOURCES += ./src/render/text/compound.cpp magicseteditor_SOURCES += ./src/render/text/symbol.cpp @@ -23,137 +23,137 @@ magicseteditor_SOURCES += ./src/render/text/element.cpp magicseteditor_SOURCES += ./src/render/symbol/viewer.cpp magicseteditor_SOURCES += ./src/render/symbol/filter.cpp magicseteditor_SOURCES += ./src/render/card/viewer.cpp -magicseteditor_SOURCES += ./src/render/value/color.cpp magicseteditor_SOURCES += ./src/render/value/viewer.cpp -magicseteditor_SOURCES += ./src/render/value/image.cpp -magicseteditor_SOURCES += ./src/render/value/text.cpp magicseteditor_SOURCES += ./src/render/value/symbol.cpp magicseteditor_SOURCES += ./src/render/value/multiple_choice.cpp -magicseteditor_SOURCES += ./src/render/value/choice.cpp +magicseteditor_SOURCES += ./src/render/value/color.cpp +magicseteditor_SOURCES += ./src/render/value/image.cpp +magicseteditor_SOURCES += ./src/render/value/text.cpp magicseteditor_SOURCES += ./src/render/value/information.cpp -magicseteditor_SOURCES += ./src/gfx/rotate_image.cpp +magicseteditor_SOURCES += ./src/render/value/choice.cpp magicseteditor_SOURCES += ./src/gfx/color.cpp -magicseteditor_SOURCES += ./src/gfx/bezier.cpp magicseteditor_SOURCES += ./src/gfx/combine_image.cpp +magicseteditor_SOURCES += ./src/gfx/bezier.cpp +magicseteditor_SOURCES += ./src/gfx/generated_image.cpp +magicseteditor_SOURCES += ./src/gfx/rotate_image.cpp magicseteditor_SOURCES += ./src/gfx/image_effects.cpp magicseteditor_SOURCES += ./src/gfx/polynomial.cpp magicseteditor_SOURCES += ./src/gfx/blend_image.cpp magicseteditor_SOURCES += ./src/gfx/resample_image.cpp magicseteditor_SOURCES += ./src/gfx/resample_text.cpp magicseteditor_SOURCES += ./src/gfx/mask_image.cpp -magicseteditor_SOURCES += ./src/gfx/generated_image.cpp -magicseteditor_SOURCES += ./src/gui/control/select_card_list.cpp magicseteditor_SOURCES += ./src/gui/control/graph.cpp -magicseteditor_SOURCES += ./src/gui/control/image_card_list.cpp +magicseteditor_SOURCES += ./src/gui/control/select_card_list.cpp magicseteditor_SOURCES += ./src/gui/control/card_list.cpp +magicseteditor_SOURCES += ./src/gui/control/image_card_list.cpp magicseteditor_SOURCES += ./src/gui/control/text_ctrl.cpp -magicseteditor_SOURCES += ./src/gui/control/native_look_editor.cpp magicseteditor_SOURCES += ./src/gui/control/card_editor.cpp +magicseteditor_SOURCES += ./src/gui/control/keyword_list.cpp magicseteditor_SOURCES += ./src/gui/control/card_list_column_select.cpp +magicseteditor_SOURCES += ./src/gui/control/native_look_editor.cpp magicseteditor_SOURCES += ./src/gui/control/filtered_card_list.cpp magicseteditor_SOURCES += ./src/gui/control/package_list.cpp +magicseteditor_SOURCES += ./src/gui/control/item_list.cpp magicseteditor_SOURCES += ./src/gui/control/gallery_list.cpp magicseteditor_SOURCES += ./src/gui/control/card_viewer.cpp -magicseteditor_SOURCES += ./src/gui/control/item_list.cpp -magicseteditor_SOURCES += ./src/gui/control/keyword_list.cpp -magicseteditor_SOURCES += ./src/gui/set/style_panel.cpp +magicseteditor_SOURCES += ./src/gui/value/symbol.cpp +magicseteditor_SOURCES += ./src/gui/value/multiple_choice.cpp +magicseteditor_SOURCES += ./src/gui/value/color.cpp +magicseteditor_SOURCES += ./src/gui/value/image.cpp +magicseteditor_SOURCES += ./src/gui/value/text.cpp +magicseteditor_SOURCES += ./src/gui/value/information.cpp +magicseteditor_SOURCES += ./src/gui/value/editor.cpp +magicseteditor_SOURCES += ./src/gui/value/choice.cpp magicseteditor_SOURCES += ./src/gui/set/panel.cpp +magicseteditor_SOURCES += ./src/gui/set/style_panel.cpp magicseteditor_SOURCES += ./src/gui/set/set_info_panel.cpp magicseteditor_SOURCES += ./src/gui/set/keywords_panel.cpp magicseteditor_SOURCES += ./src/gui/set/window.cpp magicseteditor_SOURCES += ./src/gui/set/cards_panel.cpp magicseteditor_SOURCES += ./src/gui/set/stats_panel.cpp -magicseteditor_SOURCES += ./src/gui/symbol/select_editor.cpp magicseteditor_SOURCES += ./src/gui/symbol/point_editor.cpp magicseteditor_SOURCES += ./src/gui/symbol/control.cpp magicseteditor_SOURCES += ./src/gui/symbol/part_list.cpp +magicseteditor_SOURCES += ./src/gui/symbol/select_editor.cpp magicseteditor_SOURCES += ./src/gui/symbol/editor.cpp magicseteditor_SOURCES += ./src/gui/symbol/basic_shape_editor.cpp magicseteditor_SOURCES += ./src/gui/symbol/window.cpp -magicseteditor_SOURCES += ./src/gui/value/color.cpp -magicseteditor_SOURCES += ./src/gui/value/image.cpp -magicseteditor_SOURCES += ./src/gui/value/text.cpp -magicseteditor_SOURCES += ./src/gui/value/symbol.cpp -magicseteditor_SOURCES += ./src/gui/value/multiple_choice.cpp -magicseteditor_SOURCES += ./src/gui/value/editor.cpp -magicseteditor_SOURCES += ./src/gui/value/choice.cpp -magicseteditor_SOURCES += ./src/gui/value/information.cpp -magicseteditor_SOURCES += ./src/gui/util.cpp -magicseteditor_SOURCES += ./src/gui/card_select_window.cpp magicseteditor_SOURCES += ./src/gui/about_window.cpp +magicseteditor_SOURCES += ./src/gui/new_window.cpp +magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp +magicseteditor_SOURCES += ./src/gui/preferences_window.cpp +magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp +magicseteditor_SOURCES += ./src/gui/card_select_window.cpp magicseteditor_SOURCES += ./src/gui/update_checker.cpp magicseteditor_SOURCES += ./src/gui/thumbnail_thread.cpp magicseteditor_SOURCES += ./src/gui/icon_menu.cpp -magicseteditor_SOURCES += ./src/gui/new_window.cpp -magicseteditor_SOURCES += ./src/gui/preferences_window.cpp +magicseteditor_SOURCES += ./src/gui/util.cpp magicseteditor_SOURCES += ./src/gui/welcome_window.cpp magicseteditor_SOURCES += ./src/gui/print_window.cpp -magicseteditor_SOURCES += ./src/gui/drop_down_list.cpp -magicseteditor_SOURCES += ./src/gui/image_slice_window.cpp magicseteditor_SOURCES += ./src/gui/html_export_window.cpp magicseteditor_SOURCES += ./src/gui/images_export_window.cpp -magicseteditor_SOURCES += ./src/script/script_manager.cpp -magicseteditor_SOURCES += ./src/script/script.cpp magicseteditor_SOURCES += ./src/script/functions/basic.cpp magicseteditor_SOURCES += ./src/script/functions/export.cpp magicseteditor_SOURCES += ./src/script/functions/image.cpp magicseteditor_SOURCES += ./src/script/functions/editor.cpp magicseteditor_SOURCES += ./src/script/functions/english.cpp +magicseteditor_SOURCES += ./src/script/script_manager.cpp +magicseteditor_SOURCES += ./src/script/script.cpp magicseteditor_SOURCES += ./src/script/value.cpp magicseteditor_SOURCES += ./src/script/dependency.cpp magicseteditor_SOURCES += ./src/script/image.cpp magicseteditor_SOURCES += ./src/script/context.cpp magicseteditor_SOURCES += ./src/script/scriptable.cpp magicseteditor_SOURCES += ./src/script/parser.cpp +magicseteditor_SOURCES += ./src/data/field/symbol.cpp +magicseteditor_SOURCES += ./src/data/field/multiple_choice.cpp magicseteditor_SOURCES += ./src/data/field/color.cpp magicseteditor_SOURCES += ./src/data/field/boolean.cpp magicseteditor_SOURCES += ./src/data/field/image.cpp magicseteditor_SOURCES += ./src/data/field/text.cpp -magicseteditor_SOURCES += ./src/data/field/symbol.cpp -magicseteditor_SOURCES += ./src/data/field/multiple_choice.cpp -magicseteditor_SOURCES += ./src/data/field/choice.cpp magicseteditor_SOURCES += ./src/data/field/information.cpp +magicseteditor_SOURCES += ./src/data/field/choice.cpp magicseteditor_SOURCES += ./src/data/format/clipboard.cpp magicseteditor_SOURCES += ./src/data/format/image.cpp magicseteditor_SOURCES += ./src/data/format/html.cpp magicseteditor_SOURCES += ./src/data/format/mse1.cpp magicseteditor_SOURCES += ./src/data/format/mse2.cpp magicseteditor_SOURCES += ./src/data/format/mws.cpp +magicseteditor_SOURCES += ./src/data/format/image_to_symbol.cpp magicseteditor_SOURCES += ./src/data/format/apprentice.cpp magicseteditor_SOURCES += ./src/data/format/formats.cpp magicseteditor_SOURCES += ./src/data/format/mtg_editor.cpp -magicseteditor_SOURCES += ./src/data/format/image_to_symbol.cpp +magicseteditor_SOURCES += ./src/data/action/keyword.cpp magicseteditor_SOURCES += ./src/data/action/symbol.cpp magicseteditor_SOURCES += ./src/data/action/set.cpp magicseteditor_SOURCES += ./src/data/action/symbol_part.cpp magicseteditor_SOURCES += ./src/data/action/value.cpp -magicseteditor_SOURCES += ./src/data/action/keyword.cpp magicseteditor_SOURCES += ./src/data/locale.cpp magicseteditor_SOURCES += ./src/data/settings.cpp +magicseteditor_SOURCES += ./src/data/game.cpp +magicseteditor_SOURCES += ./src/data/export_template.cpp +magicseteditor_SOURCES += ./src/data/field.cpp +magicseteditor_SOURCES += ./src/data/set.cpp +magicseteditor_SOURCES += ./src/data/installer.cpp magicseteditor_SOURCES += ./src/data/symbol.cpp magicseteditor_SOURCES += ./src/data/font.cpp -magicseteditor_SOURCES += ./src/data/game.cpp magicseteditor_SOURCES += ./src/data/card.cpp -magicseteditor_SOURCES += ./src/data/field.cpp +magicseteditor_SOURCES += ./src/data/pack.cpp magicseteditor_SOURCES += ./src/data/keyword.cpp magicseteditor_SOURCES += ./src/data/stylesheet.cpp magicseteditor_SOURCES += ./src/data/statistics.cpp -magicseteditor_SOURCES += ./src/data/set.cpp magicseteditor_SOURCES += ./src/data/symbol_font.cpp -magicseteditor_SOURCES += ./src/data/export_template.cpp -magicseteditor_SOURCES += ./src/data/installer.cpp -magicseteditor_SOURCES += ./src/data/pack.cpp -magicseteditor_SOURCES += ./src/util/io/get_member.cpp magicseteditor_SOURCES += ./src/util/io/reader.cpp magicseteditor_SOURCES += ./src/util/io/package_manager.cpp +magicseteditor_SOURCES += ./src/util/io/get_member.cpp magicseteditor_SOURCES += ./src/util/io/package.cpp magicseteditor_SOURCES += ./src/util/io/writer.cpp magicseteditor_SOURCES += ./src/util/rotation.cpp -magicseteditor_SOURCES += ./src/util/tagged_string.cpp +magicseteditor_SOURCES += ./src/util/version.cpp magicseteditor_SOURCES += ./src/util/action_stack.cpp magicseteditor_SOURCES += ./src/util/string.cpp magicseteditor_SOURCES += ./src/util/alignment.cpp -magicseteditor_SOURCES += ./src/util/version.cpp +magicseteditor_SOURCES += ./src/util/tagged_string.cpp magicseteditor_SOURCES += ./src/util/error.cpp magicseteditor_SOURCES += ./src/util/age.cpp magicseteditor_SOURCES += ./src/main.cpp diff --git a/data/magic-extended-art.mse-style/style b/data/magic-extended-art.mse-style/style index 837f9e5e..388e0976 100644 --- a/data/magic-extended-art.mse-style/style +++ b/data/magic-extended-art.mse-style/style @@ -218,6 +218,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 ############################# PT pt: diff --git a/data/magic-firepenguinmaster-flip.mse-style/style b/data/magic-firepenguinmaster-flip.mse-style/style index 117b0827..b119160e 100644 --- a/data/magic-firepenguinmaster-flip.mse-style/style +++ b/data/magic-firepenguinmaster-flip.mse-style/style @@ -261,6 +261,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 watermark: left: 42 top : 380 diff --git a/data/magic-firepenguinmaster.mse-style/style b/data/magic-firepenguinmaster.mse-style/style index 3777e63b..5d5062ea 100644 --- a/data/magic-firepenguinmaster.mse-style/style +++ b/data/magic-firepenguinmaster.mse-style/style @@ -236,6 +236,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 watermark: left: 127 diff --git a/data/magic-firepenguinmasterpromo.mse-style/style b/data/magic-firepenguinmasterpromo.mse-style/style index 3175042d..e907856b 100644 --- a/data/magic-firepenguinmasterpromo.mse-style/style +++ b/data/magic-firepenguinmasterpromo.mse-style/style @@ -229,6 +229,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 watermark: left: 127 top : 340 diff --git a/data/magic-firepenguinmastersplit.mse-style/style b/data/magic-firepenguinmastersplit.mse-style/style index bbc71160..d5962160 100644 --- a/data/magic-firepenguinmastersplit.mse-style/style +++ b/data/magic-firepenguinmastersplit.mse-style/style @@ -311,6 +311,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 text 2: left: 302.74 top : 244 diff --git a/data/magic-firepenguinmastertokens.mse-style/style b/data/magic-firepenguinmastertokens.mse-style/style index 561be783..5da9fb71 100644 --- a/data/magic-firepenguinmastertokens.mse-style/style +++ b/data/magic-firepenguinmastertokens.mse-style/style @@ -244,6 +244,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 textbox: left: 52 top: 405 diff --git a/data/magic-new-flip.mse-style/style b/data/magic-new-flip.mse-style/style index 4d2fcc15..b380df22 100644 --- a/data/magic-new-flip.mse-style/style +++ b/data/magic-new-flip.mse-style/style @@ -257,6 +257,7 @@ card style: padding bottom: -1 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 text 2: left: 32 diff --git a/data/magic-new-promo.mse-style/style b/data/magic-new-promo.mse-style/style index 15e3a36b..edb064ca 100644 --- a/data/magic-new-promo.mse-style/style +++ b/data/magic-new-promo.mse-style/style @@ -211,6 +211,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 watermark: left: 117 diff --git a/data/magic-new.mse-style/style b/data/magic-new.mse-style/style index 1eda4b1e..0da73ab1 100644 --- a/data/magic-new.mse-style/style +++ b/data/magic-new.mse-style/style @@ -254,6 +254,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 watermark: left: 117 diff --git a/data/magic-old-split.mse-style/style b/data/magic-old-split.mse-style/style index e286e89c..ef60f23f 100644 --- a/data/magic-old-split.mse-style/style +++ b/data/magic-old-split.mse-style/style @@ -290,6 +290,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 text 2: left: 289 diff --git a/data/magic-old-token.mse-style/style b/data/magic-old-token.mse-style/style index e7c6a286..ef0f02a6 100644 --- a/data/magic-old-token.mse-style/style +++ b/data/magic-old-token.mse-style/style @@ -192,6 +192,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 ############################# PT pt: diff --git a/data/magic-old.mse-style/style b/data/magic-old.mse-style/style index 5b97ba77..4bbeb2db 100644 --- a/data/magic-old.mse-style/style +++ b/data/magic-old.mse-style/style @@ -211,6 +211,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 watermark: left: 99 diff --git a/data/magic-planeshifted.mse-style/style b/data/magic-planeshifted.mse-style/style index 2d1f8574..08ed65bf 100644 --- a/data/magic-planeshifted.mse-style/style +++ b/data/magic-planeshifted.mse-style/style @@ -216,6 +216,7 @@ card style: padding bottom: 2 line height hard: 1.2 line height line: 1.5 + line height soft: 0.9 watermark: left: 117 diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 67a7f229..3545aba1 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -1,4 +1,4 @@ -mse version: 0.3.3 +mse version: 0.3.3 short name: Magic full name: Magic the Gathering icon: card-back.png @@ -1132,20 +1132,54 @@ statistics category: pack type: name: Starter pack +pack type: + name: Tournament pack + card type: + name: Rare + amount: 3 + filter: card.rarity == "rare" + card type: + name: Uncommon + amount: 9 + filter: card.rarity == "uncommon" + card type: + name: Common + amount: 33 + filter: card.rarity == "common" + card type: + name: Plains + amount: 6 + filter: card.type == "Plains" + card type: + name: Island + amount: 6 + filter: card.type == "Island" + card type: + name: Swamp + amount: 6 + filter: card.type == "Swamp" + card type: + name: Mountain + amount: 6 + filter: card.type == "Mountain" + card type: + name: Forest + amount: 6 + filter: card.type == "Forest" pack type: name: Booster pack card type: name: Rare amount: 1 - filter: card.rarity = "rare" + filter: card.rarity == "rare" card type: name: Uncommon amount: 3 - filter: card.rarity = "uncommon" + filter: card.rarity == "uncommon" card type: name: Common amount: 11 - filter: card.rarity = "common" + filter: card.rarity == "common"