From 2f8563c97c75f6e69e25ee1b3f5ec0ea3baf11f9 Mon Sep 17 00:00:00 2001 From: Starwalker Date: Mon, 22 Oct 2007 06:39:37 +0000 Subject: [PATCH] added Automag V, M1 Carbine, KAC PDW, and Magpul PDR added 30 round AP and HP mags for the new PDW-type guns (6x35mm caliber) added P-08 Parabellum pistol and M1 Carbine to EnemyGunChoices git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@900 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/TableData/Attachments.xml | 165 +++++++++++++++++ .../Data-1.13/TableData/EnemyGunChoices.xml | 8 +- gamedir/Data-1.13/TableData/German.Items.xml | 55 ++++-- gamedir/Data-1.13/TableData/Items.xml | 167 ++++++++++++++++-- gamedir/Data-1.13/TableData/Magazines.xml | 12 ++ .../TableData/NPCInventory/TonyInventory.xml | 30 ++++ gamedir/Data-1.13/TableData/Russian.Items.xml | 55 ++++-- gamedir/Data-1.13/TableData/Weapons.xml | 124 ++++++++++++- 8 files changed, 576 insertions(+), 40 deletions(-) diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml index 2b9fb9055..21a3b2d70 100644 --- a/gamedir/Data-1.13/TableData/Attachments.xml +++ b/gamedir/Data-1.13/TableData/Attachments.xml @@ -2580,6 +2580,11 @@ 1179 5 + + 207 + 1192 + 5 + 208 19 @@ -6535,6 +6540,26 @@ 1187 5 + + 241 + 1192 + 5 + + + 241 + 1193 + 5 + + + 241 + 1190 + 5 + + + 241 + 1191 + 5 + 242 856 @@ -9135,6 +9160,16 @@ 1187 5 + + 307 + 1190 + 5 + + + 307 + 1191 + 5 + 309 308 @@ -9695,6 +9730,11 @@ 1187 5 + + 310 + 1190 + 5 + 316 264 @@ -13265,6 +13305,16 @@ 1077 5 + + 946 + 1190 + 5 + + + 946 + 1191 + 5 + 947 795 @@ -15615,6 +15665,26 @@ 1187 5 + + 1003 + 1192 + 5 + + + 1003 + 1193 + 5 + + + 1003 + 1190 + 5 + + + 1003 + 1191 + 5 + 1004 12 @@ -16095,6 +16165,16 @@ 1188 5 + + 1004 + 1190 + 5 + + + 1004 + 1191 + 5 + 1005 1 @@ -17525,6 +17605,26 @@ 1187 5 + + 1005 + 1192 + 5 + + + 1005 + 1193 + 5 + + + 1005 + 1190 + 5 + + + 1005 + 1191 + 5 + 1006 1 @@ -18665,6 +18765,21 @@ 1188 5 + + 1006 + 1192 + 5 + + + 1006 + 1190 + 5 + + + 1006 + 1191 + 5 + 1007 12 @@ -20055,6 +20170,16 @@ 1187 5 + + 1011 + 1190 + 5 + + + 1011 + 1191 + 5 + 1012 12 @@ -20410,6 +20535,16 @@ 1187 5 + + 1012 + 1190 + 5 + + + 1012 + 1191 + 5 + 1024 176 @@ -22395,6 +22530,21 @@ 1077 5 + + 1029 + 1193 + 5 + + + 1029 + 1190 + 5 + + + 1029 + 1191 + 5 + 1030 12 @@ -22875,6 +23025,16 @@ 1188 5 + + 1030 + 1190 + 5 + + + 1030 + 1191 + 5 + 1053 282 @@ -23165,6 +23325,11 @@ 683 5 + + 1181 + 1193 + 5 + 1182 693 diff --git a/gamedir/Data-1.13/TableData/EnemyGunChoices.xml b/gamedir/Data-1.13/TableData/EnemyGunChoices.xml index 3b6dcbab8..fc691a343 100644 --- a/gamedir/Data-1.13/TableData/EnemyGunChoices.xml +++ b/gamedir/Data-1.13/TableData/EnemyGunChoices.xml @@ -3,7 +3,7 @@ 0 0% - 14 + 15 689 690 635 @@ -18,7 +18,7 @@ 5 720 759 - 0 + 798 0 0 0 @@ -113,7 +113,7 @@ 2 20% - 19 + 20 694 2 22 @@ -133,7 +133,7 @@ 773 775 780 - 0 + 1193 0 0 0 diff --git a/gamedir/Data-1.13/TableData/German.Items.xml b/gamedir/Data-1.13/TableData/German.Items.xml index f7a45edb1..70d4d9435 100644 --- a/gamedir/Data-1.13/TableData/German.Items.xml +++ b/gamedir/Data-1.13/TableData/German.Items.xml @@ -7440,19 +7440,19 @@ 932 - Nada - Nothing - Index 932 - Nothing - Nothing + 6x35mm HP + 6x35mm HP + Beschreibung erwünscht + 6x35mm HP + Beschreibung erwünscht 933 - Nada - Nothing - Index 933 - Nothing - Nothing + 6x35mm AP + 6x35mm AP + Beschreibung erwünscht + 6x35mm AP + Beschreibung erwünscht 934 @@ -9090,4 +9090,39 @@ CETME Ameli Beschreibung erwünscht + + 1189 + + + 1190 + KAC PDW + KAC PDW + Beschreibung erwünscht + KAC PDW + Beschreibung erwünscht + + + 1191 + Magpul PDR + Magpul PDR + Beschreibung erwünscht + Magpul PDR + Beschreibung erwünscht + + + 1192 + Automag V + Automag V + Beschreibung erwünscht + Automag V + Beschreibung erwünscht + + + 1193 + M1 Carbine + M1 Carbine + Beschreibung erwünscht + M1 Carbine + Beschreibung erwünscht + \ 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 4ac937971..8be45a5f7 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -21290,25 +21290,43 @@ 932 - Nada - Nothing - Index 932 - Nothing - Nothing - 1 - 1 + 6x35mm HP + 6x35mm HP + 30 rounds of hollowpoint ammo for 6x35mm PDW-class guns. + 6x35mm HP + Here's what you need for your shiny new 6x35mm PDW: 30 rounds tipped with hollowpoint bullets for anti-personnel work. + 1024 + 318 + 1 + 713 + 3 + 4 + 180 + 5 + 1 + 1 1 + 2 933 - Nada - Nothing - Index 933 - Nothing - Nothing - 1 - 1 + 6x35mm AP + 6x35mm AP + 30 rounds of FMJ ammo for 6x35mm guns. + 6x35mm AP + 30 full metal jacket rounds for 6x35mm personal defense weapons, if hollowpoints won't do it any longer. + 1024 + 319 + 1 + 712 + 3 + 4 + 240 + 5 + 1 + 1 1 + 2 934 @@ -21560,7 +21578,6 @@ Rifle LAM-Flashlight This Laser Aiming Module and tactical flashlight combination is meant to fit on modern rifle rail interface systems. 268435456 - 0 341 4 2 @@ -27058,4 +27075,124 @@ 1200 209 + + 1189 + Nada + Nothing + Index 1189 + Nothing + Nothing + 1 + 1 + 1 + + + 1190 + KAC PDW + KAC PDW + Almost as light as some heavier pistols, this is the ideal sidearm for the modern Private Military Contractor. + KAC PDW + A new PDW on the market, this little beauty was made by the Knight Armament Corporation and fires the new 6x35mm round. + 2 + 1190 + 3 + 338 + 20 + 1780 + 6 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 600 + -1 + 30 + + + 1191 + Magpul PDR + Magpul PDR + Yet another new 6x35mm PDW, and a very effective one. + Magpul PDR + Just out of prototype stage, this new PDW is chambered for 6x35mm ammo. The SciFi-look belittles its effectiveness, though. + 2 + 1191 + 3 + 339 + 18 + 2160 + 8 + 1 + -2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 600 + 1011 + + + 1192 + Automag V + Automag V + This Automag is chambered for the .50 AE caliber. + Automag V + The .50 Action Express version of Galena's line of Automag pistols. + 2 + 1192 + 3 + 340 + 14 + 780 + 5 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 1 + 20 + + + 1193 + M1 Carbine + M1 Carbine + Intended to replace the pistol as the sidearm, this gun was more often used as a light rifle during WW-II. + M1 Carbine + The good old M1 Carbine, still on the market for WW-II enthusiasts and gun collectors. + 2 + 1193 + 3 + 330 + 24 + 1310 + 3 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 3 + 1 + 60 + \ 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 999b390d2..f49f27c20 100644 --- a/gamedir/Data-1.13/TableData/Magazines.xml +++ b/gamedir/Data-1.13/TableData/Magazines.xml @@ -1908,4 +1908,16 @@ 8 2 + + 318 + 47 + 30 + 1 + + + 319 + 47 + 30 + 2 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml index a13a156a8..f4f703bab 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml @@ -3660,4 +3660,34 @@ 1187 0 + + 732 + 932 + 1 + + + 733 + 933 + 1 + + + 734 + 1193 + 1 + + + 735 + 1192 + 1 + + + 736 + 1191 + 0 + + + 737 + 1190 + 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 2f8ccb595..ade08126c 100644 --- a/gamedir/Data-1.13/TableData/Russian.Items.xml +++ b/gamedir/Data-1.13/TableData/Russian.Items.xml @@ -7454,19 +7454,19 @@ 932 - Nada - Nothing - Index 932 - Nothing - Nothing + 6x35mm HP + 6x35mm HP + 30 rounds of hollowpoint ammo for 6x35mm PDW-class guns. + 6x35mm HP + Here's what you need for your shiny new 6x35mm PDW: 30 rounds tipped with hollowpoint bullets for anti-personnel work. 933 - Nada - Nothing - Index 933 - Nothing - Nothing + 6x35mm AP + 6x35mm AP + 30 rounds of FMJ ammo for 6x35mm guns. + 6x35mm AP + 30 full metal jacket rounds for 6x35mm personal defense weapons, if hollowpoints won't do it any longer. 934 @@ -8943,4 +8943,39 @@ 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. + + 1189 + + + 1190 + KAC PDW + KAC PDW + Almost as light as some heavier pistols, this is the ideal sidearm for the modern Private Military Contractor. + KAC PDW + A new PDW on the market, this little beauty was made by the Knight Armament Corporation and fires the new 6x35mm round. + + + 1191 + Magpul PDR + Magpul PDR + Yet another new 6x35mm PDW, and a very effective one. + Magpul PDR + Just out of prototype stage, this new PDW is chambered for 6x35mm ammo. The SciFi-look belittles its effectiveness, though. + + + 1192 + Automag V + Automag V + This Automag is chambered for the .50 AE caliber. + Automag V + The .50 Action Express version of Galena's line of Automag pistols. + + + 1193 + M1 Carbine + M1 Carbine + Intended to replace the pistol as the sidearm, this gun was more often used as a light rifle during WW-II. + M1 Carbine + The good old M1 Carbine, still on the market for WW-II enthusiasts and gun collectors. + \ 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 7a3f61de6..42c4f1b96 100644 --- a/gamedir/Data-1.13/TableData/Weapons.xml +++ b/gamedir/Data-1.13/TableData/Weapons.xml @@ -9542,7 +9542,7 @@ 3 4 45 - 2 + 1 14 22 29 @@ -9834,4 +9834,126 @@ 1 476 + + 1190 + KAC PDW + 2 + 3 + 47 + 1 + 18 + 3 + 5 + 22 + 30 + 32 + 5 + 30 + 190 + 200 + 33 + 48 + 5 + 494 + 120 + 111 + 101 + 107 + 157 + 3 + 3 + 4 + 1 + 7 + 6 + 476 + + + 1191 + Magpul PDR + 2 + 3 + 47 + 21 + 7 + 22 + 31 + 33 + 5 + 30 + 280 + 200 + 33 + 45 + 3 + 494 + 120 + 111 + 101 + 107 + 157 + 3 + 3 + 6 + 1 + 7 + 7 + 476 + + + 1192 + Automag V + 1 + 1 + 35 + 10 + 21 + 29 + 19 + 7 + 150 + 200 + 100 + 75 + 10 + 420 + 100 + 106 + 157 + 5 + 4 + 1 + 7 + 476 + + + 1193 + M1 Carbine + 3 + 4 + 45 + 2 + 14 + 22 + 29 + 23 + 5 + 30 + 200 + 200 + 43 + 55 + 3 + 155 + 123 + 111 + 101 + 107 + 157 + 5 + 4 + 1 + 7 + 476 + \ No newline at end of file