diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale index 81bbbfe9..8203cdd5 100644 --- a/data/en.mse-locale/locale +++ b/data/en.mse-locale/locale @@ -98,6 +98,7 @@ help: file: new set: Create a new set open set: Open an existing set + last opened set: Open '%s' save set: Save the set save set as: Save the set with a new name export: Export the set... diff --git a/data/magic-embossedletters.mse-symbol-font/symbol-font b/data/magic-embossedletters.mse-symbol-font/symbol-font index 97e7e5d7..b7fc3af3 100644 --- a/data/magic-embossedletters.mse-symbol-font/symbol-font +++ b/data/magic-embossedletters.mse-symbol-font/symbol-font @@ -1,4 +1,4 @@ -mse version: 0.3.3 +mse version: 0.3.3 image font size: 46 horizontal space: 1.2 diff --git a/data/magic-future-textless.mse-style/artifact_black.png b/data/magic-future-textless.mse-style/artifact_black.png index a904d128..29471db2 100644 Binary files a/data/magic-future-textless.mse-style/artifact_black.png and b/data/magic-future-textless.mse-style/artifact_black.png differ diff --git a/data/magic-future-textless.mse-style/artifact_white.png b/data/magic-future-textless.mse-style/artifact_white.png index 686c74ac..1ada518a 100644 Binary files a/data/magic-future-textless.mse-style/artifact_white.png and b/data/magic-future-textless.mse-style/artifact_white.png differ diff --git a/data/magic-future-textless.mse-style/creature_black.png b/data/magic-future-textless.mse-style/creature_black.png index 0bfaeaec..0e4f6aef 100644 Binary files a/data/magic-future-textless.mse-style/creature_black.png and b/data/magic-future-textless.mse-style/creature_black.png differ diff --git a/data/magic-future-textless.mse-style/creature_white.png b/data/magic-future-textless.mse-style/creature_white.png index 4162656b..3a9e6d2a 100644 Binary files a/data/magic-future-textless.mse-style/creature_white.png and b/data/magic-future-textless.mse-style/creature_white.png differ diff --git a/data/magic-future-textless.mse-style/enchantment_black.png b/data/magic-future-textless.mse-style/enchantment_black.png index a5a05e40..aebd3ac2 100644 Binary files a/data/magic-future-textless.mse-style/enchantment_black.png and b/data/magic-future-textless.mse-style/enchantment_black.png differ diff --git a/data/magic-future-textless.mse-style/enchantment_white.png b/data/magic-future-textless.mse-style/enchantment_white.png index c745ecbb..ae8c9b60 100644 Binary files a/data/magic-future-textless.mse-style/enchantment_white.png and b/data/magic-future-textless.mse-style/enchantment_white.png differ diff --git a/data/magic-future-textless.mse-style/instant_black.png b/data/magic-future-textless.mse-style/instant_black.png index 7e28012a..4a75a887 100644 Binary files a/data/magic-future-textless.mse-style/instant_black.png and b/data/magic-future-textless.mse-style/instant_black.png differ diff --git a/data/magic-future-textless.mse-style/instant_white.png b/data/magic-future-textless.mse-style/instant_white.png index 26aea92e..c0bd0951 100644 Binary files a/data/magic-future-textless.mse-style/instant_white.png and b/data/magic-future-textless.mse-style/instant_white.png differ diff --git a/data/magic-future-textless.mse-style/land_black.png b/data/magic-future-textless.mse-style/land_black.png index e827b732..051c4cce 100644 Binary files a/data/magic-future-textless.mse-style/land_black.png and b/data/magic-future-textless.mse-style/land_black.png differ diff --git a/data/magic-future-textless.mse-style/land_white.png b/data/magic-future-textless.mse-style/land_white.png index 800d2e12..440e4c91 100644 Binary files a/data/magic-future-textless.mse-style/land_white.png and b/data/magic-future-textless.mse-style/land_white.png differ diff --git a/data/magic-future-textless.mse-style/style b/data/magic-future-textless.mse-style/style index 067d0ad7..692ec32f 100644 --- a/data/magic-future-textless.mse-style/style +++ b/data/magic-future-textless.mse-style/style @@ -201,41 +201,6 @@ card style: render style: image choice images: tombstone: tombstone.png - type symbol: - left: - { if card.type_symbol=="white artifact" or card.type_symbol=="black artifact" then 25 - else if card.type_symbol=="white enchantment" or card.type_symbol=="black enchantment" then 24 - else 24 } - top: - { if card.type_symbol=="white artifact" or card.type_symbol=="black artifact" then 26 - else if card.type_symbol=="white enchantment" or card.type_symbol=="black enchantment" then 23 - else 25 } - width: - { if card.type_symbol=="white artifact" or card.type_symbol=="black artifact" then 16 - else if card.type_symbol=="white instant" or card.type_symbol=="black instant" then 16 - else 18 } - height: - { if card.type_symbol=="white artifact" or card.type_symbol=="black artifact" then 16 - else if card.type_symbol=="white enchantment" or card.type_symbol=="black enchantment" then 16 - else if card.type_symbol=="white land" or card.type_symbol=="black land" then 16 - else 18 } - z index: 2 - render style: image - choice images: - white artifact: artifact_white.png - black artifact: artifact_black.png - white creature: creature_white.png - black creature: creature_black.png - white enchantment: enchantment_white.png - black enchantment: enchantment_black.png - white instant: instant_white.png - black instant: instant_black.png - white land: land_white.png - black land: land_black.png - white multitype: multitype_white.png - black multitype: multitype_black.png - white sorcery: sorcery_white.png - black sorcery: sorcery_black.png ############################# Image image: @@ -322,6 +287,27 @@ extra card field: name: pt box script: card.card_color editable: false +extra card field: + type: choice + name: type symbol + choice: + name: white + choice: artifact + choice: creature + choice: enchantment + choice: instant + choice: land + choice: multitype + choice: sorcery + choice: + name: black + choice: artifact + choice: creature + choice: enchantment + choice: instant + choice: land + choice: multitype + choice: sorcery extra card field: type: choice name: paintbrush @@ -341,6 +327,28 @@ extra card style: render style: image image: { card_ptbox() } mask: mask_pt.png + type symbol: + left: 23 + top: 25 + width: 21 + height: 20 + z index: 2 + render style: image + choice images: + white artifact: artifact_white.png + black artifact: artifact_black.png + white creature: creature_white.png + black creature: creature_black.png + white enchantment: enchantment_white.png + black enchantment: enchantment_black.png + white instant: instant_white.png + black instant: instant_black.png + white land: land_white.png + black land: land_black.png + white multitype: multitype_white.png + black multitype: multitype_black.png + white sorcery: sorcery_white.png + black sorcery: sorcery_black.png paintbrush: right: { ( if card.pt != "" then 281 else 341 ) - card_style.illustrator.content_width } top : 479 diff --git a/data/magic-futureshift.mse-style/artifact_black.png b/data/magic-futureshift.mse-style/artifact_black.png index a904d128..29471db2 100644 Binary files a/data/magic-futureshift.mse-style/artifact_black.png and b/data/magic-futureshift.mse-style/artifact_black.png differ diff --git a/data/magic-futureshift.mse-style/artifact_white.png b/data/magic-futureshift.mse-style/artifact_white.png index 686c74ac..1ada518a 100644 Binary files a/data/magic-futureshift.mse-style/artifact_white.png and b/data/magic-futureshift.mse-style/artifact_white.png differ diff --git a/data/magic-futureshift.mse-style/creature_black.png b/data/magic-futureshift.mse-style/creature_black.png index 0bfaeaec..0e4f6aef 100644 Binary files a/data/magic-futureshift.mse-style/creature_black.png and b/data/magic-futureshift.mse-style/creature_black.png differ diff --git a/data/magic-futureshift.mse-style/creature_white.png b/data/magic-futureshift.mse-style/creature_white.png index 4162656b..3a9e6d2a 100644 Binary files a/data/magic-futureshift.mse-style/creature_white.png and b/data/magic-futureshift.mse-style/creature_white.png differ diff --git a/data/magic-futureshift.mse-style/enchantment_black.png b/data/magic-futureshift.mse-style/enchantment_black.png index a5a05e40..aebd3ac2 100644 Binary files a/data/magic-futureshift.mse-style/enchantment_black.png and b/data/magic-futureshift.mse-style/enchantment_black.png differ diff --git a/data/magic-futureshift.mse-style/enchantment_white.png b/data/magic-futureshift.mse-style/enchantment_white.png index c745ecbb..ae8c9b60 100644 Binary files a/data/magic-futureshift.mse-style/enchantment_white.png and b/data/magic-futureshift.mse-style/enchantment_white.png differ diff --git a/data/magic-futureshift.mse-style/instant_black.png b/data/magic-futureshift.mse-style/instant_black.png index 7e28012a..4a75a887 100644 Binary files a/data/magic-futureshift.mse-style/instant_black.png and b/data/magic-futureshift.mse-style/instant_black.png differ diff --git a/data/magic-futureshift.mse-style/instant_white.png b/data/magic-futureshift.mse-style/instant_white.png index 26aea92e..c0bd0951 100644 Binary files a/data/magic-futureshift.mse-style/instant_white.png and b/data/magic-futureshift.mse-style/instant_white.png differ diff --git a/data/magic-futureshift.mse-style/land_black.png b/data/magic-futureshift.mse-style/land_black.png index e827b732..051c4cce 100644 Binary files a/data/magic-futureshift.mse-style/land_black.png and b/data/magic-futureshift.mse-style/land_black.png differ diff --git a/data/magic-futureshift.mse-style/land_white.png b/data/magic-futureshift.mse-style/land_white.png index 800d2e12..440e4c91 100644 Binary files a/data/magic-futureshift.mse-style/land_white.png and b/data/magic-futureshift.mse-style/land_white.png differ diff --git a/data/magic-futureshift.mse-style/style b/data/magic-futureshift.mse-style/style index 95c3d218..d89bbcd4 100644 --- a/data/magic-futureshift.mse-style/style +++ b/data/magic-futureshift.mse-style/style @@ -236,43 +236,6 @@ card style: render style: image choice images: tombstone: tombstone.png - type symbol: - left: - { if card.type_symbol=="white artifact" or card.type_symbol=="black artifact" then 26 - else if card.type_symbol=="white enchantment" or card.type_symbol=="black enchantment" then 25 - else 25 } - top: - { if card.type_symbol=="white artifact" or card.type_symbol=="black artifact" then 26 - else if card.type_symbol=="white enchantment" or card.type_symbol=="black enchantment" then 23 - else if card.type_symbol=="white instant" or card.type_symbol=="black instant" then 25 - else if card.type_symbol=="black land" or card.type_symbol=="white land" then 25 - else 24 } - width: - { if card.type_symbol=="white artifact" or card.type_symbol=="black artifact" then 15 - else if card.type_symbol=="white instant" or card.type_symbol=="black instant" then 15 - else 18 } - height: - { if card.type_symbol=="white artifact" or card.type_symbol=="black artifact" then 15 - else if card.type_symbol=="white enchantment" or card.type_symbol=="black enchantment" then 15 - else if card.type_symbol=="white land" or card.type_symbol=="black land" then 15 - else 18 } - z index: 4 - render style: image - choice images: - white artifact: artifact_white.png - black artifact: artifact_black.png - white creature: creature_white.png - black creature: creature_black.png - white enchantment: enchantment_white.png - black enchantment: enchantment_black.png - white instant: instant_white.png - black instant: instant_black.png - white land: land_white.png - black land: land_black.png - white multitype: multitype_white.png - black multitype: multitype_black.png - white sorcery: sorcery_white.png - black sorcery: sorcery_black.png ############################# Image image: @@ -415,6 +378,27 @@ extra card field: script: card.card_color editable: false save value: false +extra card field: + type: choice + name: type symbol + choice: + name: white + choice: artifact + choice: creature + choice: enchantment + choice: instant + choice: land + choice: multitype + choice: sorcery + choice: + name: black + choice: artifact + choice: creature + choice: enchantment + choice: instant + choice: land + choice: multitype + choice: sorcery extra card field: type: choice name: paintbrush @@ -451,6 +435,28 @@ extra card style: visible: { card.pt != "" } render style: image image: { card_ptbox() } + type symbol: + left: 23 + top: 25 + width: 21 + height: 20 + z index: 4 + render style: image + choice images: + white artifact: artifact_white.png + black artifact: artifact_black.png + white creature: creature_white.png + black creature: creature_black.png + white enchantment: enchantment_white.png + black enchantment: enchantment_black.png + white instant: instant_white.png + black instant: instant_black.png + white land: land_white.png + black land: land_black.png + white multitype: multitype_white.png + black multitype: multitype_black.png + white sorcery: sorcery_white.png + black sorcery: sorcery_black.png paintbrush: right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width } top : 476 diff --git a/data/magic-mana-future.mse-symbol-font/symbol-font b/data/magic-mana-future.mse-symbol-font/symbol-font index 6c7c7deb..91fbb9f1 100644 --- a/data/magic-mana-future.mse-symbol-font/symbol-font +++ b/data/magic-mana-future.mse-symbol-font/symbol-font @@ -1,4 +1,4 @@ -mse version: 0.3.3 +mse version: 0.3.3 # Symbol font in the 'futuristic' style, used for casting costs on futureshift cards image font size: 135 diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index 05eefc28..27c2bc32 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -698,27 +698,6 @@ card field: choice: none choice: tombstone description: Symbol for this card (tombstone) -card field: - type: choice - name: type symbol - choice: - name: white - choice: artifact - choice: creature - choice: enchantment - choice: instant - choice: land - choice: multitype - choice: sorcery - choice: - name: black - choice: artifact - choice: creature - choice: enchantment - choice: instant - choice: land - choice: multitype - choice: sorcery ############################# Image card field: diff --git a/src/gui/welcome_window.cpp b/src/gui/welcome_window.cpp index fecabeb5..0ba13f61 100644 --- a/src/gui/welcome_window.cpp +++ b/src/gui/welcome_window.cpp @@ -41,7 +41,7 @@ WelcomeWindow::WelcomeWindow() wxFileName n(settings.recent_sets.front()); if (n.FileExists() || n.DirExists()) #ifdef USE_HOVERBUTTON - open_last = new HoverButtonExt(this, ID_FILE_RECENT, load_resource_image(_("welcome_last")), _BUTTON_("last opened set"), _("Open '") + n.GetName() + _("'")); + open_last = new HoverButtonExt(this, ID_FILE_RECENT, load_resource_image(_("welcome_last")), _BUTTON_("last opened set"), _HELP_1_("last opened set", n.GetName())); #else open_last = new wxButton(this, ID_FILE_RECENT, _BUTTON_("last opened set")); #endif