BETA: Added missing merchant buylists and some minor html cleanup.

	Patch by: pandragon
	Reported by: yksdtc
	Reviewed by: Adry_85

L2J_DataPack_BETA/dist/game/data/buylists/3016301.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+	<npcs>
+		<npc>30163</npc> <!-- Rex -->
+	</npcs>
+	<item id="11610" /> <!-- Common Item - Bone Staff -->
+	<item id="11619" /> <!-- Common Item - Scroll of Wisdom -->
+	<item id="11611" /> <!-- Common Item - Priest Sword -->
+	<item id="11612" /> <!-- Common Item - Branch of Life -->
+	<item id="11609" /> <!-- Common Item - Proof of Revenge -->
+	<item id="11627" /> <!-- Common Item - Mace of Prayer -->
+	<item id="11630" /> <!-- Common Item - Doom Hammer -->
+	<item id="11634" /> <!-- Common Item - Mystic Staff -->
+	<item id="11633" /> <!-- Common Item - Staff of Mana -->
+	<item id="11637" /> <!-- Common Item - Divine Tome -->
+	<item id="11655" /> <!-- Common Item - Sword of Magic -->
+	<item id="11656" /> <!-- Common Item - Sword of Mystic -->
+	<item id="11657" /> <!-- Common Item - Sword of Occult -->
+	<item id="11662" /> <!-- Common Item - Dagger of Mana -->
+	<item id="11664" /> <!-- Common Item - Mystic Knife -->
+	<item id="11672" /> <!-- Common Item - Conjuror's Knife -->
+	<item id="11660" /> <!-- Common Item - Shilen Knife -->
+	<item id="11663" /> <!-- Common Item - Staff of Magic -->
+	<item id="11678" /> <!-- Common Item - Sage's Blood -->
+	<item id="11676" /> <!-- Common Item - Tome of Blood -->
+	<item id="11693" /> <!-- Common Item - Goat Head Staff -->
+	<item id="11696" /> <!-- Common Item - Sword of Magic Fog -->
+	<item id="11692" /> <!-- Common Item - Priest Mace -->
+	<item id="11709" /> <!-- Common Item - Crucifix of Blood -->
+	<item id="11715" /> <!-- Common Item - Demon Fangs -->
+	<item id="11732" /> <!-- Common Item - Atuba Hammer -->
+	<item id="11737" /> <!-- Common Item - Ghost Staff -->
+	<item id="11729" /> <!-- Common Item - Staff of Life -->
+	<item id="11731" /> <!-- Common Item - Atuba Mace -->
+	<item id="11764" /> <!-- Common Item - Crystal Staff -->
+	<item id="11757" /> <!-- Common Item - Stick of Faith -->
+	<item id="11748" /> <!-- Common Item - Mysterious Sword -->
+	<item id="11779" /> <!-- Common Item - Soulfire Dirk -->
+	<item id="11792" /> <!-- Common Item - Horn of Glory -->
+	<item id="11793" /> <!-- Common Item - Cursed Staff -->
+	<item id="11829" /> <!-- Common Item - Homunkulus's Sword -->
+	<item id="11805" /> <!-- Common Item - Sword of Whispering Death -->
+	<item id="11802" /> <!-- Common Item - Nirvana Axe -->
+	<item id="11799" /> <!-- Common Item - Stick of Eternity -->
+	<item id="11804" /> <!-- Common Item - Club of Nature -->
+	<item id="11806" /> <!-- Common Item - Mace of Underworld -->
+	<item id="11817" /> <!-- Common Item - Heathen's Book -->
+	<item id="11825" /> <!-- Common Item - Paradia Staff -->
+	<item id="11819" /> <!-- Common Item - Inferno Staff -->
+	<item id="11824" /> <!-- Common Item - Pa'agrian Hammer -->
+	<item id="11828" /> <!-- Common Item - Sage's Staff -->
+	<item id="11833" /> <!-- Common Item - Pa'agrian Axe -->
+	<item id="11850" /> <!-- Common Item - Ecliptic Sword -->
+	<item id="11859" /> <!-- Common Item - Ecliptic Axe -->
+	<item id="11842" /> <!-- Common Item - Deadman's Staff -->
+	<item id="11838" /> <!-- Common Item - Ghoul's Staff -->
+	<item id="11855" /> <!-- Common Item - Demon's Staff -->
+</list>

L2J_DataPack_BETA/dist/game/data/buylists/3016401.xml

