From 0877bc1fbd7f50fc1a8c1112fffc038e09bc7128 Mon Sep 17 00:00:00 2001
From: Adry85 <adrya85@hotmail.it>
Date: Fri, 2 Feb 2018 10:26:47 +0100
Subject: [PATCH] Moved Fisherman AI from Core to Datapack.
NOTE: Require Core update.
---
dist/game/data/scripts.cfg | 1 +
.../ai/npc/Fisherman}/31562-pk.htm | 0
.../ai/npc/Fisherman}/31562.htm | 6 +-
.../ai/npc/Fisherman}/31563-pk.htm | 0
.../ai/npc/Fisherman}/31563.htm | 6 +-
.../ai/npc/Fisherman}/31564-pk.htm | 0
.../ai/npc/Fisherman}/31564.htm | 6 +-
.../ai/npc/Fisherman}/31565-pk.htm | 0
.../ai/npc/Fisherman}/31565.htm | 6 +-
.../ai/npc/Fisherman}/31566-pk.htm | 0
.../ai/npc/Fisherman}/31566.htm | 6 +-
.../ai/npc/Fisherman}/31567-pk.htm | 0
.../ai/npc/Fisherman}/31567.htm | 6 +-
.../ai/npc/Fisherman}/31568-pk.htm | 0
.../ai/npc/Fisherman}/31568.htm | 6 +-
.../ai/npc/Fisherman}/31569-pk.htm | 0
.../ai/npc/Fisherman}/31569.htm | 6 +-
.../ai/npc/Fisherman}/31570-pk.htm | 0
.../ai/npc/Fisherman}/31570.htm | 6 +-
.../ai/npc/Fisherman}/31571-pk.htm | 0
.../ai/npc/Fisherman}/31571.htm | 6 +-
.../ai/npc/Fisherman}/31572-pk.htm | 0
.../ai/npc/Fisherman}/31572.htm | 6 +-
.../ai/npc/Fisherman}/31573-pk.htm | 0
.../ai/npc/Fisherman}/31573.htm | 6 +-
.../ai/npc/Fisherman}/31574-pk.htm | 0
.../ai/npc/Fisherman}/31574.htm | 6 +-
.../ai/npc/Fisherman}/31575-pk.htm | 0
.../ai/npc/Fisherman}/31575.htm | 6 +-
.../ai/npc/Fisherman}/31576-pk.htm | 0
.../ai/npc/Fisherman}/31576.htm | 6 +-
.../ai/npc/Fisherman}/31577-pk.htm | 0
.../ai/npc/Fisherman}/31577.htm | 6 +-
.../ai/npc/Fisherman}/31578-pk.htm | 0
.../ai/npc/Fisherman}/31578.htm | 6 +-
.../ai/npc/Fisherman}/31579-pk.htm | 0
.../ai/npc/Fisherman}/31579.htm | 6 +-
.../ai/npc/Fisherman}/31696-pk.htm | 0
.../ai/npc/Fisherman}/31696.htm | 6 +-
.../ai/npc/Fisherman}/31697-pk.htm | 0
.../ai/npc/Fisherman}/31697.htm | 6 +-
.../ai/npc/Fisherman}/31989-pk.htm | 0
.../ai/npc/Fisherman}/31989.htm | 6 +-
.../ai/npc/Fisherman}/32007-2.htm | 0
.../ai/npc/Fisherman}/32007-3.htm | 0
.../ai/npc/Fisherman}/32007-5.htm | 0
.../ai/npc/Fisherman}/32007-pk.htm | 0
.../ai/npc/Fisherman}/32007.htm | 6 +-
.../ai/npc/Fisherman}/32348-pk.htm | 0
.../ai/npc/Fisherman}/32348.htm | 6 +-
.../scripts/ai/npc/Fisherman/Fisherman.java | 158 ++++++++++++++++++
.../npc/Fisherman}/fishing_championship.htm | 2 +-
dist/game/data/stats/npcs/31500-31599.xml | 36 ++--
dist/game/data/stats/npcs/31600-31699.xml | 4 +-
dist/game/data/stats/npcs/31900-31999.xml | 2 +-
dist/game/data/stats/npcs/32000-32099.xml | 2 +-
dist/game/data/stats/npcs/32300-32399.xml | 2 +-
57 files changed, 252 insertions(+), 93 deletions(-)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31562-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31562.htm (65%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31563-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31563.htm (64%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31564-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31564.htm (64%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31565-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31565.htm (63%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31566-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31566.htm (67%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31567-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31567.htm (69%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31568-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31568.htm (65%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31569-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31569.htm (68%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31570-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31570.htm (69%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31571-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31571.htm (66%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31572-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31572.htm (74%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31573-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31573.htm (68%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31574-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31574.htm (68%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31575-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31575.htm (69%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31576-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31576.htm (70%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31577-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31577.htm (68%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31578-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31578.htm (72%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31579-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31579.htm (66%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31696-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31696.htm (71%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31697-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31697.htm (73%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31989-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/31989.htm (66%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/32007-2.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/32007-3.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/32007-5.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/32007-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/32007.htm (71%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/32348-pk.htm (100%)
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/32348.htm (67%)
create mode 100644 dist/game/data/scripts/ai/npc/Fisherman/Fisherman.java
rename dist/game/data/{html/fisherman => scripts/ai/npc/Fisherman}/fishing_championship.htm (94%)
diff --git a/dist/game/data/scripts.cfg b/dist/game/data/scripts.cfg
index e564b47625..809efd399c 100644
--- a/dist/game/data/scripts.cfg
+++ b/dist/game/data/scripts.cfg
@@ -33,6 +33,7 @@ ai/npc/Dorian/Dorian.java
ai/npc/DragonVortex/DragonVortex.java
ai/npc/EchoCrystals/EchoCrystals.java
ai/npc/FameManager/FameManager.java
+ai/npc/Fisherman/Fisherman.java
ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
ai/npc/ForgeOfTheGods/Rooney.java
ai/npc/ForgeOfTheGods/TarBeetle.java
diff --git a/dist/game/data/html/fisherman/31562-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31562-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31562-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31562-pk.htm
diff --git a/dist/game/data/html/fisherman/31562.htm b/dist/game/data/scripts/ai/npc/Fisherman/31562.htm
similarity index 65%
rename from dist/game/data/html/fisherman/31562.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31562.htm
index aa3ef138df..1ff7dbc71a 100644
--- a/dist/game/data/html/fisherman/31562.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31562.htm
@@ -2,9 +2,9 @@
Nice to meet you! Interested in learning about fishing?<br>
There's no better way to enjoy a warm summer day, I can promise you that!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3156200">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31563-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31563-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31563-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31563-pk.htm
diff --git a/dist/game/data/html/fisherman/31563.htm b/dist/game/data/scripts/ai/npc/Fisherman/31563.htm
similarity index 64%
rename from dist/game/data/html/fisherman/31563.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31563.htm
index 0f0786f271..f044530b3a 100644
--- a/dist/game/data/html/fisherman/31563.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31563.htm
@@ -1,9 +1,9 @@
<html><body>Fishing Guild Member Perelin:<br>
If you're a nature lover, fishing is the thing for you. Fresh air, warm sun, cool water -- it's perfect!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3156300">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31564-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31564-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31564-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31564-pk.htm
diff --git a/dist/game/data/html/fisherman/31564.htm b/dist/game/data/scripts/ai/npc/Fisherman/31564.htm
similarity index 64%
rename from dist/game/data/html/fisherman/31564.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31564.htm
index 01f1e76532..9f1bc880b3 100644
--- a/dist/game/data/html/fisherman/31564.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31564.htm
@@ -1,9 +1,9 @@
<html><body>Fishing Guild Member Mishini:<br>
Welcome! Care to take a reel and try your luck? This is the best season for fishing in these parts!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3156400">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31565-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31565-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31565-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31565-pk.htm
diff --git a/dist/game/data/html/fisherman/31565.htm b/dist/game/data/scripts/ai/npc/Fisherman/31565.htm
similarity index 63%
rename from dist/game/data/html/fisherman/31565.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31565.htm
index a4c9962a68..73d2073340 100644
--- a/dist/game/data/html/fisherman/31565.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31565.htm
@@ -1,9 +1,9 @@
<html><body>Fishing Guild Member Ogord:<br>
Welcome! Interested in learning how to fish? I warn you, it's an addictive hobby!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3156500">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31566-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31566-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31566-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31566-pk.htm
diff --git a/dist/game/data/html/fisherman/31566.htm b/dist/game/data/scripts/ai/npc/Fisherman/31566.htm
similarity index 67%
rename from dist/game/data/html/fisherman/31566.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31566.htm
index 3852633307..2898b5655a 100644
--- a/dist/game/data/html/fisherman/31566.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31566.htm
@@ -2,9 +2,9 @@
Have you ever caught a fish? No? Want to learn? There's no more enjoyable hobby, I promise you.<br>
It can also be profitable -- I'll buy anything you don't want to keep!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3156600">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31567-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31567-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31567-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31567-pk.htm
diff --git a/dist/game/data/html/fisherman/31567.htm b/dist/game/data/scripts/ai/npc/Fisherman/31567.htm
similarity index 69%
rename from dist/game/data/html/fisherman/31567.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31567.htm
index f01f2ac1d0..c775d98c35 100644
--- a/dist/game/data/html/fisherman/31567.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31567.htm
@@ -2,9 +2,9 @@
Nice to meet you! I am a Fishing Guild Member Bleaker.<br>
In addition to selling fishing equipment, I also teach various fishing techniques. Ah, and I can take your fish, too. Whatever your fishing needs, you've come to the right place!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3156700">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31568-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31568-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31568-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31568-pk.htm
diff --git a/dist/game/data/html/fisherman/31568.htm b/dist/game/data/scripts/ai/npc/Fisherman/31568.htm
similarity index 65%
rename from dist/game/data/html/fisherman/31568.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31568.htm
index 601df7e19c..a291b304ee 100644
--- a/dist/game/data/html/fisherman/31568.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31568.htm
@@ -1,9 +1,9 @@
<html><body>Fishing Guild Member Pamfus:<br>
Do you like fishing? You know I do! Nothing else calms your mind and spirit like spending a quiet afternoon with a fine rod and reel.<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3156800">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31569-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31569-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31569-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31569-pk.htm
diff --git a/dist/game/data/html/fisherman/31569.htm b/dist/game/data/scripts/ai/npc/Fisherman/31569.htm
similarity index 68%
rename from dist/game/data/html/fisherman/31569.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31569.htm
index c36a081dd4..8cebad78d6 100644
--- a/dist/game/data/html/fisherman/31569.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31569.htm
@@ -2,9 +2,9 @@
Gludin Harbor is one of the best places for beginners to learn how to fish. Head on down to the beach and try your luck!<br>
I sell bait, and if you catch any fish I'll be happy to buy them from you.<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3156900">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31570-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31570-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31570-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31570-pk.htm
diff --git a/dist/game/data/html/fisherman/31570.htm b/dist/game/data/scripts/ai/npc/Fisherman/31570.htm
similarity index 69%
rename from dist/game/data/html/fisherman/31570.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31570.htm
index 85c283f6cc..53e8bec1e7 100644
--- a/dist/game/data/html/fisherman/31570.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31570.htm
@@ -3,9 +3,9 @@ So did you hook a big one?<br>
Fishing isn't as easy as it looks. If you want to be successful, you need to use the right bait at the right spot at the right time.<br>
Come see me when you need the right equipment and I'll set you up.<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3157000">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31571-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31571-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31571-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31571-pk.htm
diff --git a/dist/game/data/html/fisherman/31571.htm b/dist/game/data/scripts/ai/npc/Fisherman/31571.htm
similarity index 66%
rename from dist/game/data/html/fisherman/31571.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31571.htm
index 769cdf4f9d..abfe78373f 100644
--- a/dist/game/data/html/fisherman/31571.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31571.htm
@@ -2,9 +2,9 @@
Welcome! Want to learn how to fish?<br>
There's no better way to spend a leisurely afternoon, matching wits and muscles with some elusive quarry...<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3157100">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31572-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31572-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31572-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31572-pk.htm
diff --git a/dist/game/data/html/fisherman/31572.htm b/dist/game/data/scripts/ai/npc/Fisherman/31572.htm
similarity index 74%
rename from dist/game/data/html/fisherman/31572.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31572.htm
index b88da3a7ff..2dfbc5fe24 100644
--- a/dist/game/data/html/fisherman/31572.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31572.htm
@@ -2,9 +2,9 @@
Everything is plentiful here in Giran, which is why so many people spend their leisure time fishing. Care to try it?<br>
Ah, pardon me -- I forgot to introduce myself! I am Ofulle, the only officially licensed fishing professional in this territory! Come see me whenever you need bait, fishing gear or want to sell the fish you've caught. I'll by anything...except mermaids, that is! Ha ha ha!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3157200">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31573-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31573-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31573-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31573-pk.htm
diff --git a/dist/game/data/html/fisherman/31573.htm b/dist/game/data/scripts/ai/npc/Fisherman/31573.htm
similarity index 68%
rename from dist/game/data/html/fisherman/31573.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31573.htm
index 954b4110a6..45eb1870c9 100644
--- a/dist/game/data/html/fisherman/31573.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31573.htm
@@ -2,9 +2,9 @@
Nice to meet you! I am Monakan.<br>
Besides teaching you how to fish, I also sell the fishing gear you'll need. Oh, and I'll buy any fish you catch. In other words, this is your one-stop fishing shop!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3157300">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31574-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31574-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31574-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31574-pk.htm
diff --git a/dist/game/data/html/fisherman/31574.htm b/dist/game/data/scripts/ai/npc/Fisherman/31574.htm
similarity index 68%
rename from dist/game/data/html/fisherman/31574.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31574.htm
index 54c04eec25..19f590ed71 100644
--- a/dist/game/data/html/fisherman/31574.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31574.htm
@@ -1,9 +1,9 @@
<html><body>Fishing Guild Member Willeri:<br>
Fishing has become all the rage in these parts! Of course, there are the serious fishermen, and then there are those who just want an excuse to daydream drowsily in the sun. Which one are you, I wonder?<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3157400">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31575-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31575-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31575-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31575-pk.htm
diff --git a/dist/game/data/html/fisherman/31575.htm b/dist/game/data/scripts/ai/npc/Fisherman/31575.htm
similarity index 69%
rename from dist/game/data/html/fisherman/31575.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31575.htm
index 29901e8e21..a9bac720fe 100644
--- a/dist/game/data/html/fisherman/31575.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31575.htm
@@ -2,9 +2,9 @@
There's no better place for fishing than Innadril. Wet and warm all year round, beautiful scenery, exotic locales. Best place in the whole world!<br>
I mean, how can you go wrong in a place that boasts a "city of water"!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3157500">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31576-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31576-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31576-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31576-pk.htm
diff --git a/dist/game/data/html/fisherman/31576.htm b/dist/game/data/scripts/ai/npc/Fisherman/31576.htm
similarity index 70%
rename from dist/game/data/html/fisherman/31576.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31576.htm
index 5e808d8514..8c507be9a4 100644
--- a/dist/game/data/html/fisherman/31576.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31576.htm
@@ -2,9 +2,9 @@
It's a mistake to think that there are only hunters here, just because the name of this place is "Hunter's Village." Many great fisherman have also come from here! Including me! Ha ha ha!<br>
Well, care to go fishing? Let's not waste a minute of this beautiful weather!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3157600">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31577-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31577-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31577-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31577-pk.htm
diff --git a/dist/game/data/html/fisherman/31577.htm b/dist/game/data/scripts/ai/npc/Fisherman/31577.htm
similarity index 68%
rename from dist/game/data/html/fisherman/31577.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31577.htm
index 1c23ce3ac4..3a878e2474 100644
--- a/dist/game/data/html/fisherman/31577.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31577.htm
@@ -2,9 +2,9 @@
You know, the king is an avid fisherman himself -- and quite a good one, in fact.<br>
Aden is filled with prime fishing spots. How about spending this beautiful day on the shores of one of them?<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3157700">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31578-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31578-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31578-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31578-pk.htm
diff --git a/dist/game/data/html/fisherman/31578.htm b/dist/game/data/scripts/ai/npc/Fisherman/31578.htm
similarity index 72%
rename from dist/game/data/html/fisherman/31578.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31578.htm
index 740052b8b3..b047825e2c 100644
--- a/dist/game/data/html/fisherman/31578.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31578.htm
@@ -2,9 +2,9 @@
Welcome, my young friend! Nice to meet you! It's a great day to go fishing!<br>
My family have been members of the fishing guild since my great-grandfather joined. In fact, that's why I was sent here to Rune. Not only is the fishing particularly challenging here, but it's become something of a hobby among the elite.<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3157800">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31579-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31579-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31579-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31579-pk.htm
diff --git a/dist/game/data/html/fisherman/31579.htm b/dist/game/data/scripts/ai/npc/Fisherman/31579.htm
similarity index 66%
rename from dist/game/data/html/fisherman/31579.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31579.htm
index 3ae7100759..f6e05e38b7 100644
--- a/dist/game/data/html/fisherman/31579.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31579.htm
@@ -1,9 +1,9 @@
<html><body>Fishing Guild Member Klaw:<br>
Thanks to its many mountain streams and lakes, Goddard is a prime fishing spot. People come from all over to test their skill and try their luck here. You interested?<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3157900">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31696-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31696-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31696-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31696-pk.htm
diff --git a/dist/game/data/html/fisherman/31696.htm b/dist/game/data/scripts/ai/npc/Fisherman/31696.htm
similarity index 71%
rename from dist/game/data/html/fisherman/31696.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31696.htm
index 5f27139211..9a3b10c929 100644
--- a/dist/game/data/html/fisherman/31696.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31696.htm
@@ -2,9 +2,9 @@
The fishing spots near here are the only ones in Elmore from which you can catch actual sea fish. Back during the Elmoreden Empire, they were famous throughout the kingdom. Now the lack of ships has revitalized them.<br>
Care to give it a try? If you catch something good, be sure to show it to me!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3169600">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31697-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31697-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31697-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31697-pk.htm
diff --git a/dist/game/data/html/fisherman/31697.htm b/dist/game/data/scripts/ai/npc/Fisherman/31697.htm
similarity index 73%
rename from dist/game/data/html/fisherman/31697.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31697.htm
index 32cc87f8c2..3d4c3e2c10 100644
--- a/dist/game/data/html/fisherman/31697.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31697.htm
@@ -2,9 +2,9 @@
Do you know about these hot springs? The effects of the nearby Forge of Gods has created a whole network of them around here. Even more surprising, <font color="LEVEL">there are special species of fish living in these hot springs. How can any fisherman worth the name ignore an opportunity like that!</font><br>
Enjoy the fishing here and let me know if you need anything!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3169700">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/31989-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/31989-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/31989-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31989-pk.htm
diff --git a/dist/game/data/html/fisherman/31989.htm b/dist/game/data/scripts/ai/npc/Fisherman/31989.htm
similarity index 66%
rename from dist/game/data/html/fisherman/31989.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/31989.htm
index 7f197fcbd5..2f1d768d04 100644
--- a/dist/game/data/html/fisherman/31989.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/31989.htm
@@ -2,9 +2,9 @@
Hey, good to see you! You came here to fish, right?<br>
Well, it's a better way to spend an afternoon than breaking your back in some dark and dank mine!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3198900">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/32007-2.htm b/dist/game/data/scripts/ai/npc/Fisherman/32007-2.htm
similarity index 100%
rename from dist/game/data/html/fisherman/32007-2.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/32007-2.htm
diff --git a/dist/game/data/html/fisherman/32007-3.htm b/dist/game/data/scripts/ai/npc/Fisherman/32007-3.htm
similarity index 100%
rename from dist/game/data/html/fisherman/32007-3.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/32007-3.htm
diff --git a/dist/game/data/html/fisherman/32007-5.htm b/dist/game/data/scripts/ai/npc/Fisherman/32007-5.htm
similarity index 100%
rename from dist/game/data/html/fisherman/32007-5.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/32007-5.htm
diff --git a/dist/game/data/html/fisherman/32007-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/32007-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/32007-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/32007-pk.htm
diff --git a/dist/game/data/html/fisherman/32007.htm b/dist/game/data/scripts/ai/npc/Fisherman/32007.htm
similarity index 71%
rename from dist/game/data/html/fisherman/32007.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/32007.htm
index 3af3fd91b2..d4f29e49f6 100644
--- a/dist/game/data/html/fisherman/32007.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/32007.htm
@@ -2,9 +2,9 @@
Rainbow Springs is a fishing heaven! There's no place like it.<br>
Not only are the fish large and fat, but <font color="LEVEL">several fisherman have even fished up a Clan Hall War Decree</font>. Before you start fishing, let me know if you need any gear or have anything to sell.<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3200700">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest AvantGarde fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/html/fisherman/32348-pk.htm b/dist/game/data/scripts/ai/npc/Fisherman/32348-pk.htm
similarity index 100%
rename from dist/game/data/html/fisherman/32348-pk.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/32348-pk.htm
diff --git a/dist/game/data/html/fisherman/32348.htm b/dist/game/data/scripts/ai/npc/Fisherman/32348.htm
similarity index 67%
rename from dist/game/data/html/fisherman/32348.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/32348.htm
index c9931157ca..3284fef80d 100644
--- a/dist/game/data/html/fisherman/32348.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/32348.htm
@@ -2,9 +2,9 @@
Some call me the "doctor of fishing," some think I'm just all wet. Ha ha!<br>
Of course, I sell fishing gear and teach a variety of fishing techniques. I'll also buy any fish you've caught!<br>
<a action="bypass player_help 7561.htm#7561">Ask how to fish.</a><br>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Fishing Contest</a><br>
-<a action="bypass -h npc_%objectId%_FishSkillList">Learn fishing skill.</a><br>
-<a action="bypass -h npc_%objectId%_Buy 3234800">Buy/Sell/Refund.</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Fishing Contest</a><br>
+<a action="bypass -h Quest Fisherman LearnFishSkill">Learn fishing skill.</a><br>
+<a action="bypass -h Quest Fisherman BuySellRefund">Buy/Sell/Refund.</a><br>
<a action="bypass -h npc_%objectId%_multisell 009">Sell fish.</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>
diff --git a/dist/game/data/scripts/ai/npc/Fisherman/Fisherman.java b/dist/game/data/scripts/ai/npc/Fisherman/Fisherman.java
new file mode 100644
index 0000000000..8c36ecdfd2
--- /dev/null
+++ b/dist/game/data/scripts/ai/npc/Fisherman/Fisherman.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2004-2018 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package ai.npc.Fisherman;
+
+import java.util.List;
+
+import com.l2jserver.Config;
+import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
+import com.l2jserver.gameserver.datatables.SkillData;
+import com.l2jserver.gameserver.model.L2SkillLearn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.AcquireSkillType;
+import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
+import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+
+import ai.npc.AbstractNpcAI;
+
+/**
+ * Fisherman AI.
+ * @author Adry_85
+ * @since 2.6.0.0
+ */
+public class Fisherman extends AbstractNpcAI
+{
+ // NPC
+ private static final int[] FISHERMAN =
+ {
+ 31562,
+ 31563,
+ 31564,
+ 31565,
+ 31566,
+ 31567,
+ 31568,
+ 31569,
+ 31570,
+ 31571,
+ 31572,
+ 31573,
+ 31574,
+ 31575,
+ 31576,
+ 31577,
+ 31578,
+ 31579,
+ 31696,
+ 31697,
+ 31989,
+ 32007,
+ 32348
+ };
+
+ public Fisherman()
+ {
+ super(Fisherman.class.getSimpleName(), "ai/npc");
+ addStartNpc(FISHERMAN);
+ addTalkId(FISHERMAN);
+ addFirstTalkId(FISHERMAN);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = null;
+ switch (event)
+ {
+ case "LearnFishSkill":
+ {
+ showFishSkillList(player);
+ break;
+ }
+ case "fishing_championship.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "BuySellRefund":
+ {
+ ((L2MerchantInstance) npc).showBuyWindow(player, npc.getId() * 100, true);
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onFirstTalk(L2Npc npc, L2PcInstance player)
+ {
+ if ((player.getKarma() > 0) && !Config.ALT_GAME_KARMA_PLAYER_CAN_SHOP)
+ {
+ return npc.getId() + "-pk.htm";
+ }
+ return npc.getId() + ".htm";
+ }
+
+ /**
+ * Display the Fishing Skill list to the player.
+ * @param player the player
+ */
+ public static void showFishSkillList(L2PcInstance player)
+ {
+ final List<L2SkillLearn> fishskills = SkillTreesData.getInstance().getAvailableFishingSkills(player);
+ final AcquireSkillList asl = new AcquireSkillList(AcquireSkillType.FISHING);
+ int count = 0;
+
+ for (L2SkillLearn s : fishskills)
+ {
+ if (SkillData.getInstance().getSkill(s.getSkillId(), s.getSkillLevel()) != null)
+ {
+ count++;
+ asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), s.getLevelUpSp(), 1);
+ }
+ }
+
+ if (count > 0)
+ {
+ player.sendPacket(asl);
+ }
+ else
+ {
+ final int minlLevel = SkillTreesData.getInstance().getMinLevelForNewSkill(player, SkillTreesData.getInstance().getFishingSkillTree());
+ if (minlLevel > 0)
+ {
+ SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
+ sm.addInt(minlLevel);
+ player.sendPacket(sm);
+ }
+ else
+ {
+ player.sendPacket(SystemMessageId.NO_MORE_SKILLS_TO_LEARN);
+ }
+ }
+ }
+
+ public static void main(String[] args)
+ {
+ new Fisherman();
+ }
+}
diff --git a/dist/game/data/html/fisherman/fishing_championship.htm b/dist/game/data/scripts/ai/npc/Fisherman/fishing_championship.htm
similarity index 94%
rename from dist/game/data/html/fisherman/fishing_championship.htm
rename to dist/game/data/scripts/ai/npc/Fisherman/fishing_championship.htm
index 292e2e51bf..440bebe5cb 100644
--- a/dist/game/data/html/fisherman/fishing_championship.htm
+++ b/dist/game/data/scripts/ai/npc/Fisherman/fishing_championship.htm
@@ -8,7 +8,7 @@ Remember, you have only <font color="LEVEL">one week</font> to claim your prize.
Don't fret if your name isn't listed this time. Next week, there will be a new group of winners!<br>
This list will be updated in 0 minute(s)!<br><br>
<center>
-<a action="bypass -h npc_%objectId%_Link fisherman/fishing_championship.htm">Claim Prize</a><br>
+<a action="bypass -h Quest Fisherman fishing_championship.htm">Claim Prize</a><br>
</center>
<center>
<table width=270 border=0 bgcolor="111111">
diff --git a/dist/game/data/stats/npcs/31500-31599.xml b/dist/game/data/stats/npcs/31500-31599.xml
index 87f7aeabd1..00018ca82c 100644
--- a/dist/game/data/stats/npcs/31500-31599.xml
+++ b/dist/game/data/stats/npcs/31500-31599.xml
@@ -2576,7 +2576,7 @@
<height normal="9" />
</collision>
</npc>
- <npc id="31562" level="70" type="L2Fisherman" name="Klufe" title="Fishing Guild Member">
+ <npc id="31562" level="70" type="L2Merchant" name="Klufe" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2617,7 +2617,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31563" level="70" type="L2Fisherman" name="Perelin" title="Fishing Guild Member">
+ <npc id="31563" level="70" type="L2Merchant" name="Perelin" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2658,7 +2658,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31564" level="70" type="L2Fisherman" name="Mishini" title="Fishing Guild Member">
+ <npc id="31564" level="70" type="L2Merchant" name="Mishini" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2699,7 +2699,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31565" level="70" type="L2Fisherman" name="Ogord" title="Fishing Guild Member">
+ <npc id="31565" level="70" type="L2Merchant" name="Ogord" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2740,7 +2740,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31566" level="70" type="L2Fisherman" name="Ropfi" title="Fishing Guild Member">
+ <npc id="31566" level="70" type="L2Merchant" name="Ropfi" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2781,7 +2781,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31567" level="70" type="L2Fisherman" name="Bleaker" title="Fishing Guild Member">
+ <npc id="31567" level="70" type="L2Merchant" name="Bleaker" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2822,7 +2822,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31568" level="70" type="L2Fisherman" name="Pamfus" title="Fishing Guild Member">
+ <npc id="31568" level="70" type="L2Merchant" name="Pamfus" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2863,7 +2863,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31569" level="70" type="L2Fisherman" name="Cyano" title="Fishing Guild Member">
+ <npc id="31569" level="70" type="L2Merchant" name="Cyano" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2904,7 +2904,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31570" level="70" type="L2Fisherman" name="Lanosco" title="Fishing Guild Member">
+ <npc id="31570" level="70" type="L2Merchant" name="Lanosco" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2945,7 +2945,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31571" level="70" type="L2Fisherman" name="Hufs" title="Fishing Guild Member">
+ <npc id="31571" level="70" type="L2Merchant" name="Hufs" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -2986,7 +2986,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31572" level="70" type="L2Fisherman" name="O'Fulle" title="Fishing Guild Member">
+ <npc id="31572" level="70" type="L2Merchant" name="O'Fulle" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3027,7 +3027,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31573" level="70" type="L2Fisherman" name="Monakan" title="Fishing Guild Member">
+ <npc id="31573" level="70" type="L2Merchant" name="Monakan" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3068,7 +3068,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31574" level="70" type="L2Fisherman" name="Willie" title="Fishing Guild Member">
+ <npc id="31574" level="70" type="L2Merchant" name="Willie" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3109,7 +3109,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31575" level="70" type="L2Fisherman" name="Litulon" title="Fishing Guild Member">
+ <npc id="31575" level="70" type="L2Merchant" name="Litulon" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3150,7 +3150,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31576" level="70" type="L2Fisherman" name="Berix" title="Fishing Guild Member">
+ <npc id="31576" level="70" type="L2Merchant" name="Berix" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3191,7 +3191,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31577" level="70" type="L2Fisherman" name="Linnaeus" title="Fishing Guild Member">
+ <npc id="31577" level="70" type="L2Merchant" name="Linnaeus" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3232,7 +3232,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31578" level="70" type="L2Fisherman" name="Hilgendorf" title="Fishing Guild Member">
+ <npc id="31578" level="70" type="L2Merchant" name="Hilgendorf" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3273,7 +3273,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31579" level="70" type="L2Fisherman" name="Klaus" title="Fishing Guild Member">
+ <npc id="31579" level="70" type="L2Merchant" name="Klaus" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
diff --git a/dist/game/data/stats/npcs/31600-31699.xml b/dist/game/data/stats/npcs/31600-31699.xml
index 1244d6712d..f2a79fca03 100644
--- a/dist/game/data/stats/npcs/31600-31699.xml
+++ b/dist/game/data/stats/npcs/31600-31699.xml
@@ -3938,7 +3938,7 @@
<height normal="22" />
</collision>
</npc>
- <npc id="31696" level="70" type="L2Fisherman" name="Platis" title="Fishing Guild Member">
+ <npc id="31696" level="70" type="L2Merchant" name="Platis" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
@@ -3979,7 +3979,7 @@
<height normal="23" />
</collision>
</npc>
- <npc id="31697" level="70" type="L2Fisherman" name="Eindarkner" title="Fishing Guild Member">
+ <npc id="31697" level="70" type="L2Merchant" name="Eindarkner" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
diff --git a/dist/game/data/stats/npcs/31900-31999.xml b/dist/game/data/stats/npcs/31900-31999.xml
index 4ae8407edb..6313a93d11 100644
--- a/dist/game/data/stats/npcs/31900-31999.xml
+++ b/dist/game/data/stats/npcs/31900-31999.xml
@@ -4071,7 +4071,7 @@
<height normal="23.5" />
</collision>
</npc>
- <npc id="31989" level="70" type="L2Fisherman" name="Batidae" title="Fishing Guild Member">
+ <npc id="31989" level="70" type="L2Merchant" name="Batidae" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
diff --git a/dist/game/data/stats/npcs/32000-32099.xml b/dist/game/data/stats/npcs/32000-32099.xml
index 4d5c4b4e9b..7b6d19c856 100644
--- a/dist/game/data/stats/npcs/32000-32099.xml
+++ b/dist/game/data/stats/npcs/32000-32099.xml
@@ -263,7 +263,7 @@
<height normal="28" />
</collision>
</npc>
- <npc id="32007" level="70" type="L2Fisherman" name="Galba" title="Fishing Guild Member">
+ <npc id="32007" level="70" type="L2Merchant" name="Galba" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
diff --git a/dist/game/data/stats/npcs/32300-32399.xml b/dist/game/data/stats/npcs/32300-32399.xml
index ecbfa796fc..3430cdf1bd 100644
--- a/dist/game/data/stats/npcs/32300-32399.xml
+++ b/dist/game/data/stats/npcs/32300-32399.xml
@@ -1732,7 +1732,7 @@
<height normal="16.5" />
</collision>
</npc>
- <npc id="32348" level="70" type="L2Fisherman" name="Burang" title="Fishing Guild Member">
+ <npc id="32348" level="70" type="L2Merchant" name="Burang" title="Fishing Guild Member">
<!-- Confirmed CT2.5 -->
<parameters>
<param name="MoveAroundSocial" value="0" />
--
GitLab