From 5725e878e17143faf92afab14dc75cb5e0f81392 Mon Sep 17 00:00:00 2001
From: pichoro <pichoro@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Tue, 18 Sep 2007 04:11:48 +0000
Subject: [PATCH] More tweaking of futureshift styles.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@709 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 .../sorcery_black.png                          | Bin 973 -> 1069 bytes
 .../sorcery_white.png                          | Bin 917 -> 985 bytes
 data/magic-future-textless.mse-style/style     |   8 ++++++--
 data/magic-future.mse-style/costmask.png       | Bin 133 -> 971 bytes
 data/magic-future.mse-style/style              |   8 ++++++--
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/data/magic-future-common.mse-include/sorcery_black.png b/data/magic-future-common.mse-include/sorcery_black.png
index 26588109d98e04a3e1c0ffc2c0eaabdb375948c3..3d54154cbfd7454edebb82b449ed0c68ad4f213a 100644
GIT binary patch
literal 1069
zcmV+|1k(G7P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00007bV*G`2iFM_
z0RStRk?17=000SaNLh0L03N~s03N~tZqRi;00004XF*Lt006O%3;baP000BLNkl<Z
zc-o~@O>Z1U5bdh&o}KZ|?1$snUT1BRki<4Il1)NP5~2tq@u5h$aN-VsBmaOaCxk$P
z17|J~5*H){;s7Bc3Nld=*?2eh+QzfH-mjVI=8c1qiM@^^YPFi~>aN#S{a!VRK2{dO
zqf+S{NjYhW7CN2IFSS~&DGq7e&(EWyCz$yLHk5m|*R5r0$zefLQ~UU6Vsv6kYVnD+
z;>VteKV7M;EIkkCz8RNFC6AT4&O~F1#rKs;Wj83{ulpo)FtFF@Xe-1FFfx|pnS4H9
z*tM*W4GxaHP%51o85uc_x!Vs|?l~!&buvo5Du}KUi77|xDC_$hzVEl2&1Tmb7_jh7
zYOUYS2Z1M*T5Y%6-Dd)0lPMMo2@}80EGLM0RuP|-Ox*$Budc4HZi3oP*Yl1_mLFu4
zW~tSE#PtpYh8d}K%~7%=n1&>=gY3@|(VW(*lX2aL>+9<q1(e_@{k{<Ps^jRz%`m)=
z*yJGKH0vJpyWl#`?Zlej$=V2+PYP>a(O@+w6f%(Fo1pRv5ubqnc#wC$3B#?;1A$XR
zLv;TN!zE;LH}JgQ0BlLnJihai`4Yxg063h|g7J{Bd<V%qO5^$g^VrzfpzFG_)oMkU
z$6>Qs8!QxBEafb&WCofm!Jor;TU7=p5Pn+mgRs$9+D~p&E|&`~7)Pl`F}JC+oXZU+
zv7NzWcpJ!WyX{U44wBZ|Ikf)E`|7w<ERCatw{ZG3$Z3aV_JUv>(dVo&Et8mg0BQWQ
zmV(<fbCTkSBssi;^`8z>u9_oZ-?PGwXCg`)V>u0MhT*c4%YAMveT8fT&HRp#>IT+E
z#glGCi0xq5-j}>$K6nwQp9VpfERzoMxi#On-P};7r!vLWZWJy4xxD;G&hzd_sUtwX
zgs{LE6XT+PP2%M1`c`9M53rZbZi4X*RQ4`Qo|8o9rEpHgkv<d0@kP`-oA>i>*xq{R
zc)SQDyhhtEtVodZXH6Ej+Koni4=`G`jZ53edR`IJX#`C{3DfAn3%KJ8knly8^hU;U
zjIn$V>oXvEN?5ZJN72odYW2|$se9zs?RGoaAh>H2vj%}qAQK;@R!m}VVg4P68$swi
zGbsRHh9(>`;-gsdxAl7c-?pYc{gL_y#*d8Wag{oWqNpCnEu~aa@Vv{U^i6B*G>EK`
zFdw($_={?_y7n}{q3z_!W2bGRK7<0!+c^FKm3+DQ`0<0ZQJ>!X%m;h7nO4$cMYnMs
nKegicXS{T2mqpKm@xSeFihg=w?PeDp00000NkvXXu0mjfI}Qd}

literal 973
zcmV;;12X)HP)<h;3K|Lk000e1NJLTq000sI000&U1^@s6&0owx000A&Nkl<Zc-pm8
z-ESL35Z{^Iy^r|LcXpfD=Q^PuX_L?(CA1VuLFGdNAtatb;spuBf6@PdSDp~!0sa8Q
zOH~OWQ6UfyP>@hjsalj$JF$~s8^`wD?d>u?n#h<!`@&e3c4l^d`@8wgF0d)9Gv-1R
zodM3548V=iX!L!%-R`po7*6|GtsX<f*C<g>OcJ;4cE%pU#KamFste0pvJZ@5-y~Xn
zxYgLY!yeKO7)4R!qR_7*KusX~s?lgnf&l&H)WP=$az`U+7+a+p+W<cm1VK2lPaY|k
zE009cVx>|!O1?7<#19Y)1<MxV2?lTxfGt~6rUlR2^*nFb@AqSCX2wu#NlN*0;QKBY
zqBR^2<9`5AP?y3mL%?Sc`2rxW3Bc1FA)fKPW~<fekQ5!qb!R#9w{0PjOL3FxlD`3w
zX)a~k5`4rE4s$?@*qsJ|bt%QjcAVQgJ3G4}QM817gE4c_vgAgm+r3G(*(A`IRYLP~
z!?CPunbALkF)1-yV#Yi!Nd-R)Z5oXisP)eR;4z9H^#kWhx4YMY|4`Iks8&x1%X$+S
zzD31`7;YM4W(i=9m`aMonaSSm_WPesGQwJ|R(2eR4+evjd_^1D<uDu|=WA5BN~cB?
zFVZ?!TN5JCPYS%XFF(}l_0S<ji25w~CciGlVmVW0m7KY}(BxsWUqis07_QS*dMpQu
zO3^$~dx_9rBzcp4hOY0=)9y1y>w(Vnbt?MfUTzF##>{}TLmc>A{%NIB={ZF9IwclG
z!mj+j*K6lZGDe{#?`WgHP&&Ixn+MeV8l}8@(@xmBOUtW&0R{dE0y#;Wo;C>54~pBK
zXX4^vI}vuN6{qROZ+GwhQgq!PIhQFxJW6H0)>=`ce#lhzSq|hD3LTEPOH5xuj_VxY
zEN9lDO64h~)Oq5+7I=Zv9q!$>T-;y=pMw0wVVPm(qdv0BIS^feA$|02!F5aIuF$4s
zQfh@J{2cY@9F5R<<nX+0Sy~&sPWe?5WtkbhrPB1$R<rr*f&6hCj|#s3lgacp0$ZSy
zJfhyvnYm2<m(+|3wfIRy5Cn9AG_ydn_Y}v^d%a#VJ&<F6X8zE8K&_Bjnx;La211A|
zblnRe<Rzoc3XMS<n0|k#)W^+cb9=w=fp+}(k&`A9?~q1kjZ$9|(@!=wH*ZmDbiWt!
vUri6P1O;59&--?u)OYj}j32#}{U7!x+^%Y#@4P_D00000NkvXXu0mjf#|+N7

diff --git a/data/magic-future-common.mse-include/sorcery_white.png b/data/magic-future-common.mse-include/sorcery_white.png
index 43f270c9fa9ff6092eea8fe0188197be30a62370..e5f8aff146585e424f5bb764d4ca63bfb63cd2a4 100644
GIT binary patch
literal 985
zcmV;~119{5P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00007bV*G`2iFM_
z0Rb&(>3mTD000SaNLh0L03N~s03N~tZqRi;00004XF*Lt006O%3;baP000AMNkl<Z
zc-qZWO=whC6u#%&`!bVc-jlHgtxktGnxV;5?1(}mD41GGYl4Cjm*S!ny6U31cHyGS
z7A&-zDu@dW*cNps7%W2;8g0OYq~q9`{4r+Hq#>DkZ|1#sPtOdU62nX#cRlca?z#7T
z=R1EFL<^aln~PR_|0p7MYtMU}OePBe5QsJfn<?k#=Q}mx03v)WWnEQi7qB5}t72?y
zOnIL7p$533wf?F%(fjk8f;MGr+jfMMI>Wzfex)+Cd5?%>KA#Vdj*iMV1~v>sGQu7J
zu|tN9kFwdU)!6%Ebu}VFp~RshN8V$74?DuPfy?Ex2SUsWfS5#e5jxc8voBs87#|<+
z+#8LqJJsr6<aq<A)CC4VFflP<v<1Ahv{d$d_YMa>%UzIQ)nz5&+Z{W1o}4TctdwmR
zCBP_i9h8P~$=tp@)r>hb^ENp-*=<?YkOn$SfHte%W#a`ReZ>R!j)7*EB>JA$Cp3xc
zf$LsOrBZ*s7Wkh+!SwWWR7JvRN%FK1`ZP!2XrlW-(8aM1fq-3n)M1$6ryCoYbNlyK
z8}_OdFoV=SEBrk8okbX`gX8@S0sFSl>13xv2Q6!!|8p&K%moR}<Yo@@*KFt_k;p2u
zdsz#l1&w0}`u&#0%gkiV0N@a!@kuxw_UgJ!#w>a6NkI7YKO(d#(0ey4UOD)7*E?yZ
zbk6sED;|$KH62f(rvovk6kcP(KatP}nf(dg>S@^Vgc=f1wFD-udq|Ki5$u`g&yU}{
zapTv)!9ka|9`mUG7VYZ`MSOpEP<5Xn$}hMMv3l4NiXd>QWmn`Da!Js}Ft^dyK=dpi
z@sJNZLZTA!OAB2z!)A7QdAZx#w(UC&;uM>On9Nls{7r8>KGl@*LT(`+i^cAe#1Urm
z0p~Tz4$e^hy5s~1bk?2HJ!P6d@a^}6Lp)wfNtN{Nt{}*5#(JfA9Jar>xLDw(|55<n
zVzy!KyWIkDLm)h4X9bCJBqYQLC$_iFRtG=IivK8)NVqLi@o%nqM2p4ZTaM%G;)`CD
ziB?Rd)?MJi@V!fXV3?hBlYn2mAh?{`w=c(QdM)tQCaw9Z^*0*E5U<WNNGT9-(=V0A
z`}_M>wt}_`T$d@L4kMo*kV@^5K`^_vww6t&)1`Lp|NrtguI_Q5{BjuO00000NkvXX
Hu0mjf<ebjG

literal 917
zcmV;G18V$<P)<h;3K|Lk000e1NJLTq000sI000&U1^@s6&0owx000AANkl<Zc-qZW
zO=whC6u#%&`!bVc-jh*-f79WOW-ytGjwm#Og3(f16DnBZQe248RTssz3m09sV4-eQ
z5EnL3E9y=#C_@&SwgD58j$>!?$25y3hGgcwnfKm3Ju^7N5L43bdf>fx@45GU=R4<q
z?}AuoGcz;Mitiss#7^ybFO$h+0RRHAiDBzxc6PR1BlaP}CsNj374a`kH3lOiBg*r<
zQySp9*81!2MEB3)KUkBIZQBu2>KqSO{7Pk_brTWEd_Er@9v+sP0vU!OIbsih*e=7y
z$JuPwYOMXSyc`jsP~yn3V;{1=i-GYUfy(8w2SQ8>fS5#e1=`f*={Ii<j*gDD?~O)R
zooe+hd0rnXb&<gij*X2O8v-pXER;RpeaMAO^C>0Rbxle5Zu^cMXT}Q!D`ne72{6oD
z`lVr9HMed}wK9WN)ba80PRp_eG|(3WXtQfSZ=NI4*FA6_8fbP%q91sET9ddFxbBry
zD)rZUK<^q0larHC6$z&$$+JS}v&_)ZL{EUAgKHQ70XuoC!{LL!uB~OxA2?7|>w!3^
z_F3ZR>F;d9P;Jcr5(4(DOWV##1`b=+ERS=|8o7a?sod02{+bP6BobNX?0?pXZhYu)
z0zn^YHajzwF#~`jh{mVkaM-K+G8wbvxn}_3vsU4*Gn)dvx2f!19Ur7Q<$2%tt#~}{
z)O@URPX}T~DZI^u?vv1mncZn#>T00yA7Ds8)dV7~yGW2N5$vhguTS2)d-r*Nf4|F1
zFZtK`E!xu)iunHSpz6LtlwWcmWA$<*6hYuZ^VD*4xg=;~kdO5nAbJ&$c*YAakf=ob
z(n1%_u$f(4T<o;AZ24Y;_?*K+octCO`nEeBpQtmM%gyCuvDhP$IK<gL;=Uvq@Ep~z
z4=zZcv+9%{E7QEex5F=7!pT~RRnk9o1VOIZY%ar}pPw(V$i5PQKQfyz>tMG)ToVY-
z7`z}+4uymm;>L8>+34V=toSbyiG=%}AZwB@7K_^)$Jxmjn<^76nM$p?z(VxBtGr>5
zK|4vn11|`!rS|R1@tihPcB@Eg*fo8jVGQu>0tb}>0r&h;X|%Vucc}rg8BpCOh}w*N
rzE3K(M+U+4%F0SMolcj;|K9!v>PK;)2~F1r00000NkvXXu0mjfAe*?S

