From 86b72ab0fee2fb97fe12fc1cd8557efe55926109 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Sun, 16 Sep 2012 14:54:27 +0000
Subject: [PATCH] - added an example clothes merge - added clothes to Keith's
 merchant inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1541 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Clothes.xml       |  9 +-
 gamedir/Data-1.13/TableData/Items.xml         | 20 ++---
 gamedir/Data-1.13/TableData/Merges.xml        |  8 ++
 .../TableData/NPCInventory/KeithInventory.xml | 85 +++++++++++++++++++
 4 files changed, 110 insertions(+), 12 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Clothes.xml b/gamedir/Data-1.13/TableData/Clothes.xml
index 30a12a6ab..85253ac8c 100644
--- a/gamedir/Data-1.13/TableData/Clothes.xml
+++ b/gamedir/Data-1.13/TableData/Clothes.xml
@@ -69,7 +69,7 @@
 	
 	<CLOTHES>
     <uiIndex>8</uiIndex>
-		<szName>GYELLOWSHIRT</szName>
+		<szName>light green</szName>
 		<Vest>GYELLOWSHIRT</Vest>
 	</CLOTHES>
 	
@@ -126,5 +126,12 @@
 		<szName>Bluejeans</szName>
 		<Pants>BLUEPANTS</Pants>
 	</CLOTHES>
+	
+	<CLOTHES>
+    <uiIndex>18</uiIndex>
+		<szName>white t-shirt and jeans</szName>
+		<Vest>WHITEVEST</Vest>
+		<Pants>BLUEPANTS</Pants>
+	</CLOTHES>
 
 </CLOTHESLIST>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/Items.xml b/gamedir/Data-1.13/TableData/Items.xml
index 5ff6d3637..ea8d87044 100644
--- a/gamedir/Data-1.13/TableData/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items.xml
@@ -47346,19 +47346,17 @@
 		<szBRDesc>Since when does this shop sell cheap clothes?</szBRDesc>
 		<usItemClass>8192</usItemClass>
 		<nasLayoutClass>1</nasLayoutClass>
-		<ubGraphicType>1</ubGraphicType>
-		<ubGraphicNum>513</ubGraphicNum>
-		<ubWeight>1</ubWeight>
+		<ubGraphicType>2</ubGraphicType>
+		<ubGraphicNum>148</ubGraphicNum>
+		<ubWeight>12</ubWeight>
 		<ubPerPocket>8</ubPerPocket>
 		<ItemSize>13</ItemSize>
-		<usPrice>250</usPrice>
+		<usPrice>110</usPrice>
 		<ubCoolness>5</ubCoolness>
 		<Damageable>1</Damageable>
 		<WaterDamages>1</WaterDamages>
 		<ShowStatus>1</ShowStatus>
-		<BR_NewInventory>3</BR_NewInventory>
-		<usOverheatingCooldownFactor>100.0</usOverheatingCooldownFactor>
-		<ItemFlag>4096</ItemFlag>
+		<clothestype>18</clothestype>
 		<STAND_MODIFIERS />
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
@@ -48473,10 +48471,10 @@
 	</ITEM>
 	<ITEM>
 		<uiIndex>1616</uiIndex>
-		<szItemName>Bright yellow shirt</szItemName>
-		<szLongItemName>Bright yellow shirt</szLongItemName>
-		<szItemDesc>A totally unremarkable bright yellow T-shirt.</szItemDesc>
-		<szBRName>Bright yellow shirt</szBRName>
+		<szItemName>Light green shirt</szItemName>
+		<szLongItemName>Light green shirt</szLongItemName>
+		<szItemDesc>A totally unremarkable light green yellow T-shirt.</szItemDesc>
+		<szBRName>Light green shirt</szBRName>
 		<szBRDesc>Apparently we sell clothes now. Well, this is a T-shirt, you know?</szBRDesc>
 		<usItemClass>8192</usItemClass>
 		<nasLayoutClass>1</nasLayoutClass>
diff --git a/gamedir/Data-1.13/TableData/Merges.xml b/gamedir/Data-1.13/TableData/Merges.xml
index f38a427c6..bd3b1622e 100644
--- a/gamedir/Data-1.13/TableData/Merges.xml
+++ b/gamedir/Data-1.13/TableData/Merges.xml
@@ -3873,4 +3873,12 @@
 		<mergeType>1</mergeType>
 		<APCost>32</APCost>
 	</MERGE>
+	<MERGE>
+		<firstItemIndex>1612</firstItemIndex>
+		<secondItemIndex>1619</secondItemIndex>
+		<firstResultingItemIndex>1577</firstResultingItemIndex>
+		<secondResultingItemIndex>0</secondResultingItemIndex>
+		<mergeType>4</mergeType>
+		<APCost>32</APCost>
+	</MERGE>
 </MERGELIST>
\ No newline at end of file
diff --git a/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml b/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml
index 7b83c343e..1cf63968d 100644
--- a/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml
+++ b/gamedir/Data-1.13/TableData/NPCInventory/KeithInventory.xml
@@ -431,5 +431,90 @@
 		<uiIndex>88</uiIndex>
 		<sItemIndex>1576</sItemIndex>
 		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>	
+	<INVENTORY>
+		<uiIndex>89</uiIndex>
+		<sItemIndex>1606</sItemIndex>
+		<ubOptimalNumber>0</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>90</uiIndex>
+		<sItemIndex>1607</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>91</uiIndex>
+		<sItemIndex>1608</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>92</uiIndex>
+		<sItemIndex>1609</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>93</uiIndex>
+		<sItemIndex>1610</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>94</uiIndex>
+		<sItemIndex>1611</sItemIndex>
+		<ubOptimalNumber>0</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>95</uiIndex>
+		<sItemIndex>1612</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>96</uiIndex>
+		<sItemIndex>1613</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>97</uiIndex>
+		<sItemIndex>1614</sItemIndex>
+		<ubOptimalNumber>0</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>98</uiIndex>
+		<sItemIndex>1615</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>99</uiIndex>
+		<sItemIndex>1616</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>100</uiIndex>
+		<sItemIndex>1617</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>101</uiIndex>
+		<sItemIndex>1618</sItemIndex>
+		<ubOptimalNumber>0</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>102</uiIndex>
+		<sItemIndex>1619</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>103</uiIndex>
+		<sItemIndex>1620</sItemIndex>
+		<ubOptimalNumber>0</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>104</uiIndex>
+		<sItemIndex>1621</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
+	</INVENTORY>
+	<INVENTORY>
+		<uiIndex>105</uiIndex>
+		<sItemIndex>1622</sItemIndex>
+		<ubOptimalNumber>1</ubOptimalNumber>
 	</INVENTORY>
 </INVENTORYLIST>
\ No newline at end of file