From 1e6e89df088a5f77f824d3669fdd5852e2effc93 Mon Sep 17 00:00:00 2001 From: Starwalker Date: Thu, 22 Mar 2007 09:04:49 +0000 Subject: [PATCH] added SCAR-L and -H sniper variants. changed SCAR-L to SCAR-L CQC added replacement barrels for SCAR rifles (CQC and SV versions only) added Grenade Panel raised accuracy of the following guns: SKS, SVD, SVDS, Zastava, and Skorpion corrected description of CAWS git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@745 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/TableData/AmmoStrings.xml | 4 +- gamedir/Data-1.13/TableData/Attachments.xml | 250 +++++++++++++++- gamedir/Data-1.13/TableData/German.Items.xml | 62 +++- gamedir/Data-1.13/TableData/Items.xml | 270 ++++++++++++++---- gamedir/Data-1.13/TableData/Merges.xml | 32 +++ gamedir/Data-1.13/TableData/Russian.Items.xml | 12 + gamedir/Data-1.13/TableData/Weapons.xml | 139 ++++++++- 7 files changed, 680 insertions(+), 89 deletions(-) diff --git a/gamedir/Data-1.13/TableData/AmmoStrings.xml b/gamedir/Data-1.13/TableData/AmmoStrings.xml index f912b6fcc..3ba0c2daa 100644 --- a/gamedir/Data-1.13/TableData/AmmoStrings.xml +++ b/gamedir/Data-1.13/TableData/AmmoStrings.xml @@ -206,7 +206,7 @@ 41 - 12.7mm Subsonic - 12.7mm Sub. + 12.7x97mm Subsonic + 12.7x97mm diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml index eb73368dd..dfab33168 100644 --- a/gamedir/Data-1.13/TableData/Attachments.xml +++ b/gamedir/Data-1.13/TableData/Attachments.xml @@ -334,26 +334,51 @@ 128 3 + + 131 + 160 + 2 + 132 128 3 + + 132 + 160 + 2 + 133 128 3 + + 133 + 160 + 2 + 134 128 3 + + 134 + 160 + 2 + 135 128 3 + + 135 + 160 + 2 + 140 128 @@ -504,6 +529,11 @@ 128 3 + + 151 + 160 + 2 + 183 161 @@ -1704,6 +1734,16 @@ 650 5 + + 209 + 651 + 5 + + + 209 + 652 + 5 + 209 654 @@ -1974,6 +2014,16 @@ 782 5 + + 209 + 787 + 5 + + + 209 + 788 + 5 + 209 128 @@ -4014,6 +4064,21 @@ 785 5 + + 241 + 786 + 5 + + + 241 + 787 + 5 + + + 241 + 788 + 5 + 241 128 @@ -5479,6 +5544,16 @@ 782 5 + + 307 + 787 + 5 + + + 307 + 788 + 5 + 309 308 @@ -7629,6 +7704,26 @@ 667 5 + + 921 + 651 + 5 + + + 921 + 652 + 5 + + + 921 + 787 + 5 + + + 921 + 788 + 5 + 948 21 @@ -7814,6 +7909,16 @@ 782 5 + + 949 + 787 + 5 + + + 949 + 788 + 5 + 950 12 @@ -7974,6 +8079,16 @@ 782 5 + + 950 + 787 + 5 + + + 950 + 788 + 5 + 951 128 @@ -8034,6 +8149,11 @@ 128 3 + + 994 + 160 + 2 + 998 14 @@ -9504,6 +9624,21 @@ 785 5 + + 1003 + 786 + 5 + + + 1003 + 787 + 5 + + + 1003 + 788 + 5 + 1003 128 @@ -9889,6 +10024,16 @@ 784 5 + + 1004 + 787 + 5 + + + 1004 + 788 + 5 + 1004 128 @@ -11159,6 +11304,21 @@ 785 5 + + 1005 + 786 + 5 + + + 1005 + 787 + 5 + + + 1005 + 788 + 5 + 1005 128 @@ -12094,6 +12254,21 @@ 785 5 + + 1006 + 786 + 5 + + + 1006 + 787 + 5 + + + 1006 + 788 + 5 + 1006 128 @@ -12629,6 +12804,16 @@ 784 5 + + 1007 + 787 + 5 + + + 1007 + 788 + 5 + 1007 128 @@ -12724,11 +12909,6 @@ 694 5 - - 1008 - 696 - 5 - 1008 700 @@ -13094,6 +13274,16 @@ 649 5 + + 1011 + 651 + 5 + + + 1011 + 652 + 5 + 1011 653 @@ -13304,6 +13494,16 @@ 782 5 + + 1011 + 787 + 5 + + + 1011 + 788 + 5 + 1011 128 @@ -13614,6 +13814,16 @@ 782 5 + + 1012 + 787 + 5 + + + 1012 + 788 + 5 + 1012 128 @@ -14209,6 +14419,16 @@ 785 5 + + 1026 + 787 + 5 + + + 1026 + 788 + 5 + 1026 128 @@ -15114,6 +15334,16 @@ 784 5 + + 1029 + 787 + 5 + + + 1029 + 788 + 5 + 1029 128 @@ -15499,6 +15729,16 @@ 784 5 + + 1030 + 787 + 5 + + + 1030 + 788 + 5 + 1030 128 diff --git a/gamedir/Data-1.13/TableData/German.Items.xml b/gamedir/Data-1.13/TableData/German.Items.xml index 07b14d8f0..c117e5d2d 100644 --- a/gamedir/Data-1.13/TableData/German.Items.xml +++ b/gamedir/Data-1.13/TableData/German.Items.xml @@ -6271,27 +6271,27 @@ 786 - Nada - Nothing - Index 786 - Nothing - Nothing + Elite 10mm + Colt Delta Elite + Beschreibung erwünscht + Colt Delta Elite + Beschreibung erwünscht 787 - Nada - Nothing - Index 787 - Nothing - Nothing + SCAR-H SV + FN SCAR-H SV + Beschreibung erwünscht + FN SCAR-H SV + Kein Verkauf durch BR 788 - Nada - Nothing - Index 788 - Nothing - Nothing + SCAR-L SV + FN SCAR-L SV + Beschreibung erwünscht + FN SCAR-L SV + Kein Verkauf durch BR 789 @@ -8225,4 +8225,36 @@ ACOG Das TRIJICON 'Advanced Combat Optical Gunsight' bietet 4-fache Vergrößerung sowie verschiedene Justiermöglichkeiten. Seit August 2004 wird es als neue Zieloptik vom U.S. Marine Corps verwendet. + + 1031 + CQC .223 Lauf + SCAR-L CQC Lauf + Beschreibung erwünscht + SCAR-L CQC Lauf + Kein Verkauf durch BR + + + 1032 + SV .223 Lauf + SCAR-L SV Lauf + Beschreibung erwünscht + SCAR-L SV Lauf + Beschreibung erwünscht + + + 1033 + CQC .308 Lauf + SCAR-H CQC Lauf + Beschreibung erwünscht + SCAR-H CQC Lauf + Kein Verkauf durch BR + + + 1034 + SV .308 Lauf + SCAR-H SV Lauf + Beschreibung erwünscht + SCAR-H SV Lauf + Beschreibung erwünscht + diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index adf948656..ca7a47cd9 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -1001,7 +1001,7 @@ HK CAWS This German/US experimental Close Assault Weapon System makes the concept of human skeet shooting a gory reality. HK CAWS - Olin/Heckler and Koch's Close Assault Weapon System is the ideal light support weapon for any aspiring mercenary. Designed for the 12-guage shotgun shell, it also fires miniature grenades. + Olin/Heckler and Koch's Close Assault Weapon System is the ideal light support weapon for any aspiring mercenary. Designed for the 10-gauge shotgun shell, it also fires miniature grenades. 2 33 3 @@ -3612,13 +3612,24 @@ 160 - Nada - Nothing - Index 160 - Nothing - Nothing - 1 - 1 + Grenade Panel + Grenade Panel + Four pouches, each for a single grenade, mounted onto a modular panel that can be attached to your load bearing equipment. + Grenade Panel + No more grenades dangling from D-rings and ripping off while crawling through the underbrush. Our grenade carrier panel has four individual pouches to carry your grenades safely. + 268435456 + 1 + 573 + 4 + 1 + 180 + 4 + 3 + 1 + 1 + 1 + 3 + 1 161 @@ -10099,9 +10110,9 @@ 479 12.7mm Subsonic - 12.7mm Subsonic + 12.7x97mm Subsonic A five-round magazine of 12.7mm subsonic ammunition. This is the version with the highpower penetrator. - 12.7mm Subsonic + 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 296 @@ -13136,7 +13147,7 @@ 619 M82B1K-PDW Barrett M82B1K-PDW - Originally clocked as an internet spoof, somebody somewhere with a lot of gunsmithing experience took a hacksaw and a saudering iron to the M82A2. + Originally clocked as an internet spoof, somebody somewhere with a lot of gunsmithing experience took a hacksaw and a soldering iron to the M82A2. Barrett M82B1K-PDW Nobody will mess with you if you're carrying a bullpup .50 BMG. And we do mean nobody. 2 @@ -14035,18 +14046,19 @@ 651 - SCAR-H - FN SCAR-H - The SCAR is FN's newest offering into the military armament scene. The "H" stands for "Heavy", and refers to this version firing the 7.62mm NATO round. - FN SCAR-H + SCAR-H CQC + FN SCAR-H CQC + The SCAR is FN's newest offering into the military armament scene. The "H" stands for "Heavy", and refers to this version firing the 7.62mm NATO round. CQC denotes the shortest version for fighting in dense terrain. + FN SCAR-H CQC US SOCOM issued a solicitation for the procurement of SOF Combat Assault Rifles (SCAR) on October 15th, 2003, and this is what FN came up with. Widely customizable and extremely durable; if ever a gun had promise, the SCAR does. 2 651 3 246 - 39 + 31 4430 9 + 2 -3 1 1 @@ -14059,26 +14071,24 @@ 1 1 600 - 10 -1 - 5 - 5 30 652 - SCAR-L - FN SCAR-L - FN's latest addition to the SCAR family is the "L" or Light version, chambered in 5.56mm NATO. - FN SCAR-L - The FN SCAR was designed to be more customizable than any other weapon, period. Experts agree: it's nearly perfect. This version is chambered for the lighter 5.56mm NATO round. + SCAR-L CQC + FN SCAR-L CQC + FN's latest addition to the SCAR family is the "L" or Light version, chambered in 5.56mm NATO. The CQC version is for MOUT or dense terrain. + FN SCAR-L CQC + The FN SCAR was designed to be more customizable than any other weapon, period. Experts agree: it's nearly perfect. This version is chambered for the lighter 5.56mm NATO round. 2 652 3 243 - 35 + 31 4230 9 + 2 -3 1 1 @@ -14091,10 +14101,7 @@ 1 1 600 - 10 -1 - 5 - 5 30 @@ -17873,33 +17880,85 @@ 786 - Nada - Nothing - Index 786 - Nothing - Nothing - 1 - 1 + Elite 10mm + Colt Delta Elite + A Colt semiautomatic chambered for the 10mm Auto cartridge. + Colt Delta Elite + Colt's entry into the 10mm pistol market. All you expect from a Colt pistol, and more. + 2 + 786 + 3 + 295 + 11 + 0 + 850 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 1 + 36 787 - Nada - Nothing - Index 787 - Nothing - Nothing - 1 - 1 + SCAR-H SV + FN SCAR-H SV + The SCAR is FN's newest offering into the military armament scene. The "H" stands for "Heavy", and refers to this version firing the 7.62mm NATO round. This is the sniper variant. + FN SCAR-H SV + Not for sale through BR. + 2 + 787 + 3 + 299 + 35 + 4430 + 9 + 2 + -3 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 600 + -1 + 30 788 - Nada - Nothing - Index 788 - Nothing - Nothing - 1 - 1 + SCAR-L SV + FN SCAR-L SV + FN's latest addition to the SCAR family is the "L" or Light version, chambered in 5.56mm NATO. This is the sniper variant. + FN SCAR-L SV + Not for sale through BR. + 2 + 788 + 3 + 300 + 34 + 4230 + 9 + 2 + -3 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 600 + -1 + 30 789 @@ -20717,13 +20776,30 @@ 921 - Nada - Nothing - Index 921 - Nothing - Nothing - 1 - 1 + FN EGLM + FN EGLM Grenade Launcher + FN Herstal's underbarrel grenade launcher for the SCAR. Obviously developed from the launcher for the F2000. + FN EGLM Grenade Launcher + FN Herstal developed their launcher for the F2000 some more to fit it on the SCAR. Will fire grenades of any length and can use future medium velocity grenades. + 16 + 921 + 20 + 292 + 14 + 1 + 800 + 9 + 0 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 1 + 12 + 1 922 @@ -22844,4 +22920,86 @@ 20 20 + + 1031 + CQC .223 Barrel + SCAR-L CQC Barrel + A short barrel to change the SCAR-L into the CQC version. + SCAR-L CQC Barrel + Not for sale through BR. + 268435456 + 1 + 574 + 6 + 600 + 9 + 1 + 1 + 1 + 1 + 1 + 1 + + + 1032 + SV .223 Barrel + SCAR-L SV Barrel + A long barrel to change the SCAR-L into the SV version. + SCAR-L SV Barrel + This long barrel changes your SCAR-L into the sniper variant. + 268435456 + 1 + 575 + 9 + 900 + 9 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 1033 + CQC .308 Barrel + SCAR-H CQC Barrel + A short barrel to change the SCAR-H into the CQC version. + SCAR-H CQC Barrel + Not for sale through BR. + 268435456 + 1 + 574 + 6 + 600 + 9 + 1 + 1 + 1 + 1 + 1 + 1 + + + 1034 + SV .308 Barrel + SCAR-H SV Barrel + A long barrel to change the SCAR-H into the SV version. + SCAR-H SV Barrel + This long barrel changes your SCAR-H into the sniper variant. + 268435456 + 1 + 575 + 9 + 900 + 9 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + diff --git a/gamedir/Data-1.13/TableData/Merges.xml b/gamedir/Data-1.13/TableData/Merges.xml index 98b41db3f..de1a3507e 100644 --- a/gamedir/Data-1.13/TableData/Merges.xml +++ b/gamedir/Data-1.13/TableData/Merges.xml @@ -1167,4 +1167,36 @@ 4 8 + + 1031 + 788 + 652 + 1032 + 4 + 10 + + + 1032 + 652 + 788 + 1031 + 4 + 10 + + + 1033 + 787 + 651 + 1034 + 4 + 10 + + + 1034 + 651 + 787 + 1033 + 4 + 10 + diff --git a/gamedir/Data-1.13/TableData/Russian.Items.xml b/gamedir/Data-1.13/TableData/Russian.Items.xml index 4330172ca..4447ec1ec 100644 --- a/gamedir/Data-1.13/TableData/Russian.Items.xml +++ b/gamedir/Data-1.13/TableData/Russian.Items.xml @@ -8227,4 +8227,16 @@ 1030 + + 1031 + + + 1032 + + + 1033 + + + 1034 + diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml index 3fae95246..18974f39c 100644 --- a/gamedir/Data-1.13/TableData/Weapons.xml +++ b/gamedir/Data-1.13/TableData/Weapons.xml @@ -538,7 +538,7 @@ 22 32 22 - 1 + 3 10 370 200 @@ -568,7 +568,7 @@ 22 39 49 - 5 + 7 10 790 200 @@ -4205,12 +4205,12 @@ 651 - FN SCAR-H + FN SCAR-H CQC 3 6 9 3 - 13 + 12 9 23 32 @@ -4238,19 +4238,19 @@ 652 - FN SCAR-L + FN SCAR-L CQC 3 6 8 3 - 15 + 14 8 23 - 30 + 29 36 5 30 - 340 + 280 200 50 70 @@ -6374,7 +6374,7 @@ 22 22 15 - 2 + 3 20 120 200 @@ -6803,7 +6803,7 @@ 22 38 48 - 5 + 7 10 770 200 @@ -7397,7 +7397,7 @@ 22 35 45 - 5 + 6 10 750 200 @@ -8383,6 +8383,100 @@ 8 476 + + 786 + Colt Delta Elite + 1 + 1 + 27 + 17 + 21 + 26 + 18 + 8 + 120 + 200 + 100 + 74 + 8 + 388 + 15 + 62 + 100 + 106 + 157 + 5 + 2 + 1 + 7 + 476 + + + 787 + FN SCAR-H SV + 3 + 6 + 9 + 3 + 12 + 9 + 23 + 35 + 40 + 6 + 20 + 670 + 200 + 50 + 85 + 8 + 347 + 39 + 111 + 102 + 108 + 156 + 3 + 3 + 4 + 1 + 8 + 9 + 476 + + + 788 + FN SCAR-L SV + 3 + 6 + 8 + 3 + 14 + 8 + 23 + 30 + 38 + 6 + 30 + 380 + 200 + 50 + 70 + 7 + 346 + 38 + 111 + 102 + 108 + 156 + 3 + 3 + 4 + 1 + 7 + 8 + 476 + 901 Commando Mortar @@ -8812,4 +8906,27 @@ 7 476 + + 921 + FN EGLM Grenade Launcher + 3 + 2 + 7 + 30 + 35 + 4 + 1 + 350 + 200 + 100 + 20 + 10 + 402 + 111 + 157 + 6 + 1 + 7 + 476 +