From 54d55fad64889fcded04b5a5a8b016df08eab70f Mon Sep 17 00:00:00 2001 From: Starwalker Date: Wed, 3 Sep 2008 09:02:01 +0000 Subject: [PATCH] Added a few ammo crates Items not fitting their role are no longer taken by some dealers git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1035 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/TableData/German.Items.xml | 152 ++++ gamedir/Data-1.13/TableData/Items.xml | 597 +++++++++++--- gamedir/Data-1.13/TableData/Magazines.xml | 726 ++++++++++-------- .../TableData/NPCInventory/GabbyInventory.xml | 19 +- .../NPCInventory/MickeyInventory.xml | 15 - .../TableData/NPCInventory/TonyInventory.xml | 95 +++ gamedir/Data-1.13/TableData/Russian.Items.xml | 152 ++++ 7 files changed, 1310 insertions(+), 446 deletions(-) diff --git a/gamedir/Data-1.13/TableData/German.Items.xml b/gamedir/Data-1.13/TableData/German.Items.xml index 2ebee1fc7..98683cc7b 100644 --- a/gamedir/Data-1.13/TableData/German.Items.xml +++ b/gamedir/Data-1.13/TableData/German.Items.xml @@ -9818,4 +9818,156 @@ .338 Lapua Munitionskiste Nicht bei BR zu kaufen + + 1274 + 7,62x37mm Kiste + 7,62x37mm Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 3000 Patronen des Kalibers 7.62x37. + 7,62x37mm Munitionskiste + Nicht bei BR zu kaufen + + + 1275 + .40S&W Kiste + .40S&W Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers .40S&W. + .40S&W Munitionskiste + Nicht bei BR zu kaufen + + + 1276 + .40S&W PB Kiste + .40S&W PB Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers .40S&W PB. + .40S&W AP Munitionskiste + Nicht bei BR zu kaufen + + + 1277 + .40S&W HS Kiste + .40S&W HS Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers .40S&W HS. + .40S&W HP Munitionskiste + Nicht bei BR zu kaufen + + + 1278 + .40S&W M Kiste + .40S&W M Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers .40S&W M. + .40S&W M Munitionskiste + Nicht bei BR zu kaufen + + + 1279 + .40S&W G Kiste + .40S&W G Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers .40S&W G. + .40S&W G Munitionskiste + Nicht bei BR zu kaufen + + + 1280 + .40S&W AET Kiste + .40S&W AET Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers .40S&W AET. + .40S&W AET Munitionskiste + Nicht bei BR zu kaufen + + + 1281 + 10mm Kiste + 10mm Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers 10mm Auto. + 10mm Munitionskiste + Nicht bei BR zu kaufen + + + 1282 + 10mm PB Kiste + 10mm PB Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers 10mm PB. + 10mm AP Munitionskiste + Nicht bei BR zu kaufen + + + 1283 + 10mm HS Kiste + 10mm HS Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers 10mm HS. + 10mm HP Munitionskiste + Nicht bei BR zu kaufen + + + 1284 + 10mm M Kiste + 10mm M Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers 10mm M. + 10mm M Munitionskiste + Nicht bei BR zu kaufen + + + 1285 + 10mm G Kiste + 10mm G Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers 10mm G. + 10mm G Munitionskiste + Nicht bei BR zu kaufen + + + 1286 + 10mm AET Kiste + 10mm AET Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 4000 Patronen des Kalibers 10mm AET. + 10mm AET Munitionskiste + Nicht bei BR zu kaufen + + + 1287 + 7.62x25 PB Kiste + 7.62x25mm PB Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 5000 Patronen des Kalibers 7.62x25mm PB. + 7.62x25mm AP Munitionskiste + Nicht bei BR zu kaufen + + + 1288 + 7.62x25 HS Kiste + 7.62x25mm HS Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 5000 Patronen des Kalibers 7.62x25mm HS. + 7.62x25mm HP Munitionskiste + Nicht bei BR zu kaufen + + + 1289 + 7.62x25 AET Kiste + 7.62x25mm AET Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 5000 Patronen des Kalibers 7.62x25mm AET. + 7.62x25mm AET Munitionskiste + Nicht bei BR zu kaufen + + + 1290 + 7.62x25 AP C Kiste + 7.62x25mm AP C Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 5000 Patronen des Kalibers 7.62x25mm AP C. + 7.62x25mm AP C Munitionskiste + Nicht bei BR zu kaufen + + + 1291 + 7.62x25 HP C Kiste + 7.62x25mm HP C Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 5000 Patronen des Kalibers 7.62x25mm HP C. + 7.62x25mm HP C Munitionskiste + Nicht bei BR zu kaufen + + + 1292 + 12.7 Subs. Kiste + 12.7x97mm Subs. Munitionskiste + Munitionskiste mit einem Fassungsvermögen von 300 Patronen des Kalibers 12.7x97mm Subsonic. + 12.7x97mm Subs. Munitionskiste + Nicht bei BR zu kaufen + \ 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 b45556e10..d574fe468 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -540,8 +540,7 @@ 1 1 1 - 2 - 1 + 1 900 5 5 @@ -968,8 +967,7 @@ 1 1 1 - 2 - 1 + 1 600 1029 @@ -3048,7 +3046,7 @@ 7.62x54R Mag 10 10 rounds of long range penetrating power for the 7.62x54R chambered weapon in your collection. 1024 - 309 + 320 1 289 3 @@ -10260,7 +10258,7 @@ .30-06 AP Clip If you happen to have a M1 Garand around, here's some ammo for it. 1024 - 380 + 399 1 682 2 @@ -10392,7 +10390,7 @@ .30 car HP mag Hollowpoint rounds for the old M1 Carbine. 1024 - 376 + 395 1 683 4 @@ -10511,7 +10509,7 @@ .30 car AP mag Full Metal Jacket ammo for the old M1 Carbine. 1024 - 377 + 396 1 684 4 @@ -10532,7 +10530,7 @@ .300 WM Mag HP The .300 Winchester Magnum can be considered a standard hunting round, especially with expanding hollowpoint bullets. 1024 - 366 + 384 1 540 1 @@ -10553,7 +10551,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 - 367 + 385 1 541 1 @@ -10574,7 +10572,7 @@ 7.92x57mm 5 HP Own a vintage Mauser Gewehr 98 or Karabiner 98k? We have the ammo for your old pal! 1024 - 368 + 386 1 542 1 @@ -10595,7 +10593,7 @@ 7.92x57mm 5 AP Our AP ammo for your old Mauser Gewehr 98 or Kar 98k. 1024 - 369 + 387 1 543 1 @@ -10616,7 +10614,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 - 370 + 388 1 544 4 @@ -10638,7 +10636,7 @@ 5.56x45mm SCF mag Newly developed flechette ammo that goes together with the newly developed Steyr Advanced Combat Rifle. 1024 - 375 + 394 1 580 3 @@ -10659,7 +10657,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 - 371 + 390 1 582 5 @@ -10680,7 +10678,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 - 372 + 391 1 583 5 @@ -10776,6 +10774,7 @@ 12 600 7 + -1 1 1 1 @@ -10797,6 +10796,7 @@ 24 1500 8 + -1 1 1 1 @@ -11125,7 +11125,7 @@ 12.7mm Mag Penetrate light armor vehicles from considerable range with a clip full of 12.7mm. 1024 - 284 + 289 1 443 5 @@ -11146,7 +11146,7 @@ 9x18mm Mag 8 9x18mm Makarov fits many more Eastern European made handguns than its namesake. 1024 - 285 + 290 1 421 1 @@ -11167,7 +11167,7 @@ 9x18mm Mag 8 HP 9x18mm in HP for added stopping power. 1024 - 286 + 291 1 422 1 @@ -11188,7 +11188,7 @@ 9x18mm Mag 12 9x18mm Makarov is an inexpensive but effective ammunition. 1024 - 287 + 292 1 423 2 @@ -11209,7 +11209,7 @@ 9x18mm Mag 12 HP This HP 9x18mm ammo will knock a target down without going through. 1024 - 288 + 293 1 424 2 @@ -11230,7 +11230,7 @@ 9x18mm Mag 20 20 round clip fits many Russian SMGs and machine pistols. 1024 - 289 + 294 1 425 3 @@ -11251,7 +11251,7 @@ 9x18mm Mag 20 HP HP rounds are preferred by law enforcement officials for their low penetration. 1024 - 290 + 295 1 426 3 @@ -11272,7 +11272,7 @@ 9x18mm Mag 30 30 round clip for a Kashtan or Kiparis. 1024 - 291 + 296 1 435 4 @@ -11293,7 +11293,7 @@ 9x18mm Mag 30 HP 30 hollow-point bullets will cut a boring conversation short in no time at all. 1024 - 292 + 297 1 436 4 @@ -11314,7 +11314,7 @@ .40 Mag .40S&W is a popular ammunition among many law enforcement officers. 1024 - 295 + 300 1 427 2 @@ -11335,7 +11335,7 @@ .40 Mag HP The expansion power of HP adds substance to this powerful pistol ammunition. 1024 - 296 + 301 1 429 2 @@ -11356,7 +11356,7 @@ .40 Mag AP Punch holes in the competition with these handy AP rounds. 1024 - 297 + 302 1 428 2 @@ -11377,7 +11377,7 @@ .40 Mag AET Armored targets will go down and stay down when you tag them with this potent AET round. 1024 - 298 + 303 1 431 2 @@ -11399,7 +11399,7 @@ .40 Mag Glaser Fourteen rounds of frangible fun. All of the man-stopping power, none of the over-penetration. 1024 - 299 + 304 1 430 2 @@ -11420,7 +11420,7 @@ .40 Mag Match Competitive shooting or life and death struggle, match ammo extends your reach. 1024 - 300 + 305 1 432 2 @@ -11442,7 +11442,7 @@ 7.62x54R Mag 5 7.62x54R is an old fashioned heavy hitter. 1024 - 307 + 318 1 433 1 @@ -11463,7 +11463,7 @@ 7.62x54R Mag 5 Tracer Light up the battlefield night or day with these tracer rounds. 1024 - 308 + 319 1 434 1 @@ -11485,7 +11485,7 @@ 7.62x54R Box Crack open a box of 7.62x54R when its time to reload the squad PKM. 1024 - 311 + 322 1 412 62 @@ -11505,7 +11505,7 @@ 7.62x54R Box Tracer Adjusting automatic fire is an easy task with tracer ammo. 1024 - 312 + 323 1 413 62 @@ -11528,7 +11528,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 - 315 + 326 1 414 8 @@ -11549,7 +11549,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 - 317 + 328 1 384 1 @@ -11570,7 +11570,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 - 318 + 329 1 385 1 @@ -11591,7 +11591,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 - 319 + 330 1 386 1 @@ -11612,7 +11612,7 @@ .44 S-Load Glaser Six rounds of frangible fun. All of the man-stopping power, none of the over-penetration. 1024 - 321 + 332 1 387 1 @@ -11633,7 +11633,7 @@ .44 Mag Unparalleled muzzle velocity and knock down power in this clip of Magnum rounds. 1024 - 322 + 333 1 439 2 @@ -11654,7 +11654,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 - 323 + 334 1 440 2 @@ -11675,7 +11675,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 - 324 + 335 1 441 2 @@ -11696,7 +11696,7 @@ .44 Mag Glaser Eight rounds of frangible fun. All of the man-stopping power, none of the over-penetration. 1024 - 326 + 337 1 442 2 @@ -11717,7 +11717,7 @@ 10mm SMG Mag Developed for its stopping power, 10mm is not an uncommon ordninance for police and counter-terrorist agents. 1024 - 333 + 344 1 415 6 @@ -11738,7 +11738,7 @@ 10mm Mag HP 10mm HP is perfect for detering persistent foes. 1024 - 334 + 345 1 416 6 @@ -11759,7 +11759,7 @@ 10mm Mag AP Targets in armor are no match for an AP round in their 10 ring. 1024 - 335 + 346 1 417 6 @@ -11780,7 +11780,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 - 336 + 347 1 419 6 @@ -11802,7 +11802,7 @@ 10mm Mag Glaser Thirty rounds of frangible fun. All of the man-stopping power, none of the over-penetration. 1024 - 337 + 348 1 418 6 @@ -11823,7 +11823,7 @@ 10mm Mag Match Increased range and performance are features of this hard hitting round. 1024 - 338 + 349 1 420 6 @@ -11845,7 +11845,7 @@ 9x21mm SMG Magazine Now available: 30rnd mags vor the Veresk! 1024 - 342 + 359 1 727 5 @@ -11866,7 +11866,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 - 339 + 356 1 462 3 @@ -11887,7 +11887,7 @@ 9x21mm Mag According to its press, 9x21mm's tungsten core enables it to penetrate armored targets from 100 meters away. 1024 - 341 + 358 1 362 2 @@ -11908,7 +11908,7 @@ 7.62x37mm Mag Designed so snipers punch through helmets, not the sound barrier. 1024 - 344 + 361 1 409 2 @@ -11930,7 +11930,7 @@ 7.62x37mm Mag D-U Deliver a tactical nuclear strike on the smallest possible scale from your silenced sniper rifle. 1024 - 345 + 362 1 437 2 @@ -11953,7 +11953,7 @@ 5.45x18mm Mag 8 round magazine of 5.45x18mm ammo. 1024 - 347 + 365 1 293 1 @@ -11974,7 +11974,7 @@ 5.45x18mm Mag HP HP bullets augment the stopping power of this small-bore cartridge. 1024 - 346 + 364 1 294 1 @@ -11995,7 +11995,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 - 350 + 368 1 463 19 @@ -12060,7 +12060,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 - 352 + 370 1 175 2 @@ -12089,6 +12089,7 @@ 20 1600 9 + -1 1 1 1 @@ -12196,7 +12197,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 - 310 + 321 1 290 3 @@ -12239,7 +12240,7 @@ .50 Beowulf 7 7 rounds of the highpowered .50 Beowulf ammo, just the thing for stopping vehicles. 1024 - 365 + 383 1 515 2 @@ -12263,7 +12264,7 @@ .50 Beowulf 7 HP A clip of 7 Hollow Point rounds, perfect for harassing big pussycats. 1024 - 364 + 382 1 516 2 @@ -12287,7 +12288,7 @@ .50 Beowulf 4 not for sale at BR 1024 - 363 + 381 1 517 1 @@ -12310,7 +12311,7 @@ .50 Beowulf 4 HP not for sale at BR 1024 - 362 + 380 1 518 1 @@ -12448,7 +12449,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 - 340 + 357 1 523 3 @@ -12514,7 +12515,7 @@ .45 WinMag Mag Standard ammo for some of the big-bore pistols. 1024 - 359 + 377 1 528 2 @@ -12535,7 +12536,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 - 360 + 378 1 529 2 @@ -12556,7 +12557,7 @@ .45 WinMag Mag AP Armor piercing ammo for the Wildey pistol and other .45 WinMag pistols. 1024 - 361 + 379 1 530 2 @@ -12577,7 +12578,7 @@ .454 C S-Load .454 Casull is a round developed for some truly large revolvers. 1024 - 356 + 374 1 531 2 @@ -12598,7 +12599,7 @@ .454 C S-Load HP .454 Casull Hollow Point ammunition, if you use your revolver for hunting. 1024 - 357 + 375 1 532 2 @@ -12619,7 +12620,7 @@ .454 C S-Load AP .454 Casull Armor Piercers meet any need for self-defense ammo. 1024 - 358 + 376 1 533 2 @@ -12640,7 +12641,7 @@ .454 C Cartridge A single .454 Casull cartridge. 1024 - 353 + 371 1 534 1 @@ -12661,7 +12662,7 @@ .454 C Cartridge HP .454 Casull Hollow Point ammunition, for hunting game large enough not to be splattered by it. 1024 - 354 + 372 1 535 1 @@ -12682,7 +12683,7 @@ .454 C Cartridge AP A .454 Casull Armor Piercer, if you want to shock the rangemaster at your next silhouette-training. 1024 - 355 + 373 1 536 1 @@ -12774,6 +12775,7 @@ 22 600 2 + -3 1 1 1 @@ -12827,7 +12829,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 - 351 + 369 1 557 2 @@ -12914,7 +12916,7 @@ 10mm Mag Preferred by the FBI, 10mm Auto ammunition in magazines of 8 rounds each. 1024 - 327 + 338 1 567 2 @@ -12935,7 +12937,7 @@ 10mm Mag HP Hollowpoint ammunition in 10mm Auto, for serious self-defense. 1024 - 328 + 339 1 568 2 @@ -12956,7 +12958,7 @@ 10mm Mag AP 10mm Auto armor piercing ammo, for law enforcement and military use. 1024 - 329 + 340 1 569 2 @@ -12977,7 +12979,7 @@ 10mm Mag AET If armor piercing ist not good enough, AET will do. 1024 - 330 + 341 1 570 2 @@ -12985,6 +12987,7 @@ 12 112 5 + -3 1 1 1 @@ -12998,7 +13001,7 @@ 10mm Mag Glaser Glaser ammo in the much underestimated 10mm Auto caliber. 1024 - 331 + 342 1 571 2 @@ -13019,7 +13022,7 @@ 10mm Mag Match This 10mm Auto match ammunition is intended for the serious gun enthusiast. 1024 - 332 + 343 1 572 2 @@ -14984,7 +14987,6 @@ 1 1 1 - 1 12 208 @@ -15725,7 +15727,6 @@ 1 1 1 - 1 18 1000 @@ -16159,7 +16160,6 @@ 1 1 1 - 1 12 208 @@ -22285,6 +22285,7 @@ 12 600 7 + -1 1 1 1 @@ -22298,7 +22299,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 - 381 + 400 1 713 3 @@ -22319,7 +22320,7 @@ 6x35mm AP 30 full metal jacket rounds for 6x35mm personal defense weapons, if hollowpoints won't do it any longer. 1024 - 382 + 401 1 712 3 @@ -22340,7 +22341,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 - 320 + 331 1 739 1 @@ -22362,7 +22363,7 @@ .44 Mag AET Advanced high speed rounds that make body armor a joke. 1024 - 325 + 336 1 738 2 @@ -24918,7 +24919,7 @@ .40 S&W SMG Mag .40 S&W is a popular ammunition among many law enforcement officers. 1024 - 301 + 306 1 601 4 @@ -24939,7 +24940,7 @@ .40 S&W SMG Mag, HP The expansion power of HP adds substance to this powerful pistol ammunition. 1024 - 302 + 307 1 602 4 @@ -24960,7 +24961,7 @@ .40 S&W SMG Mag, AP Punch holes in the competition with these handy AP rounds. 1024 - 303 + 308 1 603 4 @@ -24981,7 +24982,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 - 304 + 309 1 606 4 @@ -25003,7 +25004,7 @@ .40 S&W SMG Mag, Glaser Thirty rounds of frangible fun. All of the man-stopping power, none of the over-penetration. 1024 - 305 + 310 1 604 4 @@ -25024,7 +25025,7 @@ .40 S&W SMG Mag, Match Competitive shooting or life and death struggle, match ammo extends your reach. 1024 - 306 + 311 1 605 4 @@ -29847,7 +29848,7 @@ 1024 239 1 - 728 + 730 374 34 70000 @@ -29947,7 +29948,7 @@ 7.62x54mm ammo crate Not buyable at BR 1024 - 313 + 324 1 730 833 @@ -29967,7 +29968,7 @@ 7.62x54mm T ammo crate Not buyable at BR 1024 - 314 + 325 1 732 833 @@ -29992,7 +29993,7 @@ 730 465 34 - 990000 + 8200 8 1 1 @@ -30027,7 +30028,7 @@ 5,45x18mm AP ammo crate Not buyable at BR 1024 - 349 + 367 1 730 511 @@ -30047,7 +30048,7 @@ 5,45x18mm HP ammo crate Not buyable at BR 1024 - 348 + 366 1 729 511 @@ -30067,7 +30068,7 @@ 9x18mm ammo crate Not buyable at BR 1024 - 293 + 298 1 728 624 @@ -30087,7 +30088,7 @@ 9x18mm HP ammo crate Not buyable at BR 1024 - 294 + 299 1 729 624 @@ -30107,7 +30108,7 @@ 9x21mm ammo crate Not buyable at BR 1024 - 343 + 360 1 730 669 @@ -30127,7 +30128,7 @@ .30car ammo crate Not buyable at BR 1024 - 379 + 398 1 730 760 @@ -30147,7 +30148,7 @@ .30car HP ammo crate Not buyable at BR 1024 - 378 + 397 1 729 760 @@ -30167,7 +30168,7 @@ 6.8x43mm ammo crate Not buyable at BR 1024 - 374 + 393 1 730 760 @@ -30187,7 +30188,7 @@ 6.8x43mm HP ammo crate Not buyable at BR 1024 - 373 + 392 1 729 760 @@ -30207,7 +30208,7 @@ .338 Lapua ammo crate Not buyable at BR 1024 - 316 + 327 1 730 778 @@ -30219,4 +30220,384 @@ 1 1 + + 1274 + 7.62x37mm crate + 7.62x37mm ammo crate + ammo crate + 7.62x37mm ammo crate + Not buyable at BR + 1024 + 363 + 1 + 730 + 724 + 34 + 60000 + 8 + 1 + 1 + 1 + 1 + + + 1275 + .40S&W crate + .40S&W ammo crate + ammo crate + .40S&W ammo crate + Not buyable at BR + 1024 + 312 + 1 + 728 + 651 + 34 + 4000 + 8 + 1 + 1 + 1 + 1 + + + 1276 + .40S&W AP crate + .40S&W AP ammo crate + ammo crate + .40S&W AP ammo crate + Not buyable at BR + 1024 + 314 + 1 + 730 + 651 + 34 + 12000 + 8 + 1 + 1 + 1 + 1 + + + 1277 + .40S&W HP crate + .40S&W HP ammo crate + ammo crate + .40S&W HP ammo crate + Not buyable at BR + 1024 + 313 + 1 + 729 + 651 + 34 + 8000 + 8 + 1 + 1 + 1 + 1 + + + 1278 + .40S&W M crate + .40S&W M ammo crate + ammo crate + .40S&W M ammo crate + Not buyable at BR + 1024 + 317 + 1 + 731 + 651 + 34 + 24000 + 8 + 1 + 1 + 1 + 1 + + + 1279 + .40S&W G crate + .40S&W G ammo crate + ammo crate + .40S&W G ammo crate + Not buyable at BR + 1024 + 316 + 1 + 733 + 651 + 34 + 28000 + 8 + 1 + 1 + 1 + 1 + + + 1280 + .40S&W AET crate + .40S&W AET ammo crate + ammo crate + .40S&W AET ammo crate + Not buyable at BR + 1024 + 315 + 1 + 734 + 651 + 34 + 32000 + 8 + 1 + 1 + 1 + 1 + + + 1281 + 10mm crate + 10mm ammo crate + ammo crate + 10mm ammo crate + Not buyable at BR + 1024 + 350 + 1 + 728 + 760 + 34 + 6800 + 8 + 1 + 1 + 1 + 1 + + + 1282 + 10mm AP crate + 10mm AP ammo crate + ammo crate + 10mm AP ammo crate + Not buyable at BR + 1024 + 352 + 1 + 730 + 760 + 34 + 20400 + 8 + 1 + 1 + 1 + 1 + + + 1283 + 10mm HP crate + 10mm HP ammo crate + ammo crate + 10mm HP ammo crate + Not buyable at BR + 1024 + 351 + 1 + 729 + 760 + 34 + 13600 + 8 + 1 + 1 + 1 + 1 + + + 1284 + 10mm M crate + 10mm M ammo crate + ammo crate + 10mm M ammo crate + Not buyable at BR + 1024 + 355 + 1 + 731 + 760 + 34 + 40800 + 8 + 1 + 1 + 1 + 1 + + + 1285 + 10mm G crate + 10mm G ammo crate + ammo crate + 10mm G ammo crate + Not buyable at BR + 1024 + 354 + 1 + 733 + 760 + 34 + 47600 + 8 + 1 + 1 + 1 + 1 + + + 1286 + 10mm AET crate + 10mm AET ammo crate + ammo crate + 10mm AET ammo crate + Not buyable at BR + 1024 + 353 + 1 + 734 + 760 + 34 + 54400 + 8 + 1 + 1 + 1 + 1 + + + 1287 + 7.62x25 AP crate + 7.62x25mm AP ammo crate + ammo crate + 7.62x25mm AP ammo crate + Not buyable at BR + 1024 + 285 + 1 + 730 + 624 + 34 + 5000 + 8 + 1 + 1 + 1 + 1 + + + 1288 + 7.62x25 HP crate + 7.62x25mm HP ammo crate + ammo crate + 7.62x25mm HP ammo crate + Not buyable at BR + 1024 + 284 + 1 + 729 + 624 + 34 + 10000 + 8 + 1 + 1 + 1 + 1 + + + 1289 + 7.62x25 AET crate + 7.62x25mm AET ammo crate + ammo crate + 7.62x25mm AET ammo crate + Not buyable at BR + 1024 + 286 + 1 + 734 + 624 + 34 + 40000 + 8 + 1 + 1 + 1 + 1 + + + 1290 + 7.62x25 AP C crate + 7.62x25mm AP C ammo crate + ammo crate + 7.62x25mm AP C ammo crate + Not buyable at BR + 1024 + 288 + 1 + 730 + 624 + 34 + 4555 + 8 + 1 + 1 + 1 + 1 + + + 1291 + 7.62x25 HP C crate + 7.62x25mm HP C ammo crate + ammo crate + 7.62x25mm HP C ammo crate + Not buyable at BR + 1024 + 287 + 1 + 729 + 624 + 34 + 9000 + 8 + 1 + 1 + 1 + 1 + + + 1292 + 12.7 Subs. crate + 12.7x97mm Subs. ammo crate + ammo crate + 12.7x97mm Subs. ammo crate + Not buyable at BR + 1024 + 389 + 1 + 730 + 465 + 34 + 14400 + 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 2c972f387..72260f249 100644 --- a/gamedir/Data-1.13/TableData/Magazines.xml +++ b/gamedir/Data-1.13/TableData/Magazines.xml @@ -1706,594 +1706,708 @@ 284 + 20 + 5000 + 1 + + + 285 + 20 + 5000 + 2 + + + 286 + 20 + 5000 + 13 + + + 287 + 20 + 5000 + 20 + + + 288 + 20 + 5000 + 21 + + + 289 21 5 3 - - 285 - 22 - 8 - 0 - - - 286 - 22 - 8 - 1 - - - 287 - 22 - 12 - 0 - - - 288 - 22 - 12 - 1 - - - 289 - 22 - 20 - 0 - 290 22 - 20 - 1 + 8 + 0 291 22 - 30 - 0 + 8 + 1 292 22 - 30 - 1 + 12 + 0 293 22 - 5000 - 0 + 12 + 1 294 22 - 5000 - 1 - - - 295 - 23 - 14 + 20 0 - 296 - 23 - 14 + 295 + 22 + 20 1 + + 296 + 22 + 30 + 0 + 297 - 23 - 14 - 2 + 22 + 30 + 1 298 - 23 - 14 - 13 + 22 + 5000 + 0 299 - 23 - 14 - 14 + 22 + 5000 + 1 300 23 14 - 17 + 0 301 23 - 30 - 0 + 14 + 1 302 23 - 30 - 1 + 14 + 2 303 23 - 30 - 2 + 14 + 13 304 23 - 30 - 13 + 14 + 14 305 23 - 30 - 14 + 14 + 17 306 23 30 - 17 + 0 307 - 24 - 5 - 2 + 23 + 30 + 1 308 + 23 + 30 + 2 + + + 309 + 23 + 30 + 13 + + + 310 + 23 + 30 + 14 + + + 311 + 23 + 30 + 17 + + + 312 + 23 + 4000 + 0 + + + 313 + 23 + 4000 + 1 + + + 314 + 23 + 4000 + 2 + + + 315 + 23 + 4000 + 13 + + + 316 + 23 + 4000 + 14 + + + 317 + 23 + 4000 + 17 + + + 318 + 24 + 5 + 2 + + + 319 24 5 16 - 309 + 320 24 10 2 - 310 + 321 24 10 16 - 311 + 322 24 200 2 - 312 + 323 24 200 16 - 313 + 324 24 3000 2 - 314 + 325 24 3000 16 - 315 + 326 25 10 3 - 316 + 327 25 1500 3 - - 317 - 26 - 6 - 0 - - - 318 - 26 - 6 - 1 - - - 319 - 26 - 6 - 2 - - - 320 - 26 - 6 - 13 - - - 321 - 26 - 6 - 14 - - - 322 - 26 - 8 - 0 - - - 323 - 26 - 8 - 1 - - - 324 - 26 - 8 - 2 - - - 325 - 26 - 8 - 13 - - - 326 - 26 - 8 - 14 - - - 327 - 27 - 8 - 0 - 328 - 27 - 8 - 1 + 26 + 6 + 0 329 - 27 - 8 - 2 + 26 + 6 + 1 330 - 27 - 8 - 13 + 26 + 6 + 2 331 - 27 - 8 - 14 + 26 + 6 + 13 332 - 27 - 8 - 17 + 26 + 6 + 14 333 - 27 - 30 + 26 + 8 0 334 - 27 - 30 + 26 + 8 1 335 - 27 - 30 + 26 + 8 2 336 - 27 - 30 + 26 + 8 13 337 - 27 - 30 + 26 + 8 14 338 27 + 8 + 0 + + + 339 + 27 + 8 + 1 + + + 340 + 27 + 8 + 2 + + + 341 + 27 + 8 + 13 + + + 342 + 27 + 8 + 14 + + + 343 + 27 + 8 + 17 + + + 344 + 27 + 30 + 0 + + + 345 + 27 + 30 + 1 + + + 346 + 27 + 30 + 2 + + + 347 + 27 + 30 + 13 + + + 348 + 27 + 30 + 14 + + + 349 + 27 30 17 - 339 + 350 + 27 + 4000 + 0 + + + 351 + 27 + 4000 + 1 + + + 352 + 27 + 4000 + 2 + + + 353 + 27 + 4000 + 13 + + + 354 + 27 + 4000 + 14 + + + 355 + 27 + 4000 + 17 + + + 356 28 5 4 - 340 + 357 28 5 5 - 341 + 358 29 18 3 - 342 + 359 29 30 3 - 343 + 360 29 5000 3 - 344 + 361 30 10 3 - 345 + 362 30 10 26 - 346 + 363 + 30 + 3000 + 3 + + + 364 33 8 1 - 347 + 365 33 8 2 - 348 + 366 33 5000 1 - 349 + 367 33 5000 2 - 350 + 368 34 72 3 - - 351 - 35 - 7 - 1 - - - 352 - 35 - 7 - 2 - - - 353 - 36 - 1 - 0 - - - 354 - 36 - 1 - 1 - - - 355 - 36 - 1 - 2 - - - 356 - 36 - 5 - 0 - - - 357 - 36 - 5 - 1 - - - 358 - 36 - 5 - 2 - - - 359 - 37 - 7 - 0 - - - 360 - 37 - 7 - 1 - - - 361 - 37 - 7 - 2 - - - 362 - 38 - 4 - 1 - - - 363 - 38 - 4 - 2 - - - 364 - 38 - 7 - 1 - - - 365 - 38 - 7 - 2 - - - 366 - 39 - 5 - 1 - - - 367 - 39 - 5 - 2 - - - 368 - 40 - 5 - 1 - 369 - 40 - 5 - 2 + 35 + 7 + 1 370 + 35 + 7 + 2 + + + 371 + 36 + 1 + 0 + + + 372 + 36 + 1 + 1 + + + 373 + 36 + 1 + 2 + + + 374 + 36 + 5 + 0 + + + 375 + 36 + 5 + 1 + + + 376 + 36 + 5 + 2 + + + 377 + 37 + 7 + 0 + + + 378 + 37 + 7 + 1 + + + 379 + 37 + 7 + 2 + + + 380 + 38 + 4 + 1 + + + 381 + 38 + 4 + 2 + + + 382 + 38 + 7 + 1 + + + 383 + 38 + 7 + 2 + + + 384 + 39 + 5 + 1 + + + 385 + 39 + 5 + 2 + + + 386 + 40 + 5 + 1 + + + 387 + 40 + 5 + 2 + + + 388 41 5 3 - 371 + 389 + 41 + 300 + 3 + + + 390 42 25 1 - 372 + 391 42 25 2 - 373 + 392 42 4000 1 - 374 + 393 42 4000 2 - 375 + 394 43 24 3 - 376 + 395 45 30 1 - 377 + 396 45 30 2 - 378 + 397 45 5000 1 - 379 + 398 45 5000 2 - 380 + 399 46 8 2 - 381 + 400 47 30 1 - 382 + 401 47 30 2 diff --git a/gamedir/Data-1.13/TableData/NPCInventory/GabbyInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/GabbyInventory.xml index 0a9d09582..d7609c8a6 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/GabbyInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/GabbyInventory.xml @@ -22,31 +22,16 @@ 4 - 230 - 0 - - - 5 - 231 - 0 - - - 6 - 232 - 0 - - - 7 260 0 - 8 + 5 261 0 - 9 + 6 262 0 diff --git a/gamedir/Data-1.13/TableData/NPCInventory/MickeyInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/MickeyInventory.xml index 1fd4528e9..e6c34c785 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/MickeyInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/MickeyInventory.xml @@ -17,21 +17,6 @@ 3 - 260 - 0 - - - 4 - 261 - 0 - - - 5 - 262 - 0 - - - 6 217 0 diff --git a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml index 250b2bd1c..180eb3796 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml @@ -4075,4 +4075,99 @@ 1273 0 + + 815 + 1274 + 0 + + + 816 + 1275 + 0 + + + 817 + 1277 + 0 + + + 818 + 1276 + 0 + + + 819 + 1278 + 0 + + + 820 + 1279 + 0 + + + 821 + 1280 + 0 + + + 822 + 1281 + 0 + + + 823 + 1282 + 0 + + + 824 + 1283 + 0 + + + 825 + 1284 + 0 + + + 826 + 1285 + 0 + + + 827 + 1286 + 0 + + + 828 + 1287 + 0 + + + 829 + 1288 + 0 + + + 830 + 1289 + 0 + + + 831 + 1290 + 0 + + + 832 + 1291 + 0 + + + 833 + 1292 + 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 0a0d8fbe4..f7f9ff562 100644 --- a/gamedir/Data-1.13/TableData/Russian.Items.xml +++ b/gamedir/Data-1.13/TableData/Russian.Items.xml @@ -10194,4 +10194,156 @@ .338 Lapua ammo crate Not buyable at BR + + 1274 + 7.62x37mm crate + 7.62x37mm ammo crate + ammo crate + 7.62x37mm ammo crate + Not buyable at BR + + + 1275 + .40S&W crate + .40S&W ammo crate + ammo crate + .40S&W ammo crate + Not buyable at BR + + + 1276 + .40S&W AP crate + .40S&W AP ammo crate + ammo crate + .40S&W AP ammo crate + Not buyable at BR + + + 1277 + .40S&W HP crate + .40S&W HP ammo crate + ammo crate + .40S&W HP ammo crate + Not buyable at BR + + + 1278 + .40S&W M crate + .40S&W M ammo crate + ammo crate + .40S&W M ammo crate + Not buyable at BR + + + 1279 + .40S&W G crate + .40S&W G ammo crate + ammo crate + .40S&W G ammo crate + Not buyable at BR + + + 1280 + .40S&W AET crate + .40S&W AET ammo crate + ammo crate + .40S&W AET ammo crate + Not buyable at BR + + + 1281 + 10mm crate + 10mm ammo crate + ammo crate + 10mm ammo crate + Not buyable at BR + + + 1282 + 10mm AP crate + 10mm AP ammo crate + ammo crate + 10mm AP ammo crate + Not buyable at BR + + + 1283 + 10mm HP crate + 10mm HP ammo crate + ammo crate + 10mm HP ammo crate + Not buyable at BR + + + 1284 + 10mm M crate + 10mm M ammo crate + ammo crate + 10mm M ammo crate + Not buyable at BR + + + 1285 + 10mm G crate + 10mm G ammo crate + ammo crate + 10mm G ammo crate + Not buyable at BR + + + 1286 + 10mm AET crate + 10mm AET ammo crate + ammo crate + 10mm AET ammo crate + Not buyable at BR + + + 1287 + 7.62x25 AP crate + 7.62x25mm AP ammo crate + ammo crate + 7.62x25mm AP ammo crate + Not buyable at BR + + + 1288 + 7.62x25 HP crate + 7.62x25mm HP ammo crate + ammo crate + 7.62x25mm HP ammo crate + Not buyable at BR + + + 1289 + 7.62x25 AET crate + 7.62x25mm AET ammo crate + ammo crate + 7.62x25mm AET ammo crate + Not buyable at BR + + + 1290 + 7.62x25 AP C crate + 7.62x25mm AP C ammo crate + ammo crate + 7.62x25mm AP C ammo crate + Not buyable at BR + + + 1291 + 7.62x25 HP C crate + 7.62x25mm HP C ammo crate + ammo crate + 7.62x25mm HP C ammo crate + Not buyable at BR + + + 1292 + 12.7 Subs. crate + 12.7x97mm Subs. ammo crate + ammo crate + 12.7x97mm Subs. ammo crate + Not buyable at BR + \ No newline at end of file