From 2a4a71d0b12f4cacb779398e2531e0efa2a58c55 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 13 Apr 2012 08:20:12 +0000 Subject: [PATCH] - New Feature: Rifle Sling (by Flugente) o This attachment fits most ARs, Rifles and SMGs. When attached, moving the gun from the main hand to the rifle sling slot does not cost APs when 'Inventory Manipulation costs AP' is turned on. o When a merc would drop his gun because of damage taken, it is instead moved to the rifle sling slot if possible. o A gun in the main hand or rifle sling slot cannot be stolen when a rifle sling is attached. - Proper picture for Tripwire (by smeagol) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1403 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/BigItems/p2item66.sti | Bin 3173 -> 2577 bytes Data-1.13/Interface/MDP2ITEMS.STI | Bin 45476 -> 45698 bytes Data-1.13/TableData/Attachments.xml | 655 ++++++++++++++++++++++++++++ Data-1.13/TableData/Explosives.xml | 16 +- Data-1.13/TableData/Items.xml | 32 +- Data-1.13/tilesets/0/SMP2ITEMS.STI | Bin 15014 -> 14941 bytes 6 files changed, 694 insertions(+), 9 deletions(-) diff --git a/Data-1.13/BigItems/p2item66.sti b/Data-1.13/BigItems/p2item66.sti index c2f3a329c783d17832447705959bb5a5a78612f2..9cda29d2b97483c0459a476f7c923b19c95287b3 100644 GIT binary patch literal 2577 zcmYjRZA=qe8lDavr6L!r=(Q-NfQZskor~iK%2x+OKBh9jP(G%DGcF<(DwM&`3R6VX z%jPaoxtEm$1?-N*lS;_1z^@CtiEmQr%wE#GPsEDzo%92F}uSwZwL% zxUsvm{ci1V+|}&^b?(ti)Rnx3o}xz1Qtv9FuN61nEUoXh)Hn+2yYQx-l1qbCEjP+9 z+$PTTmeDm0>(+zF~H*XGKjuNT#JoMQS;)4h0IXQ92fq?NBMs5->D z%P)DzCg&Nl^GHqSaiaA|^DU4lzq?*ta^kRpnmU}>3>HN#L z>ut{C)t9hV58lv~TWrg2?9MxX!*Z^-h`m{I{#r??EvM^#ZR-uX>)KCTxlgpZPiG%XiQlHNUCKXMn&rG()!bd&!B<_mL$%)`_a96vr?c&@ z+!n5Y;ff0?O&vVZe!KGG_42s*Shl+o%`tC@N50y=`CL!#q1@yP*NV<{Q}zy=yl^PzRN4tVGyUN1r!VfoG0^tin>K4=cIx7@&^_%pOEzs*U+g}6?qa2* zr(w5lSGL)hmX)w4HQsVILz}qeNM1^HOAdB2(~M>&r*2Qp*mau7K{ml=On1dyuGzBb zYn?V}Z=!blS4WQ@&c%}pN;3|cb$j$$6S_AgZD(h1jkP9^ZL3iuP<#TCl$@a3qs_|J zC+l^^C50#Q)3Xm7PUdGD4}E=>`lhitKL^`SH5^aY?@Ucg$}*#pb1-rH9pZO2o)7Z=a7|dwz}Q!^l4~lZxzR)C`zM*fTBX1 zAlSTZMgsF1ola-^6m(aA)-yq)>Q?hS65dLQoX~GDTa|4 zJ2-?5!%}IG*E$b?`%OSD_m*>^ST#wFI($5$jG#|zMB9W>+DjX)BmMJUfFw|s8+{ca zEY&U|!NF@bfMD@4sF4^IXrpn=Gy;%(CXV79`|vf2veZL!f++tFiOhwq1i`XnRx3@9 zO)JoT6y-S72I`AWZqbULgCfWqJ3-i38%gW!oJKEn=94h}++0HsG+U}ZyUDvIfJ`i(poEsQhF_c77v(ts*D1UMp} zF#((oOs~T^9H;c4a;P4|FkOlsa0~`4)w;~Ywfq3DO9QH%a>`CmBcF%Q1N6p$BFb??S32PeuTF^Am`y!<5*10N)r2T!*Ekpwssq zj&1LM53kL8R38Cj#*-n!em`)Y(n-4_3h=-=06s;ZLK}S2tfR&G?#bql%>3ww`S}4z z74>8UW!WDiGK9iHGn7@4Mp0BsYOfd#M6`~UzQ~i<^^d>){ipHeMGvI%c{0Mh>|c@n zQ(i&X=!T*XC#&?NFf6VF8D`kgVrKrZ>EE-H{}}%(phP|UmZCB;5%kN57;#|0ao~az zbc*)pS95Y;L1H3Wt=ThyL?c1w1t81}q=%O@2+w~qipKBv^Sr#_O*tG~@=Z-^Cz~S^ z$a>W0d+UKvf-f8l z244WX^3ZVn+S<%Y!0!)+rEoMHP)Q!>dpIol!KL&-Kd8e}AoN@v`XGhwKx66<`1UL& zwES)e8s8iWg?@QAD?LF%tKjDckPsUPE2ou0-yxxw?^l<gww9 NhY!miRznY={{ql3tTg}t literal 3173 zcmYjSZBP~089vC@y;lv8@Ud!C5J4em6v3iN(;$lRr-emWyk6^552OjwR79^)zwQE)-Nk~huT3eKvUsm;vvI8~cKiyv*+xcv) ztfocX(OMd8=-Bms_pVQ0cww@A_l9b<^_W`M(A>MZW#U^0oAvLkcE5eP`%jUh zJJ0u?==t`${R2%$M}9UudiVSMA3vG6cftPiCvWZ_xIA_9@<%`a?(B8v`a8E?y?FbB zAK%q3-uvV4X8!W`zvfS8hp%;BIzklf>|Luhfx2#+2&r4I5rB7vKbQM3bEs)utommpd+N@;V$j;6#&beEe z(@>+ln7`!dtxwjhUQt@GBDOp)v^p=hJTJI7e@$xP@>PYM6>D~{EUGUpT2fO~RA1bc zU&71RH&$)jzI$WO#$Ua+ZJ*pp^h_?3(w@o=!jJvUAq3lAT^ zK7Rb;$xyQq{=wDoo!*nvW2d70wRbL@KJ(U@Q)cACg~)HO4!GYNK07!%d39`S_r&Yt zQ#WtC;oQB{F?Q`ozm8w|<*j|<^MBsI|1@Jg32bQ=d&ZY=sU)E=Z9#tVf+IPJb!(HF zs*}&JO*xpFn*MldqtAEP=L_fhS}J^R`2EXE{XGZ$Ymx&gIf1P?fuhntXWpV!`HRr* zXm}cQb{4V)tc2}g1Bo-W;X8PA)XrGRoW^L1eDL$kKU2G1gx?R>h9^_FA`H%l119IX zu4ynCr+shCOr{D$*H6C8qiKShLBlX~O;KDS_^1pqWBG)l8H%yV9?0MV`>?>!bVU(j zghdkD`nE?BPxiG<`2`$xL+6`dY3R~aqLF0`mNT_8k;HIq$J9z#Dsk6P_}4ZGu7^BR z4>yj`=h#>(7c_V*SHuBpDDBwa>RnASpgNUFi zwgg5{B@RED;xJ=F&+?$5c`;?y2mxt0w=LAmL{ZJ4B~%`F$p~>(IAUP7x#(wSpW~(h zdfp%nWc?5k!3iLUAHju%pkScILECm{LB$L2XVFSjNSg;BQD_jFrr3gU}$m+2qMA;s|3de>ML1z5E2D4DWHHsnQ+tsK5<)dh(#PF;X$A}z!+G?x#EH& zN+wZI&shlVLMc#pI4~kBfSfe070sBt(ET1~}*I<8I= zW(7SjL*a?^0cY{Z@<(JQc`SsHbRH9@L&X9lwKF<_sz8I3Lns`_NHtx3kOb`~frx?1 zA)szM_KA;9#NWBp9eTDo(V6iv^b> z3I>oWq0lF>fj)Yih*KUWs7hHJn?MlMvGD{)fgf}?`A`W5sb%QH8#-=jA|h);7YJ(0 zMI0R$Sz_73p(}@)g+z4#BKs=JB9&qu1m_<80ykjLMBM-_g>cX{+>Wbg4QfYOIphW$ zGK#YP=eRv8^U*R8kfVbe5F7Y^&|d%!q%Zj4ypu0wA#o@M znjANo8OcUjO%pVvKmC8As_`KZqj16vtofk~5AU|+`4s`v`$1};*!=d!gvuFv~ zVn{V;Myry74iTWdXp637GI*U075?8^x==;-h#sl6q&DYs4*#7|8&}q&9 diff --git a/Data-1.13/Interface/MDP2ITEMS.STI b/Data-1.13/Interface/MDP2ITEMS.STI index dbb4aaf837f252fb14b6a5e01e656466dc697a4d..b7aff75c4c1e802fc4eff3d71d6fecf75669f4df 100644 GIT binary patch delta 1055 zcmY+BPiPZC7{y|#e)=!hhC;GM{*`&7A zI$ESumO?QK1!Grx@K}UB=tZx35JV9?NkEk5u%CXr*>0N&Bzf=6`+YOJ)$b|$N2=q( z@ae(1Gr-a1R~;kUt-o!ERvvrs?+Wm-DbbBAK3oM+n{CxG**jeZ{v z-30a}ygbg{0vfT-p@36&fQ2N_;L}}LSleRETfn&lcoN@=KsMIhIDtQVxxbz6P5$hcDzRUrg@db9H4?iEb>fhFUt3eCE#ke3KG3){}31C0IF1G5+ORakS zX{&ag125x#4hK^f>gMdebX>>%?djV zcaRIw4Dx&q45Q&kQ=(vu(fnBseZyc7ccOszurFog*BR8qM@oip5TTmmhBn(hhASB~ zbTCwNgP@oa1UpMQFzV6448ycEhy4XR^_qL79%{Htnr$Z6&A=TSwNpbp%gK_d+1GW$ z)UFJwLI^6s$#!Ydf8^MiLxO&q*(#{MF^E>C9Z zuLbNHuHXc2KLXbJehGhO5#ZAy;iC^+?H7(?AOy;W3%H2t+(F?nTtIOFSntmlv9*}y zYmd|X{RuE(@a4Y*+jY>c7#3RvzJj3Tq1=FaOhAAghPw;RBgnXljs z7A;!A{86F}BI+RAzLnj*7qm0A#{2+jkHRD5Nss0*c&AmHen=GNNr)!7o+mZ65tbX5 zTapD55o=!atEVZ1y_e>Ur<4=1BV!#AY!bBwXPQ!5j#5fQI#O{@meTcH73sv{fgrAH z?MJYMko>Ahsn}A!AIB>4IWDB@N|nTk&$6R*64iY!-;|QW31_sW>#80Jp$NmI^(Hs4 z5%ahAXYmQk)H?u|Xr+9|w_@I(*C~*+{E=SFQLGRxpq(Y+kYIS)9X)%#J9Ia@t!978 E|Bn>VO8@`> diff --git a/Data-1.13/TableData/Attachments.xml b/Data-1.13/TableData/Attachments.xml index 2e44ab545..0b9f79de6 100644 --- a/Data-1.13/TableData/Attachments.xml +++ b/Data-1.13/TableData/Attachments.xml @@ -25986,5 +25986,660 @@ 1522 342 20 + + + 1525 + 11 + 20 + + + 1525 + 12 + 20 + + + 1525 + 13 + 20 + + + 1525 + 14 + 20 + + + 1525 + 15 + 20 + + + 1525 + 16 + 20 + + + 1525 + 17 + 20 + + + 1525 + 20 + 20 + + + 1525 + 21 + 20 + + + 1525 + 22 + 20 + + + 1525 + 23 + 20 + + + 1525 + 24 + 20 + + + 1525 + 25 + 20 + + + 1525 + 26 + 20 + + + 1525 + 27 + 20 + + + 1525 + 28 + 20 + + + 1525 + 29 + 20 + + + 1525 + 30 + 20 + + + 1525 + 68 + 20 + + + 1525 + 69 + 20 + + + 1525 + 331 + 20 + + + 1525 + 332 + 20 + + + 1525 + 333 + 20 + + + 1525 + 342 + 20 + + + 1525 + 343 + 20 + + + 1525 + 344 + 20 + + + 1525 + 345 + 20 + + + 1525 + 346 + 20 + + + 1525 + 347 + 20 + + + 1525 + 348 + 20 + + + 1525 + 350 + 20 + + + 1525 + 602 + 20 + + + 1525 + 603 + 20 + + + 1525 + 605 + 20 + + + 1525 + 606 + 20 + + + 1525 + 607 + 20 + + + 1525 + 608 + 20 + + + 1525 + 609 + 20 + + + 1525 + 610 + 20 + + + 1525 + 611 + 20 + + + 1525 + 612 + 20 + + + 1525 + 613 + 20 + + + 1525 + 614 + 20 + + + 1525 + 615 + 20 + + + 1525 + 616 + 20 + + + 1525 + 617 + 20 + + + 1525 + 624 + 20 + + + 1525 + 626 + 20 + + + 1525 + 628 + 20 + + + 1525 + 629 + 20 + + + 1525 + 632 + 20 + + + 1525 + 633 + 20 + + + 1525 + 642 + 20 + + + 1525 + 643 + 20 + + + 1525 + 646 + 20 + + + 1525 + 647 + 20 + + + 1525 + 648 + 20 + + + 1525 + 651 + 20 + + + 1525 + 652 + 20 + + + 1525 + 653 + 20 + + + 1525 + 655 + 20 + + + 1525 + 656 + 20 + + + 1525 + 659 + 20 + + + 1525 + 660 + 20 + + + 1525 + 662 + 20 + + + 1525 + 664 + 20 + + + 1525 + 665 + 20 + + + 1525 + 666 + 20 + + + 1525 + 667 + 20 + + + 1525 + 668 + 20 + + + 1525 + 671 + 20 + + + 1525 + 676 + 20 + + + 1525 + 677 + 20 + + + 1525 + 691 + 20 + + + 1525 + 704 + 20 + + + 1525 + 708 + 20 + + + 1525 + 712 + 20 + + + 1525 + 713 + 20 + + + 1525 + 714 + 20 + + + 1525 + 715 + 20 + + + 1525 + 725 + 20 + + + 1525 + 726 + 20 + + + 1525 + 727 + 20 + + + 1525 + 737 + 20 + + + 1525 + 742 + 20 + + + 1525 + 743 + 20 + + + 1525 + 748 + 20 + + + 1525 + 749 + 20 + + + 1525 + 750 + 20 + + + 1525 + 751 + 20 + + + 1525 + 752 + 20 + + + 1525 + 755 + 20 + + + 1525 + 756 + 20 + + + 1525 + 757 + 20 + + + 1525 + 760 + 20 + + + 1525 + 761 + 20 + + + 1525 + 762 + 20 + + + 1525 + 763 + 20 + + + 1525 + 780 + 20 + + + 1525 + 781 + 20 + + + 1525 + 782 + 20 + + + 1525 + 787 + 20 + + + 1525 + 788 + 20 + + + 1525 + 789 + 20 + + + 1525 + 790 + 20 + + + 1525 + 791 + 20 + + + 1525 + 792 + 20 + + + 1525 + 793 + 20 + + + 1525 + 794 + 20 + + + 1525 + 795 + 20 + + + 1525 + 796 + 20 + + + 1525 + 797 + 20 + + + 1525 + 896 + 20 + + + 1525 + 1065 + 20 + + + 1525 + 1066 + 20 + + + 1525 + 1067 + 20 + + + 1525 + 1070 + 20 + + + 1525 + 1072 + 20 + + + 1525 + 1074 + 20 + + + 1525 + 1076 + 20 + + + 1525 + 1077 + 20 + + + 1525 + 1078 + 20 + + + 1525 + 1177 + 20 + + + 1525 + 1187 + 20 + + + 1525 + 1190 + 20 + + + 1525 + 1191 + 20 + + + 1525 + 1195 + 20 + + + 1525 + 1201 + 20 + + + 1525 + 1332 + 20 + + + 1525 + 1333 + 20 + + + 1525 + 1334 + 20 \ No newline at end of file diff --git a/Data-1.13/TableData/Explosives.xml b/Data-1.13/TableData/Explosives.xml index bfcc9e094..720221783 100644 --- a/Data-1.13/TableData/Explosives.xml +++ b/Data-1.13/TableData/Explosives.xml @@ -1533,9 +1533,9 @@ 85 0 - 30 - 30 - 2 + 10 + 10 + 1 30 2 1 @@ -1543,10 +1543,10 @@ 0 1 0 - 0 - 0 - 0 - 0 + 200 + 3 + 30 + 50 86 @@ -1557,7 +1557,7 @@ 0 0 0 - 2 + 1 0 1 0 diff --git a/Data-1.13/TableData/Items.xml b/Data-1.13/TableData/Items.xml index 70c744ef8..fccce8f37 100644 --- a/Data-1.13/TableData/Items.xml +++ b/Data-1.13/TableData/Items.xml @@ -45280,7 +45280,7 @@ 86 18 2 - 35 + 66 1 8 10 @@ -45299,4 +45299,34 @@ + + 1525 + Rifle Sling + Rifle Sling + This simple sling prevents you from losing your gun in the heat of combat. + Rifle Sling + Don't waste time putting your rifle back into your inventory. With this you can just drop your rifle and grab your trusted sidearm. + 268435456 + 1 + 128 + 524288 + 2 + 35 + 2 + 4 + 16 + 80 + 3 + 1 + 1 + 1 + 5 + 2 + 100.0 + + + + + + \ No newline at end of file diff --git a/Data-1.13/tilesets/0/SMP2ITEMS.STI b/Data-1.13/tilesets/0/SMP2ITEMS.STI index dcf23fcb2d1e8554a6024de32bd24b191e85f940..825664a7e5792358f9d911984a9e2312f6d355b5 100644 GIT binary patch delta 672 zcmZ9|zb`{k6u|Ls)AqI1S1LgaZ7oF=W%3VLh{3=n5vy3Sh`cmv5dEb;loGLMOcH4< z5|R!klSM2d@kfa1#<{#i`|cag`<#2vxj!0P@0)?8<=Oe#0EBJ>D?V!n=*CAs3C`mX z6NmBR!QkHEH;2C*?i+>;sqc|`Q$9<4VfPQpF3}O#wQUlhK7vK2EfE`qmRJvy2p{6l zKgt0IX(iy!wqK6AJqFXZ4LNYb;a7)^Was*sq=nr3Zy0!4l?74TUh$4NVq3pRO}uW~ zBn0FC4Sg~{EgovCUlc!zgSh2FJ%lDY{cJfB2a_--1*SZqK^HILhu;Ps$%V&2`}!wwd%v_>DV4#it}Zib52Lvj=#5*~T$6LDI$5_$s#9`0oRD{`K~^h)(d^_-syABJ?GwgUJtGg?X~r#%IOePZ|n`rZ2?Iv67=(#gE2Wx zj0h&iM9||QFNVA+@2ftgdPn<7KL6{VWG4?b-wrk(d0ZM@f!#@Xl-tW8L!kigzhsbM z;!|+zJEo^T$aB6;J@_l+Y%!Q$3E3^WpgTItB+9i8jQWnsEji=6J&`wg&$mM_mD2wO zmhwk(wyXY3zLygi`cR7MbkGCtOfc{)FRQ@O2uRnzmykpGfmfe?Y)=LXL&F%7c;s=o?IO+fZ