1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

changed Colt Delta Elite to small slot

Browse Source 
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
This commit is contained in:
Starwalker
2007-04-26 09:41:51 +00:00
parent 7f38c74dbe
commit 25dfe1388c
9 changed files with 494 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/AmmoStrings.xml
+10
View File
@@ -210,4 +210,14 @@
<AmmoCaliber>12.7x97mm Subsonic</AmmoCaliber>
<BRCaliber>12.7x97mm</BRCaliber>
</AMMO>
<AMMO>
<uiIndex>42</uiIndex>
<AmmoCaliber>6.8x43mm SPC</AmmoCaliber>
<BRCaliber>6.8x43mm</BRCaliber>
</AMMO>
<AMMO>
<uiIndex>43</uiIndex>
<AmmoCaliber>5.56x45mm SCF</AmmoCaliber>
<BRCaliber>5.56mm SCF</BRCaliber>
</AMMO>
</AMMOLIST>
gamedir/Data-1.13/TableData/Attachments.xml
+25 -5
View File
@@ -4085,6 +4085,11 @@
<itemIndex>128</itemIndex>
<APCost>3</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>241</attachmentIndex>
<itemIndex>789</itemIndex>
<APCost>5</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>242</attachmentIndex>
<itemIndex>856</itemIndex>
@@ -10070,6 +10075,11 @@
<itemIndex>726</itemIndex>
<APCost>5</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1004</attachmentIndex>
<itemIndex>789</itemIndex>
<APCost>5</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1005</attachmentIndex>
<itemIndex>1</itemIndex>
@@ -11355,6 +11365,11 @@
<itemIndex>128</itemIndex>
<APCost>3</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1005</attachmentIndex>
<itemIndex>789</itemIndex>
<APCost>5</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1006</attachmentIndex>
<itemIndex>1</itemIndex>
@@ -12920,6 +12935,11 @@
<itemIndex>128</itemIndex>
<APCost>3</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1007</attachmentIndex>
<itemIndex>789</itemIndex>
<APCost>5</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1008</attachmentIndex>
<itemIndex>17</itemIndex>
@@ -13400,11 +13420,6 @@
<itemIndex>656</itemIndex>
<APCost>5</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1011</attachmentIndex>
<itemIndex>658</itemIndex>
<APCost>5</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1011</attachmentIndex>
<itemIndex>661</itemIndex>
@@ -15865,4 +15880,9 @@
<itemIndex>726</itemIndex>
<APCost>5</APCost>
</ATTACHMENT>
<ATTACHMENT>
<attachmentIndex>1030</attachmentIndex>
<itemIndex>789</itemIndex>
<APCost>5</APCost>
</ATTACHMENT>
</ATTACHMENTLIST>
gamedir/Data-1.13/TableData/German.Items.xml
+12 -12
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<ITEMLIST>
<ITEM>
<uiIndex>0</uiIndex>
@@ -3824,17 +3824,17 @@
</ITEM>
<ITEM>
<uiIndex>480</uiIndex>
<szItemName>Nada</szItemName>
<szLongItemName>Nothing</szLongItemName>
<szItemDesc>Index 480</szItemDesc>
<szBRName>Nothing</szBRName>
<szBRDesc>Nothing</szBRDesc>
<szItemName>5.56 SCF mag</szItemName>
<szLongItemName>5.56x45mm SCF mag</szLongItemName>
<szItemDesc>Beschreibung erwünscht</szItemDesc>
<szBRName>5.56x45mm SCF mag</szBRName>
<szBRDesc>Beschreibung erwünscht</szBRDesc>
</ITEM>
<ITEM>
<uiIndex>481</uiIndex>
<szItemName>Nada</szItemName>
<szLongItemName>Nothing</szLongItemName>
<szItemDesc>index 481</szItemDesc>
<szItemDesc>Index 480</szItemDesc>
<szBRName>Nothing</szBRName>
<szBRDesc>Nothing</szBRDesc>
</ITEM>
@@ -6296,11 +6296,11 @@
</ITEM>
<ITEM>
<uiIndex>789</uiIndex>
<szItemName>Nada</szItemName>
<szLongItemName>Nothing</szLongItemName>
<szItemDesc>Index 789</szItemDesc>
<szBRName>Nothing</szBRName>
<szBRDesc>Nothing</szBRDesc>
<szItemName>Steyr ACR</szItemName>
<szLongItemName>Steyr ACR</szLongItemName>
<szItemDesc>Beschreibung erwünscht</szItemDesc>
<szBRName>Steyr ACR</szBRName>
<szBRDesc>Beschreibung erwünscht</szBRDesc>
</ITEM>
<ITEM>
<uiIndex>790</uiIndex>
gamedir/Data-1.13/TableData/Items.xml
+37 -16
View File
@@ -6404,7 +6404,7 @@
<ubGraphicType>1</ubGraphicType>
<ubGraphicNum>172</ubGraphicNum>
<ubWeight>5</ubWeight>
<ubPerPocket>1</ubPerPocket>
<ubPerPocket>2</ubPerPocket>
<usPrice>45</usPrice>
<ubCoolness>2</ubCoolness>
<bReliability>1</bReliability>
@@ -10142,14 +10142,20 @@
</ITEM>
<ITEM>
<uiIndex>480</uiIndex>
<szItemName>Nada</szItemName>
<szLongItemName>Nothing</szLongItemName>
<szItemDesc>Index 921</szItemDesc>
<szBRName>Nothing</szBRName>
<szBRDesc>Nothing</szBRDesc>
<usItemClass>1</usItemClass>
<NotBuyable>1</NotBuyable>
<szItemName>5.56 SCF mag</szItemName>
<szLongItemName>5.56x45mm SCF mag</szLongItemName>
<szItemDesc>A magazine of armor piercing flechette dart ammunition.</szItemDesc>
<szBRName>5.56x45mm SCF mag</szBRName>
<szBRDesc>Newly developed flechette ammo that goes together with the newly developed Steyr Advanced Combat Rifle.</szBRDesc>
<usItemClass>1024</usItemClass>
<ubClassIndex>297</ubClassIndex>
<ubGraphicType>1</ubGraphicType>
<ubGraphicNum>580</ubGraphicNum>
<ubWeight>3</ubWeight>
<ubPerPocket>4</ubPerPocket>
<usPrice>1</usPrice>
<BigGunList>1</BigGunList>
<SciFi>1</SciFi>
</ITEM>
<ITEM>
<uiIndex>481</uiIndex>
@@ -17936,6 +17942,7 @@
<ubCursor>3</ubCursor>
<ubGraphicNum>295</ubGraphicNum>
<ubWeight>11</ubWeight>
<ubPerPocket>1</ubPerPocket>
<usPrice>850</usPrice>
<ubCoolness>2</ubCoolness>
<Damageable>1</Damageable>
@@ -18009,14 +18016,27 @@
</ITEM>
<ITEM>
<uiIndex>789</uiIndex>
<szItemName>Nada</szItemName>
<szLongItemName>Nothing</szLongItemName>
<szItemDesc>Index 789</szItemDesc>
<szBRName>Nothing</szBRName>
<szBRDesc>Nothing</szBRDesc>
<usItemClass>1</usItemClass>
<NotBuyable>1</NotBuyable>
<szItemName>Steyr ACR</szItemName>
<szLongItemName>Steyr ACR</szLongItemName>
<szItemDesc>The Advanced Combat Rifle fires a small armor penetrating fin stabilized dart over a considerable range.</szItemDesc>
<szBRName>Steyr ACR</szBRName>
<szBRDesc>Prototype of a new generation of assault rifles, the Steyr ACR fires fin stabilized darts. This is the future weapon of choice.</szBRDesc>
<usItemClass>2</usItemClass>
<ubClassIndex>789</ubClassIndex>
<ubGraphicNum>301</ubGraphicNum>
<ubWeight>32</ubWeight>
<usPrice>1</usPrice>
<Damageable>1</Damageable>
<Repairable>1</Repairable>
<WaterDamages>1</WaterDamages>
<Metal>1</Metal>
<Sinks>1</Sinks>
<TwoHanded>1</TwoHanded>
<BigGunList>1</BigGunList>
<SciFi>1</SciFi>
<BR_NewInventory>1</BR_NewInventory>
<BR_ROF>1200</BR_ROF>
<DefaultAttachment>1029</DefaultAttachment>
</ITEM>
<ITEM>
<uiIndex>790</uiIndex>
@@ -20858,7 +20878,8 @@
<usItemClass>16</usItemClass>
<ubClassIndex>921</ubClassIndex>
<ubCursor>20</ubCursor>
<ubGraphicNum>292</ubGraphicNum>
<ubGraphicType>1</ubGraphicType>
<ubGraphicNum>581</ubGraphicNum>
<ubWeight>14</ubWeight>
<ubPerPocket>1</ubPerPocket>
<usPrice>800</usPrice>
gamedir/Data-1.13/TableData/Launchables.xml
+4
View File
@@ -412,6 +412,10 @@
<launchableIndex>991</launchableIndex>
<itemIndex>921</itemIndex>
</LAUNCHABLE>
<LAUNCHABLE>
<launchableIndex>991</launchableIndex>
<itemIndex>920</itemIndex>
</LAUNCHABLE>
<LAUNCHABLE>
<launchableIndex>992</launchableIndex>
<itemIndex>906</itemIndex>
gamedir/Data-1.13/TableData/Magazines.xml
+6
View File
@@ -1782,4 +1782,10 @@
<ubMagSize>5</ubMagSize>
<ubAmmoType>3</ubAmmoType>
</MAGAZINE>
<MAGAZINE>
<uiIndex>297</uiIndex>
<ubCalibre>43</ubCalibre>
<ubMagSize>24</ubMagSize>
<ubAmmoType>3</ubAmmoType>
</MAGAZINE>
</MAGAZINELIST>
gamedir/Data-1.13/TableData/Merges.xml
+369 -369
View File
@@ -1,77 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<MERGELIST>
<MERGE>
<firstItemIndex>37</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>37</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>37</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>37</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>54</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>54</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>54</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>54</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>62</firstItemIndex>
<secondItemIndex>1022</secondItemIndex>
<firstResultingItemIndex>38</firstResultingItemIndex>
<secondResultingItemIndex>1022</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>37</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>37</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>37</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>37</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>54</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>54</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>54</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>54</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>62</firstItemIndex>
<secondItemIndex>1022</secondItemIndex>
<firstResultingItemIndex>38</firstResultingItemIndex>
<secondResultingItemIndex>1022</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>136</firstItemIndex>
<secondItemIndex>137</secondItemIndex>
@@ -648,102 +648,102 @@
<mergeType>1</mergeType>
<APCost>8</APCost>
</MERGE>
<MERGE>
<firstItemIndex>299</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>299</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>299</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>299</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>300</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>300</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>300</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>300</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>301</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>301</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>301</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>301</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>299</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>299</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>299</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>299</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>300</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>300</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>300</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>300</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>301</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>301</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>301</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>301</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>311</firstItemIndex>
<secondItemIndex>312</secondItemIndex>
@@ -784,206 +784,206 @@
<mergeType>1</mergeType>
<APCost>8</APCost>
</MERGE>
<MERGE>
<firstItemIndex>593</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>593</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>593</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>593</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>594</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>594</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>594</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>594</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>595</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>595</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>595</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>595</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>597</firstItemIndex>
<secondItemIndex>1022</secondItemIndex>
<firstResultingItemIndex>596</firstResultingItemIndex>
<secondResultingItemIndex>1022</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>598</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>598</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>598</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>598</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>599</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>599</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>599</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>599</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>600</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>600</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>600</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>600</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>593</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>593</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>593</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>593</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>594</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>594</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>594</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>594</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>595</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>595</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>595</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>595</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>597</firstItemIndex>
<secondItemIndex>1022</secondItemIndex>
<firstResultingItemIndex>596</firstResultingItemIndex>
<secondResultingItemIndex>1022</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>598</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>598</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>598</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>598</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>599</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>599</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>599</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>599</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>600</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>600</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>600</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>600</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>874</firstItemIndex>
<secondItemIndex>177</secondItemIndex>
gamedir/Data-1.13/TableData/Russian.Items.xml
+11 -11
View File
@@ -3842,20 +3842,20 @@
</ITEM>
<ITEM>
<uiIndex>480</uiIndex>
<szItemName>5.56 SCF mag</szItemName>
<szLongItemName>5.56x45mm SCF mag</szLongItemName>
<szItemDesc>Description needed</szItemDesc>
<szBRName>5.56x45mm SCF mag</szBRName>
<szBRDesc>Description needed</szBRDesc>
</ITEM>
<ITEM>
<uiIndex>481</uiIndex>
<szItemName>7.62x51mm Box HP C</szItemName>
<szLongItemName>7.62x51mm Box, HP Cold</szLongItemName>
<szItemDesc>250 rounds of 7.62x51mm cold loaded hollow point ammo for muted stopping power</szItemDesc>
<szBRName>7.62x51mm Box HP Cold</szBRName>
<szBRDesc>Quietly shoot them down without shooting through them.</szBRDesc>
</ITEM>
<ITEM>
<uiIndex>481</uiIndex>
<szItemName>7.62x51mm Box C</szItemName>
<szLongItemName>7.62x51mm Box, Cold</szLongItemName>
<szItemDesc>One box of cold loaded 7.62x51mm, quieter by 40% than standard FMJ ammo.</szItemDesc>
<szBRName>7.62x51mm Box Cold</szBRName>
<szBRDesc>Maximum carnage, minium audibility and penetration power.</szBRDesc>
</ITEM>
<ITEM>
<uiIndex>482</uiIndex>
<szItemName>7.62x51mm Box G C</szItemName>
@@ -6314,10 +6314,10 @@
</ITEM>
<ITEM>
<uiIndex>789</uiIndex>
<szItemName>Nada</szItemName>
<szLongItemName>Nothing</szLongItemName>
<szItemName>Steyr ACR</szItemName>
<szLongItemName>Steyr ACR</szLongItemName>
<szItemDesc>Index 789</szItemDesc>
<szBRName>Nothing</szBRName>
<szBRName>Steyr ACR</szBRName>
<szBRDesc>Nothing</szBRDesc>
</ITEM>
<ITEM>
gamedir/Data-1.13/TableData/Weapons.xml
+20
View File
@@ -8478,6 +8478,26 @@
<AutoPenalty>8</AutoPenalty>
<ManualReloadSound>476</ManualReloadSound>
</WEAPON>
<WEAPON>
<uiIndex>789</uiIndex>
<szWeaponName>Steyr ACR</szWeaponName>
<ubWeaponClass>3</ubWeaponClass>
<ubWeaponType>6</ubWeaponType>
<ubCalibre>43</ubCalibre>
<ubReadyTime>1</ubReadyTime>
<ubShotsPer4Turns>4</ubShotsPer4Turns>
<ubShotsPerBurst>3</ubShotsPerBurst>
<ubBurstPenalty>1</ubBurstPenalty>
<ubImpact>1</ubImpact>
<ubDeadliness>1</ubDeadliness>
<bAccuracy>1</bAccuracy>
<ubMagSize>24</ubMagSize>
<usRange>600</usRange>
<bBurstAP>1</bBurstAP>
<APsToReload>6</APsToReload>
<SwapClips>1</SwapClips>
<MaxDistForMessyDeath>10</MaxDistForMessyDeath>
</WEAPON>
<WEAPON>
<uiIndex>901</uiIndex>
<szWeaponName>Commando Mortar</szWeaponName>