From 9b898706e07f8d6839200dbc7342353820c2f1e1 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 29 Jul 2017 21:11:32 +0000 Subject: [PATCH] New feature: riot shields protect against damage from some directions. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23452&start=0& git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2381 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/BigItems/p1item901.sti | Bin 0 -> 5004 bytes gamedir/Data-1.13/BigItems/p1item902.sti | Bin 0 -> 4658 bytes gamedir/Data-1.13/Item_Settings.ini | 14 +++ gamedir/Data-1.13/TableData/Items/Items.xml | 92 ++++++++++++++++++- gamedir/Data-1.13/TableData/Items/Merges.xml | 8 ++ 5 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 gamedir/Data-1.13/BigItems/p1item901.sti create mode 100644 gamedir/Data-1.13/BigItems/p1item902.sti diff --git a/gamedir/Data-1.13/BigItems/p1item901.sti b/gamedir/Data-1.13/BigItems/p1item901.sti new file mode 100644 index 0000000000000000000000000000000000000000..22710b48a72b27d6b6d8dbf00d0efe3611279b58 GIT binary patch literal 5004 zcmZXYPiQ0O8OD`T4T%CxCeteM%C`LJ@93Z9f10tqv9mk7-W?~K&1RGR5*j)!2uj>b zL5CK4YP3lMJ@^oq>QI<#VNRu2jo5%p@KN|+EH8y(kF0}Z5O|kCY@vPLZ|vQaezs;L zd;Obdp6_|z@0VuKHxr5Jbb4WRHJQoGWV3U+ zo>tXtv6wHH)k>vUtxhwxe)DE|Zf?ymR@T;TnkGx7k~1@T6%JR+l}frgi#eFeWmDx+ zQq5ylQl(<1QZ6jaS67xxON-^&QbnuHudb-e+60?Pq*GJbOfsKK6$`o9inhMCYFsZa zYl#%A)|M8Q_56HwD#a=b^OdX1MSZFI_R6eYE7TS$D_U*sYATmi%O!PjZf<>5yLoN# z#`^l*%|&Bv`L>}M>j{=z+uTT|*v5OC3u`N@8`tNrUrpvStM6}=wS}~rD^@F;ckirh z8q2q?tr+W9-@UPN=f*qtOnqaWv0`|Q4P&;0b4pZ(_R->u!bF)^J;W>~hEzw_Z;?fU8;zG>dLbBkqC_xSxk z|Lq&=*S|{4Ox}I)L3L&Bl~-T+?w{X%{@c$VeD**ss&fl-iOEDJn^|62{>Qg}f9;K* zOim|?j zk*wyRX&6859d-xZ=GZcCn$hNTk~Je{}r^8q$jd?g&RFLO!!Dv(C(%SiJ< zFm@bp2@1XKcH0o(QQL6aE`|j-6zdkZ#5eshA?ctf^i5|P;zt4JfyEw1n!IQ9#!l1m z2#(>wk8>Lrut)W_T^Hnf2}#4Cy{u+S~j6)-v63M_uwjC}FQxZ8ZzY&!TJ zJ6?~xI5*nx0&JW^w##*k#6vXv4F{lc-lNg<9C+P< zaHrGmID~gbqq~*|0 z$Q>x}xbUT3ueaMF8{$bd&1FacQpO}gFzDn5mlO$>1efe*qb|tZZqw`bym1f8N%~Ib zV&EF^W#n#CRA9?;!zZdRLj031%f>WZQy{3S_AsH-+jt0?-*>) zYYTrw3=wP#;w_*B95aWhlv^COn4ps1bTM2qhDsh0`;5?CuutK_PTM{1?rOe$yyF4B zC%O`1<|UAjO(vM&d0h9R;kM-dU(H^b0Ne(1^B0HfO*z?QwUy}iADw|OeN$H(68 z&Ti;B=Cf^q4^JqAFN9P6XcmQN?&CiE&~8ccIq5zc42Ofm&fxHPaQ67|n99Zen` z_jfTo0Vj6dRmv=b^K((TKbOX2t9;c$3(I5-?04v%Q`4-Pch z?e;NtcPKQ-BdW7a!pUy55;20XqtFCWxJ?8GaG9>cNj>R4IXffaLy%8s92|5txlQcd zJ~v5tyHoEV=ET;w!G|dn5)S1pMQITeNU|F?`$!3X7wUcjHt56QlPBLld2({Hf6&)_ zN9gXmGG-ICB&HKh7GM{DD9AXI+Z6GJP%b3PobXcMM@cua1sv?}iM`*Kd8gYyAm!va z`BLvt#>o>=JcdkRfweS^I6^U^h`iwJQ-uam;WyZ1%JA%^a2y`=8TSrI_#?mp7Q!ir z0#3q-OhW|Fl+7sjnGeT#lzt|0MH)#$H~B$^ADh*MG!lMWI{ z<#X9$#RWh&0T**gep5nlM9B+Jjt)^fSX_~Air~q9ANg)mO8Sp3LfA&_*TeM(g$c

