From 8f0c9da83d7e19d18f85cfd2250ce30b3aa1ce83 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Thu, 14 Feb 2019 00:19:25 +0000
Subject: [PATCH] Fix: missing lookup types

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2471 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 Data-1.13/TableData/Lookup/MergeType.xml | 8 ++++++++
 Data/TableData/Lookup/MergeType.xml      | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/Data-1.13/TableData/Lookup/MergeType.xml b/Data-1.13/TableData/Lookup/MergeType.xml
index 4b82a04b7..48255c01f 100644
--- a/Data-1.13/TableData/Lookup/MergeType.xml
+++ b/Data-1.13/TableData/Lookup/MergeType.xml
@@ -56,4 +56,12 @@
        <id>13</id>
        <name>Use (Drain Status)</name>
    </MergeType>
+	<MergeType>
+		<id>14</id>
+		<name>Cannibalize</name>
+	</MergeType>
+	<MergeType>
+		<id>15</id>
+		<name>Lose 10 percent</name>
+	</MergeType>
 </JA2Data>
\ No newline at end of file
diff --git a/Data/TableData/Lookup/MergeType.xml b/Data/TableData/Lookup/MergeType.xml
index 4b82a04b7..48255c01f 100644
--- a/Data/TableData/Lookup/MergeType.xml
+++ b/Data/TableData/Lookup/MergeType.xml
@@ -56,4 +56,12 @@
        <id>13</id>
        <name>Use (Drain Status)</name>
    </MergeType>
+	<MergeType>
+		<id>14</id>
+		<name>Cannibalize</name>
+	</MergeType>
+	<MergeType>
+		<id>15</id>
+		<name>Lose 10 percent</name>
+	</MergeType>
 </JA2Data>
\ No newline at end of file