From 7356ae5411c6285c064c86a99f20cafaea8b741c Mon Sep 17 00:00:00 2001 From: Flugente Date: Thu, 3 Jan 2013 04:06:06 +0000 Subject: [PATCH] - added new pics for various items (by Shanga) - enemy assassin feature is 'off' per default, in order not to freak out unwary new players git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1580 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/BigItems/p2item153.sti | Bin 0 -> 1911 bytes gamedir/Data-1.13/BigItems/p2item154.sti | Bin 0 -> 1546 bytes gamedir/Data-1.13/BigItems/p2item155.sti | Bin 0 -> 1647 bytes gamedir/Data-1.13/BigItems/p2item156.sti | Bin 0 -> 1396 bytes gamedir/Data-1.13/BigItems/p2item157.sti | Bin 0 -> 2396 bytes gamedir/Data-1.13/BigItems/p2item159.sti | Bin 0 -> 2407 bytes gamedir/Data-1.13/Ja2_Options.INI | 2 +- gamedir/Data-1.13/TableData/Items.xml | 25 ++++++++++++----------- 8 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 gamedir/Data-1.13/BigItems/p2item153.sti create mode 100644 gamedir/Data-1.13/BigItems/p2item154.sti create mode 100644 gamedir/Data-1.13/BigItems/p2item155.sti create mode 100644 gamedir/Data-1.13/BigItems/p2item156.sti create mode 100644 gamedir/Data-1.13/BigItems/p2item157.sti create mode 100644 gamedir/Data-1.13/BigItems/p2item159.sti diff --git a/gamedir/Data-1.13/BigItems/p2item153.sti b/gamedir/Data-1.13/BigItems/p2item153.sti new file mode 100644 index 0000000000000000000000000000000000000000..ab5a3c68c7fee741b9af06423c1b3a30c713a80b GIT binary patch literal 1911 zcmYjRZA@F&8NR;w8h2~DW?h#_`;jW$+9nl^IpJ~$F^NC&8XE%v?2`Z{7aPo{ZIWw) zW5)zA_!BT+*{bB0MCq0-YO^ZprhZ6mCspd!{HWCZxthBD*nUl#H0l0qwLjZ?Os4hN z_vrdO&-=We$AO^R_d$aoylfWg>lNJpZdwrqlYn2V)p~GT-@pC-|KtDQ!e4*ta1=-@ zedYKA?Tz58&F?>aClMSz@zTq+^y0m(o8y;9Ys-bgLT+Iqo{i3}B{C29?^n~S`@6TY ziG|xsyHOUtF?qeVvibAs&*DmaYIv%et?m|glkw!~*3+qEDxX@LjmFgQd>;%f&gQd; z#igsO!-0|2Tw#7D!+M6APm)wLx3RnjcK^LQzi2vci;b)K^!nUbrntO5tt78Zr@Npp z6qp#j7#|-=q+&}yIocE$VA)LW#7ix0ry#^;XT~#u-to)BQ+`jx;~MmNhAsxjy1PPs z7Y1KFel|ETDYu+G@47rbrnb=wBcUtDj@geMB`?0%($f=hxdL{(D;`fSF0KH09L_g{OjGDvHtV^P8bah_4vEK%=8zoOmsW# z)0YQ7{MG(n)~Dmq$XKv%(0hJ0oqBz^_v>Hoyq}GIwZC&an|!a|@!{COze}ldI(2t; zd_9+ay;{~E|M5+Syq90TTif_1KKkyRH&T)C{NzL~I{vlKvzSPaycwtlm8TD&`tIEnwhn=f z94y1D(dsi^M92Y$P-R1?Jp)g0Vi*QM!8;3y#gYsw$B2pey=?D6OC)@!M!-S_$7OKwy&j63=Y^Iw~yZA$X#=X*dMEGJt zZ{Ctnd0ys7Jp}F_A2fu*5oSvaE3se^ zkwmpki-OK5tO-R6_Q_!Cy0z|tn4pLpbjoUy%40-|L@7qN*$6t%Ni9l9(Abv6%XMK@ zC`hP5L_9zkSkcS~^=?}f5vy2-WfWxF5)hN76dN$qU5Rn+x+x*L!ZCv?1v6;m0DPiL zhz2`mETZ~93`Ogh8AbJ7vkikUno$zAB^7hRcncDaA?2D@ZYKd&pQBF_#!;nW-65u8 z##HnziI)-zLJ=pEAk~Uxz%*6epju55F;oOg2vV_zkrERt^BRD6-2x((-BuJzSOc7< zO$h@cYMD2T08}N09nwldS;Eo~ah=14SZ!1}?1f^Zsw05_G8%c~4c=_L2!=`D_&$=b zZ+I)wF%A+=IMQ$;`IJzm;JJ($ny@wB^WyOE{$rOZC`v`BKC5C$aq$VnaTb;Br&N^> rE~R+eHV(l7j0{lOp2V2ft859irxbqgsF$$^!nVXzRb_A0{~-PgSfsAq literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/BigItems/p2item154.sti b/gamedir/Data-1.13/BigItems/p2item154.sti new file mode 100644 index 0000000000000000000000000000000000000000..4cdb18512a6ba5e46657018cf2656e57ca1eaba3 GIT binary patch literal 1546 zcmZvbSxg&O6o$t`X=zdtReflsJ`j;M2}A@i2D2FO!q|9Yv3PvfP204z}V z`*81`N29O2a53W#-CEhO4Gd=HV=-UQH{>SlV^L3FZ)-QT0XmxILJfU&nazTiYL2Rn)j_lVN{y%o>Q#Cr3=)@e#ia>oKT@2K(GLqX&1*y;D}D zRskXqth~T!tiuezIcf{2yKDn`hg@tC3$;?Qu1{lC$P7K*+RGJf8r5(;r>#RcV6#p( za=VR&@$zzBSsDBMd5%(P5en5jp3v>~hC&M%CguyY0+9)mnAE`4DR*>;b=)RtSFb}N z)z#L^tEyYn8a+NWBM_Tw>I7n$sas{KWpj16RmtnyVTIkm$wKM z5{0Io-z(}ewPL;Iktw@}aC-wpc-dsOX!J(0OwMj>!h@k9mrE!T@jJy60Y8V^pzP^x z=Cz2VqA~ASyP*9_O;ufeZC^i_o%2~N+909WT9@71QCwX#xSYd>`|3xZsDA!t_`Cg~ z{f)-#rU$5$-|hx@&D>R=+Uqp`_-VrD(DukgkJcQ9e)Y81^T%CcX?m1gCL*EfmE~w= z&Kn%FZ?8l}ZOskr>QrogEQBeof!?^rO{>gzL%H z>L%fR(91uts{UTYm;CsS)0PYp*Ah#)!|y-f*RO}?cQUDG?!o)pH*kx2YIrDUw>_1L zLmp2fhf{v;-2BXp+vT#`?aZ5>|8}a8GUO)xOQBh?j-*il){sMbGXP33>byG#Mx>lNz8&B=H&wgXvTCaw$oH6H)*e1i{i7jFB*^JR#|TPH6Nc${`As zB#FWsJ87U1NFyxRfEUeC5|r9R8s#aa{ST$K0;8sWLCg5k6gvHnagDgke0-852pd@^t)FXu!d3u^Yomt{V@IQ(qPd#UGn8uKG7P`nJ ba6LgVV|Em_OJG4q9N8$Qlcke4_9pT#cDoTU literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/BigItems/p2item155.sti b/gamedir/Data-1.13/BigItems/p2item155.sti new file mode 100644 index 0000000000000000000000000000000000000000..c886203fa43e5732d5f1c2ee67f11735fe8ea420 GIT binary patch literal 1647 zcmZXTNlY787{@10n^3hqq&c)wD-n@44MYSmi@_MMJ=n$@czfUt;|&a6SUlKxu(9#N zVyIc$C^!bCEp6mbkCj$QBQ>p5sSAfn?FCh74=tBUm3mLqOZ#RC81n3SZ{F|wzW?`s zqZzFZm40~^LCWDpj;rwc^UN#@IfKA|Sy>rH>8bSo82<+c-2KwVPqCXgS1a#iZ|Sbp zJ=iPwbjGSH?`DFL+bf%n{((#^l?sFdgI?S@n)HSCa=YnZBDa1M_XW11>rP;u8Jf<_ zzV|`;eXqsqGP=@udVOx)@AbDdwP1cMjwRhr&xCbSCDKIPaoiV)jwg&-b0VCY90>uX zp{|CFIm64b4G~X%d;6p6%36m#yyB+;Tmt1TU3-wa5p;u>D$V{pp{k6(=oo1-9p}kYs@32oa zb9&6Cv5E>_c{%&?WtXrv_NdFtrv)8mL83*j?FO`2VQ@(n#0qGvY+ z*NRHfQU7R%pyPUNb$w%9Zy%V625dHc7+2&rWQ85Y>b%M09@;NzAAPF%^_!vZii5?? z=KPiqXq4aXhIm}gT0rY}TYvg29dPMYGW5~9%hacx^85a}i!V%#WEb&7WNKwGnTh(t zqt5M>B-+kxV%IDuXRuK>9`OJE)$ab+_n-cF_lu3$y_=cuKfm+$ACIGWaBga-7>mPoS`)z61>$KT*Dt%XHB8c5Ec0c)e?E&t2oLk$% z{rA=Uhjz`s^VmWV+i^RV!uXB!!omIzAMzVF;<25~@>B1?z3p3=%{n^j9v&WMv)LGJ9Yp~RVhn)o Z$nzijfPzd3fF;a(K|XdCYnAyh{s-~|M+pD` literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/BigItems/p2item156.sti b/gamedir/Data-1.13/BigItems/p2item156.sti new file mode 100644 index 0000000000000000000000000000000000000000..d9b108e35da08ee020716db8a720597cccd70d45 GIT binary patch literal 1396 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 Ad;kCd literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI index d6297603d..3ec665b3e 100644 --- a/gamedir/Data-1.13/Ja2_Options.INI +++ b/gamedir/Data-1.13/Ja2_Options.INI @@ -1071,7 +1071,7 @@ ASSASSINS_DISGUISED = TRUE ;------------------------------------------------------------------------------------------------------------------------------ ; TRUE: assassins can appear -ENEMY_ASSASSINS = TRUE +ENEMY_ASSASSINS = FALSE ; minimum progress required for assassins to appear ASSASSIN_MINIMUM_PROGRESS = 20 diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index 648637c6b..e9c37baf2 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -48654,7 +48654,7 @@ 268435456 1 2 - 35 + 153 2 4 16 @@ -48680,8 +48680,8 @@ 1 49 2 - 1 - 102 + 2 + 154 4 4 13 @@ -48716,7 +48716,8 @@ 1 1627 3 - 1 + 2 + 155 1 2 8 @@ -48740,8 +48741,8 @@ 1024 1 602 - 1 - 363 + 2 + 156 1 8 2 @@ -48760,8 +48761,8 @@ Whenever you feel you could go down, be sure to protect your eyes and retain vision with one of these. 32768 1 - 1 - 55 + 2 + 157 5 4 17 @@ -48789,8 +48790,8 @@ 131072 1 40 - 1 - 746 + 2 + 158 65 23 165 @@ -48817,8 +48818,8 @@ 1 1 92 - 1 - 237 + 2 + 159 10 2 18