From 232c8b3aa9cc19ea03fcfd57ebdb9d40abc55c83 Mon Sep 17 00:00:00 2001 From: coppro Date: Wed, 15 Aug 2007 17:16:27 +0000 Subject: [PATCH] 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. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@612 0fc631ac-6414-0410-93d0-97cfa31319b6 --- data/en.mse-locale/locale | 1 + .../symbol-font | 2 +- .../artifact_black.png | Bin 529 -> 576 bytes .../artifact_white.png | Bin 522 -> 568 bytes .../creature_black.png | Bin 773 -> 759 bytes .../creature_white.png | Bin 764 -> 752 bytes .../enchantment_black.png | Bin 903 -> 931 bytes .../enchantment_white.png | Bin 893 -> 926 bytes .../instant_black.png | Bin 636 -> 665 bytes .../instant_white.png | Bin 635 -> 668 bytes .../land_black.png | Bin 554 -> 576 bytes .../land_white.png | Bin 539 -> 571 bytes data/magic-future-textless.mse-style/style | 78 +++++++++-------- .../artifact_black.png | Bin 529 -> 576 bytes .../artifact_white.png | Bin 522 -> 568 bytes .../creature_black.png | Bin 773 -> 759 bytes .../creature_white.png | Bin 764 -> 752 bytes .../enchantment_black.png | Bin 903 -> 931 bytes .../enchantment_white.png | Bin 893 -> 926 bytes .../instant_black.png | Bin 636 -> 665 bytes .../instant_white.png | Bin 635 -> 668 bytes .../land_black.png | Bin 554 -> 576 bytes .../land_white.png | Bin 539 -> 571 bytes data/magic-futureshift.mse-style/style | 80 ++++++++++-------- .../symbol-font | 2 +- data/magic.mse-game/game | 21 ----- src/gui/welcome_window.cpp | 2 +- 27 files changed, 90 insertions(+), 96 deletions(-) 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 a904d1281808b5892fd1d6ec893143687f2be14c..29471db2a2141cd71e7ed43f9fd2bc78b16e03e0 100644 GIT binary patch literal 576 zcmV-G0>Ax}g!AwxWz`x@~ikYIIU?lzvBeR2J z!4EDF1r=^*-I=K>gWXeacXrm?7dojfo^I;n6_#}7)M-S7loIaFI*AB%(@;&PeEaeJ zcRcIL1rl%<2!O3&ZUL`{!{N9WnCE!_j)xE)(IWv;o?C0S^LKm&=!#TT?k%ogs_IEKdkPRjB!<`z zEX$Iz98eSmsYnPkZQDL~cU1MktggSRDrS(yNR}Pljjl}r91$T45ggRC5E0z{M3K^; zO<65rr#URaA;xU580516ZidsnNnyP`%`IwvxG}F;xD6yk2tp^a189eibso3|ybzIx ziyvPBc7a>KWgsli;aUgS9*r)U`97PI(f{Na7e|E*t-p}S6?7Te_j O0000^I|iGkj&K&S3%U#9B*?F~j~a+$kq%dOsYE22v^IE>?-? zicK*N1WFlBbSV+tMINykW*w}3K}JScw2*rrVE?c)og{MvW(A)ZVP-Of5Nkl0x0_8@ zq!c9j@NY~b8EdzaBfF1aPiH?APPewMMjLQ5%L1`n~ z9&mw+=ee^590KnM6rt8voLjyc$3>QHW9%lDAHXnwjWbtt2`x23iU+LqmjD9*muQ?6 T)=nt<00000NkvXXu0mjf0x8xk diff --git a/data/magic-future-textless.mse-style/artifact_white.png b/data/magic-future-textless.mse-style/artifact_white.png index 686c74acf8a051867040657385eb2a748f105306..1ada518aeb24f364e6baa8a68f3e3eceed8bcaf5 100644 GIT binary patch literal 568 zcmV-80>}M{P)0mVr~ zK~y-)?UcJ}RY4SnzqMx1J~{hX7%!E02@2L0Hr6&af?y}8VBzbSO0iQE6s*Lzu(At; zSey_rXlatO=e8`eg>&7<2k?g}hJWT`v2MbY4i0}{W`qzB5mw2}sJ*8d4mo#rbH=OY z-U?6yPXPtW3T6X*J~}?yn>S{FF-8T>mr`EQBLhN;rBb)u3lxz8oUld$2(n*!zu@T{ z@G@q1G2$z^r{1E7ym8J&=UhLq88tMchN`M|MC5A^@HN);PajZKQB_7~ zMrC6#cnBQKe{jw{QFVJOb31(rArL|!=Zve|xb}Vvc-Gk;opTqR>RSOy$>fszfs@IE z$>fB#Z3%6_AXZiNzKiU|pss&8=TL=|Gbtt3O$s2G8L4CtaOwt~ccBeoYEqV_aA7&j z!6D}~>>BwJfT$v@o+Mqqo=#WP>EQu@mGT&_WZ+>;R8| z+kh_X!=*#}eLTLUDmQ`O!0}YNHh`gFC8zx5#igP)j0m8g}dh=_%ig@x8OmV%w2f`z}wO0iQc6s*J_A=rn21dK6~^b(WX z-C5smE*gR)1MhBk=X>UfR;MkTb4i}(Cqf8GL`?q(Y_cSdAG0*AE3LIRoMq-qnjj9y zjb_*7bA{+W@;6Np5g?il-V#oW$h}McHeJqC99JZ2onhyeNQkK(*4kAd6K~C?Z&F#d zRlKiFaza@fNs?5hF^1q^@OC>TQ3nmY=30}qu(xn@%nuU>A;dL)8dZ^u;0VSf*YdEjPr zA>yO`IgI8@Af0OrhD#Vw4{zI%l+Obi`H`EDO!a!bkW;BRWOIZ1OGO`Z=+&=;m@V~l z8_u3afgt{3pa^_%E-jY1&@Y%G3iz8Gn~>+1FJ(WJ#C!xIC+?TB#ghN1Ps_-*2iyS{ zMU)+UYfv7tqb*n1i+ZCm%(5w^SjX`T=#GRg1F1t^YwQ!w=0|`501pwx!_2tESpWb4 M07*qoM6N<$f~3gX;s5{u diff --git a/data/magic-future-textless.mse-style/creature_black.png b/data/magic-future-textless.mse-style/creature_black.png index 0bfaeaec7dbd5a4104e679bc6a86f6c1cb7c3ac7..0e4f6aef5be209dde97d2478a6cb1257e4b6a79c 100644 GIT binary patch literal 759 zcmV200006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*9Zj_;hg#2=WcP%sAG+j`|joYKHOZ-uK>0@`y7jE z+XmO9s~sQ&Waj8o0%)+;ODa`d1&|>$iv8{C9KqvBzy`qvpaY}vMeal$%Z&ol0;6+KF0rSQm1A}oH5DMTWV2kbZlKuqh@}y=X=7Q~?C7lL7!X7w{ zqy~7;_AzI!6`TV8Fw|v9ZNCa!1owcghF?aBNrJbrzXrYqKCwNNgfpq*hW^7eYrfFc z`jgn>nNY1$p&8zq8;ns1Okr-)u@ z+Kq#S;Y}@a18F}g>4_3C4-5jJ){e| zDgf)BUPnaS&dhDVGZAqe^Dg+X;G{~~lbLtBg$`hQM0{y;LJ=o{;e*3}tJfQmwrzW> z);inO`j+5CW_~e_IjV@6%uGoWhGP-2DI)eQblsgt4L6xdtrcf>X`ddaa@6qYs1M$3 z`-)-O_HN+LN*hDJ-)A@+jz+`YDd{ZIj6yc-ku)dia^n4lTxp-1afk0+3&ZCM{VF@1 zehU19q`9VT-|q&4{4Yl$mTo2(Uj*(3qDX!0@0zxKvz?e2PESuWIW@(^s#Qej(WJ{C pI(3%5Li$}2rIdf&p#QZ*e*?RJI%;0_fCK;l002ovPDHLkV1h_6Rk8p8 literal 773 zcmV+g1N!`lP)Z!IeJxuGwhmiH zkk}$BFsMZ>0*#Wir@m(1+Ev`(*KnqEMW%lA07t z@e{Gu=0W8xA;C2(r2?bmTjq8mTIIP~Hvahh7XDh$yv=0}Rg2S`yA@BF<%$&3$V5dKEiM zX(}Udp4gDHwh8DL*uNlZ{$oZ`FX}z38FVK}pYv*z=X9Ec#~4qMTjVC*3#b@m8JIQp zKx)i8HvQp*x<%_L=d3`e0pBx#&T+QK0GLpfasjOF4{I1TnKT_^p@T3wiDxR%TFS;A z2ko`edIo=MTu!FdB2Q1ixvi`>kz3S;nPQeg<=jhRjauvLPPq?05$c!e(>TeKg+iex zjDl%dV$z88Q$eTpFA9P<1b;t37kSmu3d84=>yPpd>jyaA22pedU$GRIve{1Pzj4NL7&ezGu|YNt0Awk%j&g^TR(tUEm(z5fva;qcy8-_0c`%MQrJ17@%7e)5 zyuYp;nZVwHzJPCj%_%RHN|Gc=e#Fk5g2gL(F#rqi>BIhte6-@OVcT^tZ~N}H>MaK3 zNEilRptC?(+wjeLurP|cXhY(^4k6`HrmR+Gu)V&%_Pg+dc`5r3iq1>i71h;UL1v>U z5-$LYNz2tas|8#8qAQg;r5>Sw`i-8+%86h3{1adRdNVl|xs@3Y00000NkvXXu0mjf Dbo6aL diff --git a/data/magic-future-textless.mse-style/creature_white.png b/data/magic-future-textless.mse-style/creature_white.png index 4162656bd11cb2231968f0e930885b1445257782..3a9e6d2ae668148b156c5b56d86d30e0f083fe8c 100644 GIT binary patch literal 752 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 A#{d8T literal 893 zcmV-@1A_dCP)Ta+G|^pxiq zODXr5T+iT}Nx>d=CZyz182VtEkuR^RQ#*!+SaWriS^CJiRZ>i(Y4!}qLW2o8$8kKu zr3`RLawMxkyD$h31Y!8vRYX2f#KKyQNO9+&gmi*~m+&N7Cw;44M}wkb;F*tY|j(5rq;PKwRzRkYxpDB#ljYhd-MPXwAj<2;^vyzJy z0gV!)^Os0?9v}}8JLbA$?IeOuBIp{DUB`O_gdf7Lb7K}^+XBDKT<|Gti?`78J8~IS zSd0J{TBq3suH~3b z@Glo}cm(8st|guoWWEXs3P@0wLatd{r^-gU3WaAM(oQ0#iIE{am(W4e?V_mW%tIA5 z8eSo0QTio3tGMp3a6Sc}SkOego1eq{dDyZ59ovp(9E5H=VY*n2mRq*EURCK6FdV`5 zzNgeYY(FjC094nliF9hiX#vhnL~Pr5@#zO*@bKTIzX#|N;6CC&_jBF%mjD9*%NmT% Tst$HB00000NkvXXu0mjfHGr1x diff --git a/data/magic-future-textless.mse-style/instant_black.png b/data/magic-future-textless.mse-style/instant_black.png index 7e28012ae44ed516206914093fce3849de021390..4a75a88761e8d1d7d80be7a54bcce9bc4a69c015 100644 GIT binary patch literal 665 zcmV;K0%rY*P)200006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*9ZjOG9SQ{f+$#NWu*u< zT8SWv#%N=eAQ}Qm8eoQ^Ugi@%osIHj88BKFU!NgEi)6K zT1&uDN$+#^k3UzIcN>WjFtb_UZc|SZ?mlTD^xgNJ;y{`E>0yKbt#*4#@OALMPia+E z^SGr7-Rf^06Ty*d#(>Y7DM>mU2!A*!!xNVnT1hHx;cYE4O3f%Cftr{boE_@dM8V0$(+ zVi@Td(!<&UZvf9-!ptIY42Y6en@B^yr2*R-X9hU2!x=&-J^Qr5la$g@2w~mKz8JLB zlA-v?IReKV!x?v4SeC`d6{RaKMP3hgyC{mY*?pddPbv)aOVU>U%m^`JW>mfMNY4J$-Ot37=Km>DeXp4jTP@n{ z_Rb?#_Ih(=uXhQvZwDl_I8y#6Q3ye}HBF08{!qKun`H;qLA2oZsBLd$~OC;lePpKfe9GotfpO#U+{^8o~*d&@ z7^8mn)H49uguCCj2Oz2HGK-KnEOd=k&(8wdNV9AO^xrJ@Wm$Ij64;Abj2Ks)bDwJQ z3~mV+dq%8YJeIM6`9g~ok)To6!1c^~Kg9e1m+WAkwsd^%>>}f~GkEU-)BgvQ zJVFNFgYB)?7_VS$tpO@*02RBq@CS+PVt*jc?Sb_k*0+RtBdWdz`)_N{0S-O^^Fze@ z@Q08Ir*)D%s^Ohu200006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*9Zjn;-8VDWA{(>2c`s|@g$wV_FlWv^_q-7!vDRH}=btrl09*0#1+#2e77le5RSYTLIE&I1cWzzlSeRwaES=T!@# zn^O9L`)#D0)+jEP)kV5(~k`N)at0<`1yQA7Gh3ASnegkV-2ngJ7eT2%=~b z(^#1IN+G66Yyx-t%Wv-8BkRjO92jPA_rCeQotae!!vmT&w)O(TqXa`t*^#U-Dy2SY z&0h@l7%*!HPx{UPBxYVrF%k!CTx?WO5-(_uJ`I&{kn#Bma8AA9>YJ35s zS?7WWA;#mLYe=}Qwf>k_fhk2g^Yn*Ft@SY8i9Wn%tgEUVC&adCoI9&BvsTRO|A3kA z8>QX`P(m`5Wl2znq)evEJYl(uaDDRaynDzoY*%H~DsAOwjmyCUte;QLP{;=euSF_A zQkY9{C{u@RTSTe!OB}ST0M2(_Q%-Yh$*dV<~LwJkqHs%O)x*j z`VjFHG9zMJ8;@@I5EN>#sK!md2KKK~JOTgie0-0o;gI%VIPQU9#W{BstUJ_=7@r#m zaeyK~ZT7;>;RU^fk}JXco&0|@J%+AnsIKcS87o`Z4OvKC002ovPDHLkV1i+)6e|D# diff --git a/data/magic-future-textless.mse-style/land_black.png b/data/magic-future-textless.mse-style/land_black.png index e827b732a33e58aec7a49ffc7009662e059c4c91..051c4cce00c4b161fd4e1032ab52b6d897181e52 100644 GIT binary patch literal 576 zcmV-G0>Ax200006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*9ZjYe9cO zg#8C1D7q1g5J9l8Nh~bfnR)NA*x66fMhYf=JgIi5-qHUeB@_>R4KcM^#bmEqet` z0%QO&#*y<4I|y27PEu7p@sv6tgiX0Wl(bs*itkCf3z~d>h=G_zVwMqNK5QS#d!Z}4-WtrVc-IJ4B=xwo4*S{43VvG z+oL^ARoYh-WoN43uOK}|zGMsn9`w|ml+s)(%MNgi-C?e(syFKIg+}`2xw0tk2rct> zXiIu7>B=yDckg1h5zGYK2KMYi(1Dkj-NfuO1H(@oIXWydkQ_~*6dg-RPuHAR9AgnuTc}D}vl;9UK_|kVs1$Rr%0N<vPraqx-wto5DW>R-D`vgWTj!!UM5L3rAb=qC|5LdXLu=?CTv z?KZ}=nJ_$sZiN0OZBZ0mO5&%vqrEg^joHM<8vRd-z#{O-ou$$Xn9q=20L7fE#UF^= z6rUi+P557`v7zDG06HS9lai3m<2;+D?jCS6@C@AGaDlsXoNs}*+5qRs;#NsqTVebj sy*Ty*t!WgmxO)KJb$zE}|4#u10G4>p>K6PjAOHXW07*qoM6N<$f*Tw46951J diff --git a/data/magic-future-textless.mse-style/land_white.png b/data/magic-future-textless.mse-style/land_white.png index 800d2e12ef0ca681de252709455f4f4648814b5c..440e4c911e395099a4ffcf9f1369b32712a28380 100644 GIT binary patch literal 571 zcmV-B0>u4^P)200006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*9ZjuRstee1ndMsY{f#bRq!7u z>^}&C7Kv3@F<@b%jX}eEGuL9DyDz(|CU$}cPBC}p9%k-2BY@5KeWpU1bN6{q`E9!# zV!$1~ZExf5yIRh7yBNR6Ibc~5ZT<-cpy?FwK+=5+c0^_jxJOZ+M(G%EsoB43!LS&R z*&aoGlDJ=Pox7J)>Qp;Bkn^zU?h_n}7Db#O()E^OCsRr{>bjz_~_PDz^p z5g?^B>UVJbIMQ;v7-D>4A@p+2eVIL!v{H1+uR*#y82{MwbIPPTk?NY9Gm>skPncfH z?6IVqO=-oX114c6tVu=$sOoAU280k7EQVFa^4DNd(qd~pTcvcZuB&Gu7LCR1&S{9@ za4d_SPZ#{v2YHHY-W$V5IW;4MFcXTR2b^Mmn29mI(V)*-?ibynELVk=_&dx=dLik` zaHeLqj{9aFy!#F?yAQz(yu$q!u=VqY(%k#rg-J^|~3*A8pI zJKziMIIwW~%;2VD*a0?x4N1@4{U~q(D4Sb-7JL+ZcmCs_#t(|duh>!v^YH)x002ov JPDHLkV1i@$`BMM@ literal 539 zcmV+$0_6RPP) zMysH~?5=OKhn{B=KL*~--t5g}-kS**Zi-abn7f^G{m$64WLPRm&Jn$o%kb_?ilD|e z3d}GwCDF`;zpexCwvoIgr08TJDBy=;zR_=B?tz=4@IH%zBtXv>Y+ejsr-8?G;+qX? zOy;dpA+q)(==DlNXssv>h_jHG#DFnov08njSngJcu%n}>U1uUng0F9HKJ$EMD;dig?9Ha;{Gr*zh@Y?lrk%|&LK8P zf3vJo>XbvCP+IFT9Oi%t`k!?}#{>9HC4|VM$AS&~)_}G@6!MFAg!~ow5*JH%HNvr0 z89awMbUBIhcuYML|2ZCkJnm2Ma*Xpi@LbFH5~hlUU|0o-Zo6>o1ERQ#C*0iwulDOy dYkBVi3;@#cw{o;ky_Wz0002ovPDHLkV1j0$@LvD` 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 a904d1281808b5892fd1d6ec893143687f2be14c..29471db2a2141cd71e7ed43f9fd2bc78b16e03e0 100644 GIT binary patch literal 576 zcmV-G0>Ax}g!AwxWz`x@~ikYIIU?lzvBeR2J z!4EDF1r=^*-I=K>gWXeacXrm?7dojfo^I;n6_#}7)M-S7loIaFI*AB%(@;&PeEaeJ zcRcIL1rl%<2!O3&ZUL`{!{N9WnCE!_j)xE)(IWv;o?C0S^LKm&=!#TT?k%ogs_IEKdkPRjB!<`z zEX$Iz98eSmsYnPkZQDL~cU1MktggSRDrS(yNR}Pljjl}r91$T45ggRC5E0z{M3K^; zO<65rr#URaA;xU580516ZidsnNnyP`%`IwvxG}F;xD6yk2tp^a189eibso3|ybzIx ziyvPBc7a>KWgsli;aUgS9*r)U`97PI(f{Na7e|E*t-p}S6?7Te_j O0000^I|iGkj&K&S3%U#9B*?F~j~a+$kq%dOsYE22v^IE>?-? zicK*N1WFlBbSV+tMINykW*w}3K}JScw2*rrVE?c)og{MvW(A)ZVP-Of5Nkl0x0_8@ zq!c9j@NY~b8EdzaBfF1aPiH?APPewMMjLQ5%L1`n~ z9&mw+=ee^590KnM6rt8voLjyc$3>QHW9%lDAHXnwjWbtt2`x23iU+LqmjD9*muQ?6 T)=nt<00000NkvXXu0mjf0x8xk diff --git a/data/magic-futureshift.mse-style/artifact_white.png b/data/magic-futureshift.mse-style/artifact_white.png index 686c74acf8a051867040657385eb2a748f105306..1ada518aeb24f364e6baa8a68f3e3eceed8bcaf5 100644 GIT binary patch literal 568 zcmV-80>}M{P)0mVr~ zK~y-)?UcJ}RY4SnzqMx1J~{hX7%!E02@2L0Hr6&af?y}8VBzbSO0iQE6s*Lzu(At; zSey_rXlatO=e8`eg>&7<2k?g}hJWT`v2MbY4i0}{W`qzB5mw2}sJ*8d4mo#rbH=OY z-U?6yPXPtW3T6X*J~}?yn>S{FF-8T>mr`EQBLhN;rBb)u3lxz8oUld$2(n*!zu@T{ z@G@q1G2$z^r{1E7ym8J&=UhLq88tMchN`M|MC5A^@HN);PajZKQB_7~ zMrC6#cnBQKe{jw{QFVJOb31(rArL|!=Zve|xb}Vvc-Gk;opTqR>RSOy$>fszfs@IE z$>fB#Z3%6_AXZiNzKiU|pss&8=TL=|Gbtt3O$s2G8L4CtaOwt~ccBeoYEqV_aA7&j z!6D}~>>BwJfT$v@o+Mqqo=#WP>EQu@mGT&_WZ+>;R8| z+kh_X!=*#}eLTLUDmQ`O!0}YNHh`gFC8zx5#igP)j0m8g}dh=_%ig@x8OmV%w2f`z}wO0iQc6s*J_A=rn21dK6~^b(WX z-C5smE*gR)1MhBk=X>UfR;MkTb4i}(Cqf8GL`?q(Y_cSdAG0*AE3LIRoMq-qnjj9y zjb_*7bA{+W@;6Np5g?il-V#oW$h}McHeJqC99JZ2onhyeNQkK(*4kAd6K~C?Z&F#d zRlKiFaza@fNs?5hF^1q^@OC>TQ3nmY=30}qu(xn@%nuU>A;dL)8dZ^u;0VSf*YdEjPr zA>yO`IgI8@Af0OrhD#Vw4{zI%l+Obi`H`EDO!a!bkW;BRWOIZ1OGO`Z=+&=;m@V~l z8_u3afgt{3pa^_%E-jY1&@Y%G3iz8Gn~>+1FJ(WJ#C!xIC+?TB#ghN1Ps_-*2iyS{ zMU)+UYfv7tqb*n1i+ZCm%(5w^SjX`T=#GRg1F1t^YwQ!w=0|`501pwx!_2tESpWb4 M07*qoM6N<$f~3gX;s5{u diff --git a/data/magic-futureshift.mse-style/creature_black.png b/data/magic-futureshift.mse-style/creature_black.png index 0bfaeaec7dbd5a4104e679bc6a86f6c1cb7c3ac7..0e4f6aef5be209dde97d2478a6cb1257e4b6a79c 100644 GIT binary patch literal 759 zcmV200006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*9Zj_;hg#2=WcP%sAG+j`|joYKHOZ-uK>0@`y7jE z+XmO9s~sQ&Waj8o0%)+;ODa`d1&|>$iv8{C9KqvBzy`qvpaY}vMeal$%Z&ol0;6+KF0rSQm1A}oH5DMTWV2kbZlKuqh@}y=X=7Q~?C7lL7!X7w{ zqy~7;_AzI!6`TV8Fw|v9ZNCa!1owcghF?aBNrJbrzXrYqKCwNNgfpq*hW^7eYrfFc z`jgn>nNY1$p&8zq8;ns1Okr-)u@ z+Kq#S;Y}@a18F}g>4_3C4-5jJ){e| zDgf)BUPnaS&dhDVGZAqe^Dg+X;G{~~lbLtBg$`hQM0{y;LJ=o{;e*3}tJfQmwrzW> z);inO`j+5CW_~e_IjV@6%uGoWhGP-2DI)eQblsgt4L6xdtrcf>X`ddaa@6qYs1M$3 z`-)-O_HN+LN*hDJ-)A@+jz+`YDd{ZIj6yc-ku)dia^n4lTxp-1afk0+3&ZCM{VF@1 zehU19q`9VT-|q&4{4Yl$mTo2(Uj*(3qDX!0@0zxKvz?e2PESuWIW@(^s#Qej(WJ{C pI(3%5Li$}2rIdf&p#QZ*e*?RJI%;0_fCK;l002ovPDHLkV1h_6Rk8p8 literal 773 zcmV+g1N!`lP)Z!IeJxuGwhmiH zkk}$BFsMZ>0*#Wir@m(1+Ev`(*KnqEMW%lA07t z@e{Gu=0W8xA;C2(r2?bmTjq8mTIIP~Hvahh7XDh$yv=0}Rg2S`yA@BF<%$&3$V5dKEiM zX(}Udp4gDHwh8DL*uNlZ{$oZ`FX}z38FVK}pYv*z=X9Ec#~4qMTjVC*3#b@m8JIQp zKx)i8HvQp*x<%_L=d3`e0pBx#&T+QK0GLpfasjOF4{I1TnKT_^p@T3wiDxR%TFS;A z2ko`edIo=MTu!FdB2Q1ixvi`>kz3S;nPQeg<=jhRjauvLPPq?05$c!e(>TeKg+iex zjDl%dV$z88Q$eTpFA9P<1b;t37kSmu3d84=>yPpd>jyaA22pedU$GRIve{1Pzj4NL7&ezGu|YNt0Awk%j&g^TR(tUEm(z5fva;qcy8-_0c`%MQrJ17@%7e)5 zyuYp;nZVwHzJPCj%_%RHN|Gc=e#Fk5g2gL(F#rqi>BIhte6-@OVcT^tZ~N}H>MaK3 zNEilRptC?(+wjeLurP|cXhY(^4k6`HrmR+Gu)V&%_Pg+dc`5r3iq1>i71h;UL1v>U z5-$LYNz2tas|8#8qAQg;r5>Sw`i-8+%86h3{1adRdNVl|xs@3Y00000NkvXXu0mjf Dbo6aL diff --git a/data/magic-futureshift.mse-style/creature_white.png b/data/magic-futureshift.mse-style/creature_white.png index 4162656bd11cb2231968f0e930885b1445257782..3a9e6d2ae668148b156c5b56d86d30e0f083fe8c 100644 GIT binary patch literal 752 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 A#{d8T literal 893 zcmV-@1A_dCP)Ta+G|^pxiq zODXr5T+iT}Nx>d=CZyz182VtEkuR^RQ#*!+SaWriS^CJiRZ>i(Y4!}qLW2o8$8kKu zr3`RLawMxkyD$h31Y!8vRYX2f#KKyQNO9+&gmi*~m+&N7Cw;44M}wkb;F*tY|j(5rq;PKwRzRkYxpDB#ljYhd-MPXwAj<2;^vyzJy z0gV!)^Os0?9v}}8JLbA$?IeOuBIp{DUB`O_gdf7Lb7K}^+XBDKT<|Gti?`78J8~IS zSd0J{TBq3suH~3b z@Glo}cm(8st|guoWWEXs3P@0wLatd{r^-gU3WaAM(oQ0#iIE{am(W4e?V_mW%tIA5 z8eSo0QTio3tGMp3a6Sc}SkOego1eq{dDyZ59ovp(9E5H=VY*n2mRq*EURCK6FdV`5 zzNgeYY(FjC094nliF9hiX#vhnL~Pr5@#zO*@bKTIzX#|N;6CC&_jBF%mjD9*%NmT% Tst$HB00000NkvXXu0mjfHGr1x diff --git a/data/magic-futureshift.mse-style/instant_black.png b/data/magic-futureshift.mse-style/instant_black.png index 7e28012ae44ed516206914093fce3849de021390..4a75a88761e8d1d7d80be7a54bcce9bc4a69c015 100644 GIT binary patch literal 665 zcmV;K0%rY*P)200006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*9ZjOG9SQ{f+$#NWu*u< zT8SWv#%N=eAQ}Qm8eoQ^Ugi@%osIHj88BKFU!NgEi)6K zT1&uDN$+#^k3UzIcN>WjFtb_UZc|SZ?mlTD^xgNJ;y{`E>0yKbt#*4#@OALMPia+E z^SGr7-Rf^06Ty*d#(>Y7DM>mU2!A*!!xNVnT1hHx;cYE4O3f%Cftr{boE_@dM8V0$(+ zVi@Td(!<&UZvf9-!ptIY42Y6en@B^yr2*R-X9hU2!x=&-J^Qr5la$g@2w~mKz8JLB zlA-v?IReKV!x?v4SeC`d6{RaKMP3hgyC{mY*?pddPbv)aOVU>U%m^`JW>mfMNY4J$-Ot37=Km>DeXp4jTP@n{ z_Rb?#_Ih(=uXhQvZwDl_I8y#6Q3ye}HBF08{!qKun`H;qLA2oZsBLd$~OC;lePpKfe9GotfpO#U+{^8o~*d&@ z7^8mn)H49uguCCj2Oz2HGK-KnEOd=k&(8wdNV9AO^xrJ@Wm$Ij64;Abj2Ks)bDwJQ z3~mV+dq%8YJeIM6`9g~ok)To6!1c^~Kg9e1m+WAkwsd^%>>}f~GkEU-)BgvQ zJVFNFgYB)?7_VS$tpO@*02RBq@CS+PVt*jc?Sb_k*0+RtBdWdz`)_N{0S-O^^Fze@ z@Q08Ir*)D%s^Ohu200006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*9Zjn;-8VDWA{(>2c`s|@g$wV_FlWv^_q-7!vDRH}=btrl09*0#1+#2e77le5RSYTLIE&I1cWzzlSeRwaES=T!@# zn^O9L`)#D0)+jEP)kV5(~k`N)at0<`1yQA7Gh3ASnegkV-2ngJ7eT2%=~b z(^#1IN+G66Yyx-t%Wv-8BkRjO92jPA_rCeQotae!!vmT&w)O(TqXa`t*^#U-Dy2SY z&0h@l7%*!HPx{UPBxYVrF%k!CTx?WO5-(_uJ`I&{kn#Bma8AA9>YJ35s zS?7WWA;#mLYe=}Qwf>k_fhk2g^Yn*Ft@SY8i9Wn%tgEUVC&adCoI9&BvsTRO|A3kA z8>QX`P(m`5Wl2znq)evEJYl(uaDDRaynDzoY*%H~DsAOwjmyCUte;QLP{;=euSF_A zQkY9{C{u@RTSTe!OB}ST0M2(_Q%-Yh$*dV<~LwJkqHs%O)x*j z`VjFHG9zMJ8;@@I5EN>#sK!md2KKK~JOTgie0-0o;gI%VIPQU9#W{BstUJ_=7@r#m zaeyK~ZT7;>;RU^fk}JXco&0|@J%+AnsIKcS87o`Z4OvKC002ovPDHLkV1i+)6e|D# diff --git a/data/magic-futureshift.mse-style/land_black.png b/data/magic-futureshift.mse-style/land_black.png index e827b732a33e58aec7a49ffc7009662e059c4c91..051c4cce00c4b161fd4e1032ab52b6d897181e52 100644 GIT binary patch literal 576 zcmV-G0>Ax200006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*9ZjYe9cO zg#8C1D7q1g5J9l8Nh~bfnR)NA*x66fMhYf=JgIi5-qHUeB@_>R4KcM^#bmEqet` z0%QO&#*y<4I|y27PEu7p@sv6tgiX0Wl(bs*itkCf3z~d>h=G_zVwMqNK5QS#d!Z}4-WtrVc-IJ4B=xwo4*S{43VvG z+oL^ARoYh-WoN43uOK}|zGMsn9`w|ml+s)(%MNgi-C?e(syFKIg+}`2xw0tk2rct> zXiIu7>B=yDckg1h5zGYK2KMYi(1Dkj-NfuO1H(@oIXWydkQ_~*6dg-RPuHAR9AgnuTc}D}vl;9UK_|kVs1$Rr%0N<vPraqx-wto5DW>R-D`vgWTj!!UM5L3rAb=qC|5LdXLu=?CTv z?KZ}=nJ_$sZiN0OZBZ0mO5&%vqrEg^joHM<8vRd-z#{O-ou$$Xn9q=20L7fE#UF^= z6rUi+P557`v7zDG06HS9lai3m<2;+D?jCS6@C@AGaDlsXoNs}*+5qRs;#NsqTVebj sy*Ty*t!WgmxO)KJb$zE}|4#u10G4>p>K6PjAOHXW07*qoM6N<$f*Tw46951J diff --git a/data/magic-futureshift.mse-style/land_white.png b/data/magic-futureshift.mse-style/land_white.png index 800d2e12ef0ca681de252709455f4f4648814b5c..440e4c911e395099a4ffcf9f1369b32712a28380 100644 GIT binary patch literal 571 zcmV-B0>u4^P)200006VoOIv0RI60 z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru*9ZjuRstee1ndMsY{f#bRq!7u z>^}&C7Kv3@F<@b%jX}eEGuL9DyDz(|CU$}cPBC}p9%k-2BY@5KeWpU1bN6{q`E9!# zV!$1~ZExf5yIRh7yBNR6Ibc~5ZT<-cpy?FwK+=5+c0^_jxJOZ+M(G%EsoB43!LS&R z*&aoGlDJ=Pox7J)>Qp;Bkn^zU?h_n}7Db#O()E^OCsRr{>bjz_~_PDz^p z5g?^B>UVJbIMQ;v7-D>4A@p+2eVIL!v{H1+uR*#y82{MwbIPPTk?NY9Gm>skPncfH z?6IVqO=-oX114c6tVu=$sOoAU280k7EQVFa^4DNd(qd~pTcvcZuB&Gu7LCR1&S{9@ za4d_SPZ#{v2YHHY-W$V5IW;4MFcXTR2b^Mmn29mI(V)*-?ibynELVk=_&dx=dLik` zaHeLqj{9aFy!#F?yAQz(yu$q!u=VqY(%k#rg-J^|~3*A8pI zJKziMIIwW~%;2VD*a0?x4N1@4{U~q(D4Sb-7JL+ZcmCs_#t(|duh>!v^YH)x002ov JPDHLkV1i@$`BMM@ literal 539 zcmV+$0_6RPP) zMysH~?5=OKhn{B=KL*~--t5g}-kS**Zi-abn7f^G{m$64WLPRm&Jn$o%kb_?ilD|e z3d}GwCDF`;zpexCwvoIgr08TJDBy=;zR_=B?tz=4@IH%zBtXv>Y+ejsr-8?G;+qX? zOy;dpA+q)(==DlNXssv>h_jHG#DFnov08njSngJcu%n}>U1uUng0F9HKJ$EMD;dig?9Ha;{Gr*zh@Y?lrk%|&LK8P zf3vJo>XbvCP+IFT9Oi%t`k!?}#{>9HC4|VM$AS&~)_}G@6!MFAg!~ow5*JH%HNvr0 z89awMbUBIhcuYML|2ZCkJnm2Ma*Xpi@LbFH5~hlUU|0o-Zo6>o1ERQ#C*0iwulDOy dYkBVi3;@#cw{o;ky_Wz0002ovPDHLkV1j0$@LvD` 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