From d739afed6b839afa888966c239ce7645df8b3638 Mon Sep 17 00:00:00 2001 From: Starwalker Date: Wed, 22 Apr 2009 07:23:04 +0000 Subject: [PATCH] added ammo (9x18mm AP and 7.62x54mm Match) decreased size of Extended Ears changed Destruction-merges so that the result is a rag, to avoid CTDs git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1119 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/TableData/Chinese.Items.xml | 86 ++- gamedir/Data-1.13/TableData/Dutch.Items.xml | 86 ++- gamedir/Data-1.13/TableData/French.Items.xml | 86 ++- gamedir/Data-1.13/TableData/German.Items.xml | 88 ++- gamedir/Data-1.13/TableData/Italian.Items.xml | 86 ++- gamedir/Data-1.13/TableData/Items.xml | 454 ++++++++----- gamedir/Data-1.13/TableData/Magazines.xml | 624 ++++++++++-------- gamedir/Data-1.13/TableData/Merges.xml | 396 +++++------ .../TableData/NPCInventory/JakeInventory.xml | 10 + .../TableData/NPCInventory/KeithInventory.xml | 50 ++ .../TableData/NPCInventory/TonyInventory.xml | 45 ++ gamedir/Data-1.13/TableData/Polish.Items.xml | 86 ++- gamedir/Data-1.13/TableData/Russian.Items.xml | 86 ++- gamedir/Data-1.13/TableData/Weapons.xml | 4 +- 14 files changed, 1282 insertions(+), 905 deletions(-) diff --git a/gamedir/Data-1.13/TableData/Chinese.Items.xml b/gamedir/Data-1.13/TableData/Chinese.Items.xml index 254a72328..8f02f72c6 100644 --- a/gamedir/Data-1.13/TableData/Chinese.Items.xml +++ b/gamedir/Data-1.13/TableData/Chinese.Items.xml @@ -7410,35 +7410,35 @@ 926 - Nada - Nothing - Index 926 - Nothing - Nothing + 9x18mm Mag 8 AP + 9x18mm Pistol Mag, 8 AP + 8 full metal jacket rounds of 9x18mm Makarov. + 9x18mm Mag 8 AP + 9x18mm in FMJ for added penetration. 927 - Nada - Nothing - Index 927 - Nothing - Nothing + 9x18mm Mag 12 AP + 9x18mm Pistol Mag, 12 AP + 12 rounds of full metal jacket ammo in cost effective 9x18mm. + 9x18mm Mag 12 AP + This AP 9x18mm ammo penetrates much better than standard ball rounds. 928 - Nada - Nothing - Index 928 - Nothing - Nothing + 9x18mm Mag 20 AP + 9x18mm SMG Mag, 20 AP + 20 round SMG mag loaded with full metal jacket ammo. + 9x18mm Mag 20 AP + AP rounds, as preferred by the military for defeating light body armor. 929 - Nada - Nothing - Index 929 - Nothing - Nothing + 9x18mm Mag 30 AP + 9x18mm SMG Mag, 30 AP + 30 round SMG mag loaded with full metal jacket ammunition. + 9x18mm Mag 30 AP + 30 full metal jacket bullets will make a sieve out of most things. 930 @@ -7490,27 +7490,27 @@ 936 - Nada - Nothing - Index 936 - Nothing - Nothing + 7.62x54R 5 M + 7.62x54R Mag, 5 Match + 5 high precision rounds for a 7.62x54mm rifle. + 7.62x54R Mag 5 M + 7.62x54R Sniper ammo, manufactured to ensure higher precision. 937 - Nada - Nothing - Index 937 - Nothing - Nothing + 7.62x54R 10 M + 7.62x54R Mag 10 Match + Ammo manufactured to higher standards. + 7.62x54R Mag 10 M + 10 rounds of the so-called "Sniper" ammo in 7.62x54R. 938 - Nada - Nothing - Index 938 - Nothing - Nothing + 7.62x54R Box M + 7.62x54R Box Match + 200 round box of 7.62x54 Sniper ammo. + 7.62x54R Box M + Not available at BR 939 @@ -10424,4 +10424,20 @@ 7.92x57 HP，3000 Not buyable at BR + + 1303 + 7.62x54mm M crate + 7.62x54mm M ammo crate + 弹药箱 + 7.62x54mmR，3000发普通弹箱 + Not buyable at BR + + + 1304 + 9x18 AP crate + 9x18mm AP ammo crate + 弹药箱 + 9x18mm AP ammo crate + Not buyable at BR + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Dutch.Items.xml b/gamedir/Data-1.13/TableData/Dutch.Items.xml index d274bd671..f7686bcdd 100644 --- a/gamedir/Data-1.13/TableData/Dutch.Items.xml +++ b/gamedir/Data-1.13/TableData/Dutch.Items.xml @@ -7410,35 +7410,35 @@ 926 - Nada - Nothing - Index 926 - Nothing - Nothing + 9x18mm Mag 8 AP + 9x18mm Pistol Mag, 8 AP + 8 full metal jacket rounds of 9x18mm Makarov. + 9x18mm Mag 8 AP + 9x18mm in FMJ for added penetration. 927 - Nada - Nothing - Index 927 - Nothing - Nothing + 9x18mm Mag 12 AP + 9x18mm Pistol Mag, 12 AP + 12 rounds of full metal jacket ammo in cost effective 9x18mm. + 9x18mm Mag 12 AP + This AP 9x18mm ammo penetrates much better than standard ball rounds. 928 - Nada - Nothing - Index 928 - Nothing - Nothing + 9x18mm Mag 20 AP + 9x18mm SMG Mag, 20 AP + 20 round SMG mag loaded with full metal jacket ammo. + 9x18mm Mag 20 AP + AP rounds, as preferred by the military for defeating light body armor. 929 - Nada - Nothing - Index 929 - Nothing - Nothing + 9x18mm Mag 30 AP + 9x18mm SMG Mag, 30 AP + 30 round SMG mag loaded with full metal jacket ammunition. + 9x18mm Mag 30 AP + 30 full metal jacket bullets will make a sieve out of most things. 930 @@ -7490,27 +7490,27 @@ 936 - Nada - Nothing - Index 936 - Nothing - Nothing + 7.62x54R 5 M + 7.62x54R Mag, 5 Match + 5 high precision rounds for a Dragunov or other 7.62x54mm rifle. + 7.62x54R Mag 5 M + 7.62x54R Sniper ammo, manufactured to ensure higher precision. 937 - Nada - Nothing - Index 937 - Nothing - Nothing + 7.62x54R 10 M + 7.62x54R Mag 10 Match + Ammo manufactured to higher standards, made especially for snipers. + 7.62x54R Mag 10 M + 10 rounds of the so-called "Sniper" ammo in 7.62x54R. 938 - Nada - Nothing - Index 938 - Nothing - Nothing + 7.62x54R Box M + 7.62x54R Box Match + 200 round box of 7.62x54 Sniper ammo. + 7.62x54R Box M + Not available at BR 939 @@ -10424,4 +10424,20 @@ 7.92x57mm HP ammo crate Not buyable at BR + + 1303 + 7.62x54mm M crate + 7.62x54mm M ammo crate + ammo crate + 7.62x54mm ammo crate + Not buyable at BR + + + 1304 + 9x18 AP crate + 9x18mm AP ammo crate + ammo crate + 9x18mm AP ammo crate + Not buyable at BR + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/French.Items.xml b/gamedir/Data-1.13/TableData/French.Items.xml index d0e627ad8..87a6e683e 100644 --- a/gamedir/Data-1.13/TableData/French.Items.xml +++ b/gamedir/Data-1.13/TableData/French.Items.xml @@ -7411,35 +7411,35 @@ 926 - Nada - Nothing - Index 926 - Nothing - Nothing + 9x18mm Mag 8 AP + 9x18mm Pistol Mag, 8 AP + 8 full metal jacket rounds of 9x18mm Makarov. + 9x18mm Mag 8 AP + 9x18mm in FMJ for added penetration. 927 - Nada - Nothing - Index 927 - Nothing - Nothing + 9x18mm Mag 12 AP + 9x18mm Pistol Mag, 12 AP + 12 rounds of full metal jacket ammo in cost effective 9x18mm. + 9x18mm Mag 12 AP + This AP 9x18mm ammo penetrates much better than standard ball rounds. 928 - Nada - Nothing - Index 928 - Nothing - Nothing + 9x18mm Mag 20 AP + 9x18mm SMG Mag, 20 AP + 20 round SMG mag loaded with full metal jacket ammo. + 9x18mm Mag 20 AP + AP rounds, as preferred by the military for defeating light body armor. 929 - Nada - Nothing - Index 929 - Nothing - Nothing + 9x18mm Mag 30 AP + 9x18mm SMG Mag, 30 AP + 30 round SMG mag loaded with full metal jacket ammunition. + 9x18mm Mag 30 AP + 30 full metal jacket bullets will make a sieve out of most things. 930 @@ -7491,27 +7491,27 @@ 936 - Nada - Nothing - Index 936 - Nothing - Nothing + 7.62x54R 5 M + 7.62x54R Mag, 5 Match + 5 high precision rounds for a Dragunov or other 7.62x54mm rifle. + 7.62x54R Mag 5 M + 7.62x54R Sniper ammo, manufactured to ensure higher precision. 937 - Nada - Nothing - Index 937 - Nothing - Nothing + 7.62x54R 10 M + 7.62x54R Mag 10 Match + Ammo manufactured to higher standards, made especially for snipers. + 7.62x54R Mag 10 M + 10 rounds of the so-called "Sniper" ammo in 7.62x54R. 938 - Nada - Nothing - Index 938 - Nothing - Nothing + 7.62x54R Box M + 7.62x54R Box Match + 200 round box of 7.62x54 Sniper ammo. + 7.62x54R Box M + Not available at BR 939 @@ -10425,4 +10425,20 @@ 7.92x57mm HP ammo crate Pas à vendre. + + 1303 + 7.62x54mm M crate + 7.62x54mm M ammo crate + ammo crate + 7.62x54mm ammo crate + Pas à vendre. + + + 1304 + 9x18 AP crate + 9x18mm AP ammo crate + ammo crate + 9x18mm AP ammo crate + Pas à vendre. + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/German.Items.xml b/gamedir/Data-1.13/TableData/German.Items.xml index 571af96f6..293c9095f 100644 --- a/gamedir/Data-1.13/TableData/German.Items.xml +++ b/gamedir/Data-1.13/TableData/German.Items.xml @@ -7392,35 +7392,35 @@ 926 - Nada - Nichts - Index 926 - Nichts - Nichts + 9x18 PB + 9x18mm Magazin, PB + Beschreibung erwünscht + 9x18 Mag PB #8 + Beschreibung erwünscht 927 - Nada - Nichts - Index 927 - Nichts - Nichts + 9x18 PB + 9x18mm Magazin, PB + Beschreibung erwünscht + 9x18 Mag PB #12 + Beschreibung erwünscht 928 - Nada - Nichts - Index 928 - Nichts - Nichts + 9x18 PB + 9x18mm MP-Mag, PB + Beschreibung erwünscht + 9x18 Mag PB #20 + Beschreibung erwünscht 929 - Nada - Nichts - Index 929 - Nichts - Nichts + 9x18 PB + 9x18mm MP-Mag, PB + Die PMC Patronen kennzeichnet ein patentiertes Design und ein eingekerbtes Kupfergeschoss. Die sofortige, kontrollierte Geschossdeformation gewährleistet eine schnelle Energieabgabe im Ziel und garantiert dadurch eine ausgezeichnete Mannstoppwirkung. + 9x18 Mag PB + Die PMC Patronen kennzeichnet ein patentiertes Design und ein eingekerbtes Kupfergeschoss. Die sofortige, kontrollierte Geschossdeformation gewährleistet eine schnelle Energieabgabe im Ziel und garantiert dadurch eine ausgezeichnete Mannstoppwirkung. 930 @@ -7472,27 +7472,27 @@ 936 - Nada - Nichts - Index 936 - Nichts - Nichts + 7.62x54R 5 M + 7.62x54R Magazin Match + Beschreibung erwünscht + 7.62x54R Mag #5 M + Beschreibung erwünscht 937 - Nada - Nichts - Index 937 - Nichts - Nichts + 7.62x54R 10 M + 7.62x54R Magazin Match + Beschreibung erwünscht + 7.62x54R Mag #10 M + Beschreibung erwünscht 938 - Nada - Nichts - Index 938 - Nichts - Nichts + 7.62x54R Box M + 7.62x54R Box Match + Beschreibung erwünscht + 7.62x54R Box #200 M + Not available at BR 939 @@ -9152,7 +9152,7 @@ KAC PDW Diese PDW hat eine 8"-Lauf und ist nicht schwerer als eine große Pistole. Sie stellt die ideale Bewaffnung für Militärpolizei und private Sicherheitskräfte dar. KAC PDW - Die 2006 vorgestellte Neuentwicklung von KNIGHT'S ARMANT COMPANY (USA) besitzt einen 8"-Lauf und feuert eine für kurze Waffenläufe optimierte Patrone im Kaliber 6x35mm. Bestellen Sie noch heute Ihr Exemplar zum testen! + Die 2006 vorgestellte Neuentwicklung von KNIGHT'S ARMAMENT COMPANY (USA) besitzt einen 8"-Lauf und feuert eine für kurze Waffenläufe optimierte Patrone im Kaliber 6x35mm. Bestellen Sie noch heute Ihr Exemplar zum testen! 1191 @@ -10050,4 +10050,20 @@ 7.92x57mm HP Munitionskiste Nicht bei BR zu kaufen + + 1303 + 7.62x54mm M Kiste + 7.62x54mm Match Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 3000 Match Patronen des Kalibers 7.62x54. + 7.62x54mm M Munitionskiste + Nicht bei BR zu kaufen + + + 1304 + 9x18 PB Kiste + 9x18mm PB Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 5000 Patronen des Kalibers 9x18mm PB. + 9x18mm PB Munitionskiste + Nicht bei BR zu kaufen + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Italian.Items.xml b/gamedir/Data-1.13/TableData/Italian.Items.xml index d1424e10f..205092bd4 100644 --- a/gamedir/Data-1.13/TableData/Italian.Items.xml +++ b/gamedir/Data-1.13/TableData/Italian.Items.xml @@ -7410,35 +7410,35 @@ 926 - Nada - Nothing - Index 926 - Nothing - Nothing + 9x18mm Mag 8 AP + 9x18mm Pistol Mag, 8 AP + 8 full metal jacket rounds of 9x18mm Makarov. + 9x18mm Mag 8 AP + 9x18mm in FMJ for added penetration. 927 - Nada - Nothing - Index 927 - Nothing - Nothing + 9x18mm Mag 12 AP + 9x18mm Pistol Mag, 12 AP + 12 rounds of full metal jacket ammo in cost effective 9x18mm. + 9x18mm Mag 12 AP + This AP 9x18mm ammo penetrates much better than standard ball rounds. 928 - Nada - Nothing - Index 928 - Nothing - Nothing + 9x18mm Mag 20 AP + 9x18mm SMG Mag, 20 AP + 20 round SMG mag loaded with full metal jacket ammo. + 9x18mm Mag 20 AP + AP rounds, as preferred by the military for defeating light body armor. 929 - Nada - Nothing - Index 929 - Nothing - Nothing + 9x18mm Mag 30 AP + 9x18mm SMG Mag, 30 AP + 30 round SMG mag loaded with full metal jacket ammunition. + 9x18mm Mag 30 AP + 30 full metal jacket bullets will make a sieve out of most things. 930 @@ -7490,27 +7490,27 @@ 936 - Nada - Nothing - Index 936 - Nothing - Nothing + 7.62x54R 5 M + 7.62x54R Mag, 5 Match + 5 high precision rounds for a Dragunov or other 7.62x54mm rifle. + 7.62x54R Mag 5 M + 7.62x54R Sniper ammo, manufactured to ensure higher precision. 937 - Nada - Nothing - Index 937 - Nothing - Nothing + 7.62x54R 10 M + 7.62x54R Mag 10 Match + Ammo manufactured to higher standards, made especially for snipers. + 7.62x54R Mag 10 M + 10 rounds of the so-called "Sniper" ammo in 7.62x54R. 938 - Nada - Nothing - Index 938 - Nothing - Nothing + 7.62x54R Box M + 7.62x54R Box Match + 200 round box of 7.62x54 Sniper ammo. + 7.62x54R Box M + Not available at BR 939 @@ -10424,4 +10424,20 @@ 7.92x57mm HP ammo crate Non in vendita tramite BR. + + 1303 + 7.62x54mm M crate + 7.62x54mm M ammo crate + ammo crate + 7.62x54mm ammo crate + Non in vendita tramite BR. + + + 1304 + 9x18 AP crate + 9x18mm AP ammo crate + ammo crate + 9x18mm AP ammo crate + Non in vendita tramite BR. + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index 97dd731af..c1d50381f 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -3047,14 +3047,14 @@ 7.62x54R Mag 10 10 rounds of long range penetrating power for the 7.62x54R chambered weapon in your collection. 1024 - 323 + 329 1 289 3 6 13 90 - 7 + 6 1 1 4 @@ -4931,7 +4931,7 @@ 77 9 1 - 25 + 22 800 7 -3 @@ -10264,7 +10264,7 @@ .30-06 AP Clip If you happen to have a M1 Garand around, here's some ammo for it. 1024 - 408 + 417 1 682 2 @@ -10396,7 +10396,7 @@ .30 car HP mag Hollowpoint rounds for the old M1 Carbine. 1024 - 404 + 413 1 683 4 @@ -10515,7 +10515,7 @@ .30 car AP mag Full Metal Jacket ammo for the old M1 Carbine. 1024 - 405 + 414 1 684 4 @@ -10536,7 +10536,7 @@ .300 WM Mag HP The .300 Winchester Magnum can be considered a standard hunting round, especially with expanding hollowpoint bullets. 1024 - 388 + 397 1 540 1 @@ -10557,7 +10557,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 - 389 + 398 1 541 1 @@ -10578,7 +10578,7 @@ 7.92x57mm 5 HP Own a vintage Mauser Gewehr 98 or Karabiner 98k? We have the ammo for your old pal! 1024 - 392 + 401 1 542 1 @@ -10599,7 +10599,7 @@ 7.92x57mm 5 AP Our AP ammo for your old Mauser Gewehr 98 or Kar 98k. 1024 - 393 + 402 1 543 1 @@ -10620,7 +10620,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 - 396 + 405 1 544 4 @@ -10642,7 +10642,7 @@ 5.56x45mm SCF mag Newly developed flechette ammo that goes together with the newly developed Steyr Advanced Combat Rifle. 1024 - 402 + 411 1 580 3 @@ -10663,7 +10663,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 - 398 + 407 1 582 5 @@ -10684,7 +10684,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 - 399 + 408 1 583 5 @@ -11194,7 +11194,7 @@ 9x18mm Mag 12 9x18mm Makarov is an inexpensive but effective ammunition. 1024 - 295 + 296 1 423 2 @@ -11215,7 +11215,7 @@ 9x18mm Mag 12 HP This HP 9x18mm ammo will knock a target down without going through. 1024 - 296 + 297 1 424 2 @@ -11236,7 +11236,7 @@ 9x18mm Mag 20 20 round clip fits many Russian SMGs and machine pistols. 1024 - 297 + 299 1 425 3 @@ -11257,7 +11257,7 @@ 9x18mm Mag 20 HP HP rounds are preferred by law enforcement officials for their low penetration. 1024 - 298 + 300 1 426 3 @@ -11278,7 +11278,7 @@ 9x18mm Mag 30 30 round clip for a Kashtan or Kiparis. 1024 - 299 + 302 1 435 4 @@ -11299,7 +11299,7 @@ 9x18mm Mag 30 HP 30 hollow-point bullets will cut a boring conversation short in no time at all. 1024 - 300 + 303 1 436 4 @@ -11320,7 +11320,7 @@ .40 Mag .40S&W is a popular ammunition among many law enforcement officers. 1024 - 303 + 308 1 427 2 @@ -11341,7 +11341,7 @@ .40 Mag HP The expansion power of HP adds substance to this powerful pistol ammunition. 1024 - 304 + 309 1 429 2 @@ -11362,7 +11362,7 @@ .40 Mag AP Punch holes in the competition with these handy AP rounds. 1024 - 305 + 310 1 428 2 @@ -11383,7 +11383,7 @@ .40 Mag AET Armored targets will go down and stay down when you tag them with this potent AET round. 1024 - 306 + 311 1 431 2 @@ -11405,7 +11405,7 @@ .40 Mag Glaser Fourteen rounds of frangible fun. All of the man-stopping power, none of the over-penetration. 1024 - 307 + 312 1 430 2 @@ -11426,7 +11426,7 @@ .40 Mag Match Competitive shooting or life and death struggle, match ammo extends your reach. 1024 - 308 + 313 1 432 2 @@ -11448,7 +11448,7 @@ 7.62x54R Mag 5 7.62x54R is an old fashioned heavy hitter. 1024 - 321 + 326 1 433 1 @@ -11469,7 +11469,7 @@ 7.62x54R Mag 5 Tracer Light up the battlefield night or day with these tracer rounds. 1024 - 322 + 327 1 434 1 @@ -11491,7 +11491,7 @@ 7.62x54R Box Crack open a box of 7.62x54R when its time to reload the squad PKM. 1024 - 325 + 332 1 412 62 @@ -11511,7 +11511,7 @@ 7.62x54R Box Tracer Adjusting automatic fire is an easy task with tracer ammo. 1024 - 326 + 333 1 413 62 @@ -11534,7 +11534,7 @@ .338 Lapua Mag If this massive largebore ammo fails to terminate the target, Bobby Ray's offers a fine line of anti-tank weaponry. 1024 - 329 + 338 1 414 8 @@ -11555,7 +11555,7 @@ .44 S-Load Why get pinned behind cover thumbing shells into your gun? Get back in the fight quickly with this speed-loader. 1024 - 331 + 340 1 384 1 @@ -11576,7 +11576,7 @@ .44 S-Load HP For every aspiring Dirty Harry, or if you've just got a thing for making a big mess, these hollow point .44 rounds will really make your day. 1024 - 332 + 341 1 385 1 @@ -11597,7 +11597,7 @@ .44 S-Load AP The infamous 'Cop Killer' round is now commercially available thanks to a convenient legislation loophole. Although not quite as effective as the NBC would have you believe, these can still pack a fair punch against targets wearing body armor. 1024 - 333 + 342 1 386 1 @@ -11618,7 +11618,7 @@ .44 S-Load Glaser Six rounds of frangible fun. All of the man-stopping power, none of the over-penetration. 1024 - 335 + 344 1 387 1 @@ -11639,7 +11639,7 @@ .44 Mag Unparalleled muzzle velocity and knock down power in this clip of Magnum rounds. 1024 - 336 + 345 1 439 2 @@ -11660,7 +11660,7 @@ .44 Mag HP For every aspiring Dirty Harry, or if you've just got a thing for making a big mess, these hollow point .44 rounds will really make your day. 1024 - 337 + 346 1 440 2 @@ -11681,7 +11681,7 @@ .44 Mag AP The infamous 'Cop Killer' round is now commercially available thanks to a convenient legislation loophole. Although not quite as effective as the NBC would have you believe, these can still pack a fair punch against targets wearing body armor. 1024 - 338 + 347 1 441 2 @@ -11702,7 +11702,7 @@ .44 Mag Glaser Eight rounds of frangible fun. All of the man-stopping power, none of the over-penetration. 1024 - 340 + 349 1 442 2 @@ -11723,7 +11723,7 @@ 10mm SMG Mag Developed for its stopping power, 10mm is not an uncommon ordninance for police and counter-terrorist agents. 1024 - 347 + 356 1 415 6 @@ -11744,7 +11744,7 @@ 10mm Mag HP 10mm HP is perfect for detering persistent foes. 1024 - 348 + 357 1 416 6 @@ -11765,7 +11765,7 @@ 10mm Mag AP Targets in armor are no match for an AP round in their 10 ring. 1024 - 349 + 358 1 417 6 @@ -11786,7 +11786,7 @@ 10mm Mag AET 10mm AET doesn't brake for armor or tough organic matter. Burn down the burliest opponent regardless of ballistic armor. 1024 - 350 + 359 1 419 6 @@ -11808,7 +11808,7 @@ 10mm Mag Glaser Thirty rounds of frangible fun. All of the man-stopping power, none of the over-penetration. 1024 - 351 + 360 1 418 6 @@ -11829,7 +11829,7 @@ 10mm Mag Match Increased range and performance are features of this hard hitting round. 1024 - 352 + 361 1 420 6 @@ -11851,7 +11851,7 @@ 9x21mm SMG Magazine Now available: 30rnd mags vor the Veresk! 1024 - 362 + 371 1 727 5 @@ -11872,7 +11872,7 @@ 12.5mm Loader Owing its dimensions to the 32 gauge shotgun shell, the 12.5mm is a weighty round for a weighty handgun. 1024 - 359 + 368 1 462 3 @@ -11893,7 +11893,7 @@ 9x21mm Mag According to its press, 9x21mm's tungsten core enables it to penetrate armored targets from 100 meters away. 1024 - 361 + 370 1 362 2 @@ -11914,7 +11914,7 @@ 7.62x37mm Mag Designed so snipers punch through helmets, not the sound barrier. 1024 - 364 + 373 1 409 2 @@ -11936,7 +11936,7 @@ 7.62x37mm Mag D-U Deliver a tactical nuclear strike on the smallest possible scale from your silenced sniper rifle. 1024 - 365 + 374 1 437 2 @@ -11959,7 +11959,7 @@ 5.45x18mm Mag 8 round magazine of 5.45x18mm ammo. 1024 - 368 + 377 1 293 1 @@ -11980,7 +11980,7 @@ 5.45x18mm Mag HP HP bullets augment the stopping power of this small-bore cartridge. 1024 - 367 + 376 1 294 1 @@ -12001,7 +12001,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 - 371 + 380 1 463 19 @@ -12066,7 +12066,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 - 374 + 383 1 175 2 @@ -12203,7 +12203,7 @@ 7.62x54R 10 Tracer Ranging and shot placement are easy with 10 rounds of 7.62 Russian tracer. Tracer ammo adds a bonus to hit in burst and full-auto modes. 1024 - 324 + 330 1 290 3 @@ -12246,7 +12246,7 @@ .50 Beowulf 7 7 rounds of the highpowered .50 Beowulf ammo, just the thing for stopping vehicles. 1024 - 387 + 396 1 515 2 @@ -12270,7 +12270,7 @@ .50 Beowulf 7 HP A clip of 7 Hollow Point rounds, perfect for harassing big pussycats. 1024 - 386 + 395 1 516 2 @@ -12294,7 +12294,7 @@ .50 Beowulf 4 not for sale at BR 1024 - 385 + 394 1 517 1 @@ -12317,7 +12317,7 @@ .50 Beowulf 4 HP not for sale at BR 1024 - 384 + 393 1 518 1 @@ -12455,7 +12455,7 @@ 12.5mm Loader FL Open up with a shower of armour piercing metal shards and your opponents will be cut down to size.. Literally. 1024 - 360 + 369 1 523 3 @@ -12521,7 +12521,7 @@ .45 WinMag Mag Standard ammo for some of the big-bore pistols. 1024 - 381 + 390 1 528 2 @@ -12542,7 +12542,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 - 382 + 391 1 529 2 @@ -12563,7 +12563,7 @@ .45 WinMag Mag AP Armor piercing ammo for the Wildey pistol and other .45 WinMag pistols. 1024 - 383 + 392 1 530 2 @@ -12584,7 +12584,7 @@ .454 C S-Load .454 Casull is a round developed for some truly large revolvers. 1024 - 378 + 387 1 531 2 @@ -12605,7 +12605,7 @@ .454 C S-Load HP .454 Casull Hollow Point ammunition, if you use your revolver for hunting. 1024 - 379 + 388 1 532 2 @@ -12626,7 +12626,7 @@ .454 C S-Load AP .454 Casull Armor Piercers meet any need for self-defense ammo. 1024 - 380 + 389 1 533 2 @@ -12647,7 +12647,7 @@ .454 C Cartridge A single .454 Casull cartridge. 1024 - 375 + 384 1 534 1 @@ -12668,7 +12668,7 @@ .454 C Cartridge HP .454 Casull Hollow Point ammunition, for hunting game large enough not to be splattered by it. 1024 - 376 + 385 1 535 1 @@ -12689,7 +12689,7 @@ .454 C Cartridge AP A .454 Casull Armor Piercer, if you want to shock the rangemaster at your next silhouette-training. 1024 - 377 + 386 1 536 1 @@ -12835,7 +12835,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 - 373 + 382 1 557 2 @@ -12922,7 +12922,7 @@ 10mm Mag Preferred by the FBI, 10mm Auto ammunition in magazines of 8 rounds each. 1024 - 341 + 350 1 567 2 @@ -12943,7 +12943,7 @@ 10mm Mag HP Hollowpoint ammunition in 10mm Auto, for serious self-defense. 1024 - 342 + 351 1 568 2 @@ -12964,7 +12964,7 @@ 10mm Mag AP 10mm Auto armor piercing ammo, for law enforcement and military use. 1024 - 343 + 352 1 569 2 @@ -12985,7 +12985,7 @@ 10mm Mag AET If armor piercing ist not good enough, AET will do. 1024 - 344 + 353 1 570 2 @@ -13007,7 +13007,7 @@ 10mm Mag Glaser Glaser ammo in the much underestimated 10mm Auto caliber. 1024 - 345 + 354 1 571 2 @@ -13028,7 +13028,7 @@ 10mm Mag Match This 10mm Auto match ammunition is intended for the serious gun enthusiast. 1024 - 346 + 355 1 572 2 @@ -22331,51 +22331,87 @@ 926 - Nada - Nothing - Index 926 - Nothing - Nothing - 1 - 34 - 1 + 9x18mm Mag 8 AP + 9x18mm Pistol Mag, 8 AP + 8 full metal jacket rounds of 9x18mm Makarov. + 9x18mm Mag 8 AP + 9x18mm in FMJ for added penetration. + 1024 + 295 + 1 + 750 + 1 + 8 + 12 + 18 + 3 + 1 + 1 1 + 7 927 - Nada - Nothing - Index 927 - Nothing - Nothing - 1 - 34 - 1 + 9x18mm Mag 12 AP + 9x18mm Pistol Mag, 12 AP + 12 rounds of full metal jacket ammo in cost effective 9x18mm. + 9x18mm Mag 12 AP + This AP 9x18mm ammo penetrates much better than standard ball rounds. + 1024 + 298 + 1 + 751 + 2 + 8 + 12 + 27 + 3 + 1 + 1 1 + 7 928 - Nada - Nothing - Index 928 - Nothing - Nothing - 1 - 34 - 1 + 9x18mm Mag 20 AP + 9x18mm SMG Mag, 20 AP + 20 round SMG mag loaded with full metal jacket ammo. + 9x18mm Mag 20 AP + AP rounds, as preferred by the military for defeating light body armor. + 1024 + 301 + 1 + 752 + 3 + 4 + 16 + 45 + 3 + 1 + 1 1 + 6 929 - Nada - Nothing - Index 929 - Nothing - Nothing - 1 - 34 - 1 + 9x18mm Mag 30 AP + 9x18mm SMG Mag, 30 AP + 30 round SMG mag loaded with full metal jacket ammunition. + 9x18mm Mag 30 AP + 30 full metal jacket bullets will make a sieve out of most things. + 1024 + 304 + 1 + 753 + 4 + 4 + 16 + 68 + 3 + 1 + 1 1 + 5 930 @@ -22428,7 +22464,7 @@ 6x35mm HP Here's what you need for your shiny new 6x35mm PDW: 30 rounds tipped with hollowpoint bullets for anti-personnel work. 1024 - 410 + 419 1 713 3 @@ -22449,7 +22485,7 @@ 6x35mm AP 30 full metal jacket rounds for 6x35mm personal defense weapons, if hollowpoints won't do it any longer. 1024 - 411 + 420 1 712 3 @@ -22470,7 +22506,7 @@ .44 S-Load AET Dirty Harry would have loved these, if they were available back in his time. Well, now they are available to you! 1024 - 334 + 343 1 739 1 @@ -22492,7 +22528,7 @@ .44 Mag AET Advanced high speed rounds that make body armor a joke. 1024 - 339 + 348 1 738 2 @@ -22508,39 +22544,68 @@ 936 - Nada - Nothing - Index 936 - Nothing - Nothing - 1 - 34 - 1 + 7.62x54R 5 M + 7.62x54R Mag, 5 Match + 5 high precision rounds for a Dragunov or other 7.62x54mm rifle. + 7.62x54R Mag 5 M + 7.62x54R Sniper ammo, manufactured to ensure higher precision. + 1024 + 328 + 1 + 754 + 1 + 6 + 13 + 90 + 6 + 1 + 1 1 + 4 + 120 937 - Nada - Nothing - Index 937 - Nothing - Nothing - 1 - 34 - 1 + 7.62x54R 10 M + 7.62x54R Mag 10 Match + Ammo manufactured to higher standards, made especially for snipers. + 7.62x54R Mag 10 M + 10 rounds of the so-called "Sniper" ammo in 7.62x54R. + 1024 + 331 + 1 + 755 + 3 + 6 + 13 + 180 + 7 + 1 + 1 1 + 2 + 120 938 - Nada - Nothing - Index 938 - Nothing - Nothing - 1 - 34 + 7.62x54R Box M + 7.62x54R Box Match + 200 round box of 7.62x54 Sniper ammo. + 7.62x54R Box M + Not available at BR + 1024 + 334 + 1 + 756 + 62 + 27 + 3600 + 10 + 1 + 1 1 1 + 120 939 @@ -25093,7 +25158,7 @@ .40 S&W SMG Mag .40 S&W is a popular ammunition among many law enforcement officers. 1024 - 309 + 314 1 601 4 @@ -25114,7 +25179,7 @@ .40 S&W SMG Mag, HP The expansion power of HP adds substance to this powerful pistol ammunition. 1024 - 310 + 315 1 602 4 @@ -25135,7 +25200,7 @@ .40 S&W SMG Mag, AP Punch holes in the competition with these handy AP rounds. 1024 - 311 + 316 1 603 4 @@ -25156,7 +25221,7 @@ .40 S&W SMG Mag, AET Armored targets will go down and stay down when you tag them with this potent AET round. 1024 - 312 + 317 1 606 4 @@ -25178,7 +25243,7 @@ .40 S&W SMG Mag, Glaser Thirty rounds of frangible fun. All of the man-stopping power, none of the over-penetration. 1024 - 313 + 318 1 604 4 @@ -25199,7 +25264,7 @@ .40 S&W SMG Mag, Match Competitive shooting or life and death struggle, match ammo extends your reach. 1024 - 314 + 319 1 605 4 @@ -30143,7 +30208,7 @@ 7.62x54mm ammo crate Not buyable at BR 1024 - 327 + 335 1 730 833 @@ -30163,7 +30228,7 @@ 7.62x54mm T ammo crate Not buyable at BR 1024 - 328 + 336 1 732 833 @@ -30223,7 +30288,7 @@ 5,45x18mm AP ammo crate Not buyable at BR 1024 - 370 + 379 1 730 511 @@ -30243,7 +30308,7 @@ 5,45x18mm HP ammo crate Not buyable at BR 1024 - 369 + 378 1 729 511 @@ -30263,7 +30328,7 @@ 9x18mm ammo crate Not buyable at BR 1024 - 301 + 305 1 728 624 @@ -30283,7 +30348,7 @@ 9x18mm HP ammo crate Not buyable at BR 1024 - 302 + 306 1 729 624 @@ -30303,7 +30368,7 @@ 9x21mm ammo crate Not buyable at BR 1024 - 363 + 372 1 730 669 @@ -30323,7 +30388,7 @@ .30car ammo crate Not buyable at BR 1024 - 407 + 416 1 730 760 @@ -30343,7 +30408,7 @@ .30car HP ammo crate Not buyable at BR 1024 - 406 + 415 1 729 760 @@ -30363,7 +30428,7 @@ 6.8x43mm ammo crate Not buyable at BR 1024 - 401 + 410 1 730 760 @@ -30383,7 +30448,7 @@ 6.8x43mm HP ammo crate Not buyable at BR 1024 - 400 + 409 1 729 760 @@ -30403,7 +30468,7 @@ .338 Lapua ammo crate Not buyable at BR 1024 - 330 + 339 1 730 778 @@ -30423,7 +30488,7 @@ 7.62x37mm ammo crate Not buyable at BR 1024 - 366 + 375 1 730 724 @@ -30443,7 +30508,7 @@ .40S&W ammo crate Not buyable at BR 1024 - 315 + 320 1 728 651 @@ -30463,7 +30528,7 @@ .40S&W AP ammo crate Not buyable at BR 1024 - 317 + 322 1 730 651 @@ -30483,7 +30548,7 @@ .40S&W HP ammo crate Not buyable at BR 1024 - 316 + 321 1 729 651 @@ -30503,7 +30568,7 @@ .40S&W M ammo crate Not buyable at BR 1024 - 320 + 325 1 731 651 @@ -30523,7 +30588,7 @@ .40S&W G ammo crate Not buyable at BR 1024 - 319 + 324 1 733 651 @@ -30543,7 +30608,7 @@ .40S&W AET ammo crate Not buyable at BR 1024 - 318 + 323 1 734 651 @@ -30563,7 +30628,7 @@ 10mm ammo crate Not buyable at BR 1024 - 353 + 362 1 728 760 @@ -30583,7 +30648,7 @@ 10mm AP ammo crate Not buyable at BR 1024 - 355 + 364 1 730 760 @@ -30603,7 +30668,7 @@ 10mm HP ammo crate Not buyable at BR 1024 - 354 + 363 1 729 760 @@ -30623,7 +30688,7 @@ 10mm M ammo crate Not buyable at BR 1024 - 358 + 367 1 731 760 @@ -30643,7 +30708,7 @@ 10mm G ammo crate Not buyable at BR 1024 - 357 + 366 1 733 760 @@ -30663,7 +30728,7 @@ 10mm AET ammo crate Not buyable at BR 1024 - 356 + 365 1 734 760 @@ -30783,7 +30848,7 @@ 12.7x97mm Subs. ammo crate Not buyable at BR 1024 - 397 + 406 1 730 465 @@ -30803,7 +30868,7 @@ 5.56x45mm SCF ammo crate Not buyable at BR 1024 - 403 + 412 1 730 374 @@ -30863,7 +30928,7 @@ 9mm MS ammo crate Not buyable at BR 1024 - 372 + 381 1 730 465 @@ -30883,7 +30948,7 @@ .30-06 ammo crate Not buyable at BR 1024 - 409 + 418 1 730 873 @@ -30903,7 +30968,7 @@ .300WinMag HP ammo crate Not buyable at BR 1024 - 390 + 399 1 729 742 @@ -30923,7 +30988,7 @@ .300WinMag AP ammo crate Not buyable at BR 1024 - 391 + 400 1 730 742 @@ -30963,7 +31028,7 @@ 7.92x57mm ammo crate Not buyable at BR 1024 - 395 + 404 1 730 800 @@ -30983,7 +31048,7 @@ 7.92x57mm HP ammo crate Not buyable at BR 1024 - 394 + 403 1 729 800 @@ -30995,4 +31060,45 @@ 1 1 + + 1303 + 7.62x54mm M crate + 7.62x54mm M ammo crate + ammo crate + 7.62x54mm M ammo crate + Not buyable at BR + 1024 + 337 + 1 + 731 + 833 + 34 + 45000 + 8 + 1 + 1 + 1 + 120 + 1 + + + 1304 + 9x18 AP crate + 9x18mm AP ammo crate + ammo crate + 9x18mm AP ammo crate + Not buyable at BR + 1024 + 307 + 1 + 730 + 624 + 34 + 11250 + 8 + 1 + 1 + 1 + 1 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Magazines.xml b/gamedir/Data-1.13/TableData/Magazines.xml index 04caf15a4..8adca4f38 100644 --- a/gamedir/Data-1.13/TableData/Magazines.xml +++ b/gamedir/Data-1.13/TableData/Magazines.xml @@ -1773,701 +1773,755 @@ 295 22 - 12 - 0 + 8 + 2 296 22 12 - 1 + 0 297 22 - 20 - 0 + 12 + 1 298 22 - 20 - 1 + 12 + 2 299 22 - 30 + 20 0 300 22 - 30 + 20 1 301 22 + 20 + 2 + + + 302 + 22 + 30 + 0 + + + 303 + 22 + 30 + 1 + + + 304 + 22 + 30 + 2 + + + 305 + 22 5000 0 - 302 + 306 22 5000 1 - - 303 - 23 - 14 - 0 - - - 304 - 23 - 14 - 1 - - - 305 - 23 - 14 - 2 - - - 306 - 23 - 14 - 13 - 307 - 23 - 14 - 14 + 22 + 5000 + 2 308 23 14 - 17 + 0 309 23 - 30 - 0 + 14 + 1 310 23 - 30 - 1 + 14 + 2 311 23 - 30 - 2 + 14 + 13 312 23 - 30 - 13 + 14 + 14 313 23 - 30 - 14 + 14 + 17 314 23 30 - 17 + 0 315 23 - 4000 - 0 + 30 + 1 316 23 - 4000 - 1 + 30 + 2 317 23 - 4000 - 2 + 30 + 13 318 23 - 4000 - 13 + 30 + 14 319 23 - 4000 - 14 + 30 + 17 320 23 4000 - 17 + 0 321 - 24 - 5 - 2 + 23 + 4000 + 1 322 - 24 - 5 - 16 + 23 + 4000 + 2 323 - 24 - 10 - 2 + 23 + 4000 + 13 324 - 24 - 10 - 16 + 23 + 4000 + 14 325 - 24 - 200 - 2 + 23 + 4000 + 17 326 24 + 5 + 2 + + + 327 + 24 + 5 + 16 + + + 328 + 24 + 5 + 18 + + + 329 + 24 + 10 + 2 + + + 330 + 24 + 10 + 16 + + + 331 + 24 + 10 + 18 + + + 332 + 24 + 200 + 2 + + + 333 + 24 200 16 - 327 + 334 + 24 + 200 + 18 + + + 335 24 3000 2 - 328 + 336 24 3000 16 - 329 + 337 + 24 + 3000 + 18 + + + 338 25 10 3 - 330 + 339 25 1500 3 - - 331 - 26 - 6 - 0 - - - 332 - 26 - 6 - 1 - - - 333 - 26 - 6 - 2 - - - 334 - 26 - 6 - 13 - - - 335 - 26 - 6 - 14 - - - 336 - 26 - 8 - 0 - - - 337 - 26 - 8 - 1 - - - 338 - 26 - 8 - 2 - - - 339 - 26 - 8 - 13 - 340 26 - 8 - 14 + 6 + 0 341 - 27 + 26 + 6 + 1 + + + 342 + 26 + 6 + 2 + + + 343 + 26 + 6 + 13 + + + 344 + 26 + 6 + 14 + + + 345 + 26 8 0 - 342 - 27 + 346 + 26 8 1 - 343 - 27 + 347 + 26 8 2 - 344 - 27 + 348 + 26 8 13 - 345 - 27 + 349 + 26 8 14 - - 346 - 27 - 8 - 17 - - - 347 - 27 - 30 - 0 - - - 348 - 27 - 30 - 1 - - - 349 - 27 - 30 - 2 - 350 27 + 8 + 0 + + + 351 + 27 + 8 + 1 + + + 352 + 27 + 8 + 2 + + + 353 + 27 + 8 + 13 + + + 354 + 27 + 8 + 14 + + + 355 + 27 + 8 + 17 + + + 356 + 27 + 30 + 0 + + + 357 + 27 + 30 + 1 + + + 358 + 27 + 30 + 2 + + + 359 + 27 30 13 - 351 + 360 27 30 14 - 352 + 361 27 30 17 - 353 + 362 27 4000 0 - 354 + 363 27 4000 1 - 355 + 364 27 4000 2 - 356 + 365 27 4000 13 - 357 + 366 27 4000 14 - 358 + 367 27 4000 17 - 359 + 368 28 5 4 - 360 + 369 28 5 5 - 361 + 370 29 18 3 - 362 + 371 29 30 3 - 363 + 372 29 5000 3 - 364 + 373 30 10 3 - 365 + 374 30 10 26 - 366 + 375 30 3000 3 - 367 + 376 33 8 1 - 368 + 377 33 8 2 - 369 + 378 33 5000 1 - 370 + 379 33 5000 2 - 371 + 380 34 72 2 - 372 + 381 34 5000 2 - - 373 - 35 - 7 - 1 - - - 374 - 35 - 7 - 2 - - - 375 - 36 - 1 - 0 - - - 376 - 36 - 1 - 1 - - - 377 - 36 - 1 - 2 - - - 378 - 36 - 5 - 0 - - - 379 - 36 - 5 - 1 - - - 380 - 36 - 5 - 2 - - - 381 - 37 - 7 - 0 - 382 - 37 + 35 7 1 383 - 37 + 35 7 2 384 - 38 - 4 - 1 + 36 + 1 + 0 385 - 38 - 4 - 2 - - - 386 - 38 - 7 + 36 + 1 1 - 387 - 38 - 7 + 386 + 36 + 1 2 + + 387 + 36 + 5 + 0 + 388 - 39 + 36 5 1 389 - 39 + 36 5 2 390 - 39 - 2000 - 1 + 37 + 7 + 0 391 + 37 + 7 + 1 + + + 392 + 37 + 7 + 2 + + + 393 + 38 + 4 + 1 + + + 394 + 38 + 4 + 2 + + + 395 + 38 + 7 + 1 + + + 396 + 38 + 7 + 2 + + + 397 + 39 + 5 + 1 + + + 398 + 39 + 5 + 2 + + + 399 + 39 + 2000 + 1 + + + 400 39 2000 2 - 392 + 401 40 5 1 - 393 + 402 40 5 2 - 394 + 403 40 2500 1 - 395 + 404 40 2500 2 - 396 + 405 41 5 3 - 397 + 406 41 300 3 - 398 + 407 42 25 1 - 399 + 408 42 25 2 - 400 + 409 42 4000 1 - 401 + 410 42 4000 2 - 402 + 411 43 24 3 - 403 + 412 43 5000 3 - 404 + 413 45 30 1 - 405 + 414 45 30 2 - 406 + 415 45 5000 1 - 407 + 416 45 5000 2 - 408 + 417 46 8 2 - 409 + 418 46 3000 2 - 410 + 419 47 30 1 - 411 + 420 47 30 2 diff --git a/gamedir/Data-1.13/TableData/Merges.xml b/gamedir/Data-1.13/TableData/Merges.xml index 8b42f3fea..e6ce3b6e5 100644 --- a/gamedir/Data-1.13/TableData/Merges.xml +++ b/gamedir/Data-1.13/TableData/Merges.xml @@ -163,9 +163,9 @@ 216 163 - 0 + 1022 0 - 0 + 4 32 @@ -179,9 +179,9 @@ 216 166 - 0 + 1022 0 - 0 + 4 32 @@ -195,9 +195,9 @@ 216 169 - 0 + 1022 0 - 0 + 6 32 @@ -211,9 +211,9 @@ 216 172 - 0 + 1022 0 - 0 + 4 32 @@ -227,9 +227,9 @@ 216 175 - 0 + 1022 0 - 0 + 4 32 @@ -243,9 +243,9 @@ 216 179 - 0 + 1022 0 - 0 + 4 32 @@ -259,9 +259,9 @@ 216 182 - 0 + 1022 0 - 0 + 4 32 @@ -275,9 +275,9 @@ 216 191 - 0 + 1022 0 - 0 + 4 32 @@ -339,49 +339,49 @@ 216 825 - 0 + 1022 0 - 0 + 4 32 216 826 - 0 + 1022 0 - 0 + 4 32 216 827 - 0 + 1022 0 - 0 + 4 32 216 834 - 0 + 1022 0 - 0 + 4 32 216 835 - 0 + 1022 0 - 0 + 4 32 216 836 - 0 + 1022 0 - 0 + 4 32 @@ -667,281 +667,281 @@ 216 1135 - 0 + 1022 0 - 0 + 4 32 216 1136 - 0 + 1022 0 - 0 + 4 32 216 1137 - 0 + 1022 0 - 0 + 4 32 216 1138 - 0 + 1022 0 - 0 + 4 32 216 1139 - 0 + 1022 0 - 0 + 4 32 216 1140 - 0 + 1022 0 - 0 + 4 32 216 1141 - 0 + 1022 0 - 0 + 4 32 216 1142 - 0 + 1022 0 - 0 + 4 32 216 1143 - 0 + 1022 0 - 0 + 4 32 216 1144 - 0 + 1022 0 - 0 + 4 32 216 1145 - 0 + 1022 0 - 0 + 4 32 216 1146 - 0 + 1022 0 - 0 + 4 32 216 1147 - 0 + 1022 0 - 0 + 4 32 216 1148 - 0 + 1022 0 - 0 + 4 32 216 1149 - 0 + 1022 0 - 0 + 4 32 216 1150 - 0 + 1022 0 - 0 + 4 32 216 1151 - 0 + 1022 0 - 0 + 4 32 216 1152 - 0 + 1022 0 - 0 + 4 32 216 1153 - 0 + 1022 0 - 0 + 4 32 216 1154 - 0 + 1022 0 - 0 + 4 32 216 1155 - 0 + 1022 0 - 0 + 4 32 216 1156 - 0 + 1022 0 - 0 + 4 32 216 1157 - 0 + 1022 0 - 0 + 4 32 216 1158 - 0 + 1022 0 - 0 + 4 32 216 1159 - 0 + 1022 0 - 0 + 4 32 216 1160 - 0 + 1022 0 - 0 + 4 32 216 1161 - 0 + 1022 0 - 0 + 4 32 216 1162 - 0 + 1022 0 - 0 + 4 32 216 1163 - 0 + 1022 0 - 0 + 4 32 216 1164 - 0 + 1022 0 - 0 + 4 32 216 1165 - 0 + 1022 0 - 0 + 4 32 216 1166 - 0 + 1022 0 - 0 + 4 32 216 1167 - 0 + 1022 0 - 0 + 4 32 216 1168 - 0 + 1022 0 - 0 + 4 32 216 1169 - 0 + 1022 0 - 0 + 4 32 @@ -955,9 +955,9 @@ 217 162 - 0 + 1022 0 - 0 + 4 32 @@ -971,9 +971,9 @@ 217 165 - 0 + 1022 0 - 0 + 4 32 @@ -987,9 +987,9 @@ 217 168 - 0 + 1022 0 - 0 + 4 32 @@ -1003,9 +1003,9 @@ 217 171 - 0 + 1022 0 - 0 + 4 32 @@ -1019,9 +1019,9 @@ 217 174 - 0 + 1022 0 - 0 + 4 32 @@ -1035,9 +1035,9 @@ 217 178 - 0 + 1022 0 - 0 + 4 32 @@ -1051,9 +1051,9 @@ 217 181 - 0 + 1022 0 - 0 + 4 32 @@ -1067,9 +1067,9 @@ 217 190 - 0 + 1022 0 - 0 + 4 32 @@ -1083,9 +1083,9 @@ 217 197 - 0 + 1022 0 - 0 + 4 32 @@ -1139,49 +1139,49 @@ 217 813 - 0 + 1022 0 - 0 + 4 32 217 814 - 0 + 1022 0 - 0 + 4 32 217 815 - 0 + 1022 0 - 0 + 4 32 217 822 - 0 + 1022 0 - 0 + 4 32 217 823 - 0 + 1022 0 - 0 + 4 32 217 824 - 0 + 1022 0 - 0 + 4 32 @@ -1467,281 +1467,281 @@ 217 1100 - 0 + 1022 0 - 0 + 4 32 217 1101 - 0 + 1022 0 - 0 + 4 32 217 1102 - 0 + 1022 0 - 0 + 4 32 217 1103 - 0 + 1022 0 - 0 + 4 32 217 1104 - 0 + 1022 0 - 0 + 4 32 217 1105 - 0 + 1022 0 - 0 + 4 32 217 1106 - 0 + 1022 0 - 0 + 4 32 217 1107 - 0 + 1022 0 - 0 + 4 32 217 1108 - 0 + 1022 0 - 0 + 4 32 217 1109 - 0 + 1022 0 - 0 + 4 32 217 1110 - 0 + 1022 0 - 0 + 4 32 217 1111 - 0 + 1022 0 - 0 + 4 32 217 1112 - 0 + 1022 0 - 0 + 4 32 217 1113 - 0 + 1022 0 - 0 + 4 32 217 1114 - 0 + 1022 0 - 0 + 4 32 217 1115 - 0 + 1022 0 - 0 + 4 32 217 1116 - 0 + 1022 0 - 0 + 4 32 217 1117 - 0 + 1022 0 - 0 + 4 32 217 1118 - 0 + 1022 0 - 0 + 4 32 217 1119 - 0 + 1022 0 - 0 + 4 32 217 1120 - 0 + 1022 0 - 0 + 4 32 217 1121 - 0 + 1022 0 - 0 + 4 32 217 1122 - 0 + 1022 0 - 0 + 4 32 217 1123 - 0 + 1022 0 - 0 + 4 32 217 1124 - 0 + 1022 0 - 0 + 4 32 217 1125 - 0 + 1022 0 - 0 + 4 32 217 1126 - 0 + 1022 0 - 0 + 4 32 217 1127 - 0 + 1022 0 - 0 + 4 32 217 1128 - 0 + 1022 0 - 0 + 4 32 217 1129 - 0 + 1022 0 - 0 + 4 32 217 1130 - 0 + 1022 0 - 0 + 4 32 217 1131 - 0 + 1022 0 - 0 + 4 32 217 1132 - 0 + 1022 0 - 0 + 4 32 217 1133 - 0 + 1022 0 - 0 + 4 32 217 1134 - 0 + 1022 0 - 0 + 4 32 diff --git a/gamedir/Data-1.13/TableData/NPCInventory/JakeInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/JakeInventory.xml index 58f905818..54dd5bca4 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/JakeInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/JakeInventory.xml @@ -310,4 +310,14 @@ 1053 1 + + 62 + 679 + 0 + + + 63 + 711 + 0 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml index 225b32df5..41ee5f77c 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml @@ -330,4 +330,54 @@ 1176 1 + + 66 + 679 + 0 + + + 67 + 711 + 0 + + + 68 + 754 + 0 + + + 69 + 1091 + 0 + + + 70 + 1098 + 0 + + + 71 + 1099 + 0 + + + 72 + 1097 + 0 + + + 73 + 1096 + 0 + + + 74 + 1095 + 0 + + + 75 + 1094 + 0 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml index 3aa5ff232..1709f8593 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml @@ -4270,4 +4270,49 @@ 1302 0 + + 854 + 937 + 2 + + + 855 + 936 + 1 + + + 856 + 938 + 0 + + + 857 + 1303 + 0 + + + 858 + 926 + 0 + + + 859 + 927 + 0 + + + 860 + 928 + 0 + + + 861 + 929 + 0 + + + 862 + 1304 + 0 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Polish.Items.xml b/gamedir/Data-1.13/TableData/Polish.Items.xml index 6e4d5cb3a..662ad13a9 100644 --- a/gamedir/Data-1.13/TableData/Polish.Items.xml +++ b/gamedir/Data-1.13/TableData/Polish.Items.xml @@ -7410,35 +7410,35 @@ 926 - Nada - Nothing - Index 926 - Nothing - Nothing + 9x18mm Mag 8 AP + 9x18mm Pistol Mag, 8 AP + 8 full metal jacket rounds of 9x18mm Makarov. + 9x18mm Mag 8 AP + 9x18mm in FMJ for added penetration. 927 - Nada - Nothing - Index 927 - Nothing - Nothing + 9x18mm Mag 12 AP + 9x18mm Pistol Mag, 12 AP + 12 rounds of full metal jacket ammo in cost effective 9x18mm. + 9x18mm Mag 12 AP + This AP 9x18mm ammo penetrates much better than standard ball rounds. 928 - Nada - Nothing - Index 928 - Nothing - Nothing + 9x18mm Mag 20 AP + 9x18mm SMG Mag, 20 AP + 20 round SMG mag loaded with full metal jacket ammo. + 9x18mm Mag 20 AP + AP rounds, as preferred by the military for defeating light body armor. 929 - Nada - Nothing - Index 929 - Nothing - Nothing + 9x18mm Mag 30 AP + 9x18mm SMG Mag, 30 AP + 30 round SMG mag loaded with full metal jacket ammunition. + 9x18mm Mag 30 AP + 30 full metal jacket bullets will make a sieve out of most things. 930 @@ -7490,27 +7490,27 @@ 936 - Nada - Nothing - Index 936 - Nothing - Nothing + 7.62x54R 5 M + 7.62x54R Mag, 5 Match + 5 high precision rounds for a Dragunov or other 7.62x54mm rifle. + 7.62x54R Mag 5 M + 7.62x54R Sniper ammo, manufactured to ensure higher precision. 937 - Nada - Nothing - Index 937 - Nothing - Nothing + 7.62x54R 10 M + 7.62x54R Mag 10 Match + Ammo manufactured to higher standards, made especially for snipers. + 7.62x54R Mag 10 M + 10 rounds of the so-called "Sniper" ammo in 7.62x54R. 938 - Nada - Nothing - Index 938 - Nothing - Nothing + 7.62x54R Box M + 7.62x54R Box Match + 200 round box of 7.62x54 Sniper ammo. + 7.62x54R Box M + Not available at BR 939 @@ -10424,4 +10424,20 @@ Skrzynka amunicji 7.92x57mm HP BR nie ma tego w sprzedaży. + + 1303 + Skrzynka amunicji 7.62x54mm M + Skrzynka amunicji 7.62x54mm M + Skrzynka amunicji + Skrzynka amunicji 7.62x54mm M + BR nie ma tego w sprzedaży. + + + 1304 + Skrzynka amunicji 9x18 AP + Skrzynka amunicji 9x18mm AP + Skrzynka amunicji + Skrzynka amunicji 9x18mm AP + BR nie ma tego w sprzedaży. + \ 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 5f884157d..ebecee21e 100644 --- a/gamedir/Data-1.13/TableData/Russian.Items.xml +++ b/gamedir/Data-1.13/TableData/Russian.Items.xml @@ -7411,35 +7411,35 @@ 926 - Nada - Nothing - Index 926 - Nothing - Nothing + 9x18мм, 8 AP + 9x18мм магазин к пистолету, 8 AP + 8 full metal jacket rounds of 9x18mm Makarov. + 9x18мм маг, 8 AP + 9x18mm in FMJ for added penetration. 927 - Nada - Nothing - Index 927 - Nothing - Nothing + 9x18мм, 12 AP + 9x18мм магазин к пистолету, 12 AP + 12 rounds of full metal jacket ammo in cost effective 9x18mm. + 9x18мм маг, 12 AP + This AP 9x18mm ammo penetrates much better than standard ball rounds. 928 - Nada - Nothing - Index 928 - Nothing - Nothing + 9x18мм, 20 AP + 9x18мм магазин к ПП, 20 AP + 20 round SMG mag loaded with full metal jacket ammo. + 9x18мм маг, 20 AP + AP rounds, as preferred by the military for defeating light body armor. 929 - Nada - Nothing - Index 929 - Nothing - Nothing + 9x18мм, 30 AP + 9x18мм магазин для ПП, 30 AP + 30 round SMG mag loaded with full metal jacket ammunition. + 9x18мм маг, 30 AP + 30 full metal jacket bullets will make a sieve out of most things. 930 @@ -7491,27 +7491,27 @@ 936 - Nada - Nothing - Index 936 - Nothing - Nothing + 7.62x54R, 5 M + 7,62x54R магазин, 5 M + 5 high precision rounds for a Dragunov or other 7.62x54mm rifle. + 7,62x54R маг, 5 M + 7.62x54R Sniper ammo, manufactured to ensure higher precision. 937 - Nada - Nothing - Index 937 - Nothing - Nothing + 7.62x54R 10 M + 7,62x54R магазин, 10 M + Ammo manufactured to higher standards, made especially for snipers. + 7,62x54R маг, 10 M + 10 rounds of the so-called "Sniper" ammo in 7.62x54R. 938 - Nada - Nothing - Index 938 - Nothing - Nothing + 7,62x54R, 200M + 7,62x54R Короб с патронами M + 200 round box of 7.62x54 Sniper ammo. + 7,62x54R короб, 200M + Not available at BR 939 @@ -10426,4 +10426,20 @@ 7.92x57мм HP, ящик с патронами Не продается у Бобби Рэя. + + 1303 + 7,62x54мм M + 7,62x54мм, ящик с патронами M + Ящик с патронами. + 7,62x54мм, ящик с патронами + Не продается у Бобби Рэя. + + + 1304 + 9x18 AP + 9x18мм AP, ящик с патронами + Ящик с патронами. + 9x18мм AP, ящик с патронами + Не продается у Бобби Рэя. + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml index e8d139ac4..bc6e400ef 100644 --- a/gamedir/Data-1.13/TableData/Weapons.xml +++ b/gamedir/Data-1.13/TableData/Weapons.xml @@ -9336,7 +9336,7 @@ 406 111 157 - 24 + 16 1 7 476 @@ -9430,7 +9430,7 @@ 405 111 157 - 24 + 16 1 7 476