From 97b8e5b43d0319f67dcef3aa2ba1732bfa50d25e Mon Sep 17 00:00:00 2001 From: Starwalker Date: Fri, 15 Jun 2007 09:34:48 +0000 Subject: [PATCH] added Grippod and ISM-V sight (pics by Marlboro Man) added 5 deactivated LBE-thingies for the inventory guys (pics by Marlboro Man) replaced Makarov PM pic (Tbird again) corrected NVG and Sungoggles boni and penalties (somehow they had become multiples of 8 instead multiples of 10) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@828 4f8fa57e-7814-0410-bad4-adc449f26b7c --- Data-1.13/BigItems/gun147.sti | Bin 2231 -> 2231 bytes Data-1.13/Interface/MDGUNS.sti | Bin 190925 -> 190925 bytes Data-1.13/TableData/Attachments.xml | 355 ++++++++++++++++++ Data-1.13/TableData/German.Items.xml | 20 +- .../TableData/IncompatibleAttachments.xml | 168 +++++++++ Data-1.13/TableData/Items.xml | 196 ++++++---- Data-1.13/TableData/Russian.Items.xml | 18 +- 7 files changed, 665 insertions(+), 92 deletions(-) diff --git a/Data-1.13/BigItems/gun147.sti b/Data-1.13/BigItems/gun147.sti index 102ffdaea4a572aa7d74ea851dfad44d2ed44823..2c6a0e39fd4e00e9d6470982419c1396bc2bfbc6 100644 GIT binary patch literal 2231 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 diff --git a/Data-1.13/Interface/MDGUNS.sti b/Data-1.13/Interface/MDGUNS.sti index 71a3037d0acfb04b8eff8aa5e364ff52d24cd5b9..4457ad99fbeda547d7245896709cac23e17bfe97 100644 GIT binary patch delta 413 zcmZ8ay-LGS6ut>kg#;pYQ^zy(0S=BA9Nb;)=nJHUPU#SnSgX*WPWMFwpTNPPICOQm zPjEAI>2&CKLqpK-OyBQWZ=&@kdiV%V?($UBCDngnYkzf9Q|k`@!4CbUP3sC-YmG7e z!l7N0sNzD14gq9Ldew9wQsucweh6U1nxgz^E8I{9UQk3bO#aphGk z6zUCh$|&D#d+M~#umv~vuG4O^{bK3pZiYDMd)xI>2>0xJ-mzm&l0@J0ay1SQu zsyqdes*~%4$fc?;oty4 zE>tEc)kWrG+*5Y$TTAL@(Zv=&W4fn2E($J`zI0uEfZ81x^Q9ZuA*^1n-3QDU6L?=t HlB?%mF7l&P diff --git a/Data-1.13/TableData/Attachments.xml b/Data-1.13/TableData/Attachments.xml index cdc6c0a23..191b291cf 100644 --- a/Data-1.13/TableData/Attachments.xml +++ b/Data-1.13/TableData/Attachments.xml @@ -12850,6 +12850,356 @@ 793 5 + + 946 + 760 + 5 + + + 946 + 606 + 5 + + + 946 + 607 + 5 + + + 946 + 608 + 5 + + + 946 + 609 + 5 + + + 946 + 610 + 5 + + + 946 + 611 + 5 + + + 946 + 795 + 5 + + + 946 + 796 + 5 + + + 946 + 764 + 5 + + + 946 + 632 + 5 + + + 946 + 12 + 5 + + + 946 + 633 + 5 + + + 946 + 23 + 5 + + + 946 + 648 + 5 + + + 946 + 792 + 5 + + + 946 + 793 + 5 + + + 946 + 651 + 5 + + + 946 + 787 + 5 + + + 946 + 652 + 5 + + + 946 + 788 + 5 + + + 946 + 790 + 5 + + + 946 + 791 + 5 + + + 946 + 1066 + 5 + + + 946 + 662 + 5 + + + 946 + 1070 + 5 + + + 946 + 1072 + 5 + + + 946 + 665 + 5 + + + 946 + 666 + 5 + + + 946 + 664 + 5 + + + 946 + 673 + 5 + + + 946 + 677 + 5 + + + 946 + 348 + 5 + + + 946 + 782 + 5 + + + 946 + 765 + 5 + + + 946 + 797 + 5 + + + 946 + 781 + 5 + + + 946 + 669 + 5 + + + 946 + 650 + 5 + + + 946 + 646 + 5 + + + 946 + 332 + 5 + + + 946 + 34 + 5 + + + 946 + 20 + 5 + + + 946 + 1074 + 5 + + + 946 + 28 + 5 + + + 946 + 647 + 5 + + + 947 + 795 + 5 + + + 947 + 796 + 5 + + + 947 + 1066 + 5 + + + 947 + 1065 + 5 + + + 947 + 662 + 5 + + + 947 + 1070 + 5 + + + 947 + 1072 + 5 + + + 947 + 797 + 5 + + + 947 + 632 + 5 + + + 947 + 12 + 5 + + + 947 + 633 + 5 + + + 947 + 23 + 5 + + + 947 + 792 + 5 + + + 947 + 648 + 5 + + + 947 + 793 + 5 + + + 947 + 651 + 5 + + + 947 + 787 + 5 + + + 947 + 652 + 5 + + + 947 + 788 + 5 + + + 947 + 790 + 5 + + + 947 + 791 + 5 + + + 947 + 650 + 5 + + + 947 + 34 + 5 + + + 947 + 29 + 5 + 948 21 @@ -19370,6 +19720,11 @@ 1074 5 + + 1011 + 650 + 5 + 1012 12 diff --git a/Data-1.13/TableData/German.Items.xml b/Data-1.13/TableData/German.Items.xml index 14c1cc182..c62a92f76 100644 --- a/Data-1.13/TableData/German.Items.xml +++ b/Data-1.13/TableData/German.Items.xml @@ -7552,19 +7552,19 @@ 946 - Nada - Nothing - Index 946 - Nothing - Nothing + ISM-V-IR + ISM-V-IR + Beschreibung erwünscht + ISM-V-IR + Beschreibung erwünscht 947 - Nada - Nothing - Index 947 - Nothing - Nothing + Grippod + Grippod + Beschreibung erwünscht + Grippod + Beschreibung erwünscht 948 diff --git a/Data-1.13/TableData/IncompatibleAttachments.xml b/Data-1.13/TableData/IncompatibleAttachments.xml index 2feac1c54..ad977ff26 100644 --- a/Data-1.13/TableData/IncompatibleAttachments.xml +++ b/Data-1.13/TableData/IncompatibleAttachments.xml @@ -96,6 +96,10 @@ 208 948 + + 208 + 946 + 209 50 @@ -144,6 +148,10 @@ 209 921 + + 209 + 947 + 223 224 @@ -168,6 +176,10 @@ 241 949 + + 241 + 946 + 244 310 @@ -236,6 +248,10 @@ 902 913 + + 902 + 947 + 904 50 @@ -280,6 +296,10 @@ 904 1011 + + 904 + 947 + 905 50 @@ -324,6 +344,10 @@ 905 1011 + + 905 + 947 + 909 50 @@ -544,6 +568,10 @@ 913 909 + + 913 + 947 + 921 209 @@ -556,6 +584,94 @@ 921 1010 + + 921 + 947 + + + 946 + 1004 + + + 946 + 1030 + + + 946 + 1007 + + + 946 + 948 + + + 946 + 999 + + + 946 + 1000 + + + 946 + 1006 + + + 946 + 1029 + + + 946 + 208 + + + 946 + 1005 + + + 946 + 241 + + + 946 + 949 + + + 946 + 950 + + + 947 + 209 + + + 947 + 1011 + + + 947 + 1010 + + + 947 + 902 + + + 947 + 921 + + + 947 + 904 + + + 947 + 913 + + + 947 + 905 + 948 208 @@ -608,6 +724,10 @@ 948 1030 + + 948 + 946 + 949 948 @@ -624,6 +744,10 @@ 949 1005 + + 949 + 946 + 950 948 @@ -640,6 +764,10 @@ 950 1005 + + 950 + 946 + 998 208 @@ -696,6 +824,10 @@ 999 948 + + 999 + 946 + 1000 208 @@ -732,6 +864,10 @@ 1000 948 + + 1000 + 946 + 1001 1002 @@ -788,6 +924,10 @@ 1004 948 + + 1004 + 946 + 1005 241 @@ -804,6 +944,10 @@ 1005 949 + + 1005 + 946 + 1006 208 @@ -824,6 +968,10 @@ 1006 948 + + 1006 + 946 + 1007 208 @@ -852,6 +1000,10 @@ 1007 948 + + 1007 + 946 + 1008 1009 @@ -904,6 +1056,10 @@ 1010 921 + + 1010 + 947 + 1011 50 @@ -948,6 +1104,10 @@ 1011 921 + + 1011 + 947 + 1012 207 @@ -988,6 +1148,10 @@ 1029 948 + + 1029 + 946 + 1030 208 @@ -1016,4 +1180,8 @@ 1030 948 + + 1030 + 946 + \ No newline at end of file diff --git a/Data-1.13/TableData/Items.xml b/Data-1.13/TableData/Items.xml index 906c7d677..b253d4da4 100644 --- a/Data-1.13/TableData/Items.xml +++ b/Data-1.13/TableData/Items.xml @@ -4747,10 +4747,10 @@ 1 4 1 - 8 - -16 - 8 - -32 + 10 + -20 + 10 + -40 212 @@ -4772,10 +4772,10 @@ 1 5 1 - -8 - 8 - -16 - 16 + -10 + 10 + -20 + 20 213 @@ -5399,10 +5399,10 @@ 1 4 1 - 16 - -16 - 16 - -32 + 20 + -20 + 20 + -40 247 @@ -14139,9 +14139,8 @@ 1 750 -1 - 5 - 5 30 + 1011 651 @@ -16277,7 +16276,7 @@ Steyr AUG HBAR A heavier barrel and integral bipod transform the AUG into a hardy squad automatic. Steyr AUG HBAR - Otherwise very similar to the AUG, the HBAR features a heavier barrel and integral bipod. + Otherwise very similar to the AUG, the HBAR features a heavier barrel, integral bipod and can use larger magazines. 2 726 3 @@ -16297,7 +16296,7 @@ 2 1 680 - 10 + 7 5 5 1029 @@ -21422,22 +21421,25 @@ 946 - ISM-V - ISM-V - A combination of a red-dot sight with an aiming laser. - ISM-V - If you do not want your gun overcrowded with attachments, here is a combination of a red-dot sight with a laser sight. precludes mounting of scopes, though. + ISM-V-IR + ISM-V-IR + A combination of a red-dot sight with an aiming laser (including IR). + ISM-V-IR + If you do not want your gun overcrowded with attachments, here is a combination of a red-dot sight with an IR-laser sight. Precludes mounting of scopes, though. 268435456 1 - 156 - 2 + 694 + 3 4 - 1800 + 3000 + 9 -4 1 1 + 1 1 1 + 1 1 1 1 @@ -21446,8 +21448,8 @@ 20 150 20 - 15 - 9 + 20 + 20 947 @@ -21458,14 +21460,17 @@ Your bipod is getting in the way so you can't mount a foregrip? Here's the solution! The Grippod drops two legs out of its bottom at the push of a button. 268435456 1 - 69 + 693 4 4 500 + 7 1 1 1 + 1 1 + 1 3 1 7 @@ -21549,8 +21554,8 @@ 1 20 300 - 25 - 10 + 30 + 20 951 @@ -22782,7 +22787,7 @@ 20 100 10 - 8 + 10 1006 @@ -23176,10 +23181,10 @@ 1 3 1 - 24 - -16 - 24 - -32 + 30 + -20 + 30 + -40 1025 @@ -23205,10 +23210,10 @@ 1 2 1 - 32 - -16 - 32 - -32 + 40 + -20 + 40 + -40 1026 @@ -24544,58 +24549,103 @@ 1089 - Nada - Nothing - Index 1089 - Nothing - Nothing - 1 - 1 + TAC-1C + TT Utility Vest + A vest with two larger pockets for carrying some big things. + TT Utility Vest + The Tactical Tailor Utility Vest is for those who are not primary combat soldiers, but have other duties as well. + 268435456 + 1 + 699 + 1 + 140 + 2 + 1 + 1 + 1 1 + 2 + 1 1090 - Nada - Nothing - Index 1090 - Nothing - Nothing - 1 - 1 + LBE Gear + LBE Gear + Several pouches mounted onto a harness. + LBE Gear + Load Bearing Equipment lets you carry your equipment into battle. + 268435456 + 1 + 698 + 1 + 80 + 2 + 1 + 1 + 1 1 + 2 + 1 1091 - Nada - Nothing - Index 1091 - Nothing - Nothing - 1 - 1 + Holster + Holster + A tactical holster that rides on the upper thigh, it has a pocket for a spare magazine. + Holster + The Eagle SAS Tactical Holster carries a medium pistol and a spare magazine. + 268435456 + 1 + 695 + 1 + 75 + 2 + 1 + 1 + 1 1 + 2 + 1 1092 - Nada - Nothing - Index 1092 - Nothing - Nothing - 1 - 1 + Holster Rig + Holster Rig + A leg rig outfitted with a medium pistol holster and a triple pistol mag pouch. + Holster Rig + This Tactical Tailor Leg Rig can carry a pistol and three magazines. + 268435456 + 1 + 696 + 1 + 110 + 2 + 1 + 1 + 1 1 + 2 + 1 1093 - Nada - Nothing - Index 1093 - Nothing - Nothing - 1 - 1 + MP Holster + MP Holster + A leg rig for large pistols or small machinepistols. Can carry an additional magazine. + MP Holster + With this Holster you can strap a small machinepistol or large pistol to your upper thigh. Has a pocket for an additional mag. + 268435456 + 1 + 697 + 1 + 130 + 2 + 1 + 1 + 1 1 + 2 + 1 1094 diff --git a/Data-1.13/TableData/Russian.Items.xml b/Data-1.13/TableData/Russian.Items.xml index 19d90e52a..6e54b3a0e 100644 --- a/Data-1.13/TableData/Russian.Items.xml +++ b/Data-1.13/TableData/Russian.Items.xml @@ -7570,19 +7570,19 @@ 946 - Nada - Nothing - Index 946 - Nothing - Nothing + ISM-V-IR + ISM-V-IR + A combination of a red-dot sight with an aiming laser (including IR). + ISM-V-IR + If you do not want your gun overcrowded with attachments, here is a combination of a red-dot sight with an IR-laser sight. Precludes mounting of scopes, though. 947 - Nada - Nothing - Index 947 + Grippod + Grippod + This Grippod fits on the lower Picatinny Rail of a lot of modern rifles. Its bipod is not as sturdy as a dedicated one, though. Nothing - Nothing + Your bipod is getting in the way so you can't mount a foregrip? Here's the solution! The Grippod drops two legs out of its bottom at the push of a button. 948