From dbf267dbcf150cfcbf5d6da6549fd7bf9cf2a022 Mon Sep 17 00:00:00 2001 From: Starwalker Date: Sun, 9 Sep 2007 12:16:25 +0000 Subject: [PATCH] added three new SMGs (MAT-49, SIG MP41, Spectre M4), also to Tony's inventory changed description of FN BDA changed SMGs usable in one hand to machinepistol class, so they appear in that section in BR's now. Additionally, these are guns that will fit into the New Inventory 'MP-Holster'. added six new thigh-packs and a single vest, but they are deactivated and still have stand-in graphics. git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@872 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/TableData/Attachments.xml | 100 ++++++++ gamedir/Data-1.13/TableData/German.Items.xml | 45 ++++ gamedir/Data-1.13/TableData/Items.xml | 234 +++++++++++++++++- .../TableData/LoadBearingEquipment.xml | 137 +++++++++- .../Data-1.13/TableData/MercStartingGear.xml | 50 ++-- .../TableData/NPCInventory/TonyInventory.xml | 15 ++ gamedir/Data-1.13/TableData/Russian.Items.xml | 45 ++++ gamedir/Data-1.13/TableData/Weapons.xml | 125 +++++++++- 8 files changed, 702 insertions(+), 49 deletions(-) diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml index e8699afa9..43dc7fa50 100644 --- a/gamedir/Data-1.13/TableData/Attachments.xml +++ b/gamedir/Data-1.13/TableData/Attachments.xml @@ -2565,6 +2565,21 @@ 672 5 + + 207 + 1177 + 5 + + + 207 + 1178 + 5 + + + 207 + 1179 + 5 + 208 19 @@ -6485,6 +6500,21 @@ 1077 5 + + 241 + 1177 + 5 + + + 241 + 1178 + 5 + + + 241 + 1179 + 5 + 242 856 @@ -9070,6 +9100,11 @@ 1077 5 + + 307 + 1177 + 5 + 309 308 @@ -9620,6 +9655,11 @@ 1074 5 + + 310 + 1179 + 5 + 316 264 @@ -14445,6 +14485,16 @@ 1067 5 + + 1002 + 1177 + 5 + + + 1002 + 1178 + 5 + 1003 1 @@ -15510,6 +15560,21 @@ 1077 5 + + 1003 + 1177 + 5 + + + 1003 + 1178 + 5 + + + 1003 + 1179 + 5 + 1004 12 @@ -17405,6 +17470,21 @@ 1077 5 + + 1005 + 1177 + 5 + + + 1005 + 1178 + 5 + + + 1005 + 1179 + 5 + 1006 1 @@ -18530,6 +18610,16 @@ 1077 5 + + 1006 + 1178 + 5 + + + 1006 + 1179 + 5 + 1007 12 @@ -20955,6 +21045,16 @@ 1077 5 + + 1026 + 1177 + 5 + + + 1026 + 1178 + 5 + 1027 282 diff --git a/gamedir/Data-1.13/TableData/German.Items.xml b/gamedir/Data-1.13/TableData/German.Items.xml index cf2f662f3..b9ee082c1 100644 --- a/gamedir/Data-1.13/TableData/German.Items.xml +++ b/gamedir/Data-1.13/TableData/German.Items.xml @@ -8983,4 +8983,49 @@ 1169 + + 1170 + + + 1171 + + + 1172 + + + 1173 + + + 1174 + + + 1175 + + + 1176 + + + 1177 + Spectre + Spectre M4 + Beschreibung erwünscht + Spectre M4 + Beschreibung erwünscht + + + 1178 + MAT-49 + MAT-49 + Beschreibung erwünscht + MAT-49 + Beschreibung erwünscht + + + 1179 + SIG MP41 + SIG MP41 + Beschreibung erwünscht + SIG MP41 + 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 75a1329ac..0554044e6 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -11420,7 +11420,6 @@ 2 6 4000 - 8 -6 1 1 @@ -13986,9 +13985,9 @@ 645 BDA 9 FN BDA 9 - The FN BDA 9 is the 9mm Parabellum version of the tried and true Browning High Power semiautomatic pistol. + The FN BDA 9 is the double-action version of the tried and true Browning High Power semiautomatic pistol. FN BDA 9 - The FN BDA 9 is the 9mm Parabellum version of the tried and true Browning High Power semiautomatic pistol. + The FN BDA 9 is the double-action version of the tried and true Browning High Power semiautomatic pistol. 2 645 3 @@ -26577,4 +26576,233 @@ -1 20 + + 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. + 268435456 + 1 + 706 + 8 + 85 + 2 + 1 + 1 + 1 + 1 + 3 + 1 + + + 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. + 268435456 + 1 + 706 + 8 + 80 + 2 + 1 + 1 + 1 + 1 + 3 + 1 + + + 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. + 268435456 + 1 + 706 + 8 + 85 + 2 + 1 + 1 + 1 + 1 + 3 + 1 + + + 1173 + Util.-Gren. + Utility / Grenade Pouch + A combination of a utility pouch with three grenade pouches. + Utility / Grenade Pouch + Here we have a utility pouch combined with three individual grenade pouches. + 268435456 + 1 + 706 + 9 + 85 + 2 + 1 + 1 + 1 + 1 + 3 + 1 + + + 1174 + L.Mag-Util. + Large Mag / Utility Pouch + This combo has a utility pouch with two pouches for oddly shaped magazines. + Large Mag / Utility Pouch + This leg rig offers a utility pouch together with two large mag pouches for those extremely long P90 or G11 magazines (or similar odd magazines). + 268435456 + 1 + 706 + 8 + 85 + 2 + 1 + 1 + 1 + 1 + 3 + 1 + + + 1175 + L.Mag-Gren. + Large Mag / Grenade Pouch + A combination of two large magazine pouches with two grenade pouches. + Large Mag / Grenade Pouch + This leg rig mounts two large magazine pouches combined with two individual grenade pouches. + 268435456 + 1 + 706 + 7 + 85 + 2 + 1 + 1 + 1 + 1 + 3 + 1 + + + 1176 + Hunter Vest + Hunter Vest + A vest as it is often used by hunters and photographers. + Hunter Vest + Not for sale through BR. + 268435456 + 1 + 698 + 8 + 90 + 2 + 1 + 1 + 1 + 1 + + + 1177 + Spectre + Spectre M4 + An ugly SMG developed with reliability as its main focus (besides spitting lead). + Spectre M4 + This Italian SMG is very reliable due to some very interesting design features, like forcing air around the barrel with every shot to keep it cool. + 2 + 1177 + 3 + 328 + 29 + 1350 + 3 + 3 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 1 + 850 + -1 + 5 + 5 + 30 + + + 1178 + MAT-49 + MAT-49 + An older French SMG that can be folded down to a small package. + MAT-49 + This is a fullauto-only French Army SMG, unlike the police versions that have semiauto, too. The magazine well can be folded along the barrel for easy storage and acts as a foregrip. + 2 + 1178 + 3 + 329 + 36 + 1460 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 3 + 1 + 600 + -1 + 5 + 5 + 30 + + + 1179 + SIG MP41 + SIG MP41 + Old but sturdy Swiss craftsmanship. + SIG MP41 + This old Swiss SMG is fullauto-only and quite heavy, but its range is up to par with modern SMGs. + 2 + 1179 + 3 + 327 + 44 + 1110 + 2 + 2 + 2 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 2 + 1 + 850 + \ 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 9980f3f78..4cd73ddf5 100644 --- a/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml +++ b/gamedir/Data-1.13/TableData/LoadBearingEquipment.xml @@ -21,10 +21,10 @@ 1 1 0 - 11 - 16 + 15 + 15 17 - 8 + 0 0 0 0 @@ -444,12 +444,12 @@ 26 - 0 + 1 0 - 0 - 0 - 0 - 0 + 9 + 13 + 13 + 13 0 0 0 @@ -461,6 +461,108 @@ 27 + 1 + 0 + 0 + 0 + 0 + 9 + 7 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 28 + 1 + 0 + 0 + 0 + 0 + 17 + 7 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 29 + 1 + 0 + 0 + 13 + 13 + 13 + 7 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 30 + 1 + 0 + 0 + 8 + 0 + 8 + 7 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 31 + 1 + 0 + 8 + 13 + 8 + 13 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 32 + 2 + 0 + 16 + 16 + 15 + 15 + 13 + 13 + 13 + 15 + 15 + 0 + 0 + 0 + + + 33 0 0 0 @@ -477,7 +579,24 @@ 0 - 28 + 34 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + 35 0 0 0 diff --git a/gamedir/Data-1.13/TableData/MercStartingGear.xml b/gamedir/Data-1.13/TableData/MercStartingGear.xml index eb6f84f71..725c7ead8 100644 --- a/gamedir/Data-1.13/TableData/MercStartingGear.xml +++ b/gamedir/Data-1.13/TableData/MercStartingGear.xml @@ -1985,7 +1985,7 @@ 176 161 0 - 9 + 1179 72 0 0 @@ -1998,9 +1998,9 @@ 0 0 0 - 0 + 1090 0 - 1093 + 0 0 0 99 @@ -2019,9 +2019,9 @@ 0 0 0 - 0 + 99 0 - 100 + 0 0 0 3 @@ -2117,8 +2117,8 @@ 0 161 0 - 4 - 71 + 1178 + 72 37 0 0 @@ -2130,9 +2130,9 @@ 0 0 0 - 0 + 1090 0 - 1093 + 0 0 0 0 @@ -2151,9 +2151,9 @@ 0 0 0 - 0 + 94 0 - 100 + 0 0 0 3 @@ -2724,7 +2724,7 @@ 0 0 0 - 0 + 1176 0 0 0 @@ -2745,7 +2745,7 @@ 0 0 0 - 0 + 52 0 0 0 @@ -2922,7 +2922,7 @@ 0 0 0 - 0 + 1176 0 0 0 @@ -2943,7 +2943,7 @@ 0 0 0 - 0 + 84 0 0 0 @@ -2988,7 +2988,7 @@ 0 0 0 - 0 + 1176 0 0 0 @@ -3009,7 +3009,7 @@ 0 0 0 - 0 + 67 0 0 0 @@ -4176,7 +4176,7 @@ 0 0 0 - 0 + 1176 0 0 0 @@ -4197,7 +4197,7 @@ 0 0 0 - 0 + 76 0 0 0 @@ -4572,7 +4572,7 @@ 0 0 0 - 0 + 1176 0 0 1098 @@ -4593,7 +4593,7 @@ 0 0 0 - 0 + 98 0 0 100 @@ -9181,8 +9181,8 @@ 0 0 275 - 1099 - 1092 + 1176 + 0 0 0 0 @@ -9202,8 +9202,8 @@ 0 0 100 - 62 - 86 + 89 + 0 0 0 0 diff --git a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml index 334c5b3ad..0e97f9558 100644 --- a/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml +++ b/gamedir/Data-1.13/TableData/NPCInventory/TonyInventory.xml @@ -3630,4 +3630,19 @@ 1077 0 + + 726 + 1177 + 1 + + + 727 + 1178 + 2 + + + 728 + 1179 + 1 + \ 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 d837b28a5..1cdbab96a 100644 --- a/gamedir/Data-1.13/TableData/Russian.Items.xml +++ b/gamedir/Data-1.13/TableData/Russian.Items.xml @@ -8836,4 +8836,49 @@ 1169 + + 1170 + + + 1171 + + + 1172 + + + 1173 + + + 1174 + + + 1175 + + + 1176 + + + 1177 + Spectre + Spectre M4 + An ugly SMG developed with reliability as its main focus (besides spitting lead). + Spectre M4 + This Italian SMG is very reliable due to some very interesting design features, like forcing air around the barrel with every shot to keep it cool. + + + 1178 + MAT-49 + MAT-49 + An older French SMG that can be folded down to a small package. + MAT-49 + This is a fullauto-only French Army SMG, unlike the police versions that have semiauto, too. The magazine well can be folded along the barrel for easy storage and acts as a foregrip. + + + 1179 + SIG MP41 + SIG MP41 + Old but sturdy Swiss craftsmanship. + SIG MP41 + This old Swiss SMG is fullauto-only and quite heavy, but its range is up to par with modern SMGs. + \ 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 b2068de85..a7816040b 100644 --- a/gamedir/Data-1.13/TableData/Weapons.xml +++ b/gamedir/Data-1.13/TableData/Weapons.xml @@ -267,7 +267,7 @@ 9 HK MP5KA4 2 - 3 + 2 2 1 15 @@ -301,7 +301,7 @@ 10 Ingram M10 2 - 3 + 2 3 1 15 @@ -1885,7 +1885,7 @@ 330 Micro-Uzi 2 - 3 + 2 2 18 10 @@ -2631,7 +2631,7 @@ 601 AEK-919K "Kashtan" 2 - 3 + 2 22 1 18 @@ -2730,7 +2730,7 @@ 604 Agram 2000 2 - 3 + 2 2 1 18 @@ -3886,7 +3886,7 @@ 641 FAMAE Mini SAF 2 - 3 + 2 2 1 18 @@ -4921,7 +4921,7 @@ 673 HK MP7A1 2 - 3 + 2 19 22 8 @@ -5385,7 +5385,7 @@ 688 Ingram M11/9 2 - 3 + 2 2 18 9 @@ -5505,7 +5505,7 @@ 692 Mini-Uzi 2 - 3 + 2 2 1 15 @@ -5784,7 +5784,7 @@ 701 PP-93 2 - 3 + 2 22 18 8 @@ -6368,7 +6368,7 @@ 720 Skorpion vz.82 2 - 3 + 2 22 18 8 @@ -6677,7 +6677,7 @@ 730 Steyr TMP 2 - 3 + 2 2 18 9 @@ -9759,4 +9759,105 @@ 9 476 + + 1177 + Spectre M4 + 2 + 3 + 2 + 2 + 15 + 8 + 22 + 25 + 18 + 5 + 30 + 130 + 200 + 63 + 50 + 3 + 374 + 60 + 62 + 101 + 107 + 376 + 3 + 4 + 4 + 1 + 7 + 8 + 476 + + + 1178 + MAT-49 + 2 + 3 + 2 + 3 + 15 + 8 + 22 + 26 + 19 + 5 + 30 + 180 + 200 + 63 + 50 + 3 + 373 + 64 + 62 + 101 + 107 + 376 + 3 + 3 + 4 + 1 + 7 + 8 + 1 + 476 + + + 1179 + SIG MP41 + 2 + 3 + 2 + 3 + 15 + 8 + 22 + 26 + 19 + 6 + 30 + 190 + 200 + 63 + 50 + 3 + 373 + 64 + 62 + 101 + 107 + 376 + 3 + 4 + 4 + 1 + 7 + 8 + 1 + 476 + \ No newline at end of file