From 247eb99d3afc66c201ec2f5b59e11e27813f85a4 Mon Sep 17 00:00:00 2001 From: Starwalker Date: Tue, 18 Sep 2007 06:55:30 +0000 Subject: [PATCH] replaced G36 family pics (Coolberg) added MG36 and MG36-RAS pics in addition to replacement mentioned above (Coolberg) added pics of G36 kits for later use changed name of G36/G36K Tactical to G36/G36K RAS added pics of LBE-items increased damage of .357M and 10mmAuto guns by 1, decreased damage of .45ACP guns by 1 updated New Inventory definition XML-files (same as on FTP-site) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@879 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/BigItems/GUN335.sti | Bin 0 -> 2464 bytes gamedir/Data-1.13/BigItems/GUN336.sti | Bin 0 -> 2583 bytes gamedir/Data-1.13/TableData/Items.xml | 20 +- .../TableData/LoadBearingEquipment.xml | 353 ++++++++++-------- gamedir/Data-1.13/TableData/Pockets.xml | 74 +++- gamedir/Data-1.13/TableData/Weapons.xml | 36 +- 6 files changed, 280 insertions(+), 203 deletions(-) create mode 100644 gamedir/Data-1.13/BigItems/GUN335.sti create mode 100644 gamedir/Data-1.13/BigItems/GUN336.sti diff --git a/gamedir/Data-1.13/BigItems/GUN335.sti b/gamedir/Data-1.13/BigItems/GUN335.sti new file mode 100644 index 0000000000000000000000000000000000000000..432e1237884934b0ee3444b20d4be6a680517f34 GIT binary patch literal 2464 zcmb_dX;fR+5q_6dECwVHAa;ozp&c!(0>mnI5Q`unHrI}^Fkl;SDKl7!B(=?^6Q;aFb#)@N5>a;EdCpG@lULdFGIca;+p3b{(-rTu&?lRxZ zyb=K~8-Y}4x5E)60={O@V}$?&HWUiAtKDP&EPt*38x(D4|lN{UO0i;9a1iwX-03-Sx{^YZg@ z^Kx@?bND&@Y<_lDc2;IqW=3X4dPaI$dKxc{m&!{`Nli&kIofu#FyJ zhWdv3y861>I#G?Nrn;u8vPxJXEH5iBD=o7Ez}m{n#@gD}#>URp*51y}&BX;}Z;y6$ z#kjdSpiqtu4o;4a&Q4DIoSl7fIG26%CL|=p$H&7hVq;@D91fe!X0cdI zCNm}`hQTNm2m~c1CB@Lm(8Kxpd3kxcxw$zxIeb1pJ3BioD=RZIGb1A-Jv}`wEse+H zrKYB)q@*M#Cv&+cIy*bs+m9bR*4Em3q`A3SEI!=S^yv z5{YVRUa6|8s;sOO3WXIF73JmSWo2chrIMZ=I1!HTDd0iihFtE>!QrXDaoGQG*RLJ3 z>y;4bFh9S4_!#Hy4H4MEWEUTZ6$EV$LkOmeg9F4FVs3A13!?zW0*nY47cecpL3_Dl zjo=YJqOgW@-a+Ix;H@8AdeiR9-)wFD706&;J$`HKI_k@@D-$PX6}eJGX7{}8<43iX zZ#WiR5g%%5I^5h2Bv8wL`2u`VECFBqKbup@7sUp# zVPQcmzT0$e#9%P=EiH;+PrN8rsZ{*~YW09-P_ruiL?M^Sq-N>rX_@>~@%P0eBO`|n zALs;#H1o5cP8eq{pX+#5xdBO7eM*ftZ$Diu!KYMEFHNE@pJMg)E`?c4` z#>RTSyWG=rsb~D+`1tPxuNH{vM9=fei(VqVD9bO0tIp3#f!ba;d}8vlDN7X!_-AL0 z#u=klH+*z>SlO!jv+~^W!!V|rztgYkS2xy(B&VMv5)^n#w)MQP3utUXohTa&1Ot)D zXf&BjZQ8arCI3k2`C~`VHZ8yl8b-y-g|E~%XoLs~e7*&d$_E$mK-77pbFFi|wY46+ z%qka(M9(0Jo)vBgwzps8!{dGU)uRGH@;|i;h>`?%`}TAO=_8k%(d%_PG&D4%*TJUK znqWsaq%~Q)1ife0x83u6@+LmKXy&K^ zEFx(Y%d{2RgFD3w8tTA2miAzNzB{@jb#(5C z?Wdlc?0y2@E`?knm9{%Oag;j?WqkW&`Ij@R%Z1g#dRS7WX`n?4>xJg@s-(AfpJs4S zv!WhYR%`mz5Mm{I^t`ff6g>(FJ&IN?sg{)L<&_n+W>6wk$mQ~`)i;P?>BG?1|6S&1 zN`RGQ$Am8dIT8RX`d)(?!LGhk0?H)-@)C)C#o+bmP#y&ImK~_`!$33SeQQt+KYs@j C;7fD> literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/BigItems/GUN336.sti b/gamedir/Data-1.13/BigItems/GUN336.sti new file mode 100644 index 0000000000000000000000000000000000000000..436a31406ca3360efe58eafb4990f4f08888c43b GIT binary patch literal 2583 zcmd5;XW@Z4;J| zoP(M4{)PD`GbcDYKF{@-SfWHC2eTNz}^y~ zHHKY)@=s)s!4L*#e0=;-?}zGh|G(Y;0#|V|r8haXC;3!MQu49bV}#>`I6@pTftW~4 zOg)vFmYSBCk$EoXTuydQVL@SjUViDt(vtHf#YM$T2D6M>Mx{_GWD2>IET|FGRM%8j zRaaG3Rq`wOJU*|2SHZ2|lyl12HQsq<22M`wqmL((p3Z)vejaR;SfyHENAorB?N+dV6}63Z+7>kax?wW!)~^#VaWS zd}0uajfpuH8+-g1EctjGfe;@TcOpJM;lv4ILP8>un3R}!GASwfvPdM-*|XiwX-13knMI^Yioa@^W)a zFJ8QO;lhQIl9Kc1&leXL7ZtIXOeTZDpwsCz8m+9Xj7p_aC=@c8Tv{rqsi~>1uCA)8 zs;sQ!^Z7g;ucD%Y%jI%7obvK=Hk-|2$)wUtot>Q>9UT&hq`kept*x!KwY8PgWP}tDWP+wnPS65eCTPqMuPfcB&oSdAPm>3@)9~&DT85tQK9v&JR z8XO!P7#Ofxtrm;LY&M%rCZo}4Fc|v#`}KOgPN&mqwHl2^tyZg4s=mIy-rgRiQmIfV z+WI~WW&;nveth)!(N9mFJbm``S;VJyU`qlt@e=k#G@rx~ z$Sd*lh&a-Eco;c+9*HzR6Nw^+k*3J=7ST_l-%Xnfyxv*6-DbDh?DqM&`30-gfq8^T zEk1K|>$FBH>-rRmRQk#NSEck{!B>w)BzOQl`Ww`$ z(^qcZvf1X<0pAqnB%o0BIv;&cGHr)KyfE(aEaokHi*DLxXJ_s6X-bQ=8(SctaCL~J z+aX=?-MQ;qUEA0U218p;C+>2&m%Lsryb^N|-m@$5(8?|eskJ(z)od{8^>5z1ef!tH zsZ~G!{P$@5*nAw?dSpx5Lc1B78y3_2g2Qp!z3g3?wa-mEMhsU+;A_ssp~dg6WlYF_ z$S@9tLu2b}z7pRCyf5r@kA}7eXI7(KW(-2o$T8cNTd2MU=Xt^wdH&_uSl^J-+}6ZsNt!A&e8t`8o)y&z+`Js}!l8x5{^Dz;iVk=aMJ7 zw^BTo_XsKSl-~;k#lIlr$D9Im-R;W3vv6QW-09>4G5)5)waw$_xNtr<$lrGIxNHs& z&*5>V|M=VQDtE4_Z;W2QJ~J~mesyAUl<2{nwJ1Ma!Qrqsp@f1Q4vWQN2P;AxPKXoO zSPyJ4=s?X;RwmQzn}2xm;_Jyd8u0V_I%AW=W^;3uZp>MycJg3gfX(HwIh#QsWe%Ig zEoT8Y(}C9+v@$x4Qsx6uq;JgI=4Nd!%H0d(yHv_5jX|d|NSVlmE!3mw3O*+Qnz+f{ zggwUzayA3tGS{QZKwI z=o^6mGr-(numUVLV?DrPFzGaUnV;$hd7)9sem{i@lR=XLazrLW0|c8w@v(V!gkuXr z-HWK6ynfyJTJl;V0T2AwP=Ufo;2Kq$=#6OI(eYC9>Q#ID%XVnJIy%XdB~^byPR!AW z3=bbZ6h1gO*xx_c+u7OO+dFu$zrVk?Q?pxDb^qS|s(Us2^?UmV@IZs`(c^~?4)$ty z_xJ1e_CcX`s{O;_ON}2Uif)8oH=u!!G!*ruM-5rGT%nXh>FrbXX*9C<6yB}qL`}aw z#~1e+w0eWy4E!uY-6#Q{8phpAU)}butQ0OSFE1^6JZ{gD%kA>uP99|Oc8C`Omr~N1m;fF?}bL>&iw?)4i=;_>tG=D}wrkr#HVZMn)2DtniR$;^j literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index f93e8e65c..1b60d3969 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -14567,11 +14567,11 @@ 665 - G36 Tac - HK G36 Tactical - The G36 Tactical is a conventional gas operated, selective fire rifle, made from mostly modern materials and using mostly modern technologies. - HK G36 Tactical - The G36 Tactical is a conventional gas operated, selective fire rifle, using mostly modern materials and technologies. Unlike the 'E'-version, the 'Tactical' is outfitted with the Picatinny-sightrail of the G36C. + G36 RAS + HK G36 RAS + The G36 RAS is a conventional gas operated, selective fire rifle, made from mostly modern materials and using mostly modern technologies. + HK G36 RAS + The G36 is a conventional gas operated, selective fire rifle, using mostly modern materials and technologies. Unlike the 'E'-version, the 'RAS' is outfitted with the Picatinny rails. 2 665 3 @@ -14597,11 +14597,11 @@ 666 - G36K Tac - HK G36K Tactical - The G36 Tactical is a conventional gas operated, selective fire rifle, using mostly modern materials and technologies. The G36K Tactical is the carbine version. - HK G36K Tactical - The G36 Tactical is a conventional gas operated, selective fire rifle, using mostly modern materials and technologies. The G36K Tactical is the carbine version. + G36K RAS + HK G36K RAS + The G36 RAS is a conventional gas operated, selective fire rifle, using mostly modern materials and technologies. The G36K RAS is the carbine version. + HK G36K RAS + The G36 is a conventional gas operated, selective fire rifle, using mostly modern materials and technologies. The G36K RAS is the carbine version, equipped with Picatinny rails. 2 666 3 diff --git a/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml b/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml index 4cd73ddf5..633df29c5 100644 --- a/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml +++ b/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml @@ -4,6 +4,7 @@ 0 0 0 + 0 0 0 0 @@ -21,9 +22,10 @@ 1 1 0 - 15 - 15 - 17 + 0 + 16 + 16 + 18 0 0 0 @@ -38,8 +40,9 @@ 2 2 0 - 15 - 15 + 0 + 16 + 16 0 0 0 @@ -55,6 +58,7 @@ 3 3 0 + 0 0 0 0 @@ -72,6 +76,7 @@ 4 4 0 + 0 0 0 0 @@ -89,8 +94,9 @@ 5 1 0 - 14 - 10 + 22 + 15 + 11 0 0 0 @@ -106,8 +112,9 @@ 6 1 0 - 8 - 8 + 26 + 9 + 9 0 0 0 @@ -123,10 +130,11 @@ 7 1 0 - 14 - 14 - 14 - 10 + 26 + 15 + 15 + 15 + 11 0 0 0 @@ -140,11 +148,12 @@ 8 1 0 - 11 + 26 + 12 0 0 0 - 6 + 7 0 0 0 @@ -157,10 +166,11 @@ 9 1 0 - 12 - 12 - 12 - 12 + 22 + 13 + 13 + 13 + 13 0 0 0 @@ -174,11 +184,12 @@ 10 1 0 + 26 0 0 0 0 - 5 + 6 0 0 0 @@ -191,32 +202,34 @@ 11 2 0 - 9 - 9 - 9 - 9 + 29 + 10 + 10 + 10 + 10 0 0 0 0 0 0 - 7 + 8 0 12 2 0 - 9 - 9 - 9 - 9 - 14 - 14 - 14 - 16 - 15 + 29 + 10 + 10 + 10 + 10 + 15 + 15 + 15 + 17 + 16 0 0 0 @@ -225,66 +238,70 @@ 13 2 0 - 9 - 9 - 9 - 9 - 16 - 16 - 13 - 13 + 29 + 10 + 10 + 10 + 10 + 17 + 17 + 14 + 14 0 0 - 7 + 8 0 14 2 0 - 9 - 9 - 12 - 12 - 12 - 12 - 13 + 29 + 10 + 10 + 13 + 13 + 13 + 13 + 14 0 0 0 - 7 + 8 0 15 2 0 - 9 - 9 - 9 - 16 - 15 - 13 - 13 + 29 + 10 + 10 + 10 + 17 + 16 + 14 + 14 0 0 0 - 7 - 7 + 8 + 8 16 2 0 - 9 - 9 - 9 - 9 - 9 - 9 - 16 - 13 - 13 + 29 + 10 + 10 + 10 + 10 + 10 + 10 + 17 + 14 + 14 0 0 0 @@ -293,16 +310,17 @@ 17 2 0 - 9 - 9 - 9 - 9 - 13 - 13 - 13 - 13 - 15 - 15 + 29 + 10 + 10 + 10 + 10 + 14 + 14 + 14 + 14 + 16 + 16 0 0 @@ -310,15 +328,16 @@ 18 2 0 - 9 - 9 - 9 - 9 - 9 - 9 - 16 - 16 - 15 + 29 + 10 + 10 + 10 + 10 + 10 + 10 + 17 + 17 + 16 0 0 0 @@ -327,30 +346,32 @@ 19 2 0 - 9 - 9 - 9 - 16 - 16 - 15 + 29 + 10 + 10 + 10 + 17 + 17 + 16 0 0 0 0 - 7 - 7 + 8 + 8 20 3 1 + 30 0 0 0 0 - 4 - 4 - 4 + 5 + 5 + 5 0 0 0 @@ -361,14 +382,15 @@ 21 3 0 - 16 + 30 + 17 0 0 0 - 4 - 4 - 4 - 4 + 5 + 5 + 5 + 5 0 0 0 @@ -378,12 +400,13 @@ 22 3 0 - 16 - 16 - 16 - 16 - 4 - 4 + 30 + 17 + 17 + 17 + 17 + 5 + 5 0 0 0 @@ -395,6 +418,7 @@ 23 4 1 + 34 0 0 0 @@ -403,42 +427,44 @@ 0 0 0 - 3 - 3 - 3 - 3 + 4 + 4 + 4 + 4 24 4 0 - 16 - 16 + 34 + 17 + 17 0 0 0 0 0 0 - 3 - 3 - 3 - 3 + 4 + 4 + 4 + 4 25 4 0 - 16 - 16 - 16 - 16 - 16 - 16 - 16 - 16 - 3 - 3 + 34 + 17 + 17 + 17 + 17 + 17 + 17 + 17 + 17 + 4 + 4 0 0 @@ -446,10 +472,11 @@ 26 1 0 - 9 - 13 - 13 - 13 + 26 + 10 + 14 + 14 + 14 0 0 0 @@ -463,11 +490,12 @@ 27 1 0 + 26 0 0 0 - 9 - 7 + 10 + 8 0 0 0 @@ -480,11 +508,12 @@ 28 1 0 + 26 0 0 0 - 17 - 7 + 18 + 8 0 0 0 @@ -497,11 +526,12 @@ 29 1 0 + 26 0 - 13 - 13 - 13 - 7 + 14 + 14 + 14 + 8 0 0 0 @@ -514,11 +544,12 @@ 30 1 0 + 26 0 - 8 + 9 0 - 8 - 7 + 9 + 8 0 0 0 @@ -531,10 +562,11 @@ 31 1 0 - 8 - 13 - 8 - 13 + 26 + 9 + 14 + 9 + 14 0 0 0 @@ -548,15 +580,16 @@ 32 2 0 - 16 - 16 - 15 - 15 - 13 - 13 - 13 - 15 - 15 + 29 + 17 + 17 + 16 + 16 + 14 + 14 + 14 + 16 + 16 0 0 0 @@ -565,6 +598,7 @@ 33 0 0 + 0 0 0 0 @@ -582,6 +616,7 @@ 34 0 0 + 0 0 0 0 @@ -599,6 +634,7 @@ 35 0 0 + 0 0 0 0 @@ -613,4 +649,3 @@ 0 - diff --git a/gamedir/Data-1.13/TableData/Pockets.xml b/gamedir/Data-1.13/TableData/Pockets.xml index 68d95c015..26cc6a7b7 100644 --- a/gamedir/Data-1.13/TableData/Pockets.xml +++ b/gamedir/Data-1.13/TableData/Pockets.xml @@ -128,7 +128,7 @@ 3 - General Large + Vehicle 7 0 0 @@ -147,6 +147,48 @@ 8 8 8 + 8 + 7 + 6 + 5 + 7 + 6 + 5 + 4 + 6 + 5 + 4 + 3 + 5 + 4 + 3 + 2 + 3 + 2 + 1 + 0 + + + 4 + General Large + 7 + 0 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 14 + 8 + 10 + 10 + 8 6 7 7 @@ -169,7 +211,7 @@ 0 - 4 + 5 Combat Pack 6 0 @@ -184,7 +226,7 @@ 1 0 0 - 8 + 10 7 7 6 @@ -211,7 +253,7 @@ 0 - 5 + 6 Medium General 8 0 @@ -253,7 +295,7 @@ 0 - 6 + 7 SMG Holster 9 0 @@ -295,7 +337,7 @@ 0 - 7 + 8 TNT Pocket 10 0 @@ -337,7 +379,7 @@ 0 - 8 + 9 Lg.Mag.Pocket 19 0 @@ -379,7 +421,7 @@ 0 - 9 + 10 AR Mag 18 0 @@ -421,7 +463,7 @@ 0 - 10 + 11 Pistol Holster 13 0 @@ -463,7 +505,7 @@ 0 - 11 + 12 SMG Mag 17 0 @@ -505,7 +547,7 @@ 0 - 12 + 13 Rifle Grenade 14 0 @@ -547,7 +589,7 @@ 0 - 13 + 14 Grenade 15 0 @@ -589,7 +631,7 @@ 0 - 14 + 15 Pistol Mag 16 0 @@ -631,7 +673,7 @@ 0 - 15 + 16 Tiny General 20 0 @@ -673,7 +715,7 @@ 0 - 16 + 17 Small General 12 0 @@ -715,7 +757,7 @@ 0 - 17 + 18 Belt Clip 21 0 diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml index 6b4445698..fd9a5af72 100644 --- a/gamedir/Data-1.13/TableData/Weapons.xml +++ b/gamedir/Data-1.13/TableData/Weapons.xml @@ -189,7 +189,7 @@ 4 13 20 - 26 + 27 16 2 6 @@ -216,7 +216,7 @@ 4 11 21 - 26 + 27 16 9 120 @@ -243,7 +243,7 @@ 3 15 21 - 27 + 26 16 7 100 @@ -307,7 +307,7 @@ 15 11 22 - 27 + 26 19 4 30 @@ -341,7 +341,7 @@ 13 10 22 - 28 + 27 21 5 30 @@ -1352,7 +1352,7 @@ 5 175 111 - 175 + 157 5 5 1 @@ -1528,7 +1528,7 @@ 5 175 111 - 175 + 157 5 5 1 @@ -1551,7 +1551,7 @@ 5 175 111 - 175 + 157 5 5 1 @@ -1574,7 +1574,7 @@ 5 175 111 - 175 + 157 5 5 1 @@ -1716,7 +1716,7 @@ 4 11 20 - 27 + 28 17 6 170 @@ -3595,7 +3595,7 @@ 3 15 21 - 27 + 26 16 1 14 @@ -4830,7 +4830,7 @@ 3 18 21 - 27 + 26 17 1 14 @@ -4862,7 +4862,7 @@ 3 9 22 - 27 + 28 21 5 30 @@ -5047,7 +5047,7 @@ 2 7 22 - 27 + 26 22 5 30 @@ -5547,7 +5547,7 @@ 31 10 5 - 600 + 500 200 100 90 @@ -6889,7 +6889,7 @@ 13 9 22 - 28 + 27 21 5 50 @@ -8392,7 +8392,7 @@ 27 17 21 - 26 + 27 18 8 120 @@ -9543,7 +9543,7 @@ 12 10 22 - 28 + 27 21 5 30