@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+	<npcs>
+		<npc>30164</npc> <!-- Ian -->
+	</npcs>
+	<item id="12014" /> <!-- Common Item - Puma Skin Gaiters -->
+	<item id="12008" /> <!-- Common Item - Ring Mail Breastplate -->
+	<item id="12015" /> <!-- Common Item - Puma Skin Shirt -->
+	<item id="12012" /> <!-- Common Item - Iron Plate Gaiters -->
+	<item id="12020" /> <!-- Common Item - Lion Skin Gaiters -->
+	<item id="12021" /> <!-- Common Item - Lion Skin Shirt -->
+	<item id="12024" /> <!-- Common Item - Scale Mail -->
+	<item id="12032" /> <!-- Common Item - Compound Scale Mail -->
+	<item id="12030" /> <!-- Common Item - Dwarven Scale Mail -->
+	<item id="12031" /> <!-- Common Item - Mithril Breastplate -->
+	<item id="12041" /> <!-- Common Item - Mithril Gaiters -->
+	<item id="12034" /> <!-- Common Item - Reinforced Leather Gaiters -->
+	<item id="12023" /> <!-- Common Item - Scale Gaiters -->
+	<item id="12044" /> <!-- Common Item - Blast Plate -->
+	<item id="12049" /> <!-- Common Item - Compound Scale Gaiters -->
+	<item id="12039" /> <!-- Common Item - Dwarven Scale Gaiters -->
+	<item id="12043" /> <!-- Common Item - Mithril Banded Mail -->
+	<item id="12042" /> <!-- Common Item - Mithril Banded Gaiters -->
+	<item id="12036" /> <!-- Common Item - Reinforced Leather Shirt -->
+	<item id="12060" /> <!-- Common Item - Brigandine Gaiters -->
+	<item id="12059" /> <!-- Common Item - Brigandine -->
+	<item id="12056" /> <!-- Common Item - Mithril Scale Gaiters -->
+	<item id="12054" /> <!-- Common Item - Manticore Skin Shirt -->
+	<item id="12052" /> <!-- Common Item - Manticore Skin Gaiters -->
+	<item id="12081" /> <!-- Common Item - Half Plate Armor -->
+	<item id="12080" /> <!-- Common Item - Plate Gaiters -->
+	<item id="12074" /> <!-- Common Item - Salamander Skin Mail -->
+	<item id="12013" /> <!-- Common Item - Bronze Shield -->
+	<item id="12025" /> <!-- Common Item - Aspis -->
+	<item id="12051" /> <!-- Common Item - Hoplon -->
+	<item id="12069" /> <!-- Common Item - Kite Shield -->
+	<item id="12063" /> <!-- Common Item - Brigandine Shield -->
+	<item id="12073" /> <!-- Common Item - Square Shield -->
+	<item id="12078" /> <!-- Common Item - Plate Shield -->
+	<item id="12007" /> <!-- Common Item - Crafted Leather Gloves -->
+	<item id="12016" /> <!-- Common Item - Leather Gauntlet -->
+	<item id="12038" /> <!-- Common Item - Gauntlet -->
+	<item id="12068" /> <!-- Common Item - Rip Gauntlet -->
+	<item id="12037" /> <!-- Common Item - Reinforced Leather Gloves -->
+	<item id="12055" /> <!-- Common Item - Manticore Skin Gloves -->
+	<item id="12061" /> <!-- Common Item - Brigandine Gauntlet -->
+	<item id="12072" /> <!-- Common Item - Mithril Gloves -->
+	<item id="12076" /> <!-- Common Item - Ogre Power Gauntlet -->
+	<item id="12006" /> <!-- Common Item - Leather Boots -->
+	<item id="12029" /> <!-- Common Item - Blue Buckskin Boots -->
+	<item id="12033" /> <!-- Common Item - Iron Boots -->
+	<item id="12070" /> <!-- Common Item - Boots of Power -->
+	<item id="12035" /> <!-- Common Item - Reinforced Leather Boots -->
+	<item id="12053" /> <!-- Common Item - Manticore Skin Boots -->
+	<item id="12062" /> <!-- Common Item - Brigandine Boots -->
+	<item id="12071" /> <!-- Common Item - Assault Boots -->
+	<item id="12075" /> <!-- Common Item - Salamander Skin Boots -->
+	<item id="12077" /> <!-- Common Item - Plate Boots -->
+	<item id="12009" /> <!-- Common Item - Bone Helmet -->
+	<item id="12028" /> <!-- Common Item - Bronze Helmet -->
+	<item id="12050" /> <!-- Common Item - Helmet -->
+	<item id="12064" /> <!-- Common Item - Brigandine Helmet -->
+	<item id="12079" /> <!-- Common Item - Plate Helmet -->
+	<item id="12085" /> <!-- Common Item - Reinforced Mithril Boots -->
+	<item id="12095" /> <!-- Common Item - Chain Mail Shirt -->
+	<item id="12094" /> <!-- Common Item - Chain Gaiters -->
+	<item id="12086" /> <!-- Common Item - Reinforced Mithril Shirt -->
+	<item id="12091" /> <!-- Common Item - Eldarake -->
+	<item id="12084" /> <!-- Common Item - Reinforced Mithril Gaiters -->
+	<item id="12093" /> <!-- Common Item - Chain Boots -->
+	<item id="12101" /> <!-- Common Item - Plate Leather Boots -->
+	<item id="12088" /> <!-- Common Item - Dwarven Chain Boots -->
+	<item id="12089" /> <!-- Common Item - Boots of Seal -->
+	<item id="12087" /> <!-- Common Item - Reinforced Mithril Gloves -->
+	<item id="12092" /> <!-- Common Item - Chain Gloves -->
+	<item id="12096" /> <!-- Common Item - Chain Shield -->
+	<item id="12128" /> <!-- Common Item - Composite Armor -->
+	<item id="12144" /> <!-- Common Item - Full Plate Armor -->
+	<item id="12135" /> <!-- Common Item - Drake Leather Armor -->
+	<item id="12107" /> <!-- Common Item - Knight's Shield -->
+	<item id="12129" /> <!-- Common Item - Tower Shield -->
+	<item id="12126" /> <!-- Common Item - Composite Shield -->
+	<item id="12143" /> <!-- Common Item - Full Plate Shield -->
+	<item id="12109" /> <!-- Common Item - Dwarven Chain Gaiters -->
+	<item id="12111" /> <!-- Common Item - Rind Leather Gaiters -->
+	<item id="12130" /> <!-- Common Item - Theca Leather Gaiters -->
+	<item id="12106" /> <!-- Common Item - Great Helmet -->
+	<item id="12127" /> <!-- Common Item - Composite Helmet -->
+	<item id="12120" /> <!-- Common Item - Shining Circlet -->
+	<item id="12145" /> <!-- Common Item - Full Plate Helmet -->
+	<item id="12108" /> <!-- Common Item - Dwarven Chain Gloves -->
+	<item id="12116" /> <!-- Common Item - Gloves of Seal -->
+	<item id="12112" /> <!-- Common Item - Rind Leather Gloves -->
+	<item id="12119" /> <!-- Common Item - Mithril Gauntlet -->
+	<item id="12131" /> <!-- Common Item - Theca Leather Gloves -->
+	<item id="12134" /> <!-- Common Item - Drake Leather Gloves -->
+	<item id="12141" /> <!-- Common Item - Full Plate Gauntlet -->
+	<item id="12118" /> <!-- Common Item - Crimson Boots -->
+	<item id="12114" /> <!-- Common Item - Rind Leather Boots -->
+	<item id="12125" /> <!-- Common Item - Composite Boots -->
+	<item id="12132" /> <!-- Common Item - Theca Leather Boots -->
+	<item id="12136" /> <!-- Common Item - Drake Leather Boots -->
+	<item id="12142" /> <!-- Common Item - Full Plate Boots -->
+	<item id="12110" /> <!-- Common Item - Dwarven Chain Mail Shirt -->
+	<item id="12113" /> <!-- Common Item - Rind Leather Armor -->
+	<item id="12133" /> <!-- Common Item - Theca Leather Armor -->
+</list>