diff --git a/data/magic-future-textless.mse-style/style b/data/magic-future-textless.mse-style/style
index 21aa79b5..5daa6547 100644
--- a/data/magic-future-textless.mse-style/style
+++ b/data/magic-future-textless.mse-style/style
@@ -77,8 +77,12 @@ init script:
 		else "white"
 	}
 	typesymbol_color:= { if contains(card.card_color, match:"artifact") then "black"
-		else if card.card_color == "multicolor" then "white"
-		else if card.card_color == "white" then "black"
+		else if contains(card.card_color, match:"multicolor") then (
+			if card.card_color=="multicolor" then "black"
+			else if not contains(card.card_color, match:"white") then "white"
+			else if contains(card.card_color, match:"red") or contains(card.card_color, match:"green") then "white"
+			else "black"
+		) else if card.card_color == "white" then "black"
 		else if contains(card.card_color, match:"land") then (
 			if contains(card.card_color, match:"green") then "white"
 			else if contains(card.card_color, match:"red") then "white"
diff --git a/data/magic-future.mse-style/costmask.png b/data/magic-future.mse-style/costmask.png
index e48cf477377b0f952975c98f9e70de6fe7c6a8c4..c797b8384795909c2408eeea630abc496725da9c 100644
GIT binary patch
literal 971
zcmeAS@N?(olHy`uVBq!ia0vp^ApDPm4M?v16vPLlSkfJR9T^xl_H+M9WCij$3p^r=
z85o30K$!7fntTNV19PsYi(^Pd+}pbcgB}}*xLo}3|Nb0?%`<qXw(4%3>|VU$)H$I&
zuit6wF8HzIZr=R+^6`vJ{~dn4F=j9nQBi2TvpzW}Q%G~7P~^>~Qwt}(v)&~>LFVMd
zsk$p<Uah!3={)1fi87>1on^1we}6J_{MPF=6BZtRpw;mIJFC%`MGY*MzAoRyI@LM0
zc7x4rd5^v)Cr*il@Ex6~7|+Q0MCYUT5*M!}!PZxp6dLC&74Dqk(YYqa@o9kG6Fl+<
zzdGB>^_Ry?i2rN5o?Wu&!s>%_{?<9P#hFZSu-d8}9bkFoX0y^q8<?-O9`4y(%>eV&
zxnH`}k+QrtvHnT<v3j*IrQ>QwUz+EZUfDf=`iTqO>_Q&mpFqC++SklZ6(2)Gq_pAB
zpMSrOI)v4iUFF+bqR?3KcO@vaR<j>FXQf~{Ng3?-zSm*bnP9#Rv)#U#59Wrgk9S?&
z>QJQO9=2^k(TdRXZ`UwSQnuU#ik`PS@=A4K0hV>O*!p$D6OTS{Tv)G*j^$QyFG@+}
z)@qOXdIx6Jhgl2%9jF(n<UKK=y^ODU^>rr6s*?^(FR!cvxhY&;=lnNznDK=vC&C?=
zEWQ7L(%s7|d|Mej6w+V1D5(Z1f!sWWyOLP>os&)|)*C+D5LsF2e~kf{g!Dm42<*0^
zex9FPKyy3eLFUfAwNMNsKi2~;ugFiT{7i<QtV-W5G^f1jHwNZL22WQ%mvv4FO#r%1
BsXzb#

delta 116
zcmX@j-pV*ZBA1Dofq~)5oLzH)6i<Lph%1o(_wV2T|NsB~{X6T{XGS33#M8wwq~g}w
z%Z|JZ1{@5ADn3j?6Ab>Zde+FVlC2t3B)GxB^8kAvO9J-`FV2KpQyJ#4RNMGSGkkQu
SUEc)M&*16m=d#Wzp$P!~iYl!D

diff --git a/data/magic-future.mse-style/style b/data/magic-future.mse-style/style
index e044cb86..cd09a97b 100644
--- a/data/magic-future.mse-style/style
+++ b/data/magic-future.mse-style/style
@@ -109,8 +109,12 @@ init script:
 		else "white"
 	}
 	typesymbol_color:= { if contains(card.card_color, match:"artifact") then "black"
-		else if card.card_color == "multicolor" then "white"
-		else if card.card_color == "white" then "black"
+		else if contains(card.card_color, match:"multicolor") then (
+			if card.card_color=="multicolor" then "black"
+			else if not contains(card.card_color, match:"white") then "white"
+			else if contains(card.card_color, match:"red") or contains(card.card_color, match:"green") then "white"
+			else "black"
+		) else if card.card_color == "white" then "black"
 		else if contains(card.card_color, match:"land") then (
 			if contains(card.card_color, match:"green") then "white"
 			else if contains(card.card_color, match:"red") then "white"