From 345bfec3cf835f374bdb8eb6ec6814b4443ebaa8 Mon Sep 17 00:00:00 2001 From: Starwalker Date: Tue, 11 Dec 2007 08:57:17 +0000 Subject: [PATCH] added mssing SCAR barrel merge (WP-version) changed Russian caliber of UDAR-Revolver changed/corrected a lot of other Russian stuff (names, weights, descriptions) increased coolnes of HK G11-PDW and Mauser M-03 added data for a new NewInv LBE-item git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@920 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/TableData/AmmoStrings.xml | 4 +- gamedir/Data-1.13/TableData/Items.xml | 191 +++++++++++------- .../TableData/LoadBearingEquipment.xml | 12 +- .../Data-1.13/TableData/MercStartingGear.xml | 4 +- gamedir/Data-1.13/TableData/Merges.xml | 8 + gamedir/Data-1.13/TableData/Pockets.xml | 42 ++++ 6 files changed, 183 insertions(+), 78 deletions(-) diff --git a/gamedir/Data-1.13/TableData/AmmoStrings.xml b/gamedir/Data-1.13/TableData/AmmoStrings.xml index c7a223520..95217ac7d 100644 --- a/gamedir/Data-1.13/TableData/AmmoStrings.xml +++ b/gamedir/Data-1.13/TableData/AmmoStrings.xml @@ -142,8 +142,8 @@ 28 - 12.3x50mm - 12.3x50mm + 12.5x35mm + 12.5x35mm 29 diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index dcbde0ca3..43fb84354 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -7157,7 +7157,7 @@ SIG P226R A runner-up in the US Military's bid to replace the venerable Colt 1911, this compact and reliable handgun is still a favorite among armed forces. SIG P226R - Reliability and ease of use are key features of this swiss made handgun. + Reliability and ease of use are key features of this swiss made handgun. Comes with a short Picatinny rail in front of the triggerguard. 2 336 3 @@ -7463,7 +7463,7 @@ 347 AK-47 AK-47 - Often copied, but never truly duplicated, Mikhail Kalishnikov's gift to the world has kept on giving for more than half a century of armed conflict. + Often copied, but never truly duplicated, Mikhail Kalashnikov's gift to the world has kept on giving for more than half a century of armed conflict. AK-47 Universally known and respected amongst assault rifles. Get yours today! 2 @@ -7526,7 +7526,7 @@ 349 3 83 - 20 + 21 2450 5 -2 @@ -10495,7 +10495,7 @@ 495 7.62x25mm Biz. Mag 7.62x25mm Bizon Mag - A 45 round box of 7.62 Tk for your Bizon PP-27 SMG. + A 45 round box of 7.62 Tk for your Bizon 2-07 SMG. 7.62x25mm Biz. Mag Originally converted PPSh-41/PPS-43 box magazines, these clips are made to fire 7.62 x 25 from a Bizon SMG. 1024 @@ -11351,11 +11351,11 @@ 538 - 12.3mm Loader - 12.3x50mm Speedloader - This five-shot speedloader of 12.3x50mm rounds is for the massive U-94 UDAR Revolver. - 12.3mm Loader - Owing its dimensions to the 32 gauge shotgun shell, the 12.3mm is a weighty round for a weighty handgun. + 12.5mm Loader + 12.5x35mm Speedloader + This five-shot speedloader of 12.5x35mm rounds is for the massive U-94S UDAR Revolver. + 12.5mm Loader + Owing its dimensions to the 32 gauge shotgun shell, the 12.5mm is a weighty round for a weighty handgun. 1024 284 1 @@ -11906,11 +11906,11 @@ 564 - 12.3mm Loader FL - 12.3x50mm Speedloader, Flechette - This five-shot speedloader of 12.3x50mm armor piercing flechette rounds is for the massive U-94 UDAR Revolver. - 12.3mm Loader FL - Open up with a shower of armour piercing metal shards and your opponents will be cut down to size.. Literally. + 12.5mm Loader FL + 12.5x35mm Speedloader, Flechette + This five-shot speedloader of 12.5x35mm armor piercing flechette rounds is for the massive U-94S UDAR Revolver. + 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 285 1 @@ -13406,7 +13406,7 @@ Beretta AR-70/90 Italian designed and manufactured assault rifle, the AR-70/90 can be a platform for a dazzling array of attachments. Beretta AR-70/90 - Yet another Kalishnikov-inspired weapon, this 5.56mm assault rifle has a quality all its own. + Yet another Kalashnikov-inspired weapon, this 5.56mm assault rifle has a quality all its own. 2 624 3 @@ -13458,16 +13458,16 @@ 626 - Bizon - Bizon PP-19 - Also known as the 2-07, this Bizon SMG is chambered to accept 7.62 Tokarev box magazines. - Bizon PP-19 + Bizon 2-07 + Bizon 2-07 + This Bizon SMG is chambered to accept 7.62 Tokarev box magazines. + Bizon 2-07 Variety is the spice of life, try out the SMG in its 7.62 Tk variant. 2 626 3 129 - 25 + 30 1410 3 -1 @@ -14397,16 +14397,16 @@ 659 - Groza 14-A - Groza OTs-14/7-A + Groza OC-14 + Groza OC-14 A bull-pup design of the AKS-74U in 7.62mm WP. This particular variant has a built-in GP-25 grenade launcher. - Groza OTs-14/7-A + Groza OC-14 The Groza is a neat little weapon, but not recommended for lefties due the placement of its cocking handle, selector switch and ejection port. This variant comes with an integral GP-25 40mm grenade launcher. 2 659 3 100 - 47 + 41 2840 5 -1 @@ -14425,16 +14425,16 @@ 660 - Groza 14-A3 - Groza OTs-14-A3 + Groza 14-4A + Groza OC-14-4A-01 Putting a silencer on this already subsonic rifle can help you keep a low profile and stay stylish in any urban combat enviroment. - Groza OTs-14-A3 + Groza OC-14-4A-01 Putting a silencer on this already subsonic rifle can help you keep a low profile and stay stylish in any urban combat enviroment. Fires 9x39mm Subsonic ammo that is highly armor effective. 2 660 3 211 - 35 + 28 3230 6 -1 @@ -14516,7 +14516,7 @@ HK G11 PDW A personal defence weapon designed to compliment the G11 rifle, the G11 PDW was rumored to only be in the prototype phase. HK G11 PDW - SPECIAL! Available for a limited time only: G11 sidearm prototypes with glow-in-the-dark keychain! + SPECIAL! Available for a limited time only: G11 sidearm prototypes with glow-in-the-dark keychain! 2 663 3 @@ -14524,7 +14524,7 @@ 15 1 1890 - 4 + 6 -2 1 1 @@ -15729,7 +15729,7 @@ 706 RPK RPK - Another product of Mikhail Kalishnikov, from Russia with love. + Another product of Mikhail Kalashnikov, from Russia with love. RPK The RPK is essentially an AK-47 with a heavier barrel and stock. It can empty a 30 round magazine or a 75 round drum at 600rpm. 2 @@ -16667,15 +16667,15 @@ 739 UDAR - U-94 UDAR + U-94S UDAR The large caliber Udar revolver is commonly used by private security agencies and other organisations involved in special missions. - U-94 UDAR - A large caliber (12.3 mm) revolver with high stopping power, used by private security forces and on special operations. + U-94S UDAR + A large caliber (12.5 mm) revolver with high stopping power, used by private security forces and on special operations. 2 739 3 216 - 10 + 9 1 810 3 @@ -17872,7 +17872,7 @@ 781 3 294 - 39 + 34 1680 5 -1 @@ -17958,7 +17958,7 @@ 296 39 2700 - 5 + 6 1 1 1 @@ -20666,10 +20666,10 @@ 904 GP-30 - GP-30 Grenade Launcher - An underbarrel mounted grenade launcher for Russian made assault rifles. The GP-30 fires 40mm VOG-25 and VOG-25P grenades. + GP-30 Obuvka Grenade Launcher + An underbarrel mounted grenade launcher for Russian made assault rifles. The GP-30 Obuvka fires 40mm VOG-25 and VOG-25P grenades. GP-30 Grenade Launcher - An improved model of the GP-25, the GP-30 features a sighting recticle and a recoil buffer to protect the rifle to which it is attached. The GP-30 fires 40mm VOG-25 and VOG-25P grenades. + An improved model of the GP-25 Kostyor, the GP-30 Obuvka features a sighting recticle and a recoil buffer to protect the rifle to which it is attached. The GP-30 fires 40mm VOG-25 and VOG-25P grenades. 16 904 20 @@ -20754,10 +20754,10 @@ 907 RGM - RGM Grenade Launcher - Light-weight, retractable 40mm Russian grenade launcher for the grenadier in your squad. The RGM fires 40mm VOG-25 and VOG-25P grenades. + RGM Kastet Grenade Launcher + Light-weight, retractable 40mm Russian grenade launcher for the grenadier in your squad. The RGM Kastet fires 40mm VOG-25 and VOG-25P grenades. RGM Grenade Launcher - Living proof that the "Russian concussion" wasn't just the nick-name of the foreign exchange student you dated in college. The RGM fires 40mm VOG-25 and VOG-25P grenades. + Living proof that the "Russian concussion" wasn't just the nick-name of the foreign exchange student you dated in college. The RGM Kastet fires 40mm VOG-25 and VOG-25P grenades. 16 907 20 @@ -20863,10 +20863,10 @@ 911 GP-25 Launcher - GP-25 Grenade Launcher (Built-in) - This model of the Groza comes with an integrated 40mm GP-25 grenade launcher. The GP-25 fires 40mm VOG-25 and VOG-25P grenades. + GP-25 Kostyor Grenade Launcher (Built-in) + This model of the Groza comes with an integrated 40mm GP-25 grenade launcher. The GP-25 Kostyor fires 40mm VOG-25 and VOG-25P grenades. GP-25 Grenade Launcher (Built-in) - This model of the Groza comes with an integrated 40mm GP-25 grenade launcher. + This model of the Groza comes with an integrated 40mm GP-25 Kostyor grenade launcher. 16 911 20 @@ -20973,9 +20973,9 @@ 915 RPG-16 - RPG-16 + RPG-16 Grom The RPG-16 was developed in the 1960s, and has better range than the RPG-7. - RPG-16 + RPG-16 Grom Once your enemy sees your packing the kind of firepower an RPG provides, have mercy on him and let him run away in fear. Or not. 16 915 @@ -21001,9 +21001,9 @@ 916 RPG-26 - RPG-26 + RPG-26 Aglen WARNING: DO NOT AIM AT FACE. - RPG-26 + RPG-26 Aglen For the times when flowers just don't cut it: say it with high explosive rocket propelled grenades. 2 916 @@ -21031,10 +21031,10 @@ 917 RPG-27 - RPG-27 + RPG-27 Tavolga A top of the line RPG launcher with improved range and accuracy. - RPG-27 - The RPG-27 is a further development of rocket propelled grenade launchers, and is endowed with increased range and accuracy. + RPG-27 Tavolga + The RPG-27 Tavolga is a further development of rocket propelled grenade launchers, and is endowed with increased range and accuracy. 2 917 3 @@ -21061,10 +21061,10 @@ 918 RPO-A - RPO-A + RPO-A Shmel With this baby, you can turn a pool party into a BBQ. Literally. - RPO-A - With the RPO-A Thermobaric rocket launcher, you can turn a pool party into a BBQ. Literally. + RPO-A Shmel + With the RPO-A Shmel thermobaric rocket launcher, you can turn a pool party into a BBQ. Literally. 2 918 3 @@ -22152,10 +22152,10 @@ 976 - Frag Rocket - Fragmentation Rocket + OG-7V Rocket + OG-7V Fragmentation Rocket Perfect for those times when you need to make a big entrance. - Fragmentation Rocket + OG-7V Fragmentation Rocket A rocket propelled grenade is perfect for those times when you need to make a big entrance. 256 55 @@ -22176,10 +22176,10 @@ 977 - HEAT Rocket - HEAT Rocket + PG-7VM Rocket + PG-7VM HEAT Rocket Works exactly like a can opener, but on tanks. Oh, and it's a bit louder. - HEAT Rocket + PG-7VM HEAT Rocket Works exactly like a can opener, but on tanks. Oh, and it's a bit louder. 256 56 @@ -22200,10 +22200,10 @@ 978 - Thermo Rocket - Thermobaric Rocket + TBG-7V Rocket + TBG-7V Thermobaric Rocket Guaranteed to blow your enemies away. - Thermobaric Rocket + TBG-7V Thermobaric Rocket Guaranteed to blow your enemies away. 256 57 @@ -22669,10 +22669,10 @@ 1000 - PSO-P - PSO-P Scope + PSO-3 + PSO-3 Scope Better than the PSO-1 (Magnification is 8x), this scope is often used on Russian DMRs and sniper rifles. - PSO-P Scope + PSO-3 Scope If you have an older style Russian rifle and need a highpower scope, than this is your best choice. Magnification is 8x. 268435456 1 @@ -27265,4 +27265,59 @@ -1 30 + + 1196 + Nada + Nothing + Index 1196 + Nothing + Nothing + 1 + 1 + 1 + + + 1197 + Nada + Nothing + Index 1197 + Nothing + Nothing + 1 + 1 + 1 + + + 1198 + Nada + Nothing + Index 1198 + Nothing + Nothing + 1 + 1 + 1 + + + 1199 + Nada + Nothing + Index 1199 + Nothing + Nothing + 1 + 1 + 1 + + + 1200 + Nada + Nothing + Index 1200 + Nothing + Nothing + 1 + 1 + 1 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml b/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml index ef8be6763..3b25ebe09 100644 --- a/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml +++ b/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml @@ -390,7 +390,7 @@ 5 5 5 - 5 + 0 0 0 0 @@ -614,12 +614,12 @@ 34 - 0 + 1 0 - 0 - 0 - 0 - 0 + 22 + 19 + 11 + 19 0 0 0 diff --git a/gamedir/Data-1.13/TableData/MercStartingGear.xml b/gamedir/Data-1.13/TableData/MercStartingGear.xml index 831bca1c0..4c100d03d 100644 --- a/gamedir/Data-1.13/TableData/MercStartingGear.xml +++ b/gamedir/Data-1.13/TableData/MercStartingGear.xml @@ -3986,7 +3986,7 @@ 90 93 0 - 100 + 95 100 100 0 @@ -7266,7 +7266,7 @@ 164 0 11 - 116 + 83 0 0 0 diff --git a/gamedir/Data-1.13/TableData/Merges.xml b/gamedir/Data-1.13/TableData/Merges.xml index f0d3441ed..c76117825 100644 --- a/gamedir/Data-1.13/TableData/Merges.xml +++ b/gamedir/Data-1.13/TableData/Merges.xml @@ -3400,6 +3400,14 @@ 4 10 + + 1046 + 790 + 791 + 1045 + 4 + 10 + 1055 194 diff --git a/gamedir/Data-1.13/TableData/Pockets.xml b/gamedir/Data-1.13/TableData/Pockets.xml index 8d545e7c3..70635f01d 100644 --- a/gamedir/Data-1.13/TableData/Pockets.xml +++ b/gamedir/Data-1.13/TableData/Pockets.xml @@ -798,4 +798,46 @@ 0 0 + + 19 + Speedloader + 23 + 0 + 1024 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 +