>Gepm3x>cya_R3KL_vhuS#-^(nDwBGFMq)l&p7{08`WPE2m1 z76}jGX6phTMo{#@GxCGjPJbWpBT$LGOOBv+DBkGgv}jT*+}_qhGsF>Sv=ZMWw77zZ z3Rx5OlOc800s8B?cOcl^^J&cWW^%dA>0C9wC;$xgwxGlx6|xe zPJg(!cLc?!EI{ta4+;pdLN#^oixthhXegwVnn?p-Tmg}x(xkzKZbCO5yV(rvU9cbT z?0PjVz*+{lDY~nWj5X(S7F$?>%@%L9!uca6USU|GSR|0(YZ?p}Y!};W+XlO)`2nwMZNq`z zh=y1TXm_kr*QRNlUN^v}0HRmXR`Zkic|2~|F~h@t8*FTi?Nc7O z_0h=UK!b}d2`!N%8nGkESRz}T<`F|^XAJL|@EQ@6l@RT^aT^lt7&Hd%MJg`N0i^@n z{~rpP9tE0|iy;KdGS(liwEQ3ts^jsv8z04DqnI0a!NhhlTog&O`@efAG8!FQLH2~? zOKONmI}vu!@<3=nW4Psb47W{rz}dBMnHX*Zn=`Q)zSIpD=mxO=dohKgmoQAEm`SQh zYB3U_1JWAS?FQ0KoM~!G}4Ue!{3k-cn450 zpcbF8!6jHYz@?i67!?T3*oe>&Gf4eIrl&`&?W7y|@cHTK!^p#rvC7Brl9ZT466tj@ z0K>r30PV$E3bJ--Fw!LkcwwM5su}DZWT?h&=V9c_``SXRY`7uga? zK%=A#hj$)gK?PYRxun;J7x>q~myxgT$&g8casLt?CP*%}D&n58_aZhuS%`6Q3O@j~ zg?E}z43)xyhT?w}`Rg+J971(^N@Yn8?#xuohTkx?1|GW`TXb)@yIPHDTeU4l58+$T L6ZOBw{~Y`mH82N- literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/BigItems/p1item902.sti b/gamedir/Data-1.13/BigItems/p1item902.sti new file mode 100644 index 0000000000000000000000000000000000000000..f7fd18b1e7d15f30fa84acd888f079f298c699a8 GIT binary patch literal 4658 zcmai%e^67|701JcJXi%qnb6m{7;b~^pb6}M~Mc4o)! z4xL6;G6;<>laUxBn-LXgGz1Au48Mj(VqD_eooq9+-Tgx>Q&_W=wbN<;$sg@G_rCk` z1C}0m@80|F%jbUYIp^M+96P@MumC?Y|`srUDJqiT^Gt<+bJbd_gYAP@}`EY#v&vv`RX6v?E z?N_hbKKS7G@4w&t-h010ckZ`m&%XQ4JLleh`|Q!9#~T`s)z>%F)zv?LzWDXmFTVO} z_RBAyI-LU+OPAUFQG2_&t*xV_rS-&#lW)Fx;`s5#^70*JWk3A*x(h6BZ<|~<5tM=~u$!oQB?H%TVjo&XUD)Nnw4SI%LgKmFd+Ua&p_@{<_ zUJXghUXwF5?e|TLdB=PsKCj0+T(qg^ilzPXl}l-9n)LKEtu{R~Q=63~tX};}PR{DQ zymdNVUT*H%n>X!UU7c>X)8*>Fd$+fzr`zGUe&|rm%uK-VpYZvHz22ez{@b^1IUEkV z)oR(gwPbpFYGT4SHs33*6>~?&rS|r=wl-6Bb=9Ls)6>)b!NGxOG&(;&FU#_iCr@T( zW*$F&90&xk&+ng_0-Y1%pre{XN^Z5RpEI2<=_ z+`z$Xwrkg}b%94ZI~y7r>g((4>gps(I(YElfddDstE($3EBEZ#vuoF`ii(OIJ9d

