From 45e9b9988d72d7f4f4022f2b5940e6fc5ef3c9f3 Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 11 Jun 2012 08:34:38 +0000 Subject: [PATCH] New Feature: static fortifications can now be built by mercs (by Flugente) - if the terrain allows it, an empty sandbag (item 1540) can be filled to a full sandbag (item 1541). You need to have a shovel (item 1015) in your second hand. You will notice the new hammer cursor - by using a full sandbag, you can build a sandbag barrier - by using a concertina stack, you can build a concertina wire barrier - this only works if the current map has sandbags/concertina wire in its tileset - with a shovel in your hand, you can remove a sandbag barrier - changed the size of shovel so it can actually be put in inventories. It was also necessary to remove its ability to be used as a melee weapon. - for further info, see this thread: http://www.bears-pit.com/board/ubbthreads.php/topics/305822.html#Post305822 o Fidel will have a shovel and a few sandbags in his kit #3 to test the feature. - new code: added a new flagmask variable to items. This one is separately from the attachments index, and can be used to determine item properties without adding up to 32 BOOLEAN varaibles git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1455 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/APBPConstants.ini | 5 ++ Data-1.13/BigItems/p1item891.sti | Bin 0 -> 2667 bytes Data-1.13/BigItems/p1item892.sti | Bin 0 -> 1763 bytes Data-1.13/BigItems/p1item893.sti | Bin 0 -> 1662 bytes Data-1.13/Interface/MDP1ITEMS.sti | Bin 422278 -> 423670 bytes Data-1.13/Ja2_Options.INI | 5 +- Data-1.13/TableData/Item_Transformations.xml | 17 +++++ Data-1.13/TableData/Items.xml | 76 ++++++++++++++++++- Data-1.13/TableData/MercStartingGear.xml | 20 ++--- Data-1.13/tilesets/0/SMP1ITEMS.STI | Bin 111349 -> 111881 bytes Data/CURSORS/HAMMER.sti | Bin 0 -> 1363 bytes Data/CURSORS/HAMMER_R.sti | Bin 0 -> 1363 bytes INIEditorAPBPConstants.xml | 7 ++ INIEditorJA2Options.xml | Bin 811768 -> 812700 bytes 14 files changed, 118 insertions(+), 12 deletions(-) create mode 100644 Data-1.13/BigItems/p1item891.sti create mode 100644 Data-1.13/BigItems/p1item892.sti create mode 100644 Data-1.13/BigItems/p1item893.sti create mode 100644 Data/CURSORS/HAMMER.sti create mode 100644 Data/CURSORS/HAMMER_R.sti diff --git a/Data-1.13/APBPConstants.ini b/Data-1.13/APBPConstants.ini index 6b6c0b982..20ab75b8c 100644 --- a/Data-1.13/APBPConstants.ini +++ b/Data-1.13/APBPConstants.ini @@ -394,6 +394,11 @@ AP_LOSS_PER_LEGSHOT_DAMAGE = 4 DEFAULT_APS = 80 DEFAULT_AIMSKILL = 80 +;*********************************************************************** +;* The APs needed build a fortification structure * +;*********************************************************************** +AP_FORTIFICATION = 80 + [BPConstants] BP_RATIO_RED_PTS_TO_NORMAL = 100 BP_RUN_ENERGYCOSTFACTOR = 3 diff --git a/Data-1.13/BigItems/p1item891.sti b/Data-1.13/BigItems/p1item891.sti new file mode 100644 index 0000000000000000000000000000000000000000..6bdb57c59cb0a87067d8d5eaaa200094cb2f9134 GIT binary patch literal 2667 zcmah~S!^5E6@3{ddD9jVVK~hqd9;j3ao-mWDK4f&NgUFoG^A+RkSwVdVGFWNOO9&9 zQRCW*BuZAiG?Al@Csq?0MFS`OU<(vQi?%3X)E|Y=zvegJ1=)`QT==iOk9#1uy(DMe zym!vI=iYfUOic{&2%-a%BSKpEee=={3cZBjOVe~^wt8qCH>dyY^$)x=IjHaGUfo#n z*=@0L{-1yU)8pKN+oVaQqfC3}yBWb{cSrr!Up`v$*iC0nhSYDfOUqN7-VzJDw%5-a z4TfaY`}z@8=4`@Zu^)F?|NQux*JYiZ4D_|DAMPx4ym2(fAK%@+Xf+y=WB$%JyDrX0 z5|Qx%kMr{fD^8nvdVG-W=sLG@Ar$P-{czr-?wuIsj(qR?)AOgyea5ic{MX<8+S6~n zJdt?+%DBgF=VRghn;E;wIKMczG(Vb%@L`|h@lUUKtcFvkV#^CBVxj)+_onn(Z9Epr zOvl*HUbo%!=+;%MNjE-ZJvTS(4{$e@(mGY|XxRPsQPr8`klkSQ54hHEWQ=;vi9vT) zN7w186CST?Wlmr_JHrFER}~xM<00m)c9&82$1irQ4%<}BbK!j4q*e!q2RE(?7EK>N z>d&Nnz1=;2m*M`_rGA@XocGMlM1mgkyO$DbmQ6&wlgVIj7wfj_9({b-Vb-Rj{TFA3 zLjmWH-w||bb!5mfH4$){&A|cZ&h;}!ttvk3o}5YfJdP`wn5wI1$ZwBNL_6D$xy-s> zJY4N}IZlsw7c%kXfBefI@@-!bjOyO-NMKIzYE*rk)BMqm1*={iALVAw@IlVLyfDVH zs&K%TO!&H?Emq@RE^9REXH)*n)UembT{{=m_Vf&exYJ|)o?|^uyZQaqj9#aS1>C90 zh`ZmiG#%?^n6SqlkB5)F+3wP+zWLi@ua~=YGPL^MY&0?QAeXW0`cg@LWj^Y%IU+vW zS3g_kY?i6Xkqb++)5*{_G+EP^yppyP9=hi zKZt00RiokHXS)kdt7$sn%UnJiKQXwqJY(op2_v4VxwN5Ad)%e}%Ww8PZu_Dzym}=W zi4IEFXB|deJQcq@7aH<8zWn5>$D%zo5neveM~`z`*QWIvHo*sew0xR82lZ#ii8%CI z_%;jFjoQQL1?{%>;4J+j$#-b?Rd=(dQ8FQQH zlVeql3a@%77Xel*Gc*nByPaGspNKc0w2~1w(Z^kf6d+F>MAHEINzb=T)YqCQqH~Ys zn$itObD(4h>W)gp4e{n8k*c$4g8NX7Utp_+K!$WNhi+-O7YdT~mP7=aGl>6Rlkk{| zg-v4v4c`ApC>dG_me)AykC4MTLr`Uhs5EwN4rfd)>C+rtWw19roj1!wb$ z{2vI3EqojG0y-%gC?&R3O0y77XNe@L#tZPUKr=wG7E9@T{&_zAE5c&;4`89ug2tex z!_Zm0iPr2`c;41lDwXnig`&c0rm7?BXDCLZvAB-boOmBXD3#iT=lOh^5T6}NP@^f8 zz>*m(uAwy-ma|f!P}pB=69k~=(`i=mEHu!`uX-Sd_AI;aav(ctSD* zIj>+9f?W63Yzq)1nNcb!O1_CcaAH}eWeGl6Nh(l46x!fMux--eth7uk0b9g`$H_D; z2V_1g^KgdMBZjw4J!;g-sbw18SdvW1MJ|Un z_2n8!SqC)fbs0vI_F)@sp-nA5sKTKDh#It^K;}RjdUOkIYD8SAvbqY*A_STtjjB$O z-AQ4*gK{biw8}a>;m{qpf&t)^wG=eP;M-`6B~1qvkRj4=K^(|Lk8~CCa(B>ncTomj zwH$&cLqe-SBzUjiMca&6ueX+`CPv(2?jv-o9k(_fz%*oq03*9-=dG#{Vx^M2B2LLz zypML?5TT{j$}2WtlM>B6^x;ux2vBN{U^kJ66Wu;i1l@{5FaaAEix1FkrARhO#dD>w zPtl#%2o6G)DBwLrcfQLVfH*Yq0Dp$=(irq)>1+Hsx{JjEJV6Z3qkFGFQY=0~_Y@*0 J{v7@m{{w2cg2Dg* literal 0 HcmV?d00001 diff --git a/Data-1.13/BigItems/p1item892.sti b/Data-1.13/BigItems/p1item892.sti new file mode 100644 index 0000000000000000000000000000000000000000..f2204befa742e35d286c790e49564d5671f62073 GIT binary patch literal 1763 zcmYk5TTB~A6oxlV8b|G_X-Y1HJI2QM%h=egjlGV+fY-)eUzPweHwP=RAcRXcQ3y>! zNx(ozQZ=EeW5w+#53NY6sH)V5)@@aUT8TbX;-PuX+p1M*BuiAvlY7>H(wUvn?sv}o z=bzDRlxtxKX!rMvGeIa}yx2GM2C2qlx(J zM~}!7XMzTU>6FFz^Xin{VjSqA>&xViZzs!-m-v}e4;IfGwVDX)tU6JBe#jg2hMH^* z_z~ZL^u3{GX?gWoe#Gr+OkEn%$?LdQ>d4#2dWX98^;(Zr|J!%p*cy#vT=3dt$YwGz zeoyv;gh{6z8Xg=UY7crDkHftB$)wGw>F)MVBs=`>#>J~KwNe@IyA!>BX;q!oqpxr=DEvZgQA{kcP65ax|&+2MYFOn z+K4nE#x~gRb=mY+MuT#xH0ZT=MO<~&Qmaw* zRy`1PCSt922Q_upr>w1QaZ^34v$mqP!KA-7olvV3e%c!C@>&}WSWzdz9<{s(*ij-IF@vc%ne)IH+P{t^fIyZR$4-JJS6{~y^&rb7RkfgvpfPB{wJ$Q>hM8#HbWzL0BhAHU%14C0T&vF5(4?WfHSPfsjR3Y%I+)xx#W%?k>`ru zA)N-jtz8Z>oG2p7~Us8i%cyqgdDP!(`-4|yTKr@vmTyQ2fA20DBD74yLlBVYl_ z?(&uOcrMOi4Br@I(AnemU6W!_T=ZGgk-a2Ifx`$orfC`rXvhENOK{KeEEa$xurH9$ z#eMNbj(AK%7t07-k+0~$4FHH^8ow1-ONv4}-;^#tTKMU!TE6DR0rqzDSTY0mNh}QF`8-Af dX0QZIl~B~yR`U7Q8bz&bL0gkhaR0N={{sdBn&I_qNivOcp**xruac#X)Jm;Nl}czI_KEg!`;r%{-p7@qeb|muRl7&${5s!v z{`3F(Z<)dFD4{KTRYeknNjtyj<_-`#Lfh5V)z8`A#sA;`NB`Fs=(sZ6WobAzyFBA} zIph7&fBp2`RXxQ(5eD|{8u%0*(pO*XLq4u@6Ml2>%A|A?(#tn^( z*VVRjsdTr?>Iii3OLIA!rM0ii+tko>a->i2 z@iXHChQ`Klhm)*Y?(YvBt*hs4=5Ie*cetG+apA(bM4QnV?CDy*I>5EIM0*3djGsBy z9N?{Zb+X-Q?T-rMW09a>e{(WvG#HW*-*7s}G#R`O^Uiyh+;-DYto`CxPpH%L&XobP z(HQA=j|_Ht?Dk-XXZ`vqn~6>Ic!$R_e!+b?7iXKAy92JoV63tJ2yZukcz?E?cb}Ae zaxO7l`gb7YU%N11GcsYRb9}(p%C;bneREEBSd58YGslKc=O{ zVY`!m-Db07GlASlkI#>;osF5Ao4Z5kWGc{nq}k)Lzdf6?m|NqW-pp{s+s;jm#*ZC6 z8WvoMMEJ<7^}LDw z$sR}BXwsj%bUM-3wK_d!W!M2p7#Sb3wwOfT^5a)`1h4D-K+o*ubR^bw?|Rm4Gbb{M zOXHz#zx$KhR|U>=VlX^?E*cZj>a|fzt05Wf{Ok0|${hSLJ2t{jd`@g0KxnZF9ip~~ zTZfQ>S*wgO%keCY(Yr+9&&nZ8(_)DR08ZpN9?*gg-6RUNNZkjPK0|}TZZJG>K$jIv ztrItNX#QXsWAzF~94x*FKv5ek!Z`ISxvvgM%3~5`0VI?sR`lgQ1n7=lVP%@qFi>buR`iM$fwDrZR8j1qdn5%Z z`Jc)Xv0Q~}mHT>B1`k>y76DNhJ=B{>{tabOgDegBp`Mz9jpy(drr{CLdooN)e^{7~ap^6z~k{G3@Qz||ncc0CPY9%ZZsXqvLxJRNnX%4hB zERm@ALtsTwDDOQxsLvL{(UYrr|Y) zEN>mOKB?;yF<@nxSguiaG5?g*v4C&YAoZD4N2@?mT1Eb(WI2W;ixRWXamva8Q08Am z(VhQDdn+o7%UaR$O=ZejBuT!Y+o}6mLAxxlAE!_)Efq_9Dj;Q*SZh$qlEmql0$*5VqSo75+ndneh|Plt0kEnB)WQKpxkYS|z$psAmNqND0lXvY AZvX%Q literal 0 HcmV?d00001 diff --git a/Data-1.13/Interface/MDP1ITEMS.sti b/Data-1.13/Interface/MDP1ITEMS.sti index 919e4b8d954bead9115ad2b6e10b7d7981827f05..0fb2189be01e7e01cc14c700d7c22ac0377172b9 100644 GIT binary patch delta 1472 zcmYLJO=ufe5Po(oH9t+8kcP^J)DSSllv16RT?N4gKZ;z0sH_TEVFd!8eJt*w>Q+B1 z$BMggLWm+LltPXL(?e(v357(L9^zmMxyXl#LKYE+1b!35@JF8tj0wR zUY3M7FFsDi#qV$I`Q~wI`#3d&F^lmI#vDfMx8qd2tC+hnV%ZU$)0hf{Jihfgh8p7L zc}x!!MOTypv>OkAZC@a&W^|h+qbN#{254P`yP)V0pzvS@+`I&M1HlaIIy>wj4@dnY zIC>dHx6LqzeXOuAK~#Kx#1;#uW-y0o3CjQU@V`wn3J#t41Z&7zpilN6?{7Zrr^B@A zCyjOB(`$!M9zFhLvmYpSxD{qJgB}TUfqJGp8ojvkWdFzgv66|ngK_Yb6KN?u)--K2 z9F6+@D@P%D@OtqEiTXU*X%<;k5`7u4UvCoERd`Q(gfFK<}(t5D;ZI7rW8o1tjK;Y5Sfxh&Ni)4u=%ELq)9Bk>p zwngh47U95PaS6bVu+D_3TVEsRmatId`c}Byu4u<8Z!(uH+EEwWo+=hAhr=>fX`KR( zJiwH<`!$d|PSEEiIaLbAgKBbw%BBcN0R;Br~G@*!&!ppJ5rl$sZ1OgUDD zo~j|mbtmhtAOH-SskxIJiHHsmSG^mNFralh9nF;!RvgY^KzozI6bwvQhrTrdCVP(n zW}R%cySi!@@7=ZY#Y#wO;$Ghho)>O-DmO*@eIi53oJ?AhQB(uZkJcT;9q8ZSmVC>4OAa7N@FZpf}zn>Y90I=*l==T^Aj~vu^-_ zvJRFXVpMUGuwztCmdOTu-A9YZXe~)}J4S|IB{7F2+KbVKQ(>cghmF!fmJRs_8(A;O zNj~}rNm;MR*8Sz28B$8GOIUH;*&*7+w&VhKDxl=P!73dn1CW0RoB#j- delta 69 zcmezNRRemove tripwire Remove tripwire from smoke grenade. + + 1541 + 1540 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 50 + 20 + Empty sandbag + Empty sand from sandbag. + \ No newline at end of file diff --git a/Data-1.13/TableData/Items.xml b/Data-1.13/TableData/Items.xml index 96d2e962d..561440f31 100644 --- a/Data-1.13/TableData/Items.xml +++ b/Data-1.13/TableData/Items.xml @@ -166,6 +166,7 @@ 0.0 0.0 0 + 4 0 0 @@ -30975,7 +30976,7 @@ 197 20 1 - 30 + 32 10 1 -2 @@ -30988,6 +30989,7 @@ 1 1 100.0 + 4 @@ -45751,4 +45753,76 @@ + + 1540 + Sandbags + Sandbags, empty + A bunch of rugged, empty bags. What could you possibly store in there? + Sandbags, empty + Only a fool would not fortify his position, especially at these prices! + 268435456 + 1 + 1 + 891 + 3 + 4 + 10 + 2 + 2 + 15 + 10 + 100.0 + 1 + + + + + + 1541 + Sandbags + Sandbags, filled + Whenever you need fortification, flood control, or cheap weigzt lifting equipment, these come in handy. + Sandbags + Not for sale through BR. + 268435456 + 1 + 1 + 892 + 200 + 1 + 22 + 2 + 2 + 1 + 100.0 + 2 + + + + + + 1542 + Concertina + Concertina Stack + A cheap way of denying access to areas. Be careful, don't hurt yourself while planting this. + Concertina Stack + Useful for serious fortification of your base, and ruining your fatigues in the process. + 268435456 + 1 + 1 + 893 + 5 + 1 + 18 + 75 + 2 + 10 + 6 + 1 + 100.0 + 8 + + + + \ No newline at end of file diff --git a/Data-1.13/TableData/MercStartingGear.xml b/Data-1.13/TableData/MercStartingGear.xml index 650b76d58..96c3c0e85 100644 --- a/Data-1.13/TableData/MercStartingGear.xml +++ b/Data-1.13/TableData/MercStartingGear.xml @@ -4428,24 +4428,24 @@ 0 2 0 - 134 + 1015 89 1 0 - 134 - 93 - 1 + 1540 + 100 + 8 0 49 91 1 0 - 0 - 0 - 0 - 0 - 0 - 0 + 134 + 89 + 1 + 134 + 93 + 1 0 0 0 diff --git a/Data-1.13/tilesets/0/SMP1ITEMS.STI b/Data-1.13/tilesets/0/SMP1ITEMS.STI index 4e5059e243b4039db5d107b6d973fe4bce081a3c..517bc33e02132ef394a8d7431b751ba3f2f2f260 100644 GIT binary patch delta 590 zcmZWlJ4?e*6h5^N6>Uc+ounuft&=25OC%jCN(U9|ptFC#K?jXVO~n=pg6N>XLGXnj zItbz>wDyp80Pa5+U_8x zTW15$6Y1!Bh^~B(C{78wVSW(s1a(t^Umgd%m*N-qr%t$3&tBKFq2!ujcOeLqcDjN5 z%y=4yFv;ox(lc7Eme_wOJIkr7%<97WhzCa*;$I9e&ipXCuM)Rvp(E+l{cmN2NgGfj-sfBuNwP~(o|DEo)y@ZtB$Iw?c}Pf zRsvPG)k>wUJ~dmd)`4pV!JOo|OI;+M?T>yHh4?q55dyHfi0}hN_z+fLBYay#-o8k>3K&Kd1k3QCC{81bu2z&$HAopMa zwKR}}lpkB;K>#7^5a=p?s>sL3>R-!GKZEkmL9W0nexDEOBhWs?YPDLt_shTaukHZ| zpnw4m1W*MoXo4Y-31!N#C{$qzSA?P(+|UfeAQh$NWpSv(9PS854S1jhMnD=$V@Y93 zCgUX@r@M-{ND~<%GD(>PDx#t)rs680Qcc{XnG6$NC<{JbQx|h_mvE^e9@0WaWV%B1 zOq7t-5|jqC<_&G4g9RonQ?|rP6jOE8P_3qJ+Dr$_S1mOgCJu(p)m_82hI(iV9R%03 zv?NcG8?)@*0#*~6HL)Qkla+}mOtOwyX0lMLW^UHZh8deI3#V+A2pDj;aI0Y+*1|?4 z1%-^~a5x0gPnt=v*W|#P_#i2hmnp}}V20LZ&Dac@0VC!jhW^jheutSquvfrY!G(;~@|>!y4gH zbBPu)BF9$vO8!T=+tvOCFOmA+JNrBQfM56@{k6BBQ$Ksu`ybdG_4T@cz~->8Y0fXw zd?*{t-!pRZQ2KlyI({e_`tN*8VFDnGkA(9HmxrwTJ1!ox(7NB@JeBmEeLea#BinRs zo>4tM-qLuF`P=1Szqj9FUe0e;edpOOMK1RC4Q}`P72fRiOT63b=eXPJ8+>@W%QfTU z<5bz&p9H=k?DM0f>lSBE62-dT>^Pknzrmbd`nOmuAb;HQXog7qZ`V9$G8+^ literal 0 HcmV?d00001 diff --git a/Data/CURSORS/HAMMER_R.sti b/Data/CURSORS/HAMMER_R.sti new file mode 100644 index 0000000000000000000000000000000000000000..be5a96a9acecc4596c8d1e65062236518ec3d240 GIT binary patch literal 1363 zcmc&zOO6~j41MEq+ucZ33E&{`DywR+j^S0diFh8WYCazKj6dTK0wXuz4RQ}^AHWMA zLwVGU8wQN5O`t@Il*q?N)t}|r@1T4-$raf1`}d?i0QaZZZnwjGw|s4XasT!i0w`dB z0|8Wl3!0z{WJZ}YEDBYa!WE&Y1~)WAH%LXPd08ClFo!$BQ3D=mfgX^C(pXZMlF4|9 z$LX#jF49E0h|E%Efr_Z8imA9ts8ka-X(ru-7s|lLYwBVy?h-CF#6wz0k4#sHo{18& zT7uGm*1Vxjw6nmhWzLpZiDIg*8miUQO`Bn()=&>^p`GBGmX_p6 za$}a=Tfk~UvnJNXWVSLBg-O;i%S;w()y&PBSvO;oWpK(?iGTrj3%45PVJ)mjQc%cv z4u?Y^{iK-$drc0!iFcARdzo_#?3JLIi>QgWWJR=Y_$&Mz`C1j2=lh=@BE-bl;(5MMKnnkzZV9Iz091nr88P*7onoG2Z z9yzwcSMnX@pZnTB;VIJoc-;StKlmTr-tT|FulO66r_(gO#l>dY@AuO!&eKTG*~2v6 zV||>FUAopC&CO=V%^NH~j)T+P{uP#Se%(&@o*S$Wrs?9iKj8XkU*YA^zQpUJeU96s zz2e>D`&9 o>nYK_$MWQktwjB`tXO_wWcRHw*9dLCl??rVzAtklj1PqKA3ghdPyhe` literal 0 HcmV?d00001 diff --git a/INIEditorAPBPConstants.xml b/INIEditorAPBPConstants.xml index 4e492c6ef..2f016cb79 100644 --- a/INIEditorAPBPConstants.xml +++ b/INIEditorAPBPConstants.xml @@ -780,6 +780,13 @@ Represents the AP cost to reload a single round of ammunition. Значение меткости по умолчанию для расчета требуемых АР в описании оружия. 枪械信息栏内计算 AP 消耗的默认值，以一个技能值为基准。（大概是技能高低影响 AP 消耗？） + + + The APs needed build a fortification structure. + + + + diff --git a/INIEditorJA2Options.xml b/INIEditorJA2Options.xml index 1bd77887f761e59bb87e7f02385866acbc30ec4b..4741d232b28826b2700143d6fd6f16479e6b9bd0 100644 GIT binary patch delta 284 zcmexy)NsyO!-f{d7N!>F7M2#)7Pc+y8}d0_7!nzBfjE8o{!n&N))F8ydwTq8ZtdwD z1?*ys3eyz}*r!hq$z&H0PGu-!$YDrj$Ye+Xl6edY48_ye&u5pFEeCTm8Pb7t5l}do zA(F7M2#)7Pc+y8}g^iE$5Dy{x6?hZ1S6Ux#@~JN45mvXZLo^xy