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

1. AttachmentClass and Silhouette xml files moved from Lookup folder to main TableData folder

Browse Source 
2. Added and updated some of the required files from HAM5.  Others will be added when the code is ready.  HAM5 XML changes have been included for use with the latest XML Editor code.  These changes will be ignored by the game.
3. AttachmentClass changes by Flugente applied to xml file.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1383 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
MaddMugsy
2012-04-09 22:35:54 +00:00
parent 443f1c7a70
commit 021df752fa
48 changed files with 27344 additions and 39942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/Merges.xml
+73 -73
View File
@@ -3647,7 +3647,7 @@
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>20</APCost>
</MERGE>
</MERGE>
<MERGE>
<firstItemIndex>1377</firstItemIndex>
<secondItemIndex>34</secondItemIndex>
@@ -3656,38 +3656,6 @@
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1380</firstItemIndex>
<secondItemIndex>35</secondItemIndex>
<firstResultingItemIndex>35</firstResultingItemIndex>
<secondResultingItemIndex>1380</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1378</firstItemIndex>
<secondItemIndex>36</secondItemIndex>
<firstResultingItemIndex>36</firstResultingItemIndex>
<secondResultingItemIndex>1378</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1378</firstItemIndex>
<secondItemIndex>627</secondItemIndex>
<firstResultingItemIndex>627</firstResultingItemIndex>
<secondResultingItemIndex>1378</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1378</firstItemIndex>
<secondItemIndex>649</secondItemIndex>
<firstResultingItemIndex>649</firstResultingItemIndex>
<secondResultingItemIndex>1378</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1377</firstItemIndex>
<secondItemIndex>650</secondItemIndex>
@@ -3712,6 +3680,62 @@
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1377</firstItemIndex>
<secondItemIndex>726</secondItemIndex>
<firstResultingItemIndex>726</firstResultingItemIndex>
<secondResultingItemIndex>1377</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1377</firstItemIndex>
<secondItemIndex>740</secondItemIndex>
<firstResultingItemIndex>740</firstResultingItemIndex>
<secondResultingItemIndex>1377</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1377</firstItemIndex>
<secondItemIndex>1076</secondItemIndex>
<firstResultingItemIndex>1076</firstResultingItemIndex>
<secondResultingItemIndex>1377</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1377</firstItemIndex>
<secondItemIndex>1188</secondItemIndex>
<firstResultingItemIndex>1188</firstResultingItemIndex>
<secondResultingItemIndex>1377</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1378</firstItemIndex>
<secondItemIndex>36</secondItemIndex>
<firstResultingItemIndex>36</firstResultingItemIndex>
<secondResultingItemIndex>1378</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1378</firstItemIndex>
<secondItemIndex>627</secondItemIndex>
<firstResultingItemIndex>627</firstResultingItemIndex>
<secondResultingItemIndex>1378</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1378</firstItemIndex>
<secondItemIndex>649</secondItemIndex>
<firstResultingItemIndex>649</firstResultingItemIndex>
<secondResultingItemIndex>1378</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1378</firstItemIndex>
<secondItemIndex>687</secondItemIndex>
@@ -3720,6 +3744,14 @@
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1378</firstItemIndex>
<secondItemIndex>1075</secondItemIndex>
<firstResultingItemIndex>1075</firstResultingItemIndex>
<secondResultingItemIndex>1378</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1379</firstItemIndex>
<secondItemIndex>699</secondItemIndex>
@@ -3736,6 +3768,14 @@
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1380</firstItemIndex>
<secondItemIndex>35</secondItemIndex>
<firstResultingItemIndex>35</firstResultingItemIndex>
<secondResultingItemIndex>1380</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1381</firstItemIndex>
<secondItemIndex>705</secondItemIndex>
@@ -3752,44 +3792,4 @@
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1377</firstItemIndex>
<secondItemIndex>726</secondItemIndex>
<firstResultingItemIndex>726</firstResultingItemIndex>
<secondResultingItemIndex>1377</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1377</firstItemIndex>
<secondItemIndex>740</secondItemIndex>
<firstResultingItemIndex>740</firstResultingItemIndex>
<secondResultingItemIndex>1377</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1378</firstItemIndex>
<secondItemIndex>1075</secondItemIndex>
<firstResultingItemIndex>1075</firstResultingItemIndex>
<secondResultingItemIndex>1378</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1377</firstItemIndex>
<secondItemIndex>1076</secondItemIndex>
<firstResultingItemIndex>1076</firstResultingItemIndex>
<secondResultingItemIndex>1377</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1377</firstItemIndex>
<secondItemIndex>1188</secondItemIndex>
<firstResultingItemIndex>1188</firstResultingItemIndex>
<secondResultingItemIndex>1377</secondResultingItemIndex>
<mergeType>8</mergeType>
<APCost>50</APCost>
</MERGE>
</MERGELIST>