6a;VpURVf1C=|j=h6`%4 za8c7zJ9+W$BscI4wIGS1r2zlr4+0}~IEs~IB9+D3Do+TuXpBer1pL7u{Br~UMX5+aW}$2XThNmd+WlSF zU{Ejtv7QkX7|2tM{Bn-OYQ-4QLrF+ej4VXSq%t>TqBr9OP)sK16)pghGm=VwkRWKE z$m0Scp&Cwl2^tKm-l4q&sfrBh5q3mW0z`p?6i{6#2red383ZJ<87x7@RZ!$CWIZ#g zHug-_lUjif{$J!G=3-QA!uhNAN62ZGLNuS3WD|f_P)U(`)t8KV9u~z)NC?sj$S92u zL_EpDvSftCr!GJ~f3BAyQ&)`AUcd+wJ-w4-Tc6()+LQ@x z6Rt4Dup7lNom6b0K`c{Z6qdqaICCVvpVLhp1E*RDbtdp=hq5D7DcdD3by8Rc1!4t3 zLMB79Q$nS&iiAw8DhngAyOAElr_#lk1_+Y0s8ck@2%QAd z@Z?%z)Njb-n;(CNzAa177)P(Kg$(tu5rB!SQj(U?_yZV|G7-w0%CR`9Id#57-&j(j z%pGSgV33%}Mp;UpzsaOB`8Y}$lI1z>!YaRLIKl@21b7mFc%e_@GVr4~d1P{&(#r~2 zUZBhxv1p#dv6PMUb)@0f0ca#R7KsXz9RP7OrAn~Vft84cO$$sUy~{?bk22XOfT^fq zOYGNFXEGB8hLjKV4tXpN%C zncz?i6Ixs#ZQ{)Ye~M1^nNmTi^x(kh7w!~GBhRn~hH;@%lTs93R~mSE$Gp%pxC~Ljj%BsHl6}Qt{Sa)4PDMXo-Wgz$15%OccD~Dwe3Q$!d{|qa^uYCXHGHIv~C>TRDImNwrY(kJY z6JkV}Y-?VIEVCFT4~0Y+Os1}c!-(j&gI3Or7-0uNDuh0Xs75|%y(?%cQ;?06X#kzY zz>9L`Z{CeWn%U&}~D z1L2pYI1*prQwW1hh*H7s2qx&hN~$^*wOT!%J``%?>pq^NOm{Mp_d*#m68$1w;UpGi zi5k-_#%B8>eGw4a3{+z{Q6uag0$q$3;CBY9OzecgLIQ|XKm^V>ngDuT%p2)LA|RVV zC_R!f*J&cKBf5nFC4_K=w2HG{VzIsmVj$n)qD0z+8e}q>>yILg+yhhu&VE6|Sv?-_nX%G2F~xgh&MbFT(HJ{{g(3CyoFB literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/Item_Settings.ini b/gamedir/Data-1.13/Item_Settings.ini index fbb7c5b70..f862cc3ef 100644 --- a/gamedir/Data-1.13/Item_Settings.ini +++ b/gamedir/Data-1.13/Item_Settings.ini @@ -345,4 +345,18 @@ DAMAGE_HEALTH_MOVE_EXPLOSIVE_MODIFIER = 0.1 DAMAGE_BREATH_MOVE_EXPLOSIVE_MODIFIER = 0.1 ;****************************************************************************************************************************** +;****************************************************************************************************************************** + +[Misc Settings] +;****************************************************************************************************************************** +; +; Modifiers for various item categories belong here. +; +;****************************************************************************************************************************** + +;****************************************************************************************************************************** +; AP costs for movement are multiplied by this if a shield is equipped. +; Valid values are from 1.0 to 10.0 . +; Default is 1.7 +SHIELD_MOVEMENT_APCOST_MODIFIER = 1.7 ;****************************************************************************************************************************** \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml index f6c4df3e8..8e66b4e75 100644 --- a/gamedir/Data-1.13/TableData/Items/Items.xml +++ b/gamedir/Data-1.13/TableData/Items/Items.xml @@ -191,6 +191,8 @@ 0 0 0 + 0 + 0 0 0 @@ -50267,7 +50269,7 @@ Multicam Molle Vest The Multicam MOLLE tactical vest is mounted on tough mesh material for superior ventilation, and is equipped with a multitude of ammo pouches and holsters for all your firearms. Multicam Molle Vest - The Multicam MOLLE compatible cross draw military vest is the maximum in practicality and durabilty for a tactical vest. + The Multicam MOLLE compatible cross draw military vest is the maximum in practicality and durability for a tactical vest. 131072 8 1 @@ -51744,7 +51746,7 @@ 2 237 120 - 949 + 6 1 1 1 @@ -51766,7 +51768,7 @@ 2 239 150 - 949 + 6 100 1 1 @@ -51789,7 +51791,7 @@ 2 240 3 - 916 + 13 5 1 1 @@ -52230,4 +52232,86 @@ + + 1742 + Wood Shield + Wooden Shield + These pieces of construction wood were hastily nailed together to form a primitive shield. They won't stop much, but it's better than nothing. + Wood Shield + Not for sale through BR. + 268435456 + 1 + 2 + 239 + 25 + 1 + 34 + 50 + 1 + 1 + 1 + 1724 + 10 + 1 + + + + + + 1743 + Riot Shield + Riot Shield + This shield protects against small arms fire, but hinders mobility. A crenel allows the simultaneous use of a handgun. + Riot Shield + Part of our 'Agents of (Riot) S.H.I.E.L.D' merchandise. + 268435456 + 1 + 1 + 902 + 25 + 1 + 34 + 200 + 2 + -1 + 1 + 1 + 1 + 4 + 1 + 28 + 2 + + + + + + 1744 + Ballistic Shield + Ballistic Shield + This shield protects against weapons fire. You can still use a handgun while carrying this. However it will slow you down. + Ballistic Shield + Shields like these are used by SWAT and military teams to provide protection against weapons fire. They offer tremendous protection against all but the heaviest firearms. Get yours today! + 268435456 + 1 + 1 + 901 + 102 + 1 + 34 + 2700 + 6 + -3 + 1 + 1 + 1 + 1 + 4 + 1 + 50 + 0 + + + + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items/Merges.xml b/gamedir/Data-1.13/TableData/Items/Merges.xml index 5250f5104..4f792a281 100644 --- a/gamedir/Data-1.13/TableData/Items/Merges.xml +++ b/gamedir/Data-1.13/TableData/Items/Merges.xml @@ -5864,4 +5864,12 @@ 4 90 + + 1726 + 1725 + 1742 + 0 + 4 + 90 + \ No newline at end of file