1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

added a missing merge with the SCAR-WP SV Barrel

Browse Source 
added further merges to exchange the barrel in a SCAR Conversion Kit
added ability to mount Kobra on Bizon SMG
corrected a typo in one of the SCAR-WP Conversion Kit descriptions
changed sound of Steyr ACR, because the sound of falling brass does not go well with synthetic cartridge cases ;-)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@789 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Starwalker
2007-05-08 09:39:50 +00:00
parent c943b34c94
commit 6acedece52
4 changed files with 80 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/Merges.xml
+72
View File
@@ -1544,6 +1544,14 @@
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1031</firstItemIndex>
<secondItemIndex>1038</secondItemIndex>
<firstResultingItemIndex>1037</firstResultingItemIndex>
<secondResultingItemIndex>1032</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>2</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1032</firstItemIndex>
<secondItemIndex>652</secondItemIndex>
@@ -1552,6 +1560,14 @@
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1032</firstItemIndex>
<secondItemIndex>1037</secondItemIndex>
<firstResultingItemIndex>1038</firstResultingItemIndex>
<secondResultingItemIndex>1031</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>2</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1033</firstItemIndex>
<secondItemIndex>787</secondItemIndex>
@@ -1560,6 +1576,14 @@
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1033</firstItemIndex>
<secondItemIndex>1044</secondItemIndex>
<firstResultingItemIndex>1043</firstResultingItemIndex>
<secondResultingItemIndex>1034</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>2</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1034</firstItemIndex>
<secondItemIndex>651</secondItemIndex>
@@ -1568,6 +1592,14 @@
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1034</firstItemIndex>
<secondItemIndex>1043</secondItemIndex>
<firstResultingItemIndex>1044</firstResultingItemIndex>
<secondResultingItemIndex>1033</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>2</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1035</firstItemIndex>
<secondItemIndex>652</secondItemIndex>
@@ -1640,6 +1672,14 @@
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1039</firstItemIndex>
<secondItemIndex>1036</secondItemIndex>
<firstResultingItemIndex>1035</firstResultingItemIndex>
<secondResultingItemIndex>1040</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>2</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1040</firstItemIndex>
<secondItemIndex>792</secondItemIndex>
@@ -1648,6 +1688,14 @@
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1040</firstItemIndex>
<secondItemIndex>1035</secondItemIndex>
<firstResultingItemIndex>1036</firstResultingItemIndex>
<secondResultingItemIndex>1039</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>2</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1041</firstItemIndex>
<secondItemIndex>651</secondItemIndex>
@@ -1720,6 +1768,30 @@
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1045</firstItemIndex>
<secondItemIndex>1042</secondItemIndex>
<firstResultingItemIndex>1041</firstResultingItemIndex>
<secondResultingItemIndex>1046</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>2</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1046</firstItemIndex>
<secondItemIndex>790</secondItemIndex>
<firstResultingItemIndex>791</firstResultingItemIndex>
<secondResultingItemIndex>1045</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1046</firstItemIndex>
<secondItemIndex>1041</secondItemIndex>
<firstResultingItemIndex>1042</firstResultingItemIndex>
<secondResultingItemIndex>1045</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>2</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1055</firstItemIndex>
<secondItemIndex>194</secondItemIndex>