From 52c64aa051dcd4fa28177b83d4ebd4fe31d46962 Mon Sep 17 00:00:00 2001 From: mwedel Date: Sun, 19 May 2002 00:19:09 +0000 Subject: [PATCH] Fix animation in sorigs armor. Add merged images for some objects I used in testing - the archetypes need to be modified to use these, but a new version of the clients needs to get pushed out before that can happen. Committing them will save someone the work of merging them later on. MSW 2002-05-18 git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/trunk/arch@1590 282e977c-c81d-0410-88c4-b93c2d0d6712 --- construct/town/collesium.base.x11.png | Bin 0 -> 5575 bytes construct/town/collesium.clsc.x11.png | Bin 0 -> 1198 bytes gods/items/mithril_ar_ele_sorig.arc | 2 +- shop/store_alch.base.x11.png | Bin 0 -> 1054 bytes shop/store_alch.clsc.x11.png | Bin 0 -> 1000 bytes shop/store_armo.base.x11.png | Bin 0 -> 1039 bytes shop/store_armo.clsc.x11.png | Bin 0 -> 980 bytes 7 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 construct/town/collesium.base.x11.png create mode 100644 construct/town/collesium.clsc.x11.png create mode 100644 shop/store_alch.base.x11.png create mode 100644 shop/store_alch.clsc.x11.png create mode 100644 shop/store_armo.base.x11.png create mode 100644 shop/store_armo.clsc.x11.png diff --git a/construct/town/collesium.base.x11.png b/construct/town/collesium.base.x11.png new file mode 100644 index 0000000000000000000000000000000000000000..2810f168fd469122faadfe7ee482c3518f6972b0 GIT binary patch literal 5575 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 M07*qoM6N<$g57!}o&W#< literal 0 HcmV?d00001 diff --git a/gods/items/mithril_ar_ele_sorig.arc b/gods/items/mithril_ar_ele_sorig.arc index 91642b018..263714c69 100644 --- a/gods/items/mithril_ar_ele_sorig.arc +++ b/gods/items/mithril_ar_ele_sorig.arc @@ -3,7 +3,7 @@ nrof 1 name mithril chainmail of lightning of Sorig type 16 face mithril_ar.111 -animation mithril_ar +animation mithril_ar_el speed 0.3 ac 4 resist_physical 40 diff --git a/shop/store_alch.base.x11.png b/shop/store_alch.base.x11.png new file mode 100644 index 0000000000000000000000000000000000000000..655d27567535fffcb98bc266896daf97110368e9 GIT binary patch literal 1054 zcmV+(1mXLMP)lrN7$Ue(d2uCIe~+@ zfQkc5`oJeXB_gNK+OF^xIb)8piNZR_8~3(m*G=mCQQCYrz0^(M}U^nxr3SX*d^63PhA zVt_s$4_*&=dU~?P=C}5MkOHo!M@vWm`t|iy696Lq zDW#QCqtKVS)=DXTsq68&gz(vi0k?ce0j3hj1IWrHg)Qa*KG!!Dz?I-Twm2J95(N-1 zZ||glNgd?`P1jHERZ5NJwr%ISDn(GnU?N0<4uS)Q@F85n^JL|oPXP*Rp0iO&p@>;WcC*IU|`T4~N|&$nB&2R+|z zfFQ;NV*qn=?T81?7o~GdSwe|t0vSC3NE_$U7cMpay$T@fzr4MRtPgw%!(32QmQv!G z$sXXF0b@V7X78i(b5#5 z&Dj9kv3#@#h;$)Uz=jSnURN3R0^oZf{ce6HUy~ttM!COuIZQ)BJJiv1y%o`$u0_+e z)-~0+u0!>9+3qt1(RYC%7>;Ld{if@oHK0H2Y3+Jalb61plvU<+u6Dpw@c-9#pDES{ zgdR{;)3e3j=_R)wDS@B)Z=rU+_O3ot5h;Lw7&XWK_4J790jM6P>Ff2RCNFGS(TA&@ z=@Dk1sn!qP#O8iYLi2p!y9Ylamfw|{bc{ZH9gUimkZ=W+IFe+fd&5)>P)90C)E-umA)U6ciK`6cnVwrLH%Tt_iudXKf{@ zK{t`!pVgRPYJL-`Qo^bVc(%}vG{5lYJRf(K0*t|>5JCzeMxiftErk&BQrBZShwy8-fl~pd5)=cJl`{*w8Use* zsRF1He9tphgE7S-kNIC}q zdHkQg6S4|$z*4}R^;HOL((al54`u)q%>Yv=F`;S<12}oE|A#<}{>(@a5m8$1D3CkZ zW{Cs1c?H*QQq|G=9L(ZEv%ZS~h_pQ2N2n7d`rCs3SxCl!C9`zX4deD%ZJj9taz%k$ zczxew00OP#J4rI@bL;{YI7@{D9+4kC2T&;x9^u980RsC@e+~e`1|Z!kkRi_oivi|l z$UGBV65pprYU=~U(rSh_R|9Ov^1%#9s(=kWY_KOm6Xt>F7H|)kg6PlQ4oj)0=D_Bi zK-0Boy4EVII#+qB-p<=&#(<>&DS@hbq}2LNH$X~2e%co!*IsBJeeH#nr**D&fG+sI zvOQ*u^#P^=s!C5S{ML)qdP)g2rN2$J^R;)484H#I)UtOz?kwNG_Ip$>K=q=Buh(8^ zA8cCD2Uk0j5$2e&*5|$?Y2*jsOH6(W?9EV0;qAG?-``x@CBg%VZ-x|n0;x9U#c9(G zKEYURmmo+1KI=E#pfSWJ5EW($+_p=t4}@QjJ3oT%4d#x{L;feQ#(xTe?gd;{H3fFv z9x02qZ43GN5X^P>LEHZLCB1D^SRY8hfVt~33Lyll7qI9pgutJl729oM!QKmmSl@M^ z=|fE0`y5lP77A|>DTD`@4Dc;cF02tCHQkWxz$1D)?0Gl&VMM^#1qB5K1qB5KLHG+f WQyF?F(R+>n0000mU&R{N|k_h5J-GK+pwTzVE+;d3UVZ z0x)l{&!mQxQuAcA)^n=Cd~B>L%=-ekoL=sP(D%JjN`)p=TnLG=NMt*~^l=hph#pR?I6TO`D9gUk)bUvuxrP`Me-|0Li0H5ht-EU9jF8%$u zasebQV0sSQdG+Ml_a{izDXXCBCAH7`z}f$ezxV%S=V!sa7B^mfHS_)vIM!c^w&?~K zV;0QY_rVm{u>k8ql!)a+H16eU+qP)BA;=h))&-Y&AR`!}9pA8cMxz+w+$u|Gt?5rp zQyVlXk)#vkz6rV(lCl;X?{grb1ps5rBBdaH7YJ$9XE-D@tI@V?aXG!rjD;>gxU`<* zGd{zURjhj)xr~uwlc74I4IW*s$S$#a|rL1$qFMqtpNZ002ov JPDHLkV1nQk>^%Sg literal 0 HcmV?d00001 diff --git a/shop/store_armo.clsc.x11.png b/shop/store_armo.clsc.x11.png new file mode 100644 index 0000000000000000000000000000000000000000..5a6d2950dc52a02b36dd7d300c4b3a83edd5e402 GIT binary patch literal 980 zcmV;_11tQAP)mU&R{N~khfpSMKz^DNSuE2dbP~`M#@XX~7+yJ8j z965I@yx@}D*jijGK`@zjFB5`zW(Hz@!B*` zt?l+wP-eL{&8QCD&s|$(SpoPK)pecfx^5BX&AEy*f8MW24GSTL#YicKQi6HkT#E?c zcG^ya&~=>>Lbw)`T?m1>yhz;y)p@_3bY7bVyT=1Uh~NOb$77(MQ@_8xC9*IN>bzf* z7GRp95JCwdlv1jQ`TOQ7&b%oAQwT1Tlu{Pi0I9k3TAn5Vtr01usgdl3F_#yydw}!Z zx3T&7004Ad2LM>DJ{>d4X_?dJ%;iI@D?A9`aJl2WU*mAO<96D9F6P)j#T%ordpv+V z?mhsA=~J%&EC+?t=9I)Sz4)6&G;nL5W5TX$8~VuOj;W7HFtpFz14gFrTd1yM+8mS^ z6Ub-*KsZ8kwYdw9-5j~#2!N%1;F}r41X*n^N{pFo0hB8o(~d<6%VPThhszyO${<~- zcQtl@;UeoE0F=>^`Ap;~5JVOMY>qvEafD|ts z^W*Xak>I5*;03Z!#1G)MHOyGT?lb#KSQZB(jZ+qYM9rIVgdNMzj4xQoW&v|{>CLep zj@Y(s0gNr6w0{u-sd?K15UC|s6zS?O5d~^+j*3wd#LNTe8i?0GN(>M=cK$p7jFSM! zcM23}vk_$hTHCfo{N^kW;Ly0eC*XB7A8i3y1@Ja-K0uYfOyDa!oW;jmKU zI=q;6)YiqmXI@iu)cqV_2|y`ewfe3@+TR>o+)i?|(A!B)Xv~_Tvq9ZY(LVQqiOzij zu$lH<+x?;1q@T{4CIF5F41=EcYu3AOFOa&Xtb)4Et^JsXCf?vr-~2RKSz+@c2lHmw z3&1;Gh;|P105ck7eGnyLc^8eDTy5JHn`2Kg#-g2rsBoCx_pbD0S#CEL7XXn{|L&B6uS5sJ~iE1^jth1Rq4E25u7wtt0xDp(dk9Z@bU z;UH~}eHQJ5`9RF^l06v_Id|4fP(?*WMMXu$@5VppP}o5RY^u@#0000