From 3ad16e949fca239030173ff122048d8246611141 Mon Sep 17 00:00:00 2001 From: coppro Date: Sat, 12 Jan 2008 18:07:34 +0000 Subject: [PATCH] Added sorting of words "A", "An", and "The". Fixed transparency on update arrow. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@820 0fc631ac-6414-0410-93d0-97cfa31319b6 --- Makefile.in | 1 + configure | 24 +++++++++++++++++++++++- data/magic.mse-game/game | 10 ++++++++-- src/resource/common/welcome_updates.png | Bin 2840 -> 1009 bytes 4 files changed, 32 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9caafa91..c61b9ab9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -269,6 +269,7 @@ WX_CXXFLAGS = @WX_CXXFLAGS@ WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@ WX_LIBS = @WX_LIBS@ WX_LIBS_STATIC = @WX_LIBS_STATIC@ +WX_RESCOMP = @WX_RESCOMP@ WX_VERSION = @WX_VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ diff --git a/configure b/configure index 8f5b4dd4..d2847524 100755 --- a/configure +++ b/configure @@ -698,6 +698,7 @@ WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION +WX_RESCOMP CC CFLAGS ac_ct_CC @@ -3195,6 +3196,22 @@ echo "${ECHO_T}yes" >&6; } fi fi + wx_has_rescomp="" + if test $wx_config_major_version -gt 2; then + wx_has_rescomp=yes + else + if test $wx_config_major_version -eq 2; then + if test $wx_config_minor_version -ge 7; then + wx_has_rescomp=yes + fi + fi + fi + if test "x$wx_has_rescomp" = x ; then + WX_RESCOMP= + else + WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp` + fi + if test "x$wx_has_cppflags" = x ; then WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags` WX_CPPFLAGS=$WX_CFLAGS @@ -3228,6 +3245,7 @@ echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6; } WX_CXXFLAGS="" WX_LIBS="" WX_LIBS_STATIC="" + WX_RESCOMP="" : fi @@ -3238,6 +3256,8 @@ echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6; } WX_CXXFLAGS="" WX_LIBS="" WX_LIBS_STATIC="" + WX_RESCOMP="" + : fi @@ -3251,6 +3271,7 @@ echo "${ECHO_T}no (version $WX_VERSION is not new enough)" >&6; } + if test "$wxWin" != 1; then { { echo "$as_me:$LINENO: error: wxWindows must be installed on your system @@ -6299,6 +6320,7 @@ WX_CXXFLAGS_ONLY!$WX_CXXFLAGS_ONLY$ac_delim WX_LIBS!$WX_LIBS$ac_delim WX_LIBS_STATIC!$WX_LIBS_STATIC$ac_delim WX_VERSION!$WX_VERSION$ac_delim +WX_RESCOMP!$WX_RESCOMP$ac_delim CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim ac_ct_CC!$ac_ct_CC$ac_delim @@ -6312,7 +6334,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/data/magic.mse-game/game b/data/magic.mse-game/game index a0e7e156..08eee237 100644 --- a/data/magic.mse-game/game +++ b/data/magic.mse-game/game @@ -1,4 +1,5 @@ -mse version: 0.3.6 + +mse version: 0.3.6 short name: Magic full name: Magic the Gathering installer group: magic/game files @@ -187,6 +188,11 @@ init script: (if contains(card.shape, match:"split") then "S" else " ") + # split cards come after normal ones ":" } + # Process the name for sorting rules (specifically, remove "The", "A", and "And" at the beginning, and make lowercase) + sort_name := + replace_rule (match: "^(The|An?) ", replace: "") + + to_lower + is_multicolor := { chosen(choice: "multicolor") and input != "artifact, multicolor" } is_null_cost := { input == "" or input == "0" } basic_land_sort := { @@ -241,7 +247,7 @@ init script: position ( of: card in: set - order_by: { rarity_sort() + sort_index() + card.name } + order_by: { rarity_sort() + sort_index() + sort_name(card.name) } filter: set_filter() ) + 1 } diff --git a/src/resource/common/welcome_updates.png b/src/resource/common/welcome_updates.png index c67d9a6a1a5c84691f818e77c4850b97e55a339f..ae5e70561f9e824774a298c28d3025030c8ce1a4 100644 GIT binary patch delta 978 zcmV;@11=e+P6)O+^RT0Spob8u68j2mk;BaY;l$R9M69mQ8D1RTzMu^KtK;JCm8_W9XzY zDXlf8LO}#Uts7VV1EKx_6;u$hqJp{*T)1%|cA=;g72Aclk)l*>u-aG~i&DhIY71%8 zq;!%t8IwEro-Y?c5L_51HddHtbKt-^?{nVsf1Z~EUAlDX(&ffvXlRIfz5bW^!NI`| z?JGK6xcALF!_538=6n<990-R{3gN*APhYLf&Ul2=k56?JLw726ZegBRpLvN)wOGxT zvDUCyWVFHxt2nauGDqM4tmBMzEH>YsM{AgvJ;S2ChM8NUz@x0imm~Ua8endAp8c<@@1CYs;^wMs<3B(X{%1qh|^K5YI~Vj&_S zDI{rB!v#>)UUaaei6W=~iP-#%AwY&Uf1+fG+}asKIbhpW1d`x@pw>=sJ;a{<_{nf^ z>M)mDv!E1M2O2~u6Uh=aTcZ?O7^(4z$EO9cP*h?K#v)%NcpZZ=2rUu8u_GPh+|$!y z!<~P}^CRJ{r(R)C`DT`NP76ckGo(`-DULFm&mf2?+;0>`L7er_80e!J4DDixf5JDp z$O`8#%y8w4COr4|ao1f0V{eRx!w(+dLOjp6`8Zfd5eaf*5ZaIx0vimO261(T>{^@L zEAsX#<-vr7e1Wfyoq@;J7js?3KYHseOh0s1Jn_j3+#z;zo7{y?D=1R>SsPWPiIfHt zka3Dg3d*8H(w{=L!sPKE*DbYff3dSa|H3_c?`Hgg39*0tW%g9=VnFnfCwypgfKX!ulBVJsWb}@0{8-_=Q`QZMK#GzA1xHq|vUX`NTntI$z zkMcw!pkqTRDiP^|;qAjrp8Sc$eOE;XkN%&r`}Q%WewgN+i?4;zMuSQBe>GQZ8|4g3 z0dm{MImfo@5GUupDhKTFQ+O^uZ z!@K!`z>P%Q(0}?4i5todAXQg%>C&Z3m;V9312}zT8scvNHvj+t07*qoM6N<$f|VH0 AqW}N^ delta 2823 zcmV+i3;6W$2bdO+83+OZ00E&6{JN1q7=HeAV>3{gMU8jb_^lgZY<_VLQfa{Uj9L_!=9VD7rxz&R(8$h@`15zh#P!nN;N znx|K-mL@Jnye`;=XLvjwag+cu)4l0C`R-n$ElCD=COSHL?L$$@*3KVm-RGQ8A~HzX z3Nt}LLBy5X6q>(Z@FDLWCx2*>NxEotVe%?WvREwQ1nhlnZKW1(6}=I*%#Ln|pC0Ok zNh+1PcJ%=IC#kPzZqIYI&apCqpN@`>Pdu8Q&L#x=GNX7gDG*sH>2dxwMTbw-$Qn

jEs$r4#OI_ z4#*DTwqkUMjg5_qi+@Y)6pq|cC9L>F-|-Gxac3`*82_L~G+I#cU7N#b|0tyB4gNOtAW^kprgMVQ_$S~Hy!vj*A-d%U} zi)QHwSsrqJN~k;A+tgi>vSUvXLy&Nlm6ec>5JqsZPZxbagU|ySMA8NuS_frSmE!SP z9I-$n40dDKDk>^u9c@t!_4`CwA1V}8j|45yAZURGF}UUvfYMUwxF!%nPpfe~({5K< zVp394(A3~@vVSg6zXr!T&>)z8iujV^f?G?p*=eeA@kcn;br`)gp)D#Zz-xd8;SMyy zK=K|UCnx{j3LTiQ9eK0tzd1R#6T%k!nbXw%;URIJ1g`-apU(#xQ8@HTke!{q!-zRJ z;BJtF=r=q}It@))|H+sm_iG1obJo^CawY0$5cg}ohJR5mXpn~3vrNlNdrdz# z4xFWH#)mV~kKhH6UyvL?g8<%;Wus#w+Hnm^LJ>FEPS^I?_ZbH+F~+o-F>Nn=`Nhjx zNXu{?4KilUFNs%gIs_cTFL{6DFNV+-T%5kNjQrYb3o&W1g@1WbvS4tATX7iUKw~7A@%;C1i*6g&P;9%?qKqCtMdPDH`_NMuV0dvQvhSfim zeO$le#!;X$LC`EY^xYW6nul}=zDrR~q!XOd`P z+jH?)bX>U|^QpSlYEJd`?MuLJ0cqkjy$0yZ$Bd@BDR)au4BL$8FzaOp*rzl4g4 zN`<0Yp*UVuB|l!BEh`VoNZ*s0N%}=1K(Bm_%ViY`v0PqIUalxFmp{IXUI~lgHUSlHf)W^-k$>Rj zMaujv;l9vsT+p~e%K=UVT?g1OJb(}D{CE`F5AfrbX4lfv0v-1!=#{V-*c{Q8NH&95 zT+rVav9e5q{sv2e=fBC{zLobZO56$_2MyttWOy)mG3$9l@!vsRdE7%HDR^Wby%H9~ zEe*=u3}UgE8y=r4af5z!VV00Y$$!r%AC&se_>d+^j=h#Pz2^4ayKDz7=yMd5fJP=X z8A9&S+`LEj!AiW86f6ezO0-bICqR@X%E*j(;jR7uws0OEBq1JZ{WBo}-^0S1Qk8FaK;vS0O_6rG~3{jTAD>&rk4}X}?zu}7b zsNsi-;F~O)Yr9=%_Sv5|u|B`cvEL$S-V?qO8an9gjtCAvvIAC%dME~-PPBWx%>bnZ znntK-y1r2Zts^v=pRFpOE>V{DQ|7GQrtDmXt*IK@fO!VuKQlPgH!wCpRJsu&vfvG% z-oZXt32Fis!>uBU-wa)o=YQVKe!Js#)%|9&~*EV^i<h7q>p8E}ilT6FiAbKri%`d9M@e@OkE=BgGXneV^tVrLt! zJ5sC!z{Os z9lPYky~#|v6U3M$Ju7&wq^l51)}+UX*%Vs~^AO#U>XonlT-PJD~7h=3iy6x=LwS@_%Aq_efXA<>5YcY2H3l z6Mx;2>XoqAT6t&v9DKaJyqu|YE58VKY$`}jE!=n~<8@Xah1z5HO6DtHO;3R2bhm1@ z@9biK_tHSm?a{uj0+EHODReu)*DGPMx=-Uo@&1VMD?oFn*t(ED@(zAn(%jPW@j)h& zp-loJR{EkYyL9(deplV6b)~|rlxRf#6`)}}eAqC#8T7=i6Zzc@r9Cb3&)aI$r+Vvwcbt(|R3-D%kmGL&m8zq)UER>8u07pZezG~UKpGsI Z_&>}s