From 5884224bbbda7afd841ab67f7d5fd6eeb6c9169f Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Fri, 16 Aug 2013 22:27:29 +0000
Subject: [PATCH] made tripwire merges not that hard, thereby reducing the stat
 gain

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1729 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Items/Merges.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Items/Merges.xml b/gamedir/Data-1.13/TableData/Items/Merges.xml
index bd3b1622e..ec7f7b7fb 100644
--- a/gamedir/Data-1.13/TableData/Items/Merges.xml
+++ b/gamedir/Data-1.13/TableData/Items/Merges.xml
@@ -3789,7 +3789,7 @@
 		<secondItemIndex>131</secondItemIndex>
 		<firstResultingItemIndex>1528</firstResultingItemIndex>
 		<secondResultingItemIndex>0</secondResultingItemIndex>
-		<mergeType>3</mergeType>
+		<mergeType>9</mergeType>
 		<APCost>32</APCost>
 	</MERGE>
 	<MERGE>
@@ -3797,7 +3797,7 @@
 		<secondItemIndex>132</secondItemIndex>
 		<firstResultingItemIndex>1529</firstResultingItemIndex>
 		<secondResultingItemIndex>0</secondResultingItemIndex>
-		<mergeType>3</mergeType>
+		<mergeType>9</mergeType>
 		<APCost>32</APCost>
 	</MERGE>
 	<MERGE>
@@ -3805,7 +3805,7 @@
 		<secondItemIndex>133</secondItemIndex>
 		<firstResultingItemIndex>1530</firstResultingItemIndex>
 		<secondResultingItemIndex>0</secondResultingItemIndex>
-		<mergeType>3</mergeType>
+		<mergeType>9</mergeType>
 		<APCost>32</APCost>
 	</MERGE>
 	<MERGE>
@@ -3813,7 +3813,7 @@
 		<secondItemIndex>134</secondItemIndex>
 		<firstResultingItemIndex>1531</firstResultingItemIndex>
 		<secondResultingItemIndex>0</secondResultingItemIndex>
-		<mergeType>3</mergeType>
+		<mergeType>9</mergeType>
 		<APCost>32</APCost>
 	</MERGE>
 	<MERGE>
@@ -3821,7 +3821,7 @@
 		<secondItemIndex>135</secondItemIndex>
 		<firstResultingItemIndex>1532</firstResultingItemIndex>
 		<secondResultingItemIndex>0</secondResultingItemIndex>
-		<mergeType>3</mergeType>
+		<mergeType>9</mergeType>
 		<APCost>32</APCost>
 	</MERGE>
 	<MERGE>
@@ -3829,7 +3829,7 @@
 		<secondItemIndex>1189</secondItemIndex>
 		<firstResultingItemIndex>1533</firstResultingItemIndex>
 		<secondResultingItemIndex>0</secondResultingItemIndex>
-		<mergeType>3</mergeType>
+		<mergeType>9</mergeType>
 		<APCost>32</APCost>
 	</MERGE>
 	<MERGE>
@@ -3837,10 +3837,9 @@
 		<secondItemIndex>151</secondItemIndex>
 		<firstResultingItemIndex>1534</firstResultingItemIndex>
 		<secondResultingItemIndex>0</secondResultingItemIndex>
-		<mergeType>3</mergeType>
+		<mergeType>9</mergeType>
 		<APCost>32</APCost>
 	</MERGE>
-	
 	<MERGE>
 		<firstItemIndex>1546</firstItemIndex>
 		<secondItemIndex>1546</secondItemIndex>