From 068db305f6a603430576250ea74f71596e6557ca Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Wed, 9 Aug 2006 15:51:51 +0000
Subject: [PATCH] -enabled grenade magazine merging

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

diff --git a/gamedir/Data-1.13/TableData/Merges.xml b/gamedir/Data-1.13/TableData/Merges.xml
index 15c763cd3..971d95058 100644
--- a/gamedir/Data-1.13/TableData/Merges.xml
+++ b/gamedir/Data-1.13/TableData/Merges.xml
@@ -690,4 +690,184 @@
 		<resultingItemIndex>1028</resultingItemIndex>
 		<mergeType>1</mergeType>
 	</MERGE>
+	<MERGE>
+		<firstItemIndex>952</firstItemIndex>
+		<secondItemIndex>952</secondItemIndex>
+		<resultingItemIndex>952</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>953</firstItemIndex>
+		<secondItemIndex>953</secondItemIndex>
+		<resultingItemIndex>953</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>954</firstItemIndex>
+		<secondItemIndex>954</secondItemIndex>
+		<resultingItemIndex>954</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>955</firstItemIndex>
+		<secondItemIndex>955</secondItemIndex>
+		<resultingItemIndex>955</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>956</firstItemIndex>
+		<secondItemIndex>956</secondItemIndex>
+		<resultingItemIndex>956</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>957</firstItemIndex>
+		<secondItemIndex>957</secondItemIndex>
+		<resultingItemIndex>957</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>958</firstItemIndex>
+		<secondItemIndex>958</secondItemIndex>
+		<resultingItemIndex>958</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>959</firstItemIndex>
+		<secondItemIndex>959</secondItemIndex>
+		<resultingItemIndex>959</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>960</firstItemIndex>
+		<secondItemIndex>960</secondItemIndex>
+		<resultingItemIndex>960</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>961</firstItemIndex>
+		<secondItemIndex>961</secondItemIndex>
+		<resultingItemIndex>961</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>962</firstItemIndex>
+		<secondItemIndex>962</secondItemIndex>
+		<resultingItemIndex>962</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>963</firstItemIndex>
+		<secondItemIndex>963</secondItemIndex>
+		<resultingItemIndex>963</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>964</firstItemIndex>
+		<secondItemIndex>964</secondItemIndex>
+		<resultingItemIndex>964</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>965</firstItemIndex>
+		<secondItemIndex>965</secondItemIndex>
+		<resultingItemIndex>965</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>966</firstItemIndex>
+		<secondItemIndex>966</secondItemIndex>
+		<resultingItemIndex>966</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>967</firstItemIndex>
+		<secondItemIndex>967</secondItemIndex>
+		<resultingItemIndex>967</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>968</firstItemIndex>
+		<secondItemIndex>968</secondItemIndex>
+		<resultingItemIndex>968</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>969</firstItemIndex>
+		<secondItemIndex>969</secondItemIndex>
+		<resultingItemIndex>969</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>971</firstItemIndex>
+		<secondItemIndex>971</secondItemIndex>
+		<resultingItemIndex>971</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>972</firstItemIndex>
+		<secondItemIndex>972</secondItemIndex>
+		<resultingItemIndex>972</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>973</firstItemIndex>
+		<secondItemIndex>973</secondItemIndex>
+		<resultingItemIndex>973</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>974</firstItemIndex>
+		<secondItemIndex>974</secondItemIndex>
+		<resultingItemIndex>974</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>975</firstItemIndex>
+		<secondItemIndex>975</secondItemIndex>
+		<resultingItemIndex>975</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>982</firstItemIndex>
+		<secondItemIndex>982</secondItemIndex>
+		<resultingItemIndex>982</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>983</firstItemIndex>
+		<secondItemIndex>983</secondItemIndex>
+		<resultingItemIndex>983</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>984</firstItemIndex>
+		<secondItemIndex>984</secondItemIndex>
+		<resultingItemIndex>984</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>985</firstItemIndex>
+		<secondItemIndex>985</secondItemIndex>
+		<resultingItemIndex>985</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>986</firstItemIndex>
+		<secondItemIndex>986</secondItemIndex>
+		<resultingItemIndex>986</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>987</firstItemIndex>
+		<secondItemIndex>987</secondItemIndex>
+		<resultingItemIndex>987</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
+	<MERGE>
+		<firstItemIndex>988</firstItemIndex>
+		<secondItemIndex>988</secondItemIndex>
+		<resultingItemIndex>988</resultingItemIndex>
+		<mergeType>1</mergeType>
+	</MERGE>
 </MERGELIST>
\ No newline at end of file