From 26a74d6050d8ee441819c7468fc38b5286cd72c2 Mon Sep 17 00:00:00 2001 From: Starwalker Date: Mon, 2 Jul 2007 07:54:04 +0000 Subject: [PATCH] replaced Milkor pic with a new one made by Tbird replaced Pistol Suppressor pic with a new one made by Tbird replaced Rifle Suppressor pic with a new one (you guessed it: Tbird) and renamed it AR Suppressor, as it will no longer be available for sniper rifles added a Sniper Suppressor (a sound suppressor for sniperrifles, not something that suppresses Snipers themselves), pic by Tbird. change several sniper rifles to attach Sniper Suppressor instead of Rifle Suppressor changed all sound suppressor to sink, they are made of metal, after all added Ares M4 Shrike and HK 417 12", pics by Tbird added OTs 39, pic by Coolberg added missing built-in folding stock on Type 85 changed HK MG36E from assault rifle to LMG changed 5.45x18mm standard ammo to AP/FMJ, because the round has a reputation for piercing soft body armor at shorter ranges (not enough to warrant XAP, though). git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@837 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/BigItems/P1ITEM52.STI | Bin 0 -> 3256 bytes gamedir/Data-1.13/BigItems/P1item709.sti | Bin 0 -> 2757 bytes gamedir/Data-1.13/BigItems/p1item180.sti | Bin 0 -> 3815 bytes gamedir/Data-1.13/BigItems/p1item710.sti | Bin 0 -> 2310 bytes gamedir/Data-1.13/TableData/Attachments.xml | 259 ++++++++++++++---- gamedir/Data-1.13/TableData/German.Items.xml | 36 ++- .../TableData/IncompatibleAttachments.xml | 32 +++ gamedir/Data-1.13/TableData/Items.xml | 222 +++++++++------ gamedir/Data-1.13/TableData/Magazines.xml | 110 ++++---- .../TableData/NPCInventory/TonyInventory.xml | 15 + gamedir/Data-1.13/TableData/Russian.Items.xml | 36 ++- gamedir/Data-1.13/TableData/Weapons.xml | 104 +++++-- 12 files changed, 571 insertions(+), 243 deletions(-) create mode 100644 gamedir/Data-1.13/BigItems/P1ITEM52.STI create mode 100644 gamedir/Data-1.13/BigItems/P1item709.sti create mode 100644 gamedir/Data-1.13/BigItems/p1item180.sti create mode 100644 gamedir/Data-1.13/BigItems/p1item710.sti diff --git a/gamedir/Data-1.13/BigItems/P1ITEM52.STI b/gamedir/Data-1.13/BigItems/P1ITEM52.STI new file mode 100644 index 0000000000000000000000000000000000000000..78b07b26f7d77ea4595c444680942d0bb20da94b GIT binary patch literal 3256 zcmeH}y-ve05P)4Q8Ap{mWT;e@Y*m63Wr#9F>VlX$!vkbQ6%0XQswz<<0Ru14XW#+y zI=lpPIbWN`Cqm;02n@Zp)}8O{&%ak+T%J!E$d#i@#(em__3n>YkHJ?;iM5-;)T`>X z>$;=S2r7!AU~D~^OtLH+3ANuU^jP|25?IV!qem49y6~DG5nr6Gp zzx?v?-}>_Gdr|+J$FlZ?{%*3tw1XMzD0=dTFBYzr^U)!lb=Dm_w|zAx2&q4sYOx;J zzyHC|8GaucAiEj@$KdyVa&=+VkThH|hTJVe`M9KAmyfeLmmkL#2In z871*A{^R}ncb)ms(YqErg?tp#UYGRAP)Q|WCtBjB9Xb5okUw73{rAa@p2lJ>X8Vo0 z1ToD@2WOSc7QIYh*OoyF4p3qg6c>P@Z#e%p)`YpFx zvRZ$Zo)dnz{I!JXj@+0-2c?pqTs>=Uw!G9_lPngdbPI6>tl@5F;oBAF8|O2Bup?~D zk<)!HvpOeky2Wb!VN_Rf+<<7UHoxL+DL7xir5@VqDLrOSIWX0hn~`+fRhs6lO1Z!v zJ`rOay>zO%Bso9x*hF)7YUUP4LE>;#T4URzp>G!f;c; zuU%QjN6lH$=vV!MEWI)A&TSNu9`@Q@i={(ngyi?F2T5r{-G+LrRyR5Gr{qYyR7_0c+ zwdR3~uPwaw>d9zyuTPl6FTUsG-zs50>n$0sNt%@M`pVqLK28GspiYgR zlIBh06oN7nB+G;i6vwurx@@2Yas?sh|GzU37CFf)*m#>L!kOdac~v4l8^|`BNRaBK z0UT+5F}AGpw7hOD;a3vZ2D(NjBIJo!){LwZSC=Gh$JnUhQ(!-KB6^2Pnup7KFxIcL z_4~C?aAEcm0eeEATpMsJ?$z`FhYJQc&KC$sa0N6R7rW|{3OLpv#Ii&Z2ulJ2(GiKI zL`0v+!`M2P@Zk)@*aq+Zh_y44E_+iW=w)z5qE3fQ8*Qsx$ z87(d%f(T{EVL%px!9vJlpxyvI=OJpCE2Ks%Jm(?Mn!Jq-@*V&lSpmMB42=kmEigz) z^2f%OS&T*kHTI}beX=am1ZzyDP@D>-vnhnd5ZLfWH98m56GHt*4 z?eUQNL@x4(q6Z$0in!-|Lcx8SawctnKa$|7AX zFVc%|z3+Fgn$QE9nk>m8HGvJ{BegPQ$s@xBFA!{tteS$ha0G6sjjXy^l1IQskLOjJ zm4s?vTzS5!glHfEnyo(!gNuAORm~a_*g-Gw1J{Gka!c+dIB! zH9)`S($g?1(0@3JMD9>gp1SL`KFcRI972N-{DsQc_a#+tpQ7Rn_$L^vcRgW@ctt zS=svfx@nr0Wp#9PY;0^aH8u72_6`pZ=jP@jU}tA%GMR*9eSQ7*_BJMJ+xE%HNnv3j zv~6u|%gf8PwY6~B+SBVPIeY0egCSN=r-U=H~YH_VV-dySuyJ zynS0!Qv>b({{GI+&f(!9;(MNVad9y^I@;RWdUtm>K0dy*wDj=s(9+U!eSHnMsi~>O z#YF^MSXcno(b3WI@i8nfFE5eZ{QNxT^Yrv|etv#>dU}61xKYu12$B&yZCch>Y`{f^!FzIJ< zBNuX35*+|q7E+(cr|2NpMM;Zs17hwk@KD@CDhH=OM7eCH+#|4q<{~it!K)v^LF%9+96VgtCDn8C9215nd4(aRBcv25r00$# z@dFYB%|k(Q%IObnN_GV4x+d)pf#&)P3rM7`Ah8NjL`HxJ)rM5yqzEIFyw6iWq)dN8 ziIVBLF%#Bq7}5+u0vPc_uzpgGOKXVb<5N;&Ll6rl!5Rg}z&^SO5f&E54j7%KiFe86 zBe{f7c2tktP@GhuxBzG_7i48LZ4I2D`pC(XRShAM< zVMP;E4FlqRQjqu%(3qd>D$$6ztSC(+sxhNiddlwKajC27@BD-pqkR=%(v?Xbk(M4J zeawNi$1{{?)kubF2(1pNBKiclc>{vnDR6W+Z0E1t4XYZ7B_P~awvG^Nl6=mkz1+E_%E_{o^~26-x!7tAUM YCE~fflIk&OOnwy_zBD_JPx24OUkWQ9w*UYD literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/BigItems/p1item710.sti b/gamedir/Data-1.13/BigItems/p1item710.sti new file mode 100644 index 0000000000000000000000000000000000000000..ce52d35c65b21b8d005d4f8610d3a7edc3017a0e GIT binary patch literal 2310 zcmeHHzl$0{6rLZ58bVOCQ*i|aw-TaYAuIvmP$G+%0|_fy34&dSh-eY5WGzovB5c6I zHicl2SRClTU=t3+I)zpG%bT5DZ;yl{d&Q->51se++xO<1H#_s*UFM4j@Xf_Wgp%+- z;!gx&1V4|*W3YU%`*-whG#Zs835Z^=htO@YSe(!2;cz$@3>FH7P$;zD?_;r8r_-s| z>wdq#R4Tb#u4FO^ud3B*AP|5Va=F}lMbR|P>-7RzsZ>CFI-QowWsKi$w_BJk9*=J} zn@A)wo6R6Bl}e@4X+=>8Au#RXaB#cbZ!Ruct=3>L$Ye5;$wb%nD@{uz5~`}^^ZC_k z^;y^Z{r-=en`X0lJRY;zY`fh)olc9zV!d9&xZCZP%OywyS*z8?<8im!9jj`i(fD$G zeOLFh_q+pq2l(B2f&Azr`h|XasEHB!j_Fq~r2=^+$g*#QMj=Xl94rPrBa}14Oa9Kx zX0Hu`S*L(ZN+nr-O-E?>fnrnCslj|j|C&ZIrc@@d*dbFT_;DaUM|q%%DG~3hilWFS zF%7fU^F3=5a<0l|5`DZ@0h$nD1>21E_y=#q@83eb%dvP{dCqI))pAvShT&|nlVX~)wH%9QF%}%&99TF2PO))wp61Je1)4FCWD literal 0 HcmV?d00001 diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml index b78da0cdf..e108416b8 100644 --- a/gamedir/Data-1.13/TableData/Attachments.xml +++ b/gamedir/Data-1.13/TableData/Attachments.xml @@ -2560,6 +2560,11 @@ 1073 5 + + 207 + 672 + 5 + 208 19 @@ -3317,12 +3322,17 @@ 209 - 669 + 648 5 209 - 648 + 1076 + 5 + + + 209 + 1077 5 @@ -5770,11 +5780,6 @@ 671 5 - - 241 - 672 - 5 - 241 673 @@ -6470,6 +6475,16 @@ 1075 5 + + 241 + 1076 + 5 + + + 241 + 1077 + 5 + 242 856 @@ -9045,6 +9060,16 @@ 1075 5 + + 307 + 1076 + 5 + + + 307 + 1077 + 5 + 309 308 @@ -9760,6 +9785,36 @@ 1169 2 + + 592 + 674 + 5 + + + 592 + 753 + 5 + + + 592 + 1069 + 5 + + + 592 + 630 + 5 + + + 592 + 634 + 5 + + + 592 + 746 + 5 + 593 282 @@ -12625,6 +12680,11 @@ 1072 5 + + 902 + 1077 + 5 + 904 25 @@ -12775,6 +12835,11 @@ 1072 5 + + 905 + 1077 + 5 + 909 605 @@ -13095,6 +13160,16 @@ 752 5 + + 946 + 1076 + 5 + + + 946 + 1077 + 5 + 947 795 @@ -13215,6 +13290,16 @@ 29 5 + + 947 + 1076 + 5 + + + 947 + 1077 + 5 + 948 21 @@ -13470,6 +13555,16 @@ 1074 5 + + 949 + 1076 + 5 + + + 949 + 1077 + 5 + 950 12 @@ -13700,6 +13795,16 @@ 1074 5 + + 950 + 1076 + 5 + + + 950 + 1077 + 5 + 951 128 @@ -15380,6 +15485,16 @@ 1074 5 + + 1003 + 1076 + 5 + + + 1003 + 1077 + 5 + 1004 12 @@ -15860,6 +15975,16 @@ 1074 5 + + 1004 + 1076 + 5 + + + 1004 + 1077 + 5 + 1005 1 @@ -16560,11 +16685,6 @@ 671 5 - - 1005 - 672 - 5 - 1005 673 @@ -17260,6 +17380,16 @@ 1075 5 + + 1005 + 1076 + 5 + + + 1005 + 1077 + 5 + 1006 1 @@ -18375,6 +18505,16 @@ 1074 5 + + 1006 + 1076 + 5 + + + 1006 + 1077 + 5 + 1007 12 @@ -18980,6 +19120,16 @@ 1072 5 + + 1007 + 1076 + 5 + + + 1007 + 1077 + 5 + 1008 17 @@ -19205,6 +19355,11 @@ 795 5 + + 1010 + 1076 + 5 + 1011 11 @@ -19495,21 +19650,11 @@ 668 5 - - 1011 - 669 - 5 - 1011 671 5 - - 1011 - 672 - 5 - 1011 677 @@ -19745,6 +19890,16 @@ 648 5 + + 1011 + 1076 + 5 + + + 1011 + 1077 + 5 + 1012 12 @@ -19845,11 +20000,6 @@ 629 5 - - 1012 - 630 - 5 - 1012 632 @@ -19860,11 +20010,6 @@ 633 5 - - 1012 - 634 - 5 - 1012 647 @@ -19925,11 +20070,6 @@ 668 5 - - 1012 - 674 - 5 - 1012 685 @@ -19980,11 +20120,6 @@ 743 5 - - 1012 - 746 - 5 - 1012 748 @@ -20010,11 +20145,6 @@ 752 5 - - 1012 - 753 - 5 - 1012 755 @@ -20105,11 +20235,6 @@ 1065 5 - - 1012 - 1069 - 5 - 1012 1070 @@ -20125,6 +20250,11 @@ 1074 5 + + 1012 + 1077 + 5 + 1024 176 @@ -20810,6 +20940,11 @@ 1074 5 + + 1026 + 1077 + 5 + 1027 282 @@ -22080,6 +22215,16 @@ 1074 5 + + 1029 + 1076 + 5 + + + 1029 + 1077 + 5 + 1030 12 @@ -22560,6 +22705,16 @@ 1074 5 + + 1030 + 1076 + 5 + + + 1030 + 1077 + 5 + 1053 282 diff --git a/gamedir/Data-1.13/TableData/German.Items.xml b/gamedir/Data-1.13/TableData/German.Items.xml index 2a5e36c8f..0283df328 100644 --- a/gamedir/Data-1.13/TableData/German.Items.xml +++ b/gamedir/Data-1.13/TableData/German.Items.xml @@ -4280,11 +4280,9 @@ 537 - 10mm Mag DU - 10mm AUTO Magazin, DU - Aufgrund der verwendeten Legierung entfalten diese panzerbrechenden Geschosse eine große Durchschlagskraft. Das Projektil enthält Uran-235 und setzt beim Einschlagen einen radioaktiven Staub frei welcher sehr tödlich ist. - 10mm Mag DU - Aufgrund der verwendeten Legierung entfalten diese panzerbrechenden Geschosse eine große Durchschlagskraft. Das Projektil enthält Uran-235 und setzt beim Einschlagen einen radioaktiven Staub frei welcher sehr tödlich ist. + Nothing + Nothing + Nothing 538 @@ -4720,10 +4718,10 @@ 592 - Nada - Nothing + Sniper Supp. + Sniper Suppressor Index 592 - Nothing + Sniper Suppressor Nothing @@ -5360,11 +5358,11 @@ 672 - HK MP5/10SD3 - HK MP5/10SD3 - Diese mit einem Schalldämpfer ausgerüstete MP5/10A3 vereint eine hohe Durchschlagskraft mit einer beeindruckenden Lautlosigkeit. - HK MP5/10SD3 - Diese Variante der MP5 im Kaliber 10x25mm stellt einen Kompromiss zwischen Kontrollierbarkeit und gesteigerter Feuerkraft dar. Sie ist mit einem Schalldämpfer ausgerüstete und vereint eine hohe Durchschlagskraft mit einer beeindruckenden Lautlosigkeit. + OTs 39 + OTs 39 + Beschreibung erwünscht + OTs 39 + Beschreibung erwünscht 673 @@ -8588,9 +8586,19 @@ 1076 + Shrike + Ares M4 Shrike + Beschreibung erwünscht + Ares M4 Shrike + Beschreibung erwünscht 1077 + HK 417 + HK 417 + Beschreibung erwünscht + HK 417 + Beschreibung erwünscht 1078 @@ -8630,7 +8638,7 @@ 1083 Blackhawk - Blakhawk Weste + Blackhawk Weste Diese spezielle Weste wurde entwickelt um eine Vielzahl von Magazinen zu tragen. Damit sollte Ihnen nie die Munition ausgehen! Blackhawk Weste Diese spezielle Weste wurde entwickelt um eine Vielzahl von Magazinen zu tragen. Damit sollte Ihnen nie die Munition ausgehen! diff --git a/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml b/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml index ad977ff26..7dc4860b7 100644 --- a/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml +++ b/gamedir/Data-1.13/TableData/IncompatibleAttachments.xml @@ -60,6 +60,10 @@ 207 1012 + + 207 + 592 + 208 998 @@ -200,6 +204,26 @@ 310 1012 + + 310 + 592 + + + 592 + 1003 + + + 592 + 310 + + + 592 + 207 + + + 592 + 1012 + 837 183 @@ -888,6 +912,10 @@ 1003 1012 + + 1003 + 592 + 1004 208 @@ -1120,6 +1148,10 @@ 1012 1003 + + 1012 + 592 + 1029 208 diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index 78ab34ed1..9d79a3e2a 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -555,6 +555,8 @@ 4 1 750 + -1 + 30 17 @@ -4642,6 +4644,7 @@ 1 1 1 + 1 1 4 1 @@ -9824,7 +9827,7 @@ .30-06 AP Clip If you happen to have a M1 Garand around, here's some ammo for it. 1024 - 318 + 317 1 682 2 @@ -9950,7 +9953,7 @@ .30 car HP mag Hollowpoint rounds for the old M1 Carbine. 1024 - 316 + 315 1 683 4 @@ -10063,7 +10066,7 @@ .30 car AP mag Full Metal Jacket ammo for the old M1 Carbine. 1024 - 317 + 316 1 684 4 @@ -10083,7 +10086,7 @@ .300 WM Mag HP The .300 Winchester Magnum can be considered a standard hunting round, especially with expanding hollowpoint bullets. 1024 - 308 + 307 1 540 1 @@ -10103,7 +10106,7 @@ .300 WM Mag AP The .300 Winchester Magnum can be considered a standard hunting round, though these bullets are for the deer with Kevlar vest. 1024 - 309 + 308 1 541 1 @@ -10123,7 +10126,7 @@ 7.92x57mm 5 HP Own a vintage Mauser Gewehr 98 or Karabiner 98k? We have the ammo for your old pal! 1024 - 310 + 309 1 542 1 @@ -10143,7 +10146,7 @@ 7.92x57mm 5 AP Our AP ammo for your old Mauser Gewehr 98 or Kar 98k. 1024 - 311 + 310 1 543 1 @@ -10163,7 +10166,7 @@ 12.7x97mm Subsonic Want to fire a .50 cal round without making noise? These babies are cutdown 12.7mm rounds to fit the Russian VSSK. 1024 - 312 + 311 1 544 4 @@ -10184,7 +10187,7 @@ 5.56x45mm SCF mag Newly developed flechette ammo that goes together with the newly developed Steyr Advanced Combat Rifle. 1024 - 315 + 314 1 580 3 @@ -10204,7 +10207,7 @@ 6.8x43mm SPC mag HP The 6.8x43mm Special Purpose Cartridge was developed under participation of the special operations comunity, who wanted a round that should be more lethal than the 5.56x45mm. Now they got it. 1024 - 313 + 312 1 582 5 @@ -10224,7 +10227,7 @@ 6.8x43mm SPC mag The new 6.8x43mm SPC special forces ammo. More range and effect than the standard NATO-5.56mm round. 1024 - 314 + 313 1 583 5 @@ -11328,15 +11331,10 @@ 537 - 10mm Mag DU - 10mm Magazine, Depleted Uranium - made from depleted radioactive matter, these bullets will blast through armor with resultant fallout damage. - 10mm Mag D-U - If a bad case of lead poisoning doesn't slow the target down, radiation poisoning surely will. - 1024 - 284 - 1 - 438 + Nothing + Nothing + Nothing + 1 6 4 5040 @@ -11355,7 +11353,7 @@ 12.3mm Loader Owing its dimensions to the 32 gauge shotgun shell, the 12.3mm is a weighty round for a weighty handgun. 1024 - 285 + 284 1 462 3 @@ -11375,7 +11373,7 @@ 9x21mm Mag According to its press, 9x21mm's tungsten core enables it to penetrate armored targets from 100 meters away. 1024 - 287 + 286 1 362 2 @@ -11395,7 +11393,7 @@ 7.62x37mm Mag Designed so snipers punch through helmets, not the sound barrier. 1024 - 288 + 287 1 409 2 @@ -11416,7 +11414,7 @@ 7.62x37mm Mag D-U Deliver a tactical nuclear strike on the smallest possible scale from your silenced sniper rifle. 1024 - 289 + 288 1 437 2 @@ -11459,7 +11457,7 @@ 5.45x18mm Mag HP HP bullets augment the stopping power of this small-bore cartridge. 1024 - 291 + 289 1 294 1 @@ -11479,7 +11477,7 @@ 9mm Metal Storm Mag Dispensing with mechanical loading and firing, Metal Storm's stacked electronically fired ammunition promises reliable mass firepower at low weight. This bundle is configured for 72 rounds across 6 barrels, in 9mm. 1024 - 292 + 291 1 463 19 @@ -11541,7 +11539,7 @@ .50 Action Express Mag Magzine size, accuracy and controlability are a fair trade off for stopping power and coolness, right? Because if you're going to use a overpriced, impractical and unreliable handgun instead of a perfectly good rifle, you'll need ammunition for it. 1024 - 294 + 293 1 175 2 @@ -11711,7 +11709,7 @@ .50 Beowulf 7 7 rounds of the highpowered .50 Beowulf ammo, just the thing for stopping vehicles. 1024 - 307 + 306 1 515 2 @@ -11734,7 +11732,7 @@ .50 Beowulf 7 HP A clip of 7 Hollow Point rounds, perfect for harassing big pussycats. 1024 - 306 + 305 1 516 2 @@ -11757,7 +11755,7 @@ .50 Beowulf 4 not for sale at BR 1024 - 305 + 304 1 517 1 @@ -11779,7 +11777,7 @@ .50 Beowulf 4 HP not for sale at BR 1024 - 304 + 303 1 518 1 @@ -11911,7 +11909,7 @@ 12.3mm Loader FL Open up with a shower of armour piercing metal shards and your opponents will be cut down to size.. Literally. 1024 - 286 + 285 1 523 3 @@ -11974,7 +11972,7 @@ .45 WinMag Mag Standard ammo for some of the big-bore pistols. 1024 - 301 + 300 1 528 2 @@ -11994,7 +11992,7 @@ .45 WinMag Mag HP If you're a hunter, then you'll need this for your sidearm if your prey is not as dead as you believed on first sight... 1024 - 302 + 301 1 529 2 @@ -12014,7 +12012,7 @@ .45 WinMag Mag AP Armor piercing ammo for the Wildey pistol and other .45 WinMag pistols. 1024 - 303 + 302 1 530 2 @@ -12034,7 +12032,7 @@ .454 C S-Load .454 Casull is a round developed for some truly large revolvers. 1024 - 298 + 297 1 531 2 @@ -12054,7 +12052,7 @@ .454 C S-Load HP .454 Casull Hollow Point ammunition, if you use your revolver for hunting. 1024 - 299 + 298 1 532 2 @@ -12074,7 +12072,7 @@ .454 C S-Load AP .454 Casull Armor Piercers meet any need for self-defense ammo. 1024 - 300 + 299 1 533 2 @@ -12094,7 +12092,7 @@ .454 C Cartridge A single .454 Casull cartridge. 1024 - 295 + 294 1 534 1 @@ -12114,7 +12112,7 @@ .454 C Cartridge HP .454 Casull Hollow Point ammunition, for hunting game large enough not to be splattered by it. 1024 - 296 + 295 1 535 1 @@ -12134,7 +12132,7 @@ .454 C Cartridge AP A .454 Casull Armor Piercer, if you want to shock the rangemaster at your next silhouette-training. 1024 - 297 + 296 1 536 1 @@ -12272,7 +12270,7 @@ .50 Action Express Mag HP Hollowpoint bullets for your .50 AE handcannon. Probably better used for target-practice, if you shoot anything living with these, there will not be much left of it. 1024 - 293 + 292 1 557 2 @@ -12470,14 +12468,30 @@ 592 - Nada - Nothing - Index 592 - Nothing - Nothing - 1 - 1 + Sniper Supp. + Sniper Suppressor + A large sound suppressor that can be fitted to some sniper rifles. + Sniper Suppressor + A very large sound suppressor that can be fitted to some sniper rifles. Suppression of highpowered rounds comes at the price of high weight, though. + 268435456 + 1 + 710 + 15 + 4 + 1200 + 6 + -1 + -1 + 1 + 1 + 1 + 1 + 1 1 + 1 + 1 + 57 + 1 593 @@ -14697,9 +14711,9 @@ 2 1 800 + 10 -1 30 - 209 670 @@ -14758,18 +14772,19 @@ 672 - MP5/10SD3 - HK MP5/10SD3 - This MP5/10A3 variant features an integral silencer, a feature that in the past has been exclusively the territory of the 9mm version. - HK MP5/10SD3 - What's even better than a 9mm MP5 that nobody can hear shooting in full auto? A 10mm MP5 that nobody can hear shooting in full auto! Get yours today. + OTs 39 + OTs 39 + A modern SMG for the old Tokarev round. + OTs 39 + The latest and most modern SMG for the 7.62x25mm round. Comes with integrated folding stock and lasersight in the forward handguard. 2 672 3 - 106 - 35 - 2080 - -3 + 323 + 18 + 1240 + 3 + 1 1 1 1 @@ -14778,12 +14793,11 @@ 1 1 1 - 4 + 2 1 - 800 - 90 - 1 - -1 + 620 + 19 + 90 30 @@ -15585,6 +15599,7 @@ 3 242 19 + 1 1140 3 -1 @@ -20712,7 +20727,8 @@ 16 906 20 - 75 + 1 + 709 53 5000 8 @@ -22948,11 +22964,11 @@ 1012 - Rifle Supp. - Rifle Suppressor - A large sound suppressor that can be fitted to most carbines and assault rifles. While it will reduce the muzzle noise and flash, it's still far from silent. - Rifle Suppressor - A large sound suppressor that can be fitted to most carbines and assault rifles. Caution: This item is not 100 percent effective on its own. Use it in conjunction with cold-loaded or subsonic ammunition to achieve a greatly reduced muzzle volume. + AR Supp. + AR Suppressor + A large sound suppressor that can be fitted to most carbines and assault rifles. While it will reduce the muzzle noise and flash, it's still far from silent. + AR Suppressor + A large sound suppressor that can be fitted to most carbines and assault rifles. Caution: This item is not 100 percent effective on its own. Use it in conjunction with cold-loaded or subsonic ammunition to achieve a greatly reduced muzzle volume. 268435456 1 180 @@ -22965,6 +22981,7 @@ 1 1 1 + 1 1 1 3 @@ -24410,25 +24427,62 @@ 1076 - Nada - Nothing - Index 1076 - Nothing - Nothing - 1 - 1 + Shrike + Ares M4 Shrike + The LMG version of the M4 assault rifle. + Ares M4 Shrike + Ares changed the M4 assault rifle to a LMG with a completely new upper receiver. Comes with a foregrip for better control during fullauto. + 2 + 1076 + 3 + 319 + 34 + 5430 + 6 + 1 + 1 + 1 + 1 + 1 + 1 + 1 1 + 2 + 1 + 1000 + -1 + 30 + 1011 1077 - Nada - Nothing - Index 1077 - Nothing - Nothing - 1 - 1 + HK 417 + HK 417 + The 7.62x51mm version of the HK 416. + HK 417 + This is the 7.62x51mm version of Heckler & Koch's new HK 416. + 2 + 1077 + 3 + 325 + 41 + 3630 + 6 + 2 + -2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 1 + 1 + 1 + 600 + -1 + 30 1078 diff --git a/gamedir/Data-1.13/TableData/Magazines.xml b/gamedir/Data-1.13/TableData/Magazines.xml index a8dc78741..999b390d2 100644 --- a/gamedir/Data-1.13/TableData/Magazines.xml +++ b/gamedir/Data-1.13/TableData/Magazines.xml @@ -1706,210 +1706,204 @@ 284 - 27 - 30 - 26 - - - 285 28 5 4 - 286 + 285 28 5 5 - 287 + 286 29 18 3 + + 287 + 30 + 10 + 3 + 288 30 10 - 3 + 26 289 - 30 - 10 - 26 + 33 + 8 + 1 290 33 8 - 0 + 2 291 - 33 - 8 - 1 - - - 292 34 72 3 - 293 + 292 35 7 1 - 294 + 293 35 7 2 + + 294 + 36 + 1 + 0 + 295 36 1 - 0 + 1 296 36 1 - 1 + 2 297 36 - 1 - 2 + 5 + 0 298 36 5 - 0 + 1 299 36 5 - 1 - - - 300 - 36 - 5 2 - 301 + 300 37 7 0 - 302 + 301 37 7 1 - 303 + 302 37 7 2 + + 303 + 38 + 4 + 1 + 304 38 4 - 1 + 2 305 38 - 4 - 2 + 7 + 1 306 38 7 - 1 + 2 307 - 38 - 7 - 2 + 39 + 5 + 1 308 39 5 - 1 + 2 309 - 39 + 40 5 - 2 + 1 310 40 5 - 1 - - - 311 - 40 - 5 2 - 312 + 311 41 5 3 - 313 + 312 42 25 1 - 314 + 313 42 25 2 - 315 + 314 43 24 3 - 316 + 315 45 30 1 - 317 + 316 45 30 2 - 318 + 317 46 8 2 diff --git a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml index ccdd9c2d4..334c5b3ad 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml @@ -3615,4 +3615,19 @@ 931 1 + + 723 + 592 + 0 + + + 724 + 1076 + 0 + + + 725 + 1077 + 0 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Russian.Items.xml b/gamedir/Data-1.13/TableData/Russian.Items.xml index 0ee4e00fe..d837b28a5 100644 --- a/gamedir/Data-1.13/TableData/Russian.Items.xml +++ b/gamedir/Data-1.13/TableData/Russian.Items.xml @@ -4298,11 +4298,9 @@ 537 - 10mm Mag DU - 10mm Magazine, Depleted Uranium - ade from depleted radioactive matter, these bullets will blast through armor with resultant fallout damage. - 10mm Mag D-U - If a bad case of lead poisoning dosen't slow the target down, radiation poisoning surely will. + Nothing + Nothing + Nothing 538 @@ -4738,11 +4736,11 @@ 592 - Nada - Nothing - Index 592 - Nothing - Nothing + Sniper Supp. + Sniper Suppressor + A large sound suppressor that can be fitted to some sniper rifles. + Sniper Suppressor + A very large sound suppressor that can be fitted to some sniper rifles. Suppression of highpowered rounds comes at the price of high weight, though. 593 @@ -5378,11 +5376,9 @@ 672 - MP5/10SD6 - HK MP5/10SD6 - This MP510/A5 variant features an integral silencer, a feature that in the past has been exclusively the territory of the 9mm version. - HK MP5/10SD6 - What's even better than a 9mm MP5 that nobody can hear shooting in full auto? A 10mm MP5 that nobody can hear shooting in full auto! Get yours today. + OTs 39 + OTs 39 + OTs 39 673 @@ -8550,9 +8546,19 @@ 1076 + Shrike + Ares M4 Shrike + The LMG version of the M4 assault rifle. + Ares M4 Shrike + Ares changed the M4 assault rifle to a LMG with a completely new upper receiver. Comes with a foregrip for better control during fullauto. 1077 + HK 417 + HK 417 + The 7.62x51mm version of the HK 416. + HK 417 + This is the 7.62x51mm version of Heckler & Koch's new HK 416. 1078 diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml index 67b244078..9007f0654 100644 --- a/gamedir/Data-1.13/TableData/Weapons.xml +++ b/gamedir/Data-1.13/TableData/Weapons.xml @@ -4759,7 +4759,7 @@ 668 HK MG36E 3 - 6 + 7 8 4 15 @@ -4887,36 +4887,34 @@ 672 - HK MP5/10SD3 + OTs 39 2 3 - 27 - 3 - 13 - 3 - 9 + 20 + 18 + 8 22 - 27 - 23 - 6 + 24 + 16 + 5 30 - 190 + 130 200 - 38 - 55 + 40 + 60 3 - 387 - 15 - 62 + 362 + 51 + 111 101 107 - 376 + 157 3 - 4 + 3 4 1 - 7 - 10 + 6 + 8 476 @@ -9695,4 +9693,70 @@ 1 476 + + 1076 + Ares M4 Shrike + 3 + 7 + 8 + 4 + 15 + 8 + 22 + 30 + 30 + 5 + 100 + 350 + 200 + 32 + 77 + 7 + 337 + 32 + 111 + 102 + 108 + 156 + 2 + 5 + 6 + 1 + 7 + 8 + 476 + + + 1077 + HK 417 + 3 + 6 + 9 + 4 + 12 + 9 + 23 + 35 + 38 + 5 + 20 + 480 + 200 + 50 + 85 + 8 + 347 + 39 + 111 + 102 + 108 + 156 + 3 + 3 + 4 + 1 + 7 + 9 + 476 + \ No newline at end of file