diff --git a/dist/game/data/scripts.cfg b/dist/game/data/scripts.cfg
index e564b4762581c026b48f6f7707c82a1b70b559a6..809efd399ccac9daf7f7aa8e930c80b5d49ada73 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 aa3ef138df5d9279374019d1658ebcac30ca7ade..1ff7dbc71a05a5f6be30773895aaec0ec3fab858 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 0f0786f27196f253208da199458517a20fc818ae..f044530b3a0e2498516f40708aa1162880edd545 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 01f1e7653238b88991e97a372c9bbf5fc78af1ef..9f1bc880b3b6e31f659b7e3a696805d2f23b3451 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 a4c9962a681915ef447a24989d47181d6c372d38..73d2073340d6851e70834a930957c875a7b3ae97 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 38526333073d015a2dc2747af46a96f7345df9a8..2898b5655acf333624897a96793963d3760f1214 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 f01f2ac1d01480ccf70fe7b4879366193746ef3f..c775d98c35bd93270702d9ff2775d7a8ff1e87bc 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 601df7e19c48ff10ce9f428b3ffde1145a1ae1be..a291b304ee6b564ce16fd9ee7357b3652193a433 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 c36a081dd45dd6b5d44c1743de06e20b471e4341..8cebad78d6fce23d8b627f373dc6416c01e88070 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 85c283f6cc4d7eb13e2ab208b38d1a6d781be728..53e8bec1e7d5571e9d89c5da09be28ac519d16fd 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 769cdf4f9d587e071bad9b2bd35bf57a72279f81..abfe78373f699a96c9feff9885a27f724255a687 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 b88da3a7ff7666e30bfbeaed1606f43550674726..2dfbc5fe24a32edcbd8dceb7c1b7437c9c4cb925 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 954b4110a63f91380dc49c71dc9b105e3d357ec6..45eb1870c9d07181f0dd64a5943f0d06df6a3e8e 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 54c04eec2598d4e732bc012015809b05e9bb2140..19f590ed715b6a85fcf1b5a1925f6af78cad707b 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 29901e8e211d2284a7b0e83f0dc300428c827255..a9bac720fe8d5173c09a9d173a1844aff4c86256 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 5e808d85149c688a929dfe9b755cdb549f588553..8c507be9a4570ec44e89421bb11b1f4730cfc98b 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 1c23ce3ac4931f421390aa278f8a442403053c3a..3a878e247444b6633bc938fd08c2ed37500c7930 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 740052b8b322869451262b9546433b2b68b7027a..b047825e2c78110b54ff21f964950d48bbefd68f 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 3ae7100759b0abe4705075bceb7bd5e692e9fe02..f6e05e38b70e00557888fe71337c0a8003298681 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 5f27139211f959fa54ff939c3ae2469505fb35fe..9a3b10c92915ceed1808c009ffa5d33b3e28e85c 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 32cc87f8c215a7ac08467211364f78e7908787b0..3d4c3e2c10f07990f24bd319eb4652b062c0a0b6 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 7f197fcbd5f6302190aeb3e28e2ea127d25741d5..2f1d768d04cb80a424aa4806e44ae4953270aa9b 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 3af3fd91b2c691c1ab7e32445d5d7193d7511dcf..d4f29e49f668aa955a78f9f162bfa0c69924f8d7 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 c9931157ca14d774f8dcb2051a7acbd6d014f6d2..3284fef80dca41aeb6364a59db1743c9ad4e56c9 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 0000000000000000000000000000000000000000..8c36ecdfd282b17b2a8e5e2881902724de23284a
--- /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 292e2e51bf656cfb9480dacb5e55b07cc16f2916..440bebe5cb4c575720c8744a04d8e85e739f107a 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 87f7aeabd1b35914b56b1b2f12b3f8860664ac9b..00018ca82c422b2bb14da5c627108376bd408351 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 1244d6712dbf9b25d66f0238cfecb3d6c51ecf3c..f2a79fca032a6f966f442d080b2ba0f507a7d866 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 4ae8407edb39628a291bc4a90d6124449e5f4003..6313a93d11f7a9107cc5a698dc26026e3ee5d5f8 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 4d5c4b4e9bde8359b720d9777e3d149cf5ebb74a..7b6d19c856a4e7ff3ddb43316f9424c542e6b04c 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 ecbfa796fc55ac1ddbdba2bd516072d146bad443..3430cdf1bdb2a90c31212a8413c3f9e161a52424 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" />