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

-moved item numbers around into the armours range for new armours and armour upgrade kits

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@259 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
MaddMugsy
2006-07-27 17:11:08 +00:00
parent 6eac28d205
commit d0513c7703
3 changed files with 1854 additions and 7250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/Attachments.xml
+674 -490
View File
File diff suppressed because it is too large Load Diff
gamedir/Data-1.13/TableData/Items.xml
+970 -6538
View File
File diff suppressed because it is too large Load Diff
gamedir/Data-1.13/TableData/Merges.xml
+210 -222
View File
@@ -462,232 +462,220 @@
<resultingItemIndex>327</resultingItemIndex>
<mergeType>1</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>874</firstItemIndex>
<secondItemIndex>177</secondItemIndex>
<resultingItemIndex>839</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>875</firstItemIndex>
<secondItemIndex>164</secondItemIndex>
<resultingItemIndex>840</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>876</firstItemIndex>
<secondItemIndex>170</secondItemIndex>
<resultingItemIndex>841</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>877</firstItemIndex>
<secondItemIndex>164</secondItemIndex>
<resultingItemIndex>842</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>877</firstItemIndex>
<secondItemIndex>196</secondItemIndex>
<resultingItemIndex>843</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>877</firstItemIndex>
<secondItemIndex>812</secondItemIndex>
<resultingItemIndex>844</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>878</firstItemIndex>
<secondItemIndex>170</secondItemIndex>
<resultingItemIndex>845</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>878</firstItemIndex>
<secondItemIndex>811</secondItemIndex>
<resultingItemIndex>846</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>879</firstItemIndex>
<secondItemIndex>164</secondItemIndex>
<resultingItemIndex>847</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>879</firstItemIndex>
<secondItemIndex>167</secondItemIndex>
<resultingItemIndex>850</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>879</firstItemIndex>
<secondItemIndex>196</secondItemIndex>
<resultingItemIndex>848</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>879</firstItemIndex>
<secondItemIndex>803</secondItemIndex>
<resultingItemIndex>851</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>879</firstItemIndex>
<secondItemIndex>812</secondItemIndex>
<resultingItemIndex>849</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>880</firstItemIndex>
<secondItemIndex>170</secondItemIndex>
<resultingItemIndex>852</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>880</firstItemIndex>
<secondItemIndex>173</secondItemIndex>
<resultingItemIndex>854</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>880</firstItemIndex>
<secondItemIndex>802</secondItemIndex>
<resultingItemIndex>855</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>880</firstItemIndex>
<secondItemIndex>811</secondItemIndex>
<resultingItemIndex>853</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>881</firstItemIndex>
<secondItemIndex>164</secondItemIndex>
<resultingItemIndex>856</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>881</firstItemIndex>
<secondItemIndex>167</secondItemIndex>
<resultingItemIndex>859</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>881</firstItemIndex>
<secondItemIndex>196</secondItemIndex>
<resultingItemIndex>857</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>881</firstItemIndex>
<secondItemIndex>803</secondItemIndex>
<resultingItemIndex>860</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>881</firstItemIndex>
<secondItemIndex>812</secondItemIndex>
<resultingItemIndex>858</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>882</firstItemIndex>
<secondItemIndex>170</secondItemIndex>
<resultingItemIndex>861</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>882</firstItemIndex>
<secondItemIndex>173</secondItemIndex>
<resultingItemIndex>863</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>882</firstItemIndex>
<secondItemIndex>802</secondItemIndex>
<resultingItemIndex>864</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>882</firstItemIndex>
<secondItemIndex>811</secondItemIndex>
<resultingItemIndex>862</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>883</firstItemIndex>
<secondItemIndex>164</secondItemIndex>
<resultingItemIndex>865</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>883</firstItemIndex>
<secondItemIndex>167</secondItemIndex>
<resultingItemIndex>868</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>883</firstItemIndex>
<secondItemIndex>196</secondItemIndex>
<resultingItemIndex>866</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>883</firstItemIndex>
<secondItemIndex>803</secondItemIndex>
<resultingItemIndex>869</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>883</firstItemIndex>
<secondItemIndex>812</secondItemIndex>
<resultingItemIndex>867</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>884</firstItemIndex>
<secondItemIndex>170</secondItemIndex>
<resultingItemIndex>870</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>884</firstItemIndex>
<secondItemIndex>173</secondItemIndex>
<resultingItemIndex>872</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>884</firstItemIndex>
<secondItemIndex>802</secondItemIndex>
<resultingItemIndex>873</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>884</firstItemIndex>
<secondItemIndex>811</secondItemIndex>
<resultingItemIndex>871</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1022</firstItemIndex>
<secondItemIndex>245</secondItemIndex>
<resultingItemIndex>979</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1022</firstItemIndex>
<secondItemIndex>255</secondItemIndex>
<resultingItemIndex>979</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1022</firstItemIndex>
<secondItemIndex>256</secondItemIndex>
<resultingItemIndex>979</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1027</firstItemIndex>
<secondItemIndex>177</secondItemIndex>
<resultingItemIndex>1040</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1028</firstItemIndex>
<secondItemIndex>164</secondItemIndex>
<resultingItemIndex>1041</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1029</firstItemIndex>
<secondItemIndex>170</secondItemIndex>
<resultingItemIndex>1042</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1030</firstItemIndex>
<secondItemIndex>164</secondItemIndex>
<resultingItemIndex>1043</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1030</firstItemIndex>
<secondItemIndex>196</secondItemIndex>
<resultingItemIndex>1044</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1030</firstItemIndex>
<secondItemIndex>812</secondItemIndex>
<resultingItemIndex>1045</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1031</firstItemIndex>
<secondItemIndex>170</secondItemIndex>
<resultingItemIndex>1046</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1031</firstItemIndex>
<secondItemIndex>811</secondItemIndex>
<resultingItemIndex>1047</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1032</firstItemIndex>
<secondItemIndex>164</secondItemIndex>
<resultingItemIndex>1048</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1032</firstItemIndex>
<secondItemIndex>196</secondItemIndex>
<resultingItemIndex>1049</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1032</firstItemIndex>
<secondItemIndex>812</secondItemIndex>
<resultingItemIndex>1050</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1032</firstItemIndex>
<secondItemIndex>167</secondItemIndex>
<resultingItemIndex>1051</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1032</firstItemIndex>
<secondItemIndex>803</secondItemIndex>
<resultingItemIndex>1052</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1033</firstItemIndex>
<secondItemIndex>170</secondItemIndex>
<resultingItemIndex>1053</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1033</firstItemIndex>
<secondItemIndex>811</secondItemIndex>
<resultingItemIndex>1054</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1033</firstItemIndex>
<secondItemIndex>173</secondItemIndex>
<resultingItemIndex>1055</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1033</firstItemIndex>
<secondItemIndex>802</secondItemIndex>
<resultingItemIndex>1056</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1034</firstItemIndex>
<secondItemIndex>164</secondItemIndex>
<resultingItemIndex>1057</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1034</firstItemIndex>
<secondItemIndex>196</secondItemIndex>
<resultingItemIndex>1058</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1034</firstItemIndex>
<secondItemIndex>812</secondItemIndex>
<resultingItemIndex>1059</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1034</firstItemIndex>
<secondItemIndex>167</secondItemIndex>
<resultingItemIndex>1060</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1034</firstItemIndex>
<secondItemIndex>803</secondItemIndex>
<resultingItemIndex>1061</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1035</firstItemIndex>
<secondItemIndex>170</secondItemIndex>
<resultingItemIndex>1062</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1035</firstItemIndex>
<secondItemIndex>811</secondItemIndex>
<resultingItemIndex>1063</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1035</firstItemIndex>
<secondItemIndex>173</secondItemIndex>
<resultingItemIndex>1064</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1035</firstItemIndex>
<secondItemIndex>802</secondItemIndex>
<resultingItemIndex>1065</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1036</firstItemIndex>
<secondItemIndex>164</secondItemIndex>
<resultingItemIndex>1066</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1036</firstItemIndex>
<secondItemIndex>196</secondItemIndex>
<resultingItemIndex>1067</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1036</firstItemIndex>
<secondItemIndex>812</secondItemIndex>
<resultingItemIndex>1068</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1036</firstItemIndex>
<secondItemIndex>167</secondItemIndex>
<resultingItemIndex>1069</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1036</firstItemIndex>
<secondItemIndex>803</secondItemIndex>
<resultingItemIndex>1070</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1037</firstItemIndex>
<secondItemIndex>170</secondItemIndex>
<resultingItemIndex>1071</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1037</firstItemIndex>
<secondItemIndex>811</secondItemIndex>
<resultingItemIndex>1072</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1037</firstItemIndex>
<secondItemIndex>173</secondItemIndex>
<resultingItemIndex>1073</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
<MERGE>
<firstItemIndex>1037</firstItemIndex>
<secondItemIndex>802</secondItemIndex>
<resultingItemIndex>1074</resultingItemIndex>
<mergeType>4</mergeType>
</MERGE>
</MERGELIST>