From f7d5e736d7f40ceae30fadad7525f5572daec5fd Mon Sep 17 00:00:00 2001 From: Starwalker Date: Thu, 1 Apr 2010 06:46:16 +0000 Subject: [PATCH] added Beretta Cx4 Storm corrected a few descriptions git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1220 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/TableData/Attachments.xml | 45 +++++++++++ gamedir/Data-1.13/TableData/Chinese.Items.xml | 10 +-- gamedir/Data-1.13/TableData/Dutch.Items.xml | 20 ++--- gamedir/Data-1.13/TableData/French.Items.xml | 20 ++--- gamedir/Data-1.13/TableData/German.Items.xml | 7 +- gamedir/Data-1.13/TableData/Italian.Items.xml | 20 ++--- gamedir/Data-1.13/TableData/Items.xml | 41 +++++++--- .../Data-1.13/TableData/MercStartingGear.xml | 80 +++++++++---------- .../TableData/NPCInventory/TonyInventory.xml | 5 ++ gamedir/Data-1.13/TableData/Polish.Items.xml | 10 +-- gamedir/Data-1.13/TableData/Russian.Items.xml | 10 +-- gamedir/Data-1.13/TableData/Weapons.xml | 32 ++++++++ 12 files changed, 201 insertions(+), 99 deletions(-) diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml index 90618478a..5a68dceed 100644 --- a/gamedir/Data-1.13/TableData/Attachments.xml +++ b/gamedir/Data-1.13/TableData/Attachments.xml @@ -2620,6 +2620,11 @@ 786 20 + + 207 + 1078 + 20 + 208 19 @@ -6700,6 +6705,11 @@ 1334 20 + + 241 + 1078 + 20 + 242 856 @@ -9970,6 +9980,11 @@ 896 20 + + 310 + 1078 + 20 + 316 264 @@ -13660,6 +13675,11 @@ 621 20 + + 946 + 1078 + 20 + 947 795 @@ -16395,6 +16415,11 @@ 1333 20 + + 1003 + 1078 + 20 + 1004 12 @@ -18485,6 +18510,11 @@ 1334 20 + + 1005 + 1078 + 20 + 1006 1 @@ -19745,6 +19775,11 @@ 1334 20 + + 1006 + 1078 + 20 + 1007 12 @@ -21195,6 +21230,11 @@ 35 5 + + 1011 + 619 + 20 + 1012 12 @@ -23700,6 +23740,11 @@ 1334 20 + + 1029 + 1078 + 20 + 1030 12 diff --git a/gamedir/Data-1.13/TableData/Chinese.Items.xml b/gamedir/Data-1.13/TableData/Chinese.Items.xml index 0bc4dd451..2dc4de90f 100644 --- a/gamedir/Data-1.13/TableData/Chinese.Items.xml +++ b/gamedir/Data-1.13/TableData/Chinese.Items.xml @@ -8626,11 +8626,11 @@ 1078 - Nada - Nothing - Index 1078 - Nothing - Nothing + Cx4 Storm + Beretta Cx4 Storm + The action of Beretta's Storm pistol inside a rifle stock. + Beretta Cx4 Storm + A futuristic looking rifle firing an unsurpassed pistol round, the .45ACP. 1079 diff --git a/gamedir/Data-1.13/TableData/Dutch.Items.xml b/gamedir/Data-1.13/TableData/Dutch.Items.xml index 7ae67ad43..250d1fe26 100644 --- a/gamedir/Data-1.13/TableData/Dutch.Items.xml +++ b/gamedir/Data-1.13/TableData/Dutch.Items.xml @@ -4382,7 +4382,7 @@ .50 Action Express Mag If you're going to use a overpriced, impractical and unreliable handgun instead of a perfectly good rifle, you'll need ammunition for it. .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. + Magazine 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. 548 @@ -4934,7 +4934,7 @@ AN-94 "Abakan" The new AN-94 Abakan design enables the gun to "pulse", firing a very fast two bullet burst before the recoil affects the user. AN-94 "Abakan" - Like father like son. This weapon was designed by the offspring of the immortal Mikhail Kalashnikov. Another leap forward in gun making, you can be sure to see it soon on a hijacked airliner near you. + This weapon was designed by Gennadiy Nikonov. Another leap forward in gun making, you can be sure to see it soon on a hijacked airliner near you. 617 @@ -5158,7 +5158,7 @@ FN Browning HP-35 .40 Originally designed in 1925, the High Power didn't see military service until 1935, and was the only sidearm that served for both sides in WW2. This one is chambered in .40S&W. FN Browning HP-35 .40 - Originally designed in 1925, the High Power didn't see military service until 1935, and was the only sidearm that served for both sides in WW2. The latest incarnation, the HP-35, is in use today in the Belgian Military. This one is chambered in .40S&W. + Originally designed in 1925, the High Power didn't see military service until 1935. The latest incarnation, the HP-35, is in use today in the Belgian Military. This one is chambered in .40S&W. 645 @@ -7318,7 +7318,7 @@ RPG-7 The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose to to provide an inexpensive albeit devastating weapon against soft targets. RPG-7 - The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose to to provide an inexpensive albeit devastating weapon against soft targets. + The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose is to provide an inexpensive albeit devastating weapon against soft targets. 915 @@ -8626,11 +8626,11 @@ 1078 - Nada - Nothing - Index 1078 - Nothing - Nothing + Cx4 Storm + Beretta Cx4 Storm + The action of Beretta's Storm pistol inside a rifle stock. + Beretta Cx4 Storm + A futuristic looking rifle firing an unsurpassed pistol round, the .45ACP. This version has a magazine well that accepts hi-cap magazines. 1079 @@ -9508,7 +9508,7 @@ 1188 Ameli CETME Ameli - Designed by the Compania de Estudios Tecnicus de Materiales Especiales, the Ameli looks as if it was derived from the MG42, but its mechanism is quite different. + Designed by the Compania de Estudios Técnicos de Materiales Especiales, the Ameli looks as if it was derived from the MG42, but its mechanism is quite different. CETME Ameli The Ameli we have in stock are the 'light-bolt'-versions with a higher rate of fire than the 'heavy-bolt'-model. Comes with bipod. diff --git a/gamedir/Data-1.13/TableData/French.Items.xml b/gamedir/Data-1.13/TableData/French.Items.xml index aaf0df364..ce938d8e7 100644 --- a/gamedir/Data-1.13/TableData/French.Items.xml +++ b/gamedir/Data-1.13/TableData/French.Items.xml @@ -4383,7 +4383,7 @@ .50 Action Express Mag If you're going to use a overpriced, impractical and unreliable handgun instead of a perfectly good rifle, you'll need ammunition for it. .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. + Magazine 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. 548 @@ -4935,7 +4935,7 @@ AN-94 "Abakan" The new AN-94 Abakan design enables the gun to "pulse", firing a very fast two bullet burst before the recoil affects the user. AN-94 "Abakan" - Like father like son. This weapon was designed by the offspring of the immortal Mikhail Kalashnikov. Another leap forward in gun making, you can be sure to see it soon on a hijacked airliner near you. + This weapon was designed by Gennadiy Nikonov. Another leap forward in gun making, you can be sure to see it soon on a hijacked airliner near you. 617 @@ -5159,7 +5159,7 @@ FN Browning HP-35 .40 Originally designed in 1925, the High Power didn't see military service until 1935, and was the only sidearm that served for both sides in WW2. This one is chambered in .40S&W. FN Browning HP-35 .40 - Originally designed in 1925, the High Power didn't see military service until 1935, and was the only sidearm that served for both sides in WW2. The latest incarnation, the HP-35, is in use today in the Belgian Military. This one is chambered in .40S&W. + Originally designed in 1925, the High Power didn't see military service until 1935. The latest incarnation, the HP-35, is in use today in the Belgian Military. This one is chambered in .40S&W. 645 @@ -7319,7 +7319,7 @@ RPG-7 The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose to to provide an inexpensive albeit devastating weapon against soft targets. RPG-7 - The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose to to provide an inexpensive albeit devastating weapon against soft targets. + The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose is to provide an inexpensive albeit devastating weapon against soft targets. 915 @@ -8627,11 +8627,11 @@ 1078 - Nada - Nothing - Index 1078 - Nothing - Nothing + Cx4 Storm + Beretta Cx4 Storm + The action of Beretta's Storm pistol inside a rifle stock. + Beretta Cx4 Storm + A futuristic looking rifle firing an unsurpassed pistol round, the .45ACP. This version has a magazine well that accepts hi-cap magazines. 1079 @@ -9509,7 +9509,7 @@ 1188 Ameli CETME Ameli - Designed by the Compania de Estudios Tecnicus de Materiales Especiales, the Ameli looks as if it was derived from the MG42, but its mechanism is quite different. + Designed by the Compania de Estudios Técnicos de Materiales Especiales, the Ameli looks as if it was derived from the MG42, but its mechanism is quite different. CETME Ameli The Ameli we have in stock are the 'light-bolt'-versions with a higher rate of fire than the 'heavy-bolt'-model. Comes with bipod. diff --git a/gamedir/Data-1.13/TableData/German.Items.xml b/gamedir/Data-1.13/TableData/German.Items.xml index a255f7eba..582a5abc5 100644 --- a/gamedir/Data-1.13/TableData/German.Items.xml +++ b/gamedir/Data-1.13/TableData/German.Items.xml @@ -5140,7 +5140,7 @@ FN Browning HP-35 .40 Ursprünglich 1925 entworfen, wurde diese Pistole erst 1935 von Belgiens Armee in Dienst gestellt. Diese Version hat das Kaliber .40S&W. FN Browning HP-35 .40 - Ursprünglich 1925 entworfen, wurde diese Pistole erst 1935 von Belgiens Armee in Dienst gestellt. Sie war die einzige Seitenwaffe die von beiden Seiten im 2. Weltkrieg eingesetzt wurde. Die neueste Variante der HP-35 wird heute vom belgischen Militär verwendet. Diese Version hat das Kaliber .40S&W. + Ursprünglich 1925 entworfen, wurde diese Pistole erst 1935 von Belgiens Armee in Dienst gestellt. Die neueste Variante der HP-35 wird heute vom belgischen Militär verwendet. Diese Version hat das Kaliber .40S&W. 645 @@ -8604,6 +8604,11 @@ 1078 + Cx4 Storm + Beretta Cx4 Storm + Beschreibung erwünscht + Beretta Cx4 Storm + Beschreibung erwünscht 1079 diff --git a/gamedir/Data-1.13/TableData/Italian.Items.xml b/gamedir/Data-1.13/TableData/Italian.Items.xml index 757368120..fa72f7ac5 100644 --- a/gamedir/Data-1.13/TableData/Italian.Items.xml +++ b/gamedir/Data-1.13/TableData/Italian.Items.xml @@ -4382,7 +4382,7 @@ .50 Action Express Mag If you're going to use a overpriced, impractical and unreliable handgun instead of a perfectly good rifle, you'll need ammunition for it. .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. + Magazine 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. 548 @@ -4934,7 +4934,7 @@ AN-94 "Abakan" The new AN-94 Abakan design enables the gun to "pulse", firing a very fast two bullet burst before the recoil affects the user. AN-94 "Abakan" - Like father like son. This weapon was designed by the offspring of the immortal Mikhail Kalashnikov. Another leap forward in gun making, you can be sure to see it soon on a hijacked airliner near you. + This weapon was designed by Gennadiy Nikonov. Another leap forward in gun making, you can be sure to see it soon on a hijacked airliner near you. 617 @@ -5158,7 +5158,7 @@ FN Browning HP-35 .40 Originally designed in 1925, the High Power didn't see military service until 1935, and was the only sidearm that served for both sides in WW2. This one is chambered in .40S&W. FN Browning HP-35 .40 - Originally designed in 1925, the High Power didn't see military service until 1935, and was the only sidearm that served for both sides in WW2. The latest incarnation, the HP-35, is in use today in the Belgian Military. This one is chambered in .40S&W. + Originally designed in 1925, the High Power didn't see military service until 1935. The latest incarnation, the HP-35, is in use today in the Belgian Military. This one is chambered in .40S&W. 645 @@ -7318,7 +7318,7 @@ RPG-7 The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose to to provide an inexpensive albeit devastating weapon against soft targets. RPG-7 - The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose to to provide an inexpensive albeit devastating weapon against soft targets. + The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose is to provide an inexpensive albeit devastating weapon against soft targets. 915 @@ -8626,11 +8626,11 @@ 1078 - Nada - Nothing - Index 1078 - Nothing - Nothing + Cx4 Storm + Beretta Cx4 Storm + The action of Beretta's Storm pistol inside a rifle stock. + Beretta Cx4 Storm + A futuristic looking rifle firing an unsurpassed pistol round, the .45ACP. This version has a magazine well that accepts hi-cap magazines. 1079 @@ -9508,7 +9508,7 @@ 1188 Ameli CETME Ameli - Designed by the Compania de Estudios Tecnicus de Materiales Especiales, the Ameli looks as if it was derived from the MG42, but its mechanism is quite different. + Designed by the Compania de Estudios Técnicos de Materiales Especiales, the Ameli looks as if it was derived from the MG42, but its mechanism is quite different. CETME Ameli The Ameli we have in stock are the 'light-bolt'-versions with a higher rate of fire than the 'heavy-bolt'-model. Comes with bipod. diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index a6d732d3b..1db06a25b 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -12087,7 +12087,7 @@ .50 Action Express Mag If you're going to use a overpriced, impractical and unreliable handgun instead of a perfectly good rifle, you'll need ammunition for it. .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. + Magazine 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 401 1 @@ -13795,7 +13795,7 @@ AN-94 "Abakan" The new AN-94 Abakan design enables the gun to "pulse", firing a very fast two bullet burst before the recoil affects the user. AN-94 "Abakan" - Like father like son. This weapon was designed by the offspring of the immortal Mikhail Kalashnikov. Another leap forward in gun making, you can be sure to see it soon on a hijacked airliner near you. + This weapon was designed by Gennadiy Nikonov. Another leap forward in gun making, you can be sure to see it soon on a hijacked airliner near you. 2 616 3 @@ -14607,7 +14607,7 @@ FN Browning HP-35 .40 Originally designed in 1925, the High Power didn't see military service until 1935, and was the only sidearm that served for both sides in WW2. This one is chambered in .40S&W. FN Browning HP-35 .40 - Originally designed in 1925, the High Power didn't see military service until 1935, and was the only sidearm that served for both sides in WW2. The latest incarnation, the HP-35, is in use today in the Belgian Military. This one is chambered in .40S&W. + Originally designed in 1925, the High Power didn't see military service until 1935. The latest incarnation, the HP-35, is in use today in the Belgian Military. This one is chambered in .40S&W. 2 644 3 @@ -22094,7 +22094,7 @@ RPG-7 The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose to to provide an inexpensive albeit devastating weapon against soft targets. RPG-7 - The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose to to provide an inexpensive albeit devastating weapon against soft targets. + The Rocket Propelled Grenade, or RPG, is a cheap, single-shot weapon. It's main purpose is to provide an inexpensive albeit devastating weapon against soft targets. 16 914 3 @@ -26009,15 +26009,30 @@ 1078 - Nada - Nothing - Index 1078 - Nothing - Nothing - 1 - 34 - 1 + Cx4 Storm + Beretta Cx4 Storm + The action of Beretta's Storm pistol inside a rifle stock. + Beretta Cx4 Storm + A futuristic looking rifle firing an unsurpassed pistol round, the .45ACP. This version has a magazine well that accepts hi-cap magazines. + 2 + 1078 + 3 + 366 + 26 + 7 + 1250 + 3 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 1 + 2 + 19 1079 @@ -28711,7 +28726,7 @@ 1188 Ameli CETME Ameli - Designed by the Compania de Estudios Tecnicus de Materiales Especiales, the Ameli looks as if it was derived from the MG42, but its mechanism is quite different. + Designed by the Compania de Estudios Técnicos de Materiales Especiales, the Ameli looks as if it was derived from the MG42, but its mechanism is quite different. CETME Ameli The Ameli we have in stock are the 'light-bolt'-versions with a higher rate of fire than the 'heavy-bolt'-model. Comes with bipod. 2 diff --git a/gamedir/Data-1.13/TableData/MercStartingGear.xml b/gamedir/Data-1.13/TableData/MercStartingGear.xml index 85aa9671c..4e4b6150c 100644 --- a/gamedir/Data-1.13/TableData/MercStartingGear.xml +++ b/gamedir/Data-1.13/TableData/MercStartingGear.xml @@ -4962,25 +4962,25 @@ 174 1 100 - 55 - 1 - 100 - 111 + 0 + 0 + 0 + 55 100 - 2 + 1 1 - 112 + 111 100 2 1 - 113 + 112 100 2 1 - 0 - 0 - 0 - 0 + 113 + 100 + 2 + 1 0 0 0 @@ -5226,17 +5226,17 @@ 0 0 0 - 36 - 1 - 94 - 101 - 100 - 2 + 0 + 0 + 0 + 36 + 94 + 1 1 - 0 - 0 - 0 - 0 + 101 + 100 + 2 + 1 0 0 0 @@ -6018,17 +6018,17 @@ 170 1 100 - 20 - 1 - 90 - 95 - 100 - 2 + 0 + 0 + 0 + 20 + 90 + 1 1 - 0 - 0 - 0 - 0 + 95 + 100 + 2 + 1 0 0 0 @@ -7734,17 +7734,17 @@ 0 0 0 - 12 - 1 - 80 - 94 - 100 + 0 + 0 + 0 + 12 + 80 1 1 - 0 - 0 - 0 - 0 + 94 + 100 + 1 + 1 0 0 0 diff --git a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml index 40a1cc6ef..343ae6088 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml @@ -4525,4 +4525,9 @@ 1351 0 + + 905 + 1078 + 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 6042d45b8..8e49cccd6 100644 --- a/gamedir/Data-1.13/TableData/Polish.Items.xml +++ b/gamedir/Data-1.13/TableData/Polish.Items.xml @@ -8626,11 +8626,11 @@ 1078 - Nada - Nothing - Index 1078 - Nothing - Nothing + Cx4 Storm + Beretta Cx4 Storm + The action of Beretta's Storm pistol inside a rifle stock. + Beretta Cx4 Storm + A futuristic looking rifle firing an unsurpassed pistol round, the .45ACP. This version has a magazine well that accepts hi-cap magazines. 1079 diff --git a/gamedir/Data-1.13/TableData/Russian.Items.xml b/gamedir/Data-1.13/TableData/Russian.Items.xml index a96fbbd76..886815dd5 100644 --- a/gamedir/Data-1.13/TableData/Russian.Items.xml +++ b/gamedir/Data-1.13/TableData/Russian.Items.xml @@ -8628,11 +8628,11 @@ 1078 - Nada - Nothing - Index 1078 - Nothing - Nothing + Cx4 Storm + Beretta Cx4 Storm + The action of Beretta's Storm pistol inside a rifle stock. + Beretta Cx4 Storm + A futuristic looking rifle firing an unsurpassed pistol round, the .45ACP. This version has a magazine well that accepts hi-cap magazines. 1079 diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml index a92432955..d118cd21a 100644 --- a/gamedir/Data-1.13/TableData/Weapons.xml +++ b/gamedir/Data-1.13/TableData/Weapons.xml @@ -2695,6 +2695,7 @@ 7 15 14.22 + 3 5 22 30 @@ -2728,6 +2729,7 @@ 10 15 13.68 + 3 6 22 32 @@ -10173,6 +10175,36 @@ 9 476 + + 1078 + Beretta Cx4 Storm + 3 + 4 + 3 + 3 + 15.46 + 22 + 27 + 20 + 5 + 14 + 210 + 200 + 43 + 55 + 3 + 414 + 76 + 111 + 100 + 106 + 157 + 20 + 16 + 1 + 7 + 476 + 1177 Spectre M4