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

removed combo-merge Gameboy+Wire=Lameboy Display (was nonfunctional)

Browse Source 
added use-item-merge Utility Knife+Gameboy=Lameboy Display

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1177 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Starwalker
2009-07-23 13:50:39 +00:00
parent b357bded1b
commit 8bbc4b3119
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gamedir/Data-1.13/TableData/AttachmentComboMerges.xml
-7
View File
@@ -35,11 +35,4 @@
<usAttachment2>0</usAttachment2>
<usResult>223</usResult>
</ATTACHMENTCOMBOMERGE>
<ATTACHMENTCOMBOMERGE>
<uiIndex>5</uiIndex>
<usItem>1016</usItem>
<usAttachment1>316</usAttachment1>
<usAttachment2>0</usAttachment2>
<usResult>315</usResult>
</ATTACHMENTCOMBOMERGE>
</ATTACHMENTCOMBOMERGELIST>
gamedir/Data-1.13/TableData/Merges.xml
+8
View File
@@ -1800,6 +1800,14 @@
<mergeType>6</mergeType>
<APCost>20</APCost>
</MERGE>
<MERGE>
<firstItemIndex>299</firstItemIndex>
<secondItemIndex>1016</secondItemIndex>
<firstResultingItemIndex>315</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>6</mergeType>
<APCost>60</APCost>
</MERGE>
<MERGE>
<firstItemIndex>300</firstItemIndex>
<secondItemIndex>194</secondItemIndex>