BETA: Misc fixes:

	* Merchants fixes.
		Patch by: Pandragon
		Reviewed by: jurchiks, Zoey76
	* Fairy Tree AI fixes.
		Patch by: Pandragon
		Reviewed by: Sdw, Nos, St3eT, Zoey76

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

@@ -2,7 +2,7 @@
 There must be something here you like! What can I do for you?<br>
 <a action="bypass -h npc_%objectId%_Buy 3083700">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3083701">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3083702">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3083702">Buy Fighter Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3083703">Buy Wizard Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_BuyShadowItem">Buy a Shadow item.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,6 +2,6 @@
 Please tell me what you need.<br>
 <a action="bypass -h npc_%objectId%_Buy 3083800">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3083801">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3083802">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3083802">Buy Fighter Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3083803">Buy Wizard Common Items.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,8 +2,8 @@
 Welcome, customer! Is there anything specific that you're looking for today? We have a wide selection of earrings, necklaces, rings and more. In fact, I daresay that we have any accessory worth having. That's the difference between Elmore and Aden, eh? Here in Aden, we believe elegance is always worth the price -- not like those savages to the north! Well, have a look around. Whatever your budget, I'm sure you'll find something that pleases you.<br>
 <a action="bypass -h npc_%objectId%_Buy 3084100">Trade accessories</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3084101">Buy/Sell/Refund Dyes.</a><br>
-<a action="bypass -h npc_%objectId%_multisell 300900001">Purchase either bracelet or talisman</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3084102">Trade a basic type accessory.</a><br>
+<a action="bypass -h npc_%objectId%_multisell 300900001">Buy a bracelet or talisman.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3084102">Buy a common type accessory.</a><br>
 <a action="bypass -h npc_%objectId%_TerritoryStatus">View information about the local lord and tax rate</a><br>
 <a action="bypass -h npc_%objectId%_Quest">Quest</a>
 </body></html>
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 Well, what kind of item are you looking for?<br>
 <a action="bypass -h npc_%objectId%_Buy 3089000">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3089001">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3089002">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3089002">Buy Fighter Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3089003">Buy Wizard Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_BuyShadowItem">Buy a Shadow item</a>
 </body></html>
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 Huh? Would you like to trade?<br>
 <a action="bypass -h npc_%objectId%_Buy 3089100">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3089101">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3089102">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3089102">Buy Fighter Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3089103">Buy Wizard Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_BuyShadowItem">Buy a Shadow item.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 What are you looking for?<br>
 <a action="bypass -h npc_%objectId%_Buy 3125600">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3125601">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy basic equipment for Warriors.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy Wizard Common Items.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3125603">Buy Fighter Common Items.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3125604">Buy Wizard Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_BuyShadowItem">Buy a Shadow item.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 Well then, how about this item?<br>
 <a action="bypass -h npc_%objectId%_Buy 3125700">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3125701">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy basic equipment for Warriors.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy Wizard Common Items.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3125702">Buy Fighter Common Items.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3125703">Buy Wizard Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_BuyShadowItem">Buy a Shadow item.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,6 +2,6 @@
 Please take a look and let me know what you like.<br>
 <a action="bypass -h npc_%objectId%_Buy 3125800">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3125801">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy basic equipment for Warriors.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy Wizard Common Items.</a>
+<a action="bypass -h npc_%objectId%_Buy 3125802">Buy Fighter Common Items.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3125803">Buy Wizard Common Items.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,6 +2,6 @@
 Well, what can I get you?<br>
 <a action="bypass -h npc_%objectId%_Buy 3125900">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3125901">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy basic equipment for Warriors.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy Wizard Common Items.</a>
