Skip to content

M
magicseteditor
Commit 668adacf authored by coppro's avatar coppro
Browse files
Options

Attempted to update type symbols on futureshifts to remove scripting 

(precise modifications still needed, but MSE runs faster when the 
positions aren't scripted)

Added translation for the 'Open most recent set' button.
Moved 'type symbol' from the game to the futureshift templates.
Fixed a few BOMs.
TODO: Move common elements from futureshifts to an include folder.
parent 0599d14b
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 96 deletions
data/en.mse-locale/locale
View file @ 668adacf
...@@ -98,6 +98,7 @@ help: ...@@ -98,6 +98,7 @@ help:
file: file:
new set: Create a new set new set: Create a new set
open set: Open an existing set open set: Open an existing set
last opened set: Open '%s'
save set: Save the set save set: Save the set
save set as: Save the set with a new name save set as: Save the set with a new name
export: Export the set... export: Export the set...
......
data/magic-embossedletters.mse-symbol-font/symbol-font
View file @ 668adacf
mse version: 0.3.3 mse version: 0.3.3
image font size: 46 image font size: 46
horizontal space: 1.2 horizontal space: 1.2
......
data/magic-future-textless.mse-style/style
View file @ 668adacf
...@@ -201,41 +201,6 @@ card style: ...@@ -201,41 +201,6 @@ card style:
render style: image render style: image
choice images: choice images:
tombstone: tombstone.png 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
image: image:
...@@ -322,6 +287,27 @@ extra card field: ...@@ -322,6 +287,27 @@ extra card field:
name: pt box name: pt box
script: card.card_color script: card.card_color
editable: false 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: extra card field:
type: choice type: choice
name: paintbrush name: paintbrush
...@@ -341,6 +327,28 @@ extra card style: ...@@ -341,6 +327,28 @@ extra card style:
render style: image render style: image
image: { card_ptbox() } image: { card_ptbox() }
mask: mask_pt.png 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: paintbrush:
right: { ( if card.pt != "" then 281 else 341 ) - card_style.illustrator.content_width } right: { ( if card.pt != "" then 281 else 341 ) - card_style.illustrator.content_width }
top : 479 top : 479
......
data/magic-futureshift.mse-style/style
View file @ 668adacf
...@@ -236,43 +236,6 @@ card style: ...@@ -236,43 +236,6 @@ card style:
render style: image render style: image
choice images: choice images:
tombstone: tombstone.png 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
image: image:
...@@ -415,6 +378,27 @@ extra card field: ...@@ -415,6 +378,27 @@ extra card field:
script: card.card_color script: card.card_color
editable: false editable: false
save value: 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: extra card field:
type: choice type: choice
name: paintbrush name: paintbrush
...@@ -451,6 +435,28 @@ extra card style: ...@@ -451,6 +435,28 @@ extra card style:
visible: { card.pt != "" } visible: { card.pt != "" }
render style: image render style: image
image: { card_ptbox() } 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: paintbrush:
right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width } right: { ( if card.pt != "" then 275 else 338 ) - card_style.illustrator.content_width }
top : 476 top : 476
......
data/magic-mana-future.mse-symbol-font/symbol-font
View file @ 668adacf
mse version: 0.3.3 mse version: 0.3.3
# Symbol font in the 'futuristic' style, used for casting costs on futureshift cards # Symbol font in the 'futuristic' style, used for casting costs on futureshift cards
image font size: 135 image font size: 135
......
data/magic.mse-game/game
View file @ 668adacf
...@@ -698,27 +698,6 @@ card field: ...@@ -698,27 +698,6 @@ card field:
choice: none choice: none
choice: tombstone choice: tombstone
description: Symbol for this card (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 ############################# Image
card field: card field:
......
src/gui/welcome_window.cpp
View file @ 668adacf
...@@ -41,7 +41,7 @@ WelcomeWindow::WelcomeWindow() ...@@ -41,7 +41,7 @@ WelcomeWindow::WelcomeWindow()
wxFileName n(settings.recent_sets.front()); wxFileName n(settings.recent_sets.front());
if (n.FileExists() || n.DirExists()) if (n.FileExists() || n.DirExists())
#ifdef USE_HOVERBUTTON #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 #else
open_last = new wxButton(this, ID_FILE_RECENT, _BUTTON_("last opened set")); open_last = new wxButton(this, ID_FILE_RECENT, _BUTTON_("last opened set"));
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment