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

added new SCARs in 6.8mm SPC and 7.62x39mm.

Browse Source 
added SCAR conversion kits
added 6.8x43mm SPC ammo (HP and AP)
activated Steyr ACR and its ammo
deactivated HK MP5/10SD3 and 10mm DU ammo
added HK MP5/40A3 and SMG ammo
raised ammo capacity of Micro-Uzi to 30
added Thor's Katana, Nunchaku, and Shuriken (also to IMP-Item choices)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@787 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Starwalker
2007-05-06 08:22:44 +00:00
parent 2a0d7fd805
commit a86c8d1ac2
8 changed files with 2188 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/Merges.xml
+184
View File
@@ -1568,4 +1568,188 @@
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1035</firstItemIndex>
<secondItemIndex>652</secondItemIndex>
<firstResultingItemIndex>792</firstResultingItemIndex>
<secondResultingItemIndex>1037</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1035</firstItemIndex>
<secondItemIndex>788</secondItemIndex>
<firstResultingItemIndex>792</firstResultingItemIndex>
<secondResultingItemIndex>1038</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1036</firstItemIndex>
<secondItemIndex>652</secondItemIndex>
<firstResultingItemIndex>793</firstResultingItemIndex>
<secondResultingItemIndex>1037</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1036</firstItemIndex>
<secondItemIndex>788</secondItemIndex>
<firstResultingItemIndex>793</firstResultingItemIndex>
<secondResultingItemIndex>1038</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1037</firstItemIndex>
<secondItemIndex>792</secondItemIndex>
<firstResultingItemIndex>652</firstResultingItemIndex>
<secondResultingItemIndex>1035</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1037</firstItemIndex>
<secondItemIndex>793</secondItemIndex>
<firstResultingItemIndex>652</firstResultingItemIndex>
<secondResultingItemIndex>1036</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1038</firstItemIndex>
<secondItemIndex>792</secondItemIndex>
<firstResultingItemIndex>788</firstResultingItemIndex>
<secondResultingItemIndex>1035</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1038</firstItemIndex>
<secondItemIndex>793</secondItemIndex>
<firstResultingItemIndex>788</firstResultingItemIndex>
<secondResultingItemIndex>1036</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1039</firstItemIndex>
<secondItemIndex>793</secondItemIndex>
<firstResultingItemIndex>792</firstResultingItemIndex>
<secondResultingItemIndex>1040</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1040</firstItemIndex>
<secondItemIndex>792</secondItemIndex>
<firstResultingItemIndex>793</firstResultingItemIndex>
<secondResultingItemIndex>1039</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1041</firstItemIndex>
<secondItemIndex>651</secondItemIndex>
<firstResultingItemIndex>790</firstResultingItemIndex>
<secondResultingItemIndex>1043</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1041</firstItemIndex>
<secondItemIndex>787</secondItemIndex>
<firstResultingItemIndex>790</firstResultingItemIndex>
<secondResultingItemIndex>1044</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1042</firstItemIndex>
<secondItemIndex>651</secondItemIndex>
<firstResultingItemIndex>791</firstResultingItemIndex>
<secondResultingItemIndex>1043</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1042</firstItemIndex>
<secondItemIndex>787</secondItemIndex>
<firstResultingItemIndex>791</firstResultingItemIndex>
<secondResultingItemIndex>1044</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1043</firstItemIndex>
<secondItemIndex>790</secondItemIndex>
<firstResultingItemIndex>651</firstResultingItemIndex>
<secondResultingItemIndex>1041</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1043</firstItemIndex>
<secondItemIndex>791</secondItemIndex>
<firstResultingItemIndex>651</firstResultingItemIndex>
<secondResultingItemIndex>1042</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1044</firstItemIndex>
<secondItemIndex>790</secondItemIndex>
<firstResultingItemIndex>787</firstResultingItemIndex>
<secondResultingItemIndex>1041</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1044</firstItemIndex>
<secondItemIndex>791</secondItemIndex>
<firstResultingItemIndex>787</firstResultingItemIndex>
<secondResultingItemIndex>1042</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1045</firstItemIndex>
<secondItemIndex>791</secondItemIndex>
<firstResultingItemIndex>790</firstResultingItemIndex>
<secondResultingItemIndex>1046</secondResultingItemIndex>
<mergeType>4</mergeType>
<APCost>10</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1055</firstItemIndex>
<secondItemIndex>194</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1055</firstItemIndex>
<secondItemIndex>195</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1055</firstItemIndex>
<secondItemIndex>291</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1055</firstItemIndex>
<secondItemIndex>296</secondItemIndex>
<firstResultingItemIndex>1022</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>5</APCost>
</MERGE>
</MERGELIST>