From f852dfe57280be91eb5ee3804d8abf9d4d05dcb8 Mon Sep 17 00:00:00 2001 From: Starwalker Date: Sun, 14 Jan 2007 14:19:32 +0000 Subject: [PATCH] added KP M/31 Suomi, VSSK Vychlop, and SPAS-12 changed WA 2000 to .300 WinMag ammo changed Name of Baikal MP-233 to Baikal MP-233B added .300 WinMag, 7.92x57mm Mauser, and 12.7mm Subsonic ammo (but there's no rifle for the Mauser ammo yet...) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@628 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/TableData/AmmoStrings.xml | 16 +- gamedir/Data-1.13/TableData/Attachments.xml | 65 ++++ gamedir/Data-1.13/TableData/Items.xml | 336 ++++++++++---------- gamedir/Data-1.13/TableData/Magazines.xml | 78 +++++ gamedir/Data-1.13/TableData/Weapons.xml | 114 ++++++- 5 files changed, 436 insertions(+), 173 deletions(-) diff --git a/gamedir/Data-1.13/TableData/AmmoStrings.xml b/gamedir/Data-1.13/TableData/AmmoStrings.xml index 7d1f0ce72..e0a832c53 100644 --- a/gamedir/Data-1.13/TableData/AmmoStrings.xml +++ b/gamedir/Data-1.13/TableData/AmmoStrings.xml @@ -149,11 +149,23 @@ .454 Casull - .45 WM - .45 WM + .45 WinMag + .45 WinMag .50 Beowulf .50 Beowulf + + .300 WinMag + .300 WinMag + + + 7.92x57mm + 7.92x57mm + + + 12.7mm Subsonic + 12.7mm Sub. + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml index 2a93e8e42..e5d5668ae 100644 --- a/gamedir/Data-1.13/TableData/Attachments.xml +++ b/gamedir/Data-1.13/TableData/Attachments.xml @@ -1350,6 +1350,11 @@ 769 5 + + 208 + 774 + 5 + 209 18 @@ -3765,6 +3770,21 @@ 772 5 + + 241 + 773 + 5 + + + 241 + 774 + 5 + + + 241 + 775 + 5 + 242 856 @@ -5160,6 +5180,11 @@ 763 5 + + 307 + 773 + 5 + 309 308 @@ -9905,6 +9930,21 @@ 772 5 + + 1005 + 773 + 5 + + + 1005 + 774 + 5 + + + 1005 + 775 + 5 + 1006 1 @@ -10795,6 +10835,16 @@ 772 5 + + 1006 + 773 + 5 + + + 1006 + 775 + 5 + 1007 12 @@ -11355,6 +11405,11 @@ 769 5 + + 1007 + 774 + 5 + 1008 17 @@ -13775,4 +13830,14 @@ 772 5 + + 1029 + 773 + 5 + + + 1029 + 775 + 5 + \ 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 1a8b935d7..bcafd4fa9 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -57952,32 +57952,32 @@ 475 - Nada - Nothing - Index 921 - Nothing - Nothing - 1 - 0 + .300 WM Mag HP + .300 WM Mag HP + A box-type magazine holding 5 .300 Winchester Magnum rounds with hollowpoint bullets. + .300 WM Mag HP + The .300 Winchester Magnum can be considered a standard hunting round, especially with expanding hollowpoint bullets. + 1024 + 455 0 0 - 0 - 0 - 0 - 0 - 0 - 0 + 1 + 540 + 1 + 6 + 30 + 3 0 0 0 0 0 - 0 - 0 + 1 + 1 0 0 0 - 1 + 0 0 0 0 @@ -57987,7 +57987,7 @@ 0 0 0 - 0 + 6 0 0 0 @@ -58074,32 +58074,32 @@ 476 - Nada - Nothing - Index 921 - Nothing - Nothing - 1 - 0 + .300 WM Mag AP + .300 WM Mag AP + A box-type magazine holding 5 .300 Winchester Magnum rounds with armor-piercing bullets. + .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 + 456 0 0 - 0 - 0 - 0 - 0 - 0 - 0 + 1 + 541 + 1 + 6 + 40 + 3 0 0 0 0 0 - 0 - 0 + 1 + 1 0 0 0 - 1 + 0 0 0 0 @@ -58109,7 +58109,7 @@ 0 0 0 - 0 + 6 0 0 0 @@ -58196,32 +58196,32 @@ 477 - Nada - Nothing - Index 921 - Nothing - Nothing - 1 - 0 + 7.92x57mm 5 HP + 7.92x57mm Mauser 5 HP + Back in WW-II, this was the German Army's rifle ammunition. Today it is still considered on par with the .308 Winchester. + 7.92x57mm 5 HP + Own a vintage Mauser Gewehr 98 or Karabiner 98k? We have the ammo for your old pal! + 1024 + 459 0 0 - 0 - 0 - 0 - 0 - 0 - 0 + 1 + 542 + 1 + 6 + 25 + 3 0 0 0 0 0 - 0 - 0 + 1 + 1 0 0 0 - 1 + 0 0 0 0 @@ -58231,7 +58231,7 @@ 0 0 0 - 0 + 9 0 0 0 @@ -58318,32 +58318,32 @@ 478 - Nada - Nothing - Index 921 - Nothing - Nothing - 1 - 0 + 7.92x57mm 5 AP + 7.92x57mm Mauser 5 AP + The German Army's AP rifle ammunition in WW-II. + 7.92x57mm 5 AP + Our AP ammo for your old Mauser Gewehr 98 or Kar 98k. + 1024 + 460 0 0 - 0 - 0 - 0 - 0 - 0 - 0 + 1 + 543 + 1 + 6 + 36 + 3 0 0 0 0 0 - 0 - 0 + 1 + 1 0 0 0 - 1 + 0 0 0 0 @@ -58353,7 +58353,7 @@ 0 0 0 - 0 + 9 0 0 0 @@ -58440,32 +58440,32 @@ 479 - Nada - Nothing - Index 921 - Nothing - Nothing - 1 - 0 + 12.7mm Subsonic + 12.7mm Subsonic + A five-round magazine of 12.7mm subsonic ammunition. This is the version with the highpower penetrator. + 12.7mm Subsonic + Want to fire a .50 cal round without making noise? These babies are cutdown 12.7mm rounds to fit the Russian VSSK. + 1024 + 463 0 0 - 0 - 0 - 0 - 0 - 0 - 0 + 1 + 544 + 1 + 4 + 240 + 10 0 0 0 0 0 - 0 - 0 + 1 + 1 0 0 0 - 1 + 0 0 0 0 @@ -58475,10 +58475,10 @@ 0 0 0 - 0 + 4 0 0 - 0 + 80 0 0 0 @@ -91990,10 +91990,10 @@ 754 - MP-233 - Baikal MP-233 + MP-233B + Baikal MP-233B Russian made over-and-under double barreled shotgun. - Baikal MP-233 + Baikal MP-233B One of the many finely produced sporting shotguns on the market from Baikal. 2 754 @@ -94308,44 +94308,44 @@ 773 - Nada - Nothing - Index 773 - Nothing - Nothing - 1 - 0 - 0 + KP M/31 + KP M/31 Suomi + Designed by Aimo Lahti, this accurate if heavy SMG is a well-made, elementary blowback weapon. In appearance it is very similar to the German Bergmann MP34 and the Soviet PPD 1934G/38G and PPSh41 which it inspired. + KP M/31 Suomi + The Suomi was used with great sucess during the war of 1940 against the Soviet Union, where this SMG showed the importance of SMGs to modern warfare. Manufacture of the Suomi ceased in 1944, but Finland used it well into the 1990s, when finally it was replaced by assault rifles. + 2 + 773 + 3 0 0 - 0 - 0 + 279 + 49 0 - 0 - 0 + 965 + 3 0 0 - 0 - 0 - 0 - 0 - 0 - 0 + 1 + 1 + 1 + 1 + 1 + 1 0 - 0 - 1 + 1 + 0 0 0 - 0 + 1 0 0 0 0 0 0 - 0 - 0 - 0 + 2 + 1 + 900 0 0 0 @@ -94430,47 +94430,47 @@ 774 - Nada - Nothing - Index 774 - Nothing - Nothing - 1 - 0 - 0 + VSSK + VSSK Vychlop + A very special sniper rifle that comes with integral silencer, integral bipod, and fires subsonic AP ammunition. + VSSK Vychlop + Quite new on the market, the Russian Vychlop (which means 'Exhaust') coughs up something more substantial (and more deadly) than carbon monoxide. Comes with integral bipod plus Battle Scope. + 2 + 774 + 3 0 0 - 0 - 0 + 285 + 70 0 - 0 - 0 + 9583 + 10 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + -2 + 1 + 1 + 1 + 1 + 1 + 1 0 - 0 - 1 + 1 + 0 0 0 - 0 + 1 0 0 0 0 0 0 - 0 + 1 0 - 0 - 0 - 0 - 0 + 24 + 80 + 1 + 10 0 0 0 @@ -94501,7 +94501,7 @@ 0 0 0 - 0 + 1007 0 0 0 @@ -94552,32 +94552,32 @@ 775 - Nada - Nothing - Index 775 - Nothing - Nothing - 1 - 0 - 0 + SPAS-12 + SPAS-12 + Designed as a police weapon from the ground up, it was introduced in 1979. + SPAS-12 + A semi-automatic shotgun designed for police use and Hollywood action movies. For lighter loads and special ammunition switch to pump-action. + 2 + 775 + 3 0 0 - 0 - 0 + 286 + 44 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 1547 + 4 + 1 + -1 + 1 + 1 + 1 + 1 + 1 + 1 0 - 0 - 1 + 1 + 0 0 0 0 @@ -94587,14 +94587,14 @@ 0 0 0 - 0 - 0 - 0 + 3 + 1 + 24 0 0 0 0 - 0 + -1 0 0 0 @@ -94607,7 +94607,7 @@ 0 0 0 - 0 + 30 0 0 0 diff --git a/gamedir/Data-1.13/TableData/Magazines.xml b/gamedir/Data-1.13/TableData/Magazines.xml index 7b2a90efd..d54b51cbd 100644 --- a/gamedir/Data-1.13/TableData/Magazines.xml +++ b/gamedir/Data-1.13/TableData/Magazines.xml @@ -2706,4 +2706,82 @@ 7 2 + + 451 + 38 + 0 + 0 + + + 452 + 38 + 0 + 0 + + + 453 + 38 + 0 + 0 + + + 454 + 38 + 0 + 0 + + + 455 + 39 + 5 + 1 + + + 456 + 39 + 5 + 2 + + + 457 + 39 + 0 + 0 + + + 458 + 39 + 0 + 0 + + + 459 + 40 + 5 + 1 + + + 460 + 40 + 5 + 2 + + + 461 + 40 + 0 + 0 + + + 462 + 40 + 0 + 0 + + + 463 + 41 + 5 + 3 + \ 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 550072306..9bb3af0cb 100644 --- a/gamedir/Data-1.13/TableData/Weapons.xml +++ b/gamedir/Data-1.13/TableData/Weapons.xml @@ -1050,7 +1050,7 @@ 3 6 9 - 5 + 4 11 0 9 @@ -8969,7 +8969,7 @@ Walther WA 2000 3 5 - 9 + 39 4 12 0 @@ -9254,7 +9254,7 @@ 754 - Baikal MP-233 + Baikal MP-233B 5 8 5 @@ -9928,6 +9928,114 @@ 0 480 + + 773 + KP M/31 + 2 + 3 + 2 + 4 + 13 + 0 + 8 + 22 + 25 + 20 + 5 + 30 + 210 + 200 + 33 + 60 + 3 + 360 + 50 + 111 + 101 + 107 + 157 + 5 + 4 + 6 + 1 + 7 + 8 + 0 + 0 + 476 + + + 774 + VSSK Vychlop + 3 + 5 + 41 + 3 + 9 + 0 + 0 + 22 + 50 + 55 + 6 + 5 + 500 + 200 + 100 + 80 + 7 + 134 + 0 + 71 + 102 + 108 + 309 + 5 + 0 + 8 + 1 + 7 + 0 + 0 + 0 + 476 + + + 775 + SPAS-12 + 5 + 8 + 5 + 3 + 11 + 0 + 0 + 22 + 40 + 28 + -1 + 7 + 160 + 200 + 100 + 85 + 8 + 391 + 3 + 111 + 103 + 109 + 157 + 5 + 0 + 18 + 0 + 7 + 0 + 0 + 0 + 481 + 901 Commando Mortar