From ead6bd91e6882858ba44d3029f5f246d07655a7e Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Thu, 20 Mar 2014 01:44:43 +0000
Subject: [PATCH] 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
---
.../dist/game/data/buylists/3125602.xml | 23 ++++
.../dist/game/data/buylists/3125603.xml | 22 ++++
.../dist/game/data/buylists/3125702.xml | 23 ++++
.../dist/game/data/buylists/3125703.xml | 22 ++++
.../dist/game/data/buylists/3125802.xml | 107 ++++++++++++++++++
.../dist/game/data/buylists/3125803.xml | 59 ++++++++++
.../dist/game/data/buylists/3125902.xml | 107 ++++++++++++++++++
.../dist/game/data/buylists/3125903.xml | 59 ++++++++++
.../dist/game/data/html/merchant/13128.htm | 2 +-
.../dist/game/data/html/merchant/30001-pk.htm | 3 +
.../dist/game/data/html/merchant/30002-pk.htm | 3 +
.../dist/game/data/html/merchant/30003-pk.htm | 3 +
.../dist/game/data/html/merchant/30004-pk.htm | 3 +
.../dist/game/data/html/merchant/30060-1.htm | 2 +-
.../dist/game/data/html/merchant/30060-pk.htm | 3 +
.../dist/game/data/html/merchant/30061-pk.htm | 3 +
.../dist/game/data/html/merchant/30063-pk.htm | 3 +
.../dist/game/data/html/merchant/30078-pk.htm | 3 +
.../dist/game/data/html/merchant/30081-pk.htm | 3 +
.../dist/game/data/html/merchant/30082-pk.htm | 3 +
.../dist/game/data/html/merchant/30084-2.htm | 6 +-
.../dist/game/data/html/merchant/30084-pk.htm | 3 +
.../dist/game/data/html/merchant/30085-1.htm | 2 +-
.../dist/game/data/html/merchant/30085-pk.htm | 3 +
.../dist/game/data/html/merchant/30085.htm | 2 +-
.../dist/game/data/html/merchant/30090-pk.htm | 3 +
.../dist/game/data/html/merchant/30090.htm | 4 +-
.../dist/game/data/html/merchant/30091-pk.htm | 3 +
.../dist/game/data/html/merchant/30091.htm | 6 +-
.../dist/game/data/html/merchant/30093-pk.htm | 3 +
.../dist/game/data/html/merchant/30094-pk.htm | 3 +
.../dist/game/data/html/merchant/30135-pk.htm | 3 +
.../dist/game/data/html/merchant/30136-1.htm | 2 +-
.../dist/game/data/html/merchant/30136-pk.htm | 3 +
.../dist/game/data/html/merchant/30136.htm | 2 +-
.../dist/game/data/html/merchant/30137-pk.htm | 3 +
.../dist/game/data/html/merchant/30147-pk.htm | 3 +
.../dist/game/data/html/merchant/30148-pk.htm | 3 +
.../dist/game/data/html/merchant/30149-pk.htm | 3 +
.../dist/game/data/html/merchant/30149.htm | 2 +-
.../dist/game/data/html/merchant/30150-pk.htm | 3 +
.../dist/game/data/html/merchant/30163-pk.htm | 4 +
.../dist/game/data/html/merchant/30164-1.htm | 4 +-
.../dist/game/data/html/merchant/30164-pk.htm | 3 +
.../dist/game/data/html/merchant/30165-pk.htm | 4 +
.../dist/game/data/html/merchant/30165.htm | 2 +-
.../dist/game/data/html/merchant/30166-pk.htm | 3 +
.../dist/game/data/html/merchant/30166.htm | 2 +-
.../dist/game/data/html/merchant/30178-pk.htm | 4 +
.../dist/game/data/html/merchant/30179-pk.htm | 3 +
.../dist/game/data/html/merchant/30180-pk.htm | 3 +
.../dist/game/data/html/merchant/30181-pk.htm | 3 +
.../dist/game/data/html/merchant/30181.htm | 4 +-
.../dist/game/data/html/merchant/30207-1.htm | 2 +-
.../dist/game/data/html/merchant/30208-1.htm | 2 +-
.../dist/game/data/html/merchant/30230-1.htm | 2 +-
.../dist/game/data/html/merchant/30253-1.htm | 2 +-
.../dist/game/data/html/merchant/30321-1.htm | 2 +-
.../dist/game/data/html/merchant/30387-pk.htm | 3 +
.../dist/game/data/html/merchant/30684-1.htm | 2 +-
.../dist/game/data/html/merchant/30837-1.htm | 2 +-
.../dist/game/data/html/merchant/30838-1.htm | 2 +-
.../dist/game/data/html/merchant/30841.htm | 4 +-
.../dist/game/data/html/merchant/30890-1.htm | 2 +-
.../dist/game/data/html/merchant/30891-1.htm | 2 +-
.../dist/game/data/html/merchant/31256-1.htm | 4 +-
.../dist/game/data/html/merchant/31257-1.htm | 4 +-
.../dist/game/data/html/merchant/31258-1.htm | 4 +-
.../dist/game/data/html/merchant/31259-1.htm | 4 +-
.../dist/game/data/html/merchant/31300-1.htm | 2 +-
.../dist/game/data/html/merchant/31301-1.htm | 2 +-
.../dist/game/data/html/merchant/31302-1.htm | 2 +-
.../dist/game/data/html/merchant/31303-1.htm | 2 +-
.../dist/game/data/html/merchant/31945-1.htm | 2 +-
.../dist/game/data/html/merchant/31946-1.htm | 2 +-
.../dist/game/data/html/merchant/31947-1.htm | 2 +-
.../dist/game/data/html/warehouse/4315.htm | 6 +-
.../scripts/ai/group_template/FairyTrees.java | 9 ++
L2J_DataPack_BETA/dist/sql/game/minions.sql | 7 ++
79 files changed, 589 insertions(+), 50 deletions(-)
create mode 100644 L2J_DataPack_BETA/dist/game/data/buylists/3125602.xml
create mode 100644 L2J_DataPack_BETA/dist/game/data/buylists/3125603.xml
create mode 100644 L2J_DataPack_BETA/dist/game/data/buylists/3125702.xml
create mode 100644 L2J_DataPack_BETA/dist/game/data/buylists/3125703.xml
create mode 100644 L2J_DataPack_BETA/dist/game/data/buylists/3125802.xml
create mode 100644 L2J_DataPack_BETA/dist/game/data/buylists/3125803.xml
create mode 100644 L2J_DataPack_BETA/dist/game/data/buylists/3125902.xml
create mode 100644 L2J_DataPack_BETA/dist/game/data/buylists/3125903.xml
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30001-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30002-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30003-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30004-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30060-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30061-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30063-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30078-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30081-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30082-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30084-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30085-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30090-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30091-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30093-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30094-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30135-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30136-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30137-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30147-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30148-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30149-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30150-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30163-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30164-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30165-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30166-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30178-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30179-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30180-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30181-pk.htm
create mode 100644 L2J_DataPack_BETA/dist/game/data/html/merchant/30387-pk.htm
diff --git a/L2J_DataPack_BETA/dist/game/data/buylists/3125602.xml b/L2J_DataPack_BETA/dist/game/data/buylists/3125602.xml
new file mode 100644
index 0000000000..e114111309
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/buylists/3125602.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+ <npcs>
+ <npc>31256</npc> <!-- Leon -->
+ </npcs>
+ <item id="11614" /> <!-- Common Item - Saber -->
+ <item id="11605" /> <!-- Common Item - Steel Sword -->
+ <item id="11613" /> <!-- Common Item - Crafted Dagger -->
+ <item id="11617" /> <!-- Common Item - Assassin Knife -->
+ <item id="11606" /> <!-- Common Item - Reinforced Bow -->
+ <item id="11623" /> <!-- Common Item - Hand Axe -->
+ <item id="11626" /> <!-- Common Item - Heavy Mace -->
+ <item id="11618" /> <!-- Common Item - Work Hammer -->
+ <item id="11622" /> <!-- Common Item - Trident -->
+ <item id="11635" /> <!-- Common Item - Bastard Sword -->
+ <item id="11646" /> <!-- Common Item - Poniard Dagger -->
+ <item id="11632" /> <!-- Common Item - Long Bow -->
+ <item id="11629" /> <!-- Common Item - Dark Elven Bow -->
+ <item id="11647" /> <!-- Common Item - Pike -->
+ <item id="11631" /> <!-- Common Item - Dwarven Trident -->
+ <item id="11608" /> <!-- Common Item - Bagh-Nakh -->
+ <item id="11642" /> <!-- Common Item - Single-Edged Jamadhr -->
+</list>
diff --git a/L2J_DataPack_BETA/dist/game/data/buylists/3125603.xml b/L2J_DataPack_BETA/dist/game/data/buylists/3125603.xml
new file mode 100644
index 0000000000..2e8d550350
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/buylists/3125603.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+ <npcs>
+ <npc>31256</npc> <!-- Leon -->
+ </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 -->
+</list>
diff --git a/L2J_DataPack_BETA/dist/game/data/buylists/3125702.xml b/L2J_DataPack_BETA/dist/game/data/buylists/3125702.xml
new file mode 100644
index 0000000000..00adcadd5c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/buylists/3125702.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+ <npcs>
+ <npc>31257</npc> <!-- Veronica -->
+ </npcs>
+ <item id="11614" /> <!-- Common Item - Saber -->
+ <item id="11605" /> <!-- Common Item - Steel Sword -->
+ <item id="11613" /> <!-- Common Item - Crafted Dagger -->
+ <item id="11617" /> <!-- Common Item - Assassin Knife -->
+ <item id="11606" /> <!-- Common Item - Reinforced Bow -->
+ <item id="11623" /> <!-- Common Item - Hand Axe -->
+ <item id="11626" /> <!-- Common Item - Heavy Mace -->
+ <item id="11618" /> <!-- Common Item - Work Hammer -->
+ <item id="11622" /> <!-- Common Item - Trident -->
+ <item id="11635" /> <!-- Common Item - Bastard Sword -->
+ <item id="11646" /> <!-- Common Item - Poniard Dagger -->
+ <item id="11632" /> <!-- Common Item - Long Bow -->
+ <item id="11629" /> <!-- Common Item - Dark Elven Bow -->
+ <item id="11647" /> <!-- Common Item - Pike -->
+ <item id="11631" /> <!-- Common Item - Dwarven Trident -->
+ <item id="11608" /> <!-- Common Item - Bagh-Nakh -->
+ <item id="11642" /> <!-- Common Item - Single-Edged Jamadhr -->
+</list>
diff --git a/L2J_DataPack_BETA/dist/game/data/buylists/3125703.xml b/L2J_DataPack_BETA/dist/game/data/buylists/3125703.xml
new file mode 100644
index 0000000000..331811aadb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/buylists/3125703.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+ <npcs>
+ <npc>31257</npc> <!-- Veronica -->
+ </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 -->
+</list>
diff --git a/L2J_DataPack_BETA/dist/game/data/buylists/3125802.xml b/L2J_DataPack_BETA/dist/game/data/buylists/3125802.xml
new file mode 100644
index 0000000000..955d570283
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/buylists/3125802.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>31258</npc> <!-- Helmut -->
+ </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>
diff --git a/L2J_DataPack_BETA/dist/game/data/buylists/3125803.xml b/L2J_DataPack_BETA/dist/game/data/buylists/3125803.xml
new file mode 100644
index 0000000000..4f8106e3f5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/buylists/3125803.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+ <npcs>
+ <npc>31258</npc> <!-- Helmut -->
+ </npcs>
+ <item id="12011" /> <!-- Common Item - Cursed Stockings -->
+ <item id="12010" /> <!-- Common Item - Cursed Tunic -->
+ <item id="12017" /> <!-- Common Item - Dark Stockings -->
+ <item id="12022" /> <!-- Common Item - White Tunic -->
+ <item id="12019" /> <!-- Common Item - Mystic's Stockings -->
+ <item id="12018" /> <!-- Common Item - Mystic's Tunic -->
+ <item id="12048" /> <!-- Common Item - Stockings of Knowledge -->
+ <item id="12047" /> <!-- Common Item - Tunic of Knowledge -->
+ <item id="12058" /> <!-- Common Item - Mithril Stockings -->
+ <item id="12057" /> <!-- Common Item - Mithril Tunic -->
+ <item id="12083" /> <!-- Common Item - Sage's Rag -->
+ <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="12046" /> <!-- Common Item - Gloves of Knowledge -->
+ <item id="12065" /> <!-- Common Item - Elven Mithril Gloves -->
+ <item id="12072" /> <!-- Common Item - Mithril Gloves -->
+ <item id="12076" /> <!-- Common Item - Ogre Power Gauntlet -->
+ <item id="12082" /> <!-- Common Item - Sage's Worn Gloves -->
+ <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="12045" /> <!-- Common Item - Boots of Knowledge -->
+ <item id="12066" /> <!-- Common Item - Elven Mithril Boots -->
+ <item id="12122" /> <!-- Common Item - Demon's Gloves -->
+ <item id="12137" /> <!-- Common Item - Divine Gloves -->
+ <item id="12071" /> <!-- Common Item - Assault Boots -->
+ <item id="12075" /> <!-- Common Item - Salamander Skin Boots -->
+ <item id="12077" /> <!-- Common Item - Plate Boots -->
+ <item id="12121" /> <!-- Common Item - Demon's 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="12099" /> <!-- Common Item - Karmian Tunic -->
+ <item id="12100" /> <!-- Common Item - Karmian Stockings -->
+ <item id="12098" /> <!-- Common Item - Karmian Boots -->
+ <item id="12097" /> <!-- Common Item - Karmian Gloves -->
+ <item id="12115" /> <!-- Common Item - Robe of Seal -->
+ <item id="12124" /> <!-- Common Item - Demon's Stockings -->
+ <item id="12139" /> <!-- Common Item - Divine Stockings -->
+ <item id="12123" /> <!-- Common Item - Demon's Tunic -->
+ <item id="12138" /> <!-- Common Item - Divine Tunic -->
+</list>
diff --git a/L2J_DataPack_BETA/dist/game/data/buylists/3125902.xml b/L2J_DataPack_BETA/dist/game/data/buylists/3125902.xml
new file mode 100644
index 0000000000..d497f226f4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/buylists/3125902.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>31259</npc> <!-- Janne -->
+ </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>
diff --git a/L2J_DataPack_BETA/dist/game/data/buylists/3125903.xml b/L2J_DataPack_BETA/dist/game/data/buylists/3125903.xml
new file mode 100644
index 0000000000..c843824e7b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/buylists/3125903.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+ <npcs>
+ <npc>31259</npc> <!-- Janne -->
+ </npcs>
+ <item id="12011" /> <!-- Common Item - Cursed Stockings -->
+ <item id="12010" /> <!-- Common Item - Cursed Tunic -->
+ <item id="12017" /> <!-- Common Item - Dark Stockings -->
+ <item id="12022" /> <!-- Common Item - White Tunic -->
+ <item id="12019" /> <!-- Common Item - Mystic's Stockings -->
+ <item id="12018" /> <!-- Common Item - Mystic's Tunic -->
+ <item id="12048" /> <!-- Common Item - Stockings of Knowledge -->
+ <item id="12047" /> <!-- Common Item - Tunic of Knowledge -->
+ <item id="12058" /> <!-- Common Item - Mithril Stockings -->
+ <item id="12057" /> <!-- Common Item - Mithril Tunic -->
+ <item id="12083" /> <!-- Common Item - Sage's Rag -->
+ <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="12046" /> <!-- Common Item - Gloves of Knowledge -->
+ <item id="12065" /> <!-- Common Item - Elven Mithril Gloves -->
+ <item id="12072" /> <!-- Common Item - Mithril Gloves -->
+ <item id="12076" /> <!-- Common Item - Ogre Power Gauntlet -->
+ <item id="12082" /> <!-- Common Item - Sage's Worn Gloves -->
+ <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="12045" /> <!-- Common Item - Boots of Knowledge -->
+ <item id="12066" /> <!-- Common Item - Elven Mithril Boots -->
+ <item id="12122" /> <!-- Common Item - Demon's Gloves -->
+ <item id="12137" /> <!-- Common Item - Divine Gloves -->
+ <item id="12071" /> <!-- Common Item - Assault Boots -->
+ <item id="12075" /> <!-- Common Item - Salamander Skin Boots -->
+ <item id="12077" /> <!-- Common Item - Plate Boots -->
+ <item id="12121" /> <!-- Common Item - Demon's 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="12099" /> <!-- Common Item - Karmian Tunic -->
+ <item id="12100" /> <!-- Common Item - Karmian Stockings -->
+ <item id="12098" /> <!-- Common Item - Karmian Boots -->
+ <item id="12097" /> <!-- Common Item - Karmian Gloves -->
+ <item id="12115" /> <!-- Common Item - Robe of Seal -->
+ <item id="12124" /> <!-- Common Item - Demon's Stockings -->
+ <item id="12139" /> <!-- Common Item - Divine Stockings -->
+ <item id="12123" /> <!-- Common Item - Demon's Tunic -->
+ <item id="12138" /> <!-- Common Item - Divine Tunic -->
+</list>
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/13128.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/13128.htm
index 61cd28112e..50997ed338 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/13128.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/13128.htm
@@ -1,5 +1,5 @@
<html><body>Golem Trader:<br>
I.can.buy.and.sell.goods. Any.money.from.the.transaction.goes.to.the.Merchant.Guild.<br>
I.exist.for.only.3.minutes.after.being.summoned.<br>
-<a action="bypass -h npc_%objectId%_Buy 1312801">Buy.</a>
+<a action="bypass -h npc_%objectId%_Buy 1312801">Trade.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30001-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30001-pk.htm
new file mode 100644
index 0000000000..55fa43c098
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30001-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Lector:<br>
+I have nothing to sell to a scoundrel like you! Get out of my sight, or I'll give you a taste of my fist.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30002-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30002-pk.htm
new file mode 100644
index 0000000000..901a170b9e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30002-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Armor Merchant Jackson:<br>
+I cannot sell to one who walks the wrong path. Go along now.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30003-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30003-pk.htm
new file mode 100644
index 0000000000..46f931ba5d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30003-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Accessory Merchant Silvia:<br>
+How rude. That someone like you should dare to come to my shop! I suggest you go away before all men of the village gather and punish you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30004-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30004-pk.htm
new file mode 100644
index 0000000000..8e874231da
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30004-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Katerina:<br>
+You have done great wrong. Come back when you have repented. Then I will show you my items.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30060-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30060-1.htm
index 18b583a921..de0bc2400f 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30060-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30060-1.htm
@@ -2,6 +2,6 @@
What would you like to buy?<br>
<a action="bypass -h npc_%objectId%_Buy 3006000">Buy Fighter equipment.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3006001">Buy Wizard equipment.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3006002">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3006002">Buy Fighter Common Items.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3006003">Buy Wizard Common Items.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30060-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30060-pk.htm
new file mode 100644
index 0000000000..2b8215507f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30060-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Sabrin:<br>
+No sale. I'll be put out of business if I sell to you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30061-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30061-pk.htm
new file mode 100644
index 0000000000..0a8346ccf1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30061-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Armor Merchant Casey:<br>
+Uncle Sabrin told me not to talk to someone like you!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30063-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30063-pk.htm
new file mode 100644
index 0000000000..1c418d1025
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30063-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Grocer Lara:<br>
+Get out of here! I don't do business with outlaws!!!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30078-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30078-pk.htm
new file mode 100644
index 0000000000..4c1751237e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30078-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Grocer Pano<br>
+In a troubled world like this, perhaps it's those who fight with weapons who make the rules. But when peace comes, and it is time to construct a new world, those who only know how to fight will have nothing to do. The world will need people who know the laws. Remember my words well, my friend, and keep your heart open to peace.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30081-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30081-pk.htm
new file mode 100644
index 0000000000..2aa4ab3157
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30081-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Grocer Helvetia:<br>
+My goodness. I can't believe people like you still walk the streets. What, do the guards of Giran just spend our taxes and sleep or what? I tell you, it's a disgrace.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30082-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30082-pk.htm
new file mode 100644
index 0000000000..8f17bbc00a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30082-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Grocer Denkus:<br>
+No need to go on standing there staring at me. I don't want to trade with you, so go away.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30084-2.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30084-2.htm
index 9d1259a669..46aeecba66 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30084-2.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30084-2.htm
@@ -1,6 +1,6 @@
<html><body>Trader Graham:<br>
Let's trade! I'm sure we can arrive at a mutually beneficial arrangement. What are you offering?<br>
-<a action="bypass -h npc_%objectId%_Buy 3008400">Trade Warrior equipment.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3008401">Trade basic equipment.</a><br>
-<a action="bypass -h npc_%objectId%_BuyShadowItem">Buy Shadow Item.</a>
+<a action="bypass -h npc_%objectId%_Buy 3008400">Buy weapons for Fighters.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3008401">Buy Fighter Common Items.</a><br>
+<a action="bypass -h npc_%objectId%_BuyShadowItem">Buy a Shadow Item.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30084-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30084-pk.htm
new file mode 100644
index 0000000000..2912f3ec2a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30084-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Graham:<br>
+See here, why do you live your life that way? My policy is not to deal with people like you. I'm sorry, but I'm going to have to ask you to leave.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30085-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30085-1.htm
index 8927710d14..8e2b58883f 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30085-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30085-1.htm
@@ -1,4 +1,4 @@
-<html><body>Trader Stany:<br>
+<html><body>Weapons Trader Stanford:<br>
What kind of weapons would you like to see?<br>
<a action="bypass -h npc_%objectId%_Buy 3008500">Buy weapons for Wizards.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3008501">Buy Wizard Common Items.</a><br>
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30085-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30085-pk.htm
new file mode 100644
index 0000000000..6ea21a0352
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30085-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Weapons Trader Stanford:<br>
+I won't say it twice. You're a nuisance to the other customers, so please leave!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30085.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30085.htm
index 4f90492ee6..c4715daffd 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30085.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30085.htm
@@ -1,4 +1,4 @@
-<html><body>Trader Stany:<br>
+<html><body>Weapons Trader Stanford:<br>
Welcome, youngster! Our shop only specializes in weapons. In fact, most of the famous knights of Aden come here. Why don't you choose one for yourself? We carry a wide selection, and only the best!<br>
<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_Wear 3008500">Try on Wizard equipment.</a><br>
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30090-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30090-pk.htm
new file mode 100644
index 0000000000..b9ec20c565
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30090-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Sandra:<br>
+Get out, get out! If people like you frequent our store, we'd be sure to lose all our customers. Get out immediately!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30090.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30090.htm
index eb29125552..d0cba59ca9 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30090.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30090.htm
@@ -1,8 +1,8 @@
<html><body>Trader Sandra:<br>
There are so many amazing things in this world! I've never seen them, but I've heard about blazing swords and magic shoes that can make you fly! Do you believe that these things really exist? Have you seen them? We have many amazing accessories here, but those items seem almost unreal... Oh, I'm sorry! I've talked too much. What can I do for you?<br>
<a action="bypass -h npc_%objectId%_Buy 3009000">Buy/Sell/Refund.</a><br>
-<a action="bypass -h npc_%objectId%_multisell 300900001">Buy bracelet or talisman.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3009001">Buy 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 3009001">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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30091-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30091-pk.htm
new file mode 100644
index 0000000000..0864cb8760
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30091-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Ellie:<br>
+I'd be happy to trade with you if I could, but it's against the law. I'm sorry. I hear there's a shop somewhere in the wilderness that will deal with someone like you ...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30091.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30091.htm
index 62e2d82b45..c23758204a 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30091.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30091.htm
@@ -1,8 +1,8 @@
<html><body>Accessory Merchant Ellie:<br>
Hello! Our shop specializes in various kinds of jewelry. We have everything from a mysterious ring that can protect you from evil magic to a healing necklace capable of raising the dead! Just tell me what you're looking for.<br>
-<a action="bypass -h npc_%objectId%_Buy 3009100">Trade accessories.</a><br>
-<a action="bypass -h npc_%objectId%_multisell 300900001">Buy bracelet or talisman.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3009101">Trade a basic type accessory.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3009100">Buy accessories.</a><br>
+<a action="bypass -h npc_%objectId%_multisell 300900001">Buy a bracelet or talisman.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3009101">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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30093-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30093-pk.htm
new file mode 100644
index 0000000000..7960cfd80c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30093-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Magic Trader Groot:<br>
+I am sorry. Our shop does not accept customers like you. I can't forbid you to look around, but please leave as soon as possible.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30094-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30094-pk.htm
new file mode 100644
index 0000000000..3a3481d206
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30094-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Magic Trader Gentler:<br>
+Look here, I've had my days in the dark shadows, like you. But look, now I'm in the light and living an honest life. Why don't you stop your wandering and come out into the bright world? I am truly sorry, but I will not trade with you now. But come and seek me out later.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30135-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30135-pk.htm
new file mode 100644
index 0000000000..976c0ad945
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30135-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Iria:<br>
+Oh look, a victim of society. I have nothing to sell to the likes of you, so get out of my sight!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30136-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30136-1.htm
index 6c4e5c4d6a..f26648d712 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30136-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30136-1.htm
@@ -1,4 +1,4 @@
-<html><body>Trader Paint:<br>
+<html><body>Trader Payne:<br>
What would you like to trade?<br>
<a action="bypass -h npc_%objectId%_Buy 3013600">Trade Fighter equipment.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3013601">Trade Wizard equipment.</a><br>
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30136-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30136-pk.htm
new file mode 100644
index 0000000000..a8a5314ccb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30136-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Payne:<br>
+Heh heh ... I would like to deal with you ... but if I were to be caught by those nosy elders ...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30136.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30136.htm
index b4670216db..3bc0292ded 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30136.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30136.htm
@@ -1,4 +1,4 @@
-<html><body>Trader Paint:<br>
+<html><body>Trader Payne:<br>
Welcome! Our shop is filled with a variety of excellent equipment, everything a brave and dashing adventurer could ever need! Just let me know if you see something you like...<br>
<a action="bypass -h npc_%objectId%_Chat 1">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_Wear 3013600">Try on Fighter equipment.</a><br>
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30137-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30137-pk.htm
new file mode 100644
index 0000000000..54c7b19039
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30137-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Vollodos:<br>
+I am sorry. You've taken the pains to come all the way here, but I cannot sell you anything. Perhaps the Humans will be able to trade with you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30147-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30147-pk.htm
new file mode 100644
index 0000000000..15ad6c3aa0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30147-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Unoren:<br>
+I will not trade with you, foreign traveler with bloodshot eyes. Leave this place at once.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30148-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30148-pk.htm
new file mode 100644
index 0000000000..38ee9114ea
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30148-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Ariel:<br>
+Your lips are smiling, but your eyes tell me all -- about the dark nature you carry in your heart. Please leave at once. I do not wish to trade with the likes of you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30149-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30149-pk.htm
new file mode 100644
index 0000000000..d950656388
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30149-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Creamees:<br>
+Leave this place before I call upon the spirits of the forest to harm you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30149.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30149.htm
index 30f2bf1633..c89f3b6099 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30149.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30149.htm
@@ -1,4 +1,4 @@
-<html><body>Merchant Chrimis:<br>
+<html><body>Merchant Creamees:<br>
Welcome, friend! Ah, the herbs smell wonderful, don't they? My young friend Herbiel is making a new secret potion. Why don't you take a look? Perhaps you will find something you need...<br>
<a action="bypass -h npc_%objectId%_Buy 3014900">Trade accessories.</a><br>
<a action="bypass -h npc_%objectId%_exc_multisell 003">Exchange equipment.</a><br>
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30150-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30150-pk.htm
new file mode 100644
index 0000000000..82f7d1b155
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30150-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Herbiel:<br>
+How did you get in here!? You'd better leave this village as fast as your legs can carry you...before I call the sentinels on you!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30163-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30163-pk.htm
new file mode 100644
index 0000000000..ea07e4645b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30163-pk.htm
@@ -0,0 +1,4 @@
+<html><body>Merchant Rex:<br>
+You are very lucky today. If I were a younger man I would have picked up the sharpest sword and killed you with it.<br>
+Now get lost! You are not welcome here!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30164-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30164-1.htm
index 64bcc77a6b..1b1351d5ad 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30164-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30164-1.htm
@@ -1,5 +1,5 @@
<html><body>Trader Iz:<br>
Tell me what you need.<br>
-<a action="bypass -h npc_%objectId%_Buy 3016400">Trade Wizard equipment.</a><br>
-<a action="bypass -h npc_%objectId%_Chat 1">Trade basic equipment.</a>
+<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>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30164-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30164-pk.htm
new file mode 100644
index 0000000000..92617f9e60
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30164-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Ian:<br>
+How did you get past the guards? The quality of their training must be slipping... I don't like this at all!<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30165-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30165-pk.htm
new file mode 100644
index 0000000000..7ea4bcb0e0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30165-pk.htm
@@ -0,0 +1,4 @@
+<html><body>Trader Ralford:<br>
+Don't come near me!<br>
+Who are you? How can you live your life like that? Such a sad person... Get out of here at once! The guards are on their way!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30165.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30165.htm
index 0aff76c53d..ecd967b8f9 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30165.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30165.htm
@@ -1,4 +1,4 @@
-<html><body>Merchant Rapin:<br>
+<html><body>Trader Ralford:<br>
You look like you've been doing some traveling, eh! Did you pass by the Elven Village? How are things there? Ah, I miss it so much...<br>
Oh, pardon me for indulging my nostalgia. It is a common failing we Elves have, you know...<br>
<a action="bypass -h npc_%objectId%_Buy 3016500">Buy/Sell/Refund.</a><br>
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30166-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30166-pk.htm
new file mode 100644
index 0000000000..d67f14214b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30166-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Magic Trader Wesley:<br>
+You have a lot of nerve coming here! Be gone immediately! I would rather destroy my merchandise than to sell it to the likes of you!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30166.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30166.htm
index 0c2f73117f..36e6944d15 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30166.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30166.htm
@@ -1,4 +1,4 @@
-<html><body>Merchant Wesley:<br>
+<html><body>Magic Trader Wesley:<br>
Hey, are you here to browse or to buy? If you're not a serious customer, I'll have to ask you to move along!<br>
<a action="bypass -h npc_%objectId%_Buy 3016601">Buy/Sell/Refund Dyes.</a><br>
<a action="bypass -h npc_%objectId%_TerritoryStatus">Ask about the local lord and tax rate.</a><br>
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30178-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30178-pk.htm
new file mode 100644
index 0000000000..29ae94a864
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30178-pk.htm
@@ -0,0 +1,4 @@
+<html><body>Merchant Zenkin:<br>
+Welcome!<br>
+..Were you expecting me to say that? Hold it right there! Hey, Raudia, are the new axes over there? Give me one.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30179-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30179-pk.htm
new file mode 100644
index 0000000000..14cd1845ae
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30179-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Raudia:<br>
+Oh my! You are evil, aren't you? I do not do business with the likes of you. Why don't you go see Zenkin over there? You will find that you have a lot in common.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30180-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30180-pk.htm
new file mode 100644
index 0000000000..3b79cf5d78
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30180-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Trader Sara:<br>
+Help! Somebody! Guards! Guards! Over here! A scoundrel! A murderer! A ruthless criminal! Help me! I shall be killed!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30181-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30181-pk.htm
new file mode 100644
index 0000000000..c44e86ff92
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30181-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Merchant Galibredo:<br>
+You seem cursed... The smell of death is upon you. You should leave now. Can't have the likes of you around, bad luck. You are surely not long for this world... Beleth cannot say he lived long...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30181.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30181.htm
index deae4b6f43..1131657fa5 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30181.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30181.htm
@@ -3,8 +3,8 @@ Where are you from, youngster? What are you looking for?<br>
No, no, I'm not talking about goods... I want to know why you came here...<br>
Sorry -- I'm not speaking very clearly. Never mind!<br>
Can I help you find anything today?<br>
-<a action="bypass -h npc_%objectId%_Buy 3018100">Trade accessories.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3018102">Trade a basic type accessory.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3018100">Buy accessories.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3018102">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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30207-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30207-1.htm
index 1e1f0d110a..36b6b2f512 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30207-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30207-1.htm
@@ -2,7 +2,7 @@
What would you like to purchase?<br>
<a action="bypass -h npc_%objectId%_Buy 3020700">Buy equipment for Fighters.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3020701">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3020702">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3020702">Buy Fighter Common Items.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3020703">Buy Wizard Common Items.</a><br>
<a action="bypass -h npc_%objectId%_exc_multisell 003">Exchange equipment</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30208-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30208-1.htm
index c2a2b8bd13..20aee3aca6 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30208-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30208-1.htm
@@ -2,7 +2,7 @@
What would you like to purchase?<br>
<a action="bypass -h npc_%objectId%_Buy 3020800">Buy equipment for Fighters.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3020801">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3020802">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3020802">Buy Fighter Common Items.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3020803">Buy Wizard Common Items.</a><br>
<a action="bypass -h npc_%objectId%_exc_multisell 003">Exchange equipment.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30230-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30230-1.htm
index 94a4a96172..5924b8bfdd 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30230-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30230-1.htm
@@ -2,6 +2,6 @@
Can I sell you something, friend? Please tell me if you see something you like.<br>
<a action="bypass -h npc_%objectId%_Buy 3023000">Buy equipment for Fighters.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3023001">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3023002">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3023002">Buy Fighter Common Items.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3023003">Buy Wizard Common Items.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30253-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30253-1.htm
index 2719a6e736..7926bc658f 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30253-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30253-1.htm
@@ -2,7 +2,7 @@
What would like to do?<br>
<a action="bypass -h npc_%objectId%_Buy 3025300">Buy equipment for Fighters.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3025301">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3025302">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3025302">Buy Fighter Common Items.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3025303">Buy Wizard Common Items.</a><br>
<a action="bypass -h npc_%objectId%_exc_multisell 003">Exchange equipment.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30321-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30321-1.htm
index 284f41298a..7412fb4376 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30321-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30321-1.htm
@@ -2,7 +2,7 @@
Well, what exactly are you looking for?<br>
<a action="bypass -h npc_%objectId%_Buy 3032100">Buy equipment for Fighters.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3032101">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3032102">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3032102">Buy Fighter Common Items.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3032103">Buy Wizard Common Items.</a><br>
<a action="bypass -h npc_%objectId%_exc_multisell 003">Exchange equipment.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30387-pk.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30387-pk.htm
new file mode 100644
index 0000000000..e9046ad41a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30387-pk.htm
@@ -0,0 +1,3 @@
+<html><body>Wharf Manager Clancy:<br>
+How'd you happen to commit a crime? Yeah. Tsk, tsk ... So many people have heard about you, I reckon no one will let you take their boat. Why don't you just turn yourself in and take your punishment?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30684-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30684-1.htm
index 97b7ef6913..da8810bb2a 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30684-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/merchant/30684-1.htm
@@ -2,7 +2,7 @@
Well, let's see what you're looking for.<br>
<a action="bypass -h npc_%objectId%_Buy 3068400">Buy equipment for Fighters.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3068401">Buy equipment for Wizards.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3068402">Buy basic equipment for Warriors.</a><br>
+<a action="bypass -h npc_%objectId%_Buy 3068402">Buy Fighter Common Items.</a><br>
<a action="bypass -h npc_%objectId%_Buy 3068403">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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30837-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30837-1.htm
index b0a6932b25..f30134333d 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30837-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30838-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30838-1.htm
index e41a1961a7..285d592201 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30838-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30841.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30841.htm
index cfd4182d4f..953f6a2992 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30841.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30890-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30890-1.htm
index cdb3877dc9..4647652e35 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30890-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/30891-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/30891-1.htm
index a010be34c3..c8c74782dd 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/30891-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31256-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31256-1.htm
index f646132d6d..9ce84fa88e 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31256-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31257-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31257-1.htm
index 69ed4fd9e6..90b26ad428 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31257-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31258-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31258-1.htm
index e169dce24c..ba3a65d84e 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31258-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31259-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31259-1.htm
index e8948bcc2f..b76ed22f62 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31259-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31300-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31300-1.htm
index a417f72906..a68c5d9684 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31300-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31301-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31301-1.htm
index bdb5e37059..fedc83b6b8 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31301-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31302-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31302-1.htm
index 9a8b3cbc9d..26b41e5d6f 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31302-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31303-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31303-1.htm
index 72c4beaadb..72216d4f9e 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31303-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31945-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31945-1.htm
index 7f2d61f779..d4fead6dbd 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31945-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31946-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31946-1.htm
index 8ae77be702..301473f10e 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31946-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/merchant/31947-1.htm b/L2J_DataPack_BETA/dist/game/data/html/merchant/31947-1.htm
index f3683e8e3e..d7f8700a7b 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/merchant/31947-1.htm
+++ b/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
diff --git a/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315.htm b/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315.htm
index ba7682b7b1..991d4f0235 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/warehouse/4315.htm
@@ -1,3 +1,5 @@
-<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>
\ No newline at end of file
+<a action="bypass -h npc_%objectId%_Chat 2">Use clan Warehouse.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java
index b780f3586d..1fcabd6aa5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FairyTrees.java
+++ b/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();
diff --git a/L2J_DataPack_BETA/dist/sql/game/minions.sql b/L2J_DataPack_BETA/dist/sql/game/minions.sql
index fc2dbe63d2..3ab7720043 100644
--- a/L2J_DataPack_BETA/dist/sql/game/minions.sql
+++ b/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),
--
GitLab