L2J_DataPack_BETA/dist/game/data/html/merchant/30002.htm

@@ -1,6 +1,6 @@
 <html><body>Armor Merchant Jackson:<br>
 Welcome! What can I do for you? Have a look around. We carry a wide selection. My advice is to always buy the best weaponry and armor you can afford -- it'll make you much more effective in battle!<br>
-<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refunds</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refund.</a><br>
 <a action="bypass -h npc_%objectId%_Wear 3000200">Try on Fighter equipment.</a><br>
 <a action="bypass -h npc_%objectId%_Wear 3000201">Try on Wizard equipment.</a><br>
 <a action="bypass -h npc_%objectId%_TerritoryStatus">View information about the local lord and tax rate.</a><br>

L2J_DataPack_BETA/dist/game/data/html/merchant/30061.htm

@@ -1,6 +1,6 @@
 <html><body>Armor Merchant Casey:<br>
 Uncle Sabrin thinks business is just about making as much money as possible as quickly as possible. But I don't agree. I think it's more important how you'll be remembered -- that's why I plan on going to Aden soon to do something else with my life!<br>
-<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refund</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refund.</a><br>
 <a action="bypass -h npc_%objectId%_Wear 3006100">Try on Fighter equipment.</a><br>
 <a action="bypass -h npc_%objectId%_Wear 3006101">Try on Wizard equipment.</a><br>
 <a action="bypass -h npc_%objectId%_TerritoryStatus">View information about the local lord and tax rate.</a><br>

