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

-sorted merges so they'll actually work :p (duh)

Browse Source 
-fixed rpgs in EnemyItemChoices.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@315 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
MaddMugsy
2006-08-09 20:39:41 +00:00
parent 011137184c
commit bd0455ca72
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/Merges.xml
+18 -18
View File
@@ -672,24 +672,6 @@
<resultingItemIndex>871</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1022</firstItemIndex>
<secondItemIndex>245</secondItemIndex>
<resultingItemIndex>979</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1027</firstItemIndex>
<secondItemIndex>1027</secondItemIndex>
<resultingItemIndex>1027</resultingItemIndex>
<mergeType>1</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1028</firstItemIndex>
<secondItemIndex>1028</secondItemIndex>
<resultingItemIndex>1028</resultingItemIndex>
<mergeType>1</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>952</firstItemIndex>
<secondItemIndex>952</secondItemIndex>
@@ -864,4 +846,22 @@
<resultingItemIndex>988</resultingItemIndex>
<mergeType>1</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1022</firstItemIndex>
<secondItemIndex>245</secondItemIndex>
<resultingItemIndex>979</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1027</firstItemIndex>
<secondItemIndex>1027</secondItemIndex>
<resultingItemIndex>1027</resultingItemIndex>
<mergeType>1</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1028</firstItemIndex>
<secondItemIndex>1028</secondItemIndex>
<resultingItemIndex>1028</resultingItemIndex>
<mergeType>1</mergeType>
</MERGE>
</MERGELIST>