From db3ce86a539fe44b7e293c4c33c74df1d8367757 Mon Sep 17 00:00:00 2001 From: Starwalker Date: Mon, 5 Nov 2007 07:20:09 +0000 Subject: [PATCH] added Colt Python and FR Ordnance MC51 (pics by Tbird) added a Flare (pic by Kaerar), which has shorter duration than the breaklight breaklights have smaller radius now git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@908 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/TableData/Attachments.xml | 100 ++++++++++++++++++ gamedir/Data-1.13/TableData/Explosives.xml | 16 ++- gamedir/Data-1.13/TableData/German.Items.xml | 36 +++++++ gamedir/Data-1.13/TableData/Items.xml | 91 ++++++++++++++-- .../TableData/LoadBearingEquipment.xml | 32 +++--- .../TableData/NPCInventory/KeithInventory.xml | 5 + .../TableData/NPCInventory/TonyInventory.xml | 10 ++ gamedir/Data-1.13/TableData/Pockets.xml | 22 ++-- gamedir/Data-1.13/TableData/Russian.Items.xml | 34 ++++++ gamedir/Data-1.13/TableData/Weapons.xml | 59 +++++++++++ 10 files changed, 365 insertions(+), 40 deletions(-) diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml index 21a3b2d70..1bdfe232e 100644 --- a/gamedir/Data-1.13/TableData/Attachments.xml +++ b/gamedir/Data-1.13/TableData/Attachments.xml @@ -6560,6 +6560,16 @@ 1191 5 + + 241 + 1194 + 5 + + + 241 + 1195 + 5 + 242 856 @@ -9170,6 +9180,11 @@ 1191 5 + + 307 + 1195 + 5 + 309 308 @@ -13315,6 +13330,11 @@ 1191 5 + + 946 + 1195 + 5 + 947 795 @@ -13460,6 +13480,11 @@ 668 5 + + 947 + 1195 + 5 + 948 21 @@ -13715,6 +13740,11 @@ 1077 5 + + 949 + 1195 + 5 + 950 12 @@ -13945,6 +13975,11 @@ 1077 5 + + 950 + 1195 + 5 + 951 128 @@ -15685,6 +15720,11 @@ 1191 5 + + 1003 + 1195 + 5 + 1004 12 @@ -16175,6 +16215,11 @@ 1191 5 + + 1004 + 1195 + 5 + 1005 1 @@ -17625,6 +17670,16 @@ 1191 5 + + 1005 + 1194 + 5 + + + 1005 + 1195 + 5 + 1006 1 @@ -18780,6 +18835,16 @@ 1191 5 + + 1006 + 1194 + 5 + + + 1006 + 1195 + 5 + 1007 12 @@ -19395,6 +19460,11 @@ 1077 5 + + 1007 + 1195 + 5 + 1008 17 @@ -20180,6 +20250,11 @@ 1191 5 + + 1011 + 1195 + 5 + 1012 12 @@ -20545,6 +20620,11 @@ 1191 5 + + 1012 + 1195 + 5 + 1024 176 @@ -21250,6 +21330,11 @@ 1188 5 + + 1026 + 1195 + 5 + 1027 282 @@ -22545,6 +22630,16 @@ 1191 5 + + 1029 + 1194 + 5 + + + 1029 + 1195 + 5 + 1030 12 @@ -23035,6 +23130,11 @@ 1191 5 + + 1030 + 1195 + 5 + 1053 282 diff --git a/gamedir/Data-1.13/TableData/Explosives.xml b/gamedir/Data-1.13/TableData/Explosives.xml index c3e3741ed..94652c71e 100644 --- a/gamedir/Data-1.13/TableData/Explosives.xml +++ b/gamedir/Data-1.13/TableData/Explosives.xml @@ -185,12 +185,12 @@ 4 0 0 - 10 + 5 0 0 1 35 - 6 + 3 16 @@ -888,4 +888,16 @@ 2 0 + + 74 + 4 + 0 + 0 + 10 + 0 + 0 + 1 + 2 + 6 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/German.Items.xml b/gamedir/Data-1.13/TableData/German.Items.xml index 4e142bb9f..65b2ce119 100644 --- a/gamedir/Data-1.13/TableData/German.Items.xml +++ b/gamedir/Data-1.13/TableData/German.Items.xml @@ -8985,12 +8985,27 @@ 1170 + AR-Gren. + AR-Mag / Grenade Pouch + Beschreibung erw´ünscht + AR-Mag / Grenade Pouch + Beschreibung erw´ünscht 1171 + AR-Util. + AR-Mag / Utility Pouch + Beschreibung erwünscht + AR-Mag / Utility Pouch + Beschreibung erwünscht 1172 + Cant.-Util. + Canteen / Utility Pouch + Beschreibung erwünscht + Canteen / Utility Pouch + Beschreibung erwünscht 1173 @@ -9107,6 +9122,11 @@ 1189 + Flare + Emergency Flare + Beschreibung erwünscht + Emergency Flare + Beschreibung erwünscht 1190 @@ -9140,4 +9160,20 @@ M1 Carbine Ursprünglich sollte der M1 Karabiner die Pistole als Seitenwaffe ersetzen, jedoch wurde er im Zweiten Weltkrieg oft als 'leichtes' Gewehr eingesetzt. Zwischen 1942-60 wurden über 6,25 Mio. Stück produziert. + + 1194 + Python + Colt Python + Beschreibung erwünscht + Colt Python + Beschreibung erwünscht + + + 1195 + MC51 + FR Ordnance MC51 + Beschreibung erwünscht + FR Ordnance MC51 + 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 8be45a5f7..710188f07 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -26619,7 +26619,7 @@ This leg rig mounts a double AR-magazine pouch and three individual grenade pouches. Great for your primary combat soldiers. 268435456 1 - 706 + 714 8 85 2 @@ -26639,7 +26639,7 @@ A double AR-magazine pouch and a larger utility pouch mounted together on a leg rig, this is useful for carrying larger things like explosives. 268435456 1 - 706 + 715 8 80 2 @@ -26659,7 +26659,7 @@ This leg rig has a utility pouch mounted besides a canteen pouch. 268435456 1 - 706 + 716 8 85 2 @@ -26739,7 +26739,7 @@ Not for sale through BR. 268435456 1 - 698 + 711 8 90 2 @@ -27077,14 +27077,26 @@ 1189 - Nada - Nothing - Index 1189 - Nothing - Nothing - 1 - 1 + Flare + Emergency Flare + A flare normally used for emergency purposes. + Emergency Flare + Brighter than chemical lightsticks, but also comparatively short-lived, these flares can light up the night for you. + 256 + 74 + 6 + 2 + 71 + 2 + 4 + 50 + 2 + 1 + 1 + 1 1 + 3 + 1 1190 @@ -27195,4 +27207,61 @@ 1 60 + + 1194 + Python + Colt Python + A very sturdy revolver, the Python has a reputation for accuracy. + Colt Python + The first 'modern' revolver after WW-II, it was made in several versions. + 2 + 1194 + 3 + 332 + 12 + 1 + 1 + 2 + 4 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 5 + 1 + 26 + + + 1195 + MC51 + FR Ordnance MC51 + Despite having stopping power in a small package, this was a not so popular gun, due to high maintenace requirements and low controllability in fullauto fire. + FR Ordnance MC51 + An even shorter version of the G3KA4 battle rifle, this was made in Great Britain for the SAS. We were able to get some of the rare rails for this gun. + 2 + 1195 + 3 + 342 + 37 + 1 + 5 + -2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 3 + 1 + 600 + -1 + 30 + \ 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 633df29c5..ef8be6763 100644 --- a/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml +++ b/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml @@ -585,29 +585,29 @@ 17 16 16 - 14 - 14 - 14 - 16 - 16 + 16 + 16 + 0 + 0 + 0 0 0 0 33 - 0 + 2 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 29 + 10 + 10 + 10 + 17 + 16 + 15 + 15 + 15 + 11 0 0 0 diff --git a/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml index eb7496b72..4dc24f817 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml @@ -320,4 +320,9 @@ 1063 0 + + 64 + 1189 + 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 f4f703bab..d8058adaf 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml @@ -3690,4 +3690,14 @@ 1190 0 + + 738 + 1194 + 1 + + + 739 + 1195 + 0 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Pockets.xml b/gamedir/Data-1.13/TableData/Pockets.xml index 26cc6a7b7..716268034 100644 --- a/gamedir/Data-1.13/TableData/Pockets.xml +++ b/gamedir/Data-1.13/TableData/Pockets.xml @@ -132,11 +132,11 @@ 7 0 0 - 1 - 1 - 1 - 1 - 1 + 3 + 3 + 3 + 2 + 2 1 1 1 @@ -174,9 +174,9 @@ 7 0 0 - 1 - 1 - 1 + 3 + 3 + 3 1 1 1 @@ -216,9 +216,9 @@ 6 0 0 - 1 - 1 - 1 + 2 + 2 + 2 1 1 1 diff --git a/gamedir/Data-1.13/TableData/Russian.Items.xml b/gamedir/Data-1.13/TableData/Russian.Items.xml index ade08126c..58db009e0 100644 --- a/gamedir/Data-1.13/TableData/Russian.Items.xml +++ b/gamedir/Data-1.13/TableData/Russian.Items.xml @@ -8838,12 +8838,27 @@ 1170 + AR-Gren. + AR-Mag / Grenade Pouch + A combination of a double AR-Mag pouch with three grenade pouches. + AR-Mag / Grenade Pouch + This leg rig mounts a double AR-magazine pouch and three individual grenade pouches. Great for your primary combat soldiers. 1171 + AR-Util. + AR-Mag / Utility Pouch + A combination of a double AR-Mag pouch and a utility pouch. + AR-Mag / Utility Pouch + A double AR-magazine pouch and a larger utility pouch mounted together on a leg rig, this is useful for carrying larger things like explosives. 1172 + Cant.-Util. + Canteen / Utility Pouch + Here a utility pouch was combined with a canteen pouch. + Canteen / Utility Pouch + This leg rig has a utility pouch mounted besides a canteen pouch. 1173 @@ -8945,6 +8960,11 @@ 1189 + Flare + Emergency Flare + A flare normally used for emergency purposes. + Emergency Flare + Brighter than chemical lightsticks, but also comparatively short-lived, these flares can light up the night for you. 1190 @@ -8978,4 +8998,18 @@ M1 Carbine The good old M1 Carbine, still on the market for WW-II enthusiasts and gun collectors. + + 1194 + Python + Colt Python + Colt Python + + + 1195 + MC51 + FR Ordnance MC51 + Despite having stopping power in a small package, this was a not so popular gun, due to high maintenace requirements and low controllability in fullauto fire. + FR Ordnance MC51 + An even shorter version of the G3KA4 battle rifle, this was made in Great Britain for the SAS. We were able to get some of the rare rails for this gun. + \ 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 42c4f1b96..7aa1a3caa 100644 --- a/gamedir/Data-1.13/TableData/Weapons.xml +++ b/gamedir/Data-1.13/TableData/Weapons.xml @@ -9956,4 +9956,63 @@ 7 476 + + 1194 + Colt Python + 1 + 1 + 4 + 13 + 20 + 27 + 16 + 3 + 6 + 110 + 200 + 100 + 60 + 5 + 423 + 100 + 106 + 157 + 5 + 5 + 7 + 480 + + + 1195 + FR Ordnance MC51 + 3 + 6 + 9 + 3 + 13 + 9 + 22 + 35 + 32 + 5 + 20 + 360 + 200 + 50 + 80 + 7 + 348 + 40 + 111 + 102 + 108 + 156 + 3 + 3 + 4 + 1 + 9 + 10 + 476 + \ No newline at end of file