From 25dfe1388c4de66303d03cb5278fb0f936c96a6b Mon Sep 17 00:00:00 2001 From: Starwalker Date: Thu, 26 Apr 2007 09:41:51 +0000 Subject: [PATCH] changed Colt Delta Elite to small slot changed FN EGLM to draw pics from P1ITEM removed Foregrip attachability from Glock 19 (made no sense on that gun) added Heavy Throwing Knife to Tony's inventory added .45 ACP Drums to Tony's inventory added Steyr ACR, but DEACTIVATED it, because it is not ready yet added Steyr ACR magazine, but DEACTIVATED it, because it is not ready yet git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@777 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/Data-1.13/TableData/AmmoStrings.xml | 10 + gamedir/Data-1.13/TableData/Attachments.xml | 30 +- gamedir/Data-1.13/TableData/German.Items.xml | 24 +- gamedir/Data-1.13/TableData/Items.xml | 53 +- gamedir/Data-1.13/TableData/Launchables.xml | 4 + gamedir/Data-1.13/TableData/Magazines.xml | 6 + gamedir/Data-1.13/TableData/Merges.xml | 738 +++++++++--------- gamedir/Data-1.13/TableData/Russian.Items.xml | 22 +- gamedir/Data-1.13/TableData/Weapons.xml | 20 + 9 files changed, 494 insertions(+), 413 deletions(-) diff --git a/gamedir/Data-1.13/TableData/AmmoStrings.xml b/gamedir/Data-1.13/TableData/AmmoStrings.xml index 243532676..ab9ac4dce 100644 --- a/gamedir/Data-1.13/TableData/AmmoStrings.xml +++ b/gamedir/Data-1.13/TableData/AmmoStrings.xml @@ -210,4 +210,14 @@ 12.7x97mm Subsonic 12.7x97mm + + 42 + 6.8x43mm SPC + 6.8x43mm + + + 43 + 5.56x45mm SCF + 5.56mm SCF + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Attachments.xml b/gamedir/Data-1.13/TableData/Attachments.xml index 4cf69ae06..395b60324 100644 --- a/gamedir/Data-1.13/TableData/Attachments.xml +++ b/gamedir/Data-1.13/TableData/Attachments.xml @@ -4085,6 +4085,11 @@ 128 3 + + 241 + 789 + 5 + 242 856 @@ -10070,6 +10075,11 @@ 726 5 + + 1004 + 789 + 5 + 1005 1 @@ -11355,6 +11365,11 @@ 128 3 + + 1005 + 789 + 5 + 1006 1 @@ -12920,6 +12935,11 @@ 128 3 + + 1007 + 789 + 5 + 1008 17 @@ -13400,11 +13420,6 @@ 656 5 - - 1011 - 658 - 5 - 1011 661 @@ -15865,4 +15880,9 @@ 726 5 + + 1030 + 789 + 5 + \ 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 dda2743b6..b0a991d92 100644 --- a/gamedir/Data-1.13/TableData/German.Items.xml +++ b/gamedir/Data-1.13/TableData/German.Items.xml @@ -1,4 +1,4 @@ - + 0 @@ -3824,17 +3824,17 @@ 480 - Nada - Nothing - Index 480 - Nothing - Nothing + 5.56 SCF mag + 5.56x45mm SCF mag + Beschreibung erwünscht + 5.56x45mm SCF mag + Beschreibung erwünscht 481 Nada Nothing - index 481 + Index 480 Nothing Nothing @@ -6296,11 +6296,11 @@ 789 - Nada - Nothing - Index 789 - Nothing - Nothing + Steyr ACR + Steyr ACR + Beschreibung erwünscht + Steyr ACR + Beschreibung erwünscht 790 diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml index d37d2c3b7..8284b3f1f 100644 --- a/gamedir/Data-1.13/TableData/Items.xml +++ b/gamedir/Data-1.13/TableData/Items.xml @@ -6404,7 +6404,7 @@ 1 172 5 - 1 + 2 45 2 1 @@ -10142,14 +10142,20 @@ 480 - Nada - Nothing - Index 921 - Nothing - Nothing - 1 - 1 + 5.56 SCF mag + 5.56x45mm SCF mag + A magazine of armor piercing flechette dart ammunition. + 5.56x45mm SCF mag + Newly developed flechette ammo that goes together with the newly developed Steyr Advanced Combat Rifle. + 1024 + 297 + 1 + 580 + 3 + 4 + 1 1 + 1 481 @@ -17936,6 +17942,7 @@ 3 295 11 + 1 850 2 1 @@ -18009,14 +18016,27 @@ 789 - Nada - Nothing - Index 789 - Nothing - Nothing - 1 - 1 + Steyr ACR + Steyr ACR + The Advanced Combat Rifle fires a small armor penetrating fin stabilized dart over a considerable range. + Steyr ACR + Prototype of a new generation of assault rifles, the Steyr ACR fires fin stabilized darts. This is the future weapon of choice. + 2 + 789 + 301 + 32 + 1 + 1 + 1 + 1 + 1 + 1 + 1 1 + 1 + 1 + 1200 + 1029 790 @@ -20858,7 +20878,8 @@ 16 921 20 - 292 + 1 + 581 14 1 800 diff --git a/gamedir/Data-1.13/TableData/Launchables.xml b/gamedir/Data-1.13/TableData/Launchables.xml index 9cba33382..d61ae15f8 100644 --- a/gamedir/Data-1.13/TableData/Launchables.xml +++ b/gamedir/Data-1.13/TableData/Launchables.xml @@ -412,6 +412,10 @@ 991 921 + + 991 + 920 + 992 906 diff --git a/gamedir/Data-1.13/TableData/Magazines.xml b/gamedir/Data-1.13/TableData/Magazines.xml index 505c24e82..762116135 100644 --- a/gamedir/Data-1.13/TableData/Magazines.xml +++ b/gamedir/Data-1.13/TableData/Magazines.xml @@ -1782,4 +1782,10 @@ 5 3 + + 297 + 43 + 24 + 3 + \ No newline at end of file diff --git a/gamedir/Data-1.13/TableData/Merges.xml b/gamedir/Data-1.13/TableData/Merges.xml index 805185ad3..8a15760b1 100644 --- a/gamedir/Data-1.13/TableData/Merges.xml +++ b/gamedir/Data-1.13/TableData/Merges.xml @@ -1,77 +1,77 @@ - + - - 37 - 194 - 1022 - 0 - 6 - 5 - - - 37 - 195 - 1022 - 0 - 6 - 5 - - - 37 - 291 - 1022 - 0 - 6 - 5 - - - 37 - 296 - 1022 - 0 - 6 - 5 - - - 54 - 194 - 1022 - 0 - 6 - 5 - - - 54 - 195 - 1022 - 0 - 6 - 5 - - - 54 - 291 - 1022 - 0 - 6 - 5 - - - 54 - 296 - 1022 - 0 - 6 - 5 - - - 62 - 1022 - 38 - 1022 - 4 - 5 - + + 37 + 194 + 1022 + 0 + 6 + 5 + + + 37 + 195 + 1022 + 0 + 6 + 5 + + + 37 + 291 + 1022 + 0 + 6 + 5 + + + 37 + 296 + 1022 + 0 + 6 + 5 + + + 54 + 194 + 1022 + 0 + 6 + 5 + + + 54 + 195 + 1022 + 0 + 6 + 5 + + + 54 + 291 + 1022 + 0 + 6 + 5 + + + 54 + 296 + 1022 + 0 + 6 + 5 + + + 62 + 1022 + 38 + 1022 + 4 + 5 + 136 137 @@ -648,102 +648,102 @@ 1 8 - - 299 - 194 - 1022 - 0 - 6 - 5 - - - 299 - 195 - 1022 - 0 - 6 - 5 - - - 299 - 291 - 1022 - 0 - 6 - 5 - - - 299 - 296 - 1022 - 0 - 6 - 5 - - - 300 - 194 - 1022 - 0 - 6 - 5 - - - 300 - 195 - 1022 - 0 - 6 - 5 - - - 300 - 291 - 1022 - 0 - 6 - 5 - - - 300 - 296 - 1022 - 0 - 6 - 5 - - - 301 - 194 - 1022 - 0 - 6 - 5 - - - 301 - 195 - 1022 - 0 - 6 - 5 - - - 301 - 291 - 1022 - 0 - 6 - 5 - - - 301 - 296 - 1022 - 0 - 6 - 5 - + + 299 + 194 + 1022 + 0 + 6 + 5 + + + 299 + 195 + 1022 + 0 + 6 + 5 + + + 299 + 291 + 1022 + 0 + 6 + 5 + + + 299 + 296 + 1022 + 0 + 6 + 5 + + + 300 + 194 + 1022 + 0 + 6 + 5 + + + 300 + 195 + 1022 + 0 + 6 + 5 + + + 300 + 291 + 1022 + 0 + 6 + 5 + + + 300 + 296 + 1022 + 0 + 6 + 5 + + + 301 + 194 + 1022 + 0 + 6 + 5 + + + 301 + 195 + 1022 + 0 + 6 + 5 + + + 301 + 291 + 1022 + 0 + 6 + 5 + + + 301 + 296 + 1022 + 0 + 6 + 5 + 311 312 @@ -784,206 +784,206 @@ 1 8 - - 593 - 194 - 1022 - 0 - 6 - 5 - - - 593 - 195 - 1022 - 0 - 6 - 5 - - - 593 - 291 - 1022 - 0 - 6 - 5 - - - 593 - 296 - 1022 - 0 - 6 - 5 - - - 594 - 194 - 1022 - 0 - 6 - 5 - - - 594 - 195 - 1022 - 0 - 6 - 5 - - - 594 - 291 - 1022 - 0 - 6 - 5 - - - 594 - 296 - 1022 - 0 - 6 - 5 - - - 595 - 194 - 1022 - 0 - 6 - 5 - - - 595 - 195 - 1022 - 0 - 6 - 5 - - - 595 - 291 - 1022 - 0 - 6 - 5 - - - 595 - 296 - 1022 - 0 - 6 - 5 - - - 597 - 1022 - 596 - 1022 - 4 - 5 - - - 598 - 194 - 1022 - 0 - 6 - 5 - - - 598 - 195 - 1022 - 0 - 6 - 5 - - - 598 - 291 - 1022 - 0 - 6 - 5 - - - 598 - 296 - 1022 - 0 - 6 - 5 - - - 599 - 194 - 1022 - 0 - 6 - 5 - - - 599 - 195 - 1022 - 0 - 6 - 5 - - - 599 - 291 - 1022 - 0 - 6 - 5 - - - 599 - 296 - 1022 - 0 - 6 - 5 - - - 600 - 194 - 1022 - 0 - 6 - 5 - - - 600 - 195 - 1022 - 0 - 6 - 5 - - - 600 - 291 - 1022 - 0 - 6 - 5 - - - 600 - 296 - 1022 - 0 - 6 - 5 - + + 593 + 194 + 1022 + 0 + 6 + 5 + + + 593 + 195 + 1022 + 0 + 6 + 5 + + + 593 + 291 + 1022 + 0 + 6 + 5 + + + 593 + 296 + 1022 + 0 + 6 + 5 + + + 594 + 194 + 1022 + 0 + 6 + 5 + + + 594 + 195 + 1022 + 0 + 6 + 5 + + + 594 + 291 + 1022 + 0 + 6 + 5 + + + 594 + 296 + 1022 + 0 + 6 + 5 + + + 595 + 194 + 1022 + 0 + 6 + 5 + + + 595 + 195 + 1022 + 0 + 6 + 5 + + + 595 + 291 + 1022 + 0 + 6 + 5 + + + 595 + 296 + 1022 + 0 + 6 + 5 + + + 597 + 1022 + 596 + 1022 + 4 + 5 + + + 598 + 194 + 1022 + 0 + 6 + 5 + + + 598 + 195 + 1022 + 0 + 6 + 5 + + + 598 + 291 + 1022 + 0 + 6 + 5 + + + 598 + 296 + 1022 + 0 + 6 + 5 + + + 599 + 194 + 1022 + 0 + 6 + 5 + + + 599 + 195 + 1022 + 0 + 6 + 5 + + + 599 + 291 + 1022 + 0 + 6 + 5 + + + 599 + 296 + 1022 + 0 + 6 + 5 + + + 600 + 194 + 1022 + 0 + 6 + 5 + + + 600 + 195 + 1022 + 0 + 6 + 5 + + + 600 + 291 + 1022 + 0 + 6 + 5 + + + 600 + 296 + 1022 + 0 + 6 + 5 + 874 177 diff --git a/gamedir/Data-1.13/TableData/Russian.Items.xml b/gamedir/Data-1.13/TableData/Russian.Items.xml index bb7230b34..a2dfc1aeb 100644 --- a/gamedir/Data-1.13/TableData/Russian.Items.xml +++ b/gamedir/Data-1.13/TableData/Russian.Items.xml @@ -3842,20 +3842,20 @@ 480 + 5.56 SCF mag + 5.56x45mm SCF mag + Description needed + 5.56x45mm SCF mag + Description needed + + + 481 7.62x51mm Box HP C 7.62x51mm Box, HP Cold 250 rounds of 7.62x51mm cold loaded hollow point ammo for muted stopping power 7.62x51mm Box HP Cold Quietly shoot them down without shooting through them. - - 481 - 7.62x51mm Box C - 7.62x51mm Box, Cold - One box of cold loaded 7.62x51mm, quieter by 40% than standard FMJ ammo. - 7.62x51mm Box Cold - Maximum carnage, minium audibility and penetration power. - 482 7.62x51mm Box G C @@ -6314,10 +6314,10 @@ 789 - Nada - Nothing + Steyr ACR + Steyr ACR Index 789 - Nothing + Steyr ACR Nothing diff --git a/gamedir/Data-1.13/TableData/Weapons.xml b/gamedir/Data-1.13/TableData/Weapons.xml index 329d85c2a..0f6756a1b 100644 --- a/gamedir/Data-1.13/TableData/Weapons.xml +++ b/gamedir/Data-1.13/TableData/Weapons.xml @@ -8478,6 +8478,26 @@ 8 476 + + 789 + Steyr ACR + 3 + 6 + 43 + 1 + 4 + 3 + 1 + 1 + 1 + 1 + 24 + 600 + 1 + 6 + 1 + 10 + 901 Commando Mortar