L2J_DataPack_BETA/dist/game/data/html/merchant/30135.htm

@@ -1,6 +1,6 @@
 <html><body>Trader Iria:<br>
 Welcome! We have everything except what we don't have. Ha ha ha! If you want to buy, do so quickly. If you just want to browse...go away! We don't sell weapons that those dirty Humans make, so if you are looking for those you've come to the wrong shop. Ha ha!<br>
-<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refunds</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refund.</a><br>
 <a action="bypass -h npc_%objectId%_Wear 3013500">Try on Fighter equipment.</a><br>
 <a action="bypass -h npc_%objectId%_Wear 3013501">Try on Wizard equipment.</a><br>
 <a action="bypass -h npc_%objectId%_TerritoryStatus">View information about the local lord and tax rate.</a><br>

L2J_DataPack_BETA/dist/game/data/html/merchant/30147.htm

@@ -1,6 +1,6 @@
 <html><body>Merchant Unoren:<br>
 Welcome, friend! Here you can buy top-notch weaponry to guarantee victory in battle. We carry everything from sharp-bladed Bronze Daggers to the highest-quality Mithril Swords. Take a look around and let me know what you'd like.<br>
-<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refund</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refund.</a><br>
 <a action="bypass -h npc_%objectId%_Wear 3014700">Try on Fighter equipment.</a><br>
 <a action="bypass -h npc_%objectId%_Wear 3014701">Try on Wizard equipment.</a><br>
 <a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the local lord and tax rate.</a><br>

L2J_DataPack_BETA/dist/game/data/html/merchant/30148.htm

@@ -1,6 +1,6 @@
 <html><body>Trader Ariel:<br>
 We sell exquisite armor, sturdy shields and elegant helms. All are guaranteed to work as good as they look!<br>
-<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refund</a><br>
+<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refund.</a><br>
 <a action="bypass -h npc_%objectId%_Wear 3014800">Try on Warrior equipment.</a><br>
 <a action="bypass -h npc_%objectId%_Wear 3014801">Try on Wizard equipment.</a><br>
 <a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the local lord and tax rate.</a><br>

L2J_DataPack_BETA/dist/game/data/html/merchant/30163-1.htm

@@ -1,5 +1,5 @@
 <html><body>Merchant Rex:<br>
 I'm not sure if we have what you're looking for. Tell me again...<br>
 <a action="bypass -h npc_%objectId%_Buy 3016300">Buy Wizard equipment.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 1">Buy Wizard Common Items.</a>
+<a action="bypass -h npc_%objectId%_Buy 3016301">Buy Wizard Common Items.</a>
 </body></html>

L2J_DataPack_BETA/dist/game/data/html/merchant/30164-1.htm

@@ -1,5 +1,5 @@
-<html><body>Trader Iz:<br>
+<html><body>Trader Ian:<br>
 Tell me what you need.<br>
 <a action="bypass -h npc_%objectId%_Buy 3016400">Buy Wizard equipment.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 1">Buy Wizard Common Items.</a>
+<a action="bypass -h npc_%objectId%_Buy 3016401">Buy Wizard Common Items.</a>
 </body></html>

L2J_DataPack_BETA/dist/game/data/html/merchant/30164.htm

@@ -1,4 +1,4 @@
-<html><body>Trader Iz:<br>
+<html><body>Trader Ian:<br>
 Welcome to the Ivory Tower, the center of magic.<br>
 These days, people think of the Ivory Tower as a research institute, but did you know it was once a powerful political entity that practically controlled the entire continent? Where do you think the knowledge and secrets our founders accumulated is stored? Right here!<br>
 If there is another global crisis, I have a feeling its cause -- and its solution -- may both emanate from this place...<br>