From 69d319810a3c2dd64cffa97a38dfee1871921df4 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Fri, 5 Jul 2013 21:48:45 +0000
Subject: [PATCH] - Darrel now sells farm products

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1696 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 .../AdditionalDealer_1_Inventory.xml          | 19 +++++++++++++++++--
 .../TableData/NPCInventory/Merchants.xml      | 14 +++++++-------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_1_Inventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_1_Inventory.xml
index 65086d169..e6463c700 100644
--- a/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_1_Inventory.xml
+++ b/gamedir/Data-1.13/TableData/NPCInventory/AdditionalDealer_1_Inventory.xml
@@ -2,7 +2,22 @@
 <INVENTORYLIST>
 	<INVENTORY>
 		<uiIndex>0</uiIndex>
-		<sItemIndex>0</sItemIndex>
-		<ubOptimalNumber>0</ubOptimalNumber>
+		<sItemIndex>1565</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>1</uiIndex>
+		<sItemIndex>1567</sItemIndex>
+		<ubOptimalNumber>8</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>2</uiIndex>
+		<sItemIndex>1568</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>3</uiIndex>
+		<sItemIndex>1572</sItemIndex>
+		<ubOptimalNumber>30</ubOptimalNumber>
 	</INVENTORY>
 </INVENTORYLIST>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/NPCInventory/Merchants.xml b/gamedir/Data-1.13/TableData/NPCInventory/Merchants.xml
index 65a81e838..19740cd85 100644
--- a/gamedir/Data-1.13/TableData/NPCInventory/Merchants.xml
+++ b/gamedir/Data-1.13/TableData/NPCInventory/Merchants.xml
@@ -595,15 +595,15 @@ uiFlags must be of
 	</MERCHANT>
 	<MERCHANT>
     <uiIndex>20</uiIndex>
-    <szName>additional dealer 1</szName>
+    <szName>Darrel</szName>
     <dBuyModifier>1.0</dBuyModifier>
     <dSellModifier>1.0</dSellModifier>
-    <ubShopKeeperID>255</ubShopKeeperID>
-    <ubTypeOfArmsDealer>0</ubTypeOfArmsDealer>
-    <iInitialCash>800</iInitialCash>
-    <uiFlags>268435456</uiFlags>
-    <dailyIncrement>800</dailyIncrement>
-    <dailyMaximum>800</dailyMaximum>
+    <ubShopKeeperID>73</ubShopKeeperID>
+    <ubTypeOfArmsDealer>1</ubTypeOfArmsDealer>
+    <iInitialCash>100</iInitialCash>
+    <uiFlags>536870912</uiFlags>
+    <dailyIncrement>100</dailyIncrement>
+    <dailyMaximum>100</dailyMaximum>
     <dailyRetained>0</dailyRetained>
     <minCoolness>1</minCoolness>
     <maxCoolness>10</maxCoolness>