From 8bbc4b311978b5f4cca1a6b4c5b2de9e20a09393 Mon Sep 17 00:00:00 2001
From: Starwalker <Starwalker@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Thu, 23 Jul 2009 13:50:39 +0000
Subject: [PATCH] removed combo-merge Gameboy+Wire=Lameboy Display (was
 nonfunctional) 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
---
 gamedir/Data-1.13/TableData/AttachmentComboMerges.xml | 7 -------
 gamedir/Data-1.13/TableData/Merges.xml                | 8 ++++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/AttachmentComboMerges.xml b/gamedir/Data-1.13/TableData/AttachmentComboMerges.xml
index 868ea3bc9..45394c79b 100644
--- a/gamedir/Data-1.13/TableData/AttachmentComboMerges.xml
+++ b/gamedir/Data-1.13/TableData/AttachmentComboMerges.xml
@@ -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>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Merges.xml b/gamedir/Data-1.13/TableData/Merges.xml
index 76ffe6b30..9f052fd23 100644
--- a/gamedir/Data-1.13/TableData/Merges.xml
+++ b/gamedir/Data-1.13/TableData/Merges.xml
@@ -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>