+<a action="bypass -h npc_%objectId%_Buy 3125902">Buy Fighter Common Items.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3125903">Buy Wizard Common Items.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 What would you like to do?<br>
 <a action="bypass -h npc_%objectId%_Buy 3130000">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3130001">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3130002">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3130002">Buy Fighter Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3130003">Buy Wizard Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_BuyShadowItem">Buy a Shadow item.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 Well, what can I do for you then?<br>
 <a action="bypass -h npc_%objectId%_Buy 3130100">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3130101">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3130102">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3130102">Buy Fighter Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3130103">Buy Wizard Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_BuyShadowItem">Buy a Shadow item.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,6 +2,6 @@
 Now, please tell me what I can do for you!<br>
 <a action="bypass -h npc_%objectId%_Buy 3130200">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3130201">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3130202">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3130202">Buy Fighter Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3130203">Buy Wizard Common Items.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,6 +2,6 @@
 I have all kinds of goods over here.. If you have anything to sell, I also buy items for a very generous price! See anything you like, stranger?<br>
 <a action="bypass -h npc_%objectId%_Buy 3130300">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3130301">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3130302">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3130302">Buy Fighter Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3130303">Buy Wizard Common Items.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 If you want to buy something, I will be happy to bring it out! What can I get for you?<br>
 <a action="bypass -h npc_%objectId%_Buy 3194500">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3194501">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3194502">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3194502">Buy Fighter Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3194503">Buy Wizard Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_BuyShadowItem">Buy a Shadow item.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 Hmm...what would you like to do?<br>
 <a action="bypass -h npc_%objectId%_Buy 3194600">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3194601">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3194602">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3194602">Buy Fighter Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3194603">Buy Wizard Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_BuyShadowItem">Buy a Shadow item.</a>
 </body></html>
\ No newline at end of file

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

@@ -2,6 +2,6 @@
 What is it that you need?<br>
 <a action="bypass -h npc_%objectId%_Buy 3194700">Buy equipment for Fighters.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3194701">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3194702">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3194702">Buy Fighter Common Items.</a><br>
 <a action="bypass -h npc_%objectId%_Buy 3194703">Buy Wizard Common Items.</a>
 </body></html>
\ No newline at end of file

L2J_DataPack_BETA/dist/game/data/html/warehouse/4315.htm

-<html><body>Fantasy Isle Warehouse Keeper:<br>For the last century, Fantasy Isle's warehouse has never had any lost accidents. Not even one! How about that? The Iron Guild's management resulted in this great pride. So please leave your items here without any worry.<br>
+<html><body>Fantasy Isle Warehouse Keeper:<br>
+For the last century, Fantasy Isle's warehouse has never had any lost accidents. Not even one! How about that? The Iron Guild's management resulted in this great pride. So please leave your items here without any worry.<br>
 <a action="bypass -h npc_%objectId%_Chat 1">Use private Warehouse.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 2">Use clan Warehouse.</a><br></body></html>
+<a action="bypass -h npc_%objectId%_Chat 2">Use clan Warehouse.</a>
\ No newline at end of file
+</body></html>
\ No newline at end of file

L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java

@@ -53,6 +53,7 @@ public class FairyTrees extends AbstractNpcAI
 	{
 		super(FairyTrees.class.getSimpleName(), "ai/group_template");
 		addKillId(MOBS);
+		addSpawnId(MOBS);
 	}
 	
 	@Override
@@ -75,6 +76,14 @@ public class FairyTrees extends AbstractNpcAI
 		return super.onKill(npc, killer, isSummon);
 	}
 	
+	@Override
+	public String onSpawn(L2Npc npc)
+	{
+		npc.setIsNoRndWalk(true);
+		npc.setIsImmobilized(true);
+		return super.onSpawn(npc);
+	}
+	
 	public static void main(String[] args)
 	{
 		new FairyTrees();

L2J_DataPack_BETA/dist/sql/game/minions.sql

@@ -127,6 +127,13 @@ INSERT INTO `minions` VALUES
 (27110,27111,3,5),
 (27113,27111,3,6);
 
+-- Fairy Trees
+INSERT INTO `minions` VALUES
+(27185,27189,3,3),
+(27186,27189,3,3),
+(27187,27189,3,3),
+(27188,27189,3,3);
+
 -- raid bosses
 INSERT INTO `minions` VALUES
 (25001,25002,3,3),