From c8622dd214bec4521210460c33fa18afb82f447a Mon Sep 17 00:00:00 2001
From: ivantotov <gmtotov@gmail.com>
Date: Thu, 20 Nov 2014 23:13:11 +0200
Subject: [PATCH] Quest: Test Of The Searcher (225) Reviewed by: @Zoey76
---
L2J_DataPack/dist/game/data/scripts.cfg | 1 -
.../quests/225_TestOfSearcher/30291-02.htm | 5 -
.../quests/225_TestOfSearcher/30291-04.htm | 7 -
.../quests/225_TestOfSearcher/30291-06.htm | 7 -
.../quests/225_TestOfSearcher/30291-10.htm | 5 -
.../quests/225_TestOfSearcher/30291-11.htm | 4 -
.../quests/225_TestOfSearcher/30420-01.htm | 5 -
.../quests/225_TestOfSearcher/30420-01a.htm | 3 -
.../quests/225_TestOfSearcher/30420-02.htm | 3 -
.../quests/225_TestOfSearcher/30420-04.htm | 3 -
.../quests/225_TestOfSearcher/30627-01.htm | 4 -
.../quests/225_TestOfSearcher/30627-01a.htm | 3 -
.../quests/225_TestOfSearcher/30628-01.htm | 4 -
.../quests/225_TestOfSearcher/30628-01a.htm | 3 -
.../quests/225_TestOfSearcher/30690-01.htm | 4 -
.../quests/225_TestOfSearcher/30690-02.htm | 4 -
.../quests/225_TestOfSearcher/30690-03.htm | 4 -
.../quests/225_TestOfSearcher/30690-04.htm | 4 -
.../quests/225_TestOfSearcher/30690-05.htm | 5 -
.../quests/225_TestOfSearcher/30690-06.htm | 3 -
.../quests/225_TestOfSearcher/30690-07.htm | 3 -
.../quests/225_TestOfSearcher/30690-08.htm | 4 -
.../quests/225_TestOfSearcher/30728-01.htm | 4 -
.../quests/225_TestOfSearcher/30728-02.htm | 3 -
.../quests/225_TestOfSearcher/30728-03.htm | 3 -
.../quests/225_TestOfSearcher/30728-04.htm | 3 -
.../quests/225_TestOfSearcher/30728-05.htm | 3 -
.../quests/225_TestOfSearcher/30728-06.htm | 3 -
.../quests/225_TestOfSearcher/30728-07.htm | 4 -
.../quests/225_TestOfSearcher/30729-01.htm | 3 -
.../quests/225_TestOfSearcher/30729-02.htm | 3 -
.../quests/225_TestOfSearcher/30729-03.htm | 4 -
.../quests/225_TestOfSearcher/30729-04.htm | 4 -
.../quests/225_TestOfSearcher/30729-05.htm | 3 -
.../quests/225_TestOfSearcher/30730-01.htm | 4 -
.../quests/225_TestOfSearcher/30730-01a.htm | 6 -
.../quests/225_TestOfSearcher/30730-01b.htm | 5 -
.../quests/225_TestOfSearcher/30730-02.htm | 5 -
.../quests/225_TestOfSearcher/30730-02a.htm | 4 -
.../quests/225_TestOfSearcher/30730-04.htm | 3 -
.../quests/225_TestOfSearcher/__init__.py | 302 ---------
.../30291-01.html} | 6 +-
.../30291-01t.html} | 2 +-
.../Q00225_TestOfTheSearcher/30291-02.html | 5 +
.../30291-03.html} | 4 +-
.../Q00225_TestOfTheSearcher/30291-04.html | 8 +
.../30291-05.html} | 6 +-
.../Q00225_TestOfTheSearcher/30291-06.html | 7 +
.../30291-07.html} | 2 +-
.../30291-08.html} | 2 +-
.../30291-09.html} | 2 +-
.../Q00225_TestOfTheSearcher/30291-10.html | 5 +
.../Q00225_TestOfTheSearcher/30291-11.html | 4 +
.../30291-12.html} | 2 +-
.../Q00225_TestOfTheSearcher/30420-01.html | 5 +
.../Q00225_TestOfTheSearcher/30420-01a.html | 3 +
.../Q00225_TestOfTheSearcher/30420-02.html | 3 +
.../30420-03.html} | 2 +-
.../Q00225_TestOfTheSearcher/30420-04.html | 3 +
.../Q00225_TestOfTheSearcher/30627-01.html | 4 +
.../Q00225_TestOfTheSearcher/30627-01a.html | 3 +
.../Q00225_TestOfTheSearcher/30628-01.html | 4 +
.../Q00225_TestOfTheSearcher/30628-01a.html | 3 +
.../Q00225_TestOfTheSearcher/30690-01.html | 4 +
.../Q00225_TestOfTheSearcher/30690-02.html | 4 +
.../Q00225_TestOfTheSearcher/30690-03.htm | 4 +
.../Q00225_TestOfTheSearcher/30690-04.htm | 4 +
.../Q00225_TestOfTheSearcher/30690-05.htm | 5 +
.../Q00225_TestOfTheSearcher/30690-05a.htm | 6 +
.../Q00225_TestOfTheSearcher/30690-06.html | 3 +
.../Q00225_TestOfTheSearcher/30690-07.html | 3 +
.../Q00225_TestOfTheSearcher/30690-08.html | 5 +
.../Q00225_TestOfTheSearcher/30728-01.html | 4 +
.../Q00225_TestOfTheSearcher/30728-02.html | 3 +
.../Q00225_TestOfTheSearcher/30728-03.html | 3 +
.../Q00225_TestOfTheSearcher/30728-04.html | 3 +
.../Q00225_TestOfTheSearcher/30728-05.html | 3 +
.../Q00225_TestOfTheSearcher/30728-06.html | 3 +
.../Q00225_TestOfTheSearcher/30728-07.html | 4 +
.../Q00225_TestOfTheSearcher/30729-01.html | 3 +
.../Q00225_TestOfTheSearcher/30729-02.html | 3 +
.../Q00225_TestOfTheSearcher/30729-03.html | 5 +
.../Q00225_TestOfTheSearcher/30729-04.html | 3 +
.../Q00225_TestOfTheSearcher/30729-05.html | 3 +
.../Q00225_TestOfTheSearcher/30730-01.html | 4 +
.../Q00225_TestOfTheSearcher/30730-01a.html | 6 +
.../Q00225_TestOfTheSearcher/30730-01b.html | 5 +
.../30730-01c.html} | 10 +-
.../30730-01d.html} | 2 +-
.../Q00225_TestOfTheSearcher/30730-02.html | 5 +
.../Q00225_TestOfTheSearcher/30730-02a.html | 4 +
.../30730-02b.html} | 4 +-
.../30730-03.html} | 4 +-
.../Q00225_TestOfTheSearcher/30730-04.html | 3 +
.../Q00225_TestOfTheSearcher.java | 620 ++++++++++++++++++
.../scripts/quests/QuestMasterHandler.java | 2 +
.../dist/sql/game/updates/20141120update.sql | 3 +-
97 files changed, 810 insertions(+), 482 deletions(-)
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-06.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-10.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-11.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-01a.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30627-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30627-01a.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30628-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30628-01a.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-05.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-06.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-07.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-08.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-05.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-06.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-07.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-05.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01a.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01b.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-02a.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30291-01.htm => Q00225_TestOfTheSearcher/30291-01.html} (52%)
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30291-01t.htm => Q00225_TestOfTheSearcher/30291-01t.html} (86%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-02.html
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30291-03.htm => Q00225_TestOfTheSearcher/30291-03.html} (58%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-04.html
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30291-05.htm => Q00225_TestOfTheSearcher/30291-05.html} (55%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-06.html
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30291-07.htm => Q00225_TestOfTheSearcher/30291-07.html} (81%)
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30291-08.htm => Q00225_TestOfTheSearcher/30291-08.html} (60%)
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30291-09.htm => Q00225_TestOfTheSearcher/30291-09.html} (57%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-10.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-11.html
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30291-12.htm => Q00225_TestOfTheSearcher/30291-12.html} (62%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-01a.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-02.html
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30420-03.htm => Q00225_TestOfTheSearcher/30420-03.html} (55%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-04.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30627-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30627-01a.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30628-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30628-01a.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-03.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-04.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-05.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-05a.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-06.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-07.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-08.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-03.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-04.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-05.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-06.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-07.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-03.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-04.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-05.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01a.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01b.html
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30730-01c.htm => Q00225_TestOfTheSearcher/30730-01c.html} (55%)
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30730-01d.htm => Q00225_TestOfTheSearcher/30730-01d.html} (64%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-02a.html
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30730-02b.htm => Q00225_TestOfTheSearcher/30730-02b.html} (63%)
rename L2J_DataPack/dist/game/data/scripts/quests/{225_TestOfSearcher/30730-03.htm => Q00225_TestOfTheSearcher/30730-03.html} (53%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-04.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
diff --git a/L2J_DataPack/dist/game/data/scripts.cfg b/L2J_DataPack/dist/game/data/scripts.cfg
index 74a63e7565..70fe0cfd65 100644
--- a/L2J_DataPack/dist/game/data/scripts.cfg
+++ b/L2J_DataPack/dist/game/data/scripts.cfg
@@ -221,7 +221,6 @@ quests/184_Nikolas_Cooperation_Contract/__init__.py
quests/185_Nikolas_Cooperation_Consideration/__init__.py
quests/216_TrialOfGuildsman/__init__.py
quests/222_TestOfDuelist/__init__.py
-quests/225_TestOfSearcher/__init__.py
quests/226_TestOfHealer/__init__.py
quests/227_TestOfReformer/__init__.py
quests/228_TestOfMagus/__init__.py
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-02.htm
deleted file mode 100644
index d50aa76b74..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Alex:<br>
-What are you still doing here? You must take the warrant I gave you to my adjutant<font color="LEVEL"> Leirynn</font>.<br>
-Do whatever she says!<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30291-01t.htm">Ask about the Floran Militia</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-04.htm
deleted file mode 100644
index 1bcfa27d44..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-04.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>Alex:<br>
-Thank you for dealing with the delu lizardman. I heard of your triumph from Leirynn.<br>
-What's this, you found a<font color="LEVEL"> strange map</font>? Let me see it...<br>
-Hmm... Dion territory... I can barely make out this name in the lower corner... 'Lambert'... Where have I heard that...?<br>
-Oh yes<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30291-05.htm">Ask about Lambert</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-06.htm
deleted file mode 100644
index 58ce154be0..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-06.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>Alex:<br>
-I believe this map will lead us to the prince's gold! I wonder how that Delu Lizardman got this?<br>
-If we can get to the gold before our opponents we will be able to hire soldiers and buy weapons with which to defend the village.<br>
-Think of this as your last test. You must find the other parts of this map and<font color="LEVEL"> get the prince's lost gold bar</font>.<br>
-Whether you are successful or not, I will write you the letter of recommendation you need.<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30291-07.htm">Agree to search for the gold bar</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-10.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-10.htm
deleted file mode 100644
index b73178e2f3..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-10.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Alex:<br>
-You have found the map! Good job!<br>
-Ahhh, the world map... Hurry to the place marked here and find the<font color="LEVEL"> lost gold</font>.<br>
-I have heard from my adjutant Leirynn that the delu lizardmen have sent assassins to retrieve the map, so be very careful.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-11.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-11.htm
deleted file mode 100644
index 26c7e2aa49..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-11.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Alex:<br>
-Excellent work, my friend! Isn't it ironic that this gold collected at the behest of such a selfish Lord should be used for the good of the ones he oppressed?<br>
-We all have you to thank for this. Please take this<font color="LEVEL"> letter of recommendation</font> to<font color="LEVEL"> Master Luther</font>. I am honored to call you my comrade-in-arms. May God smile on your future ...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-01.htm
deleted file mode 100644
index 0e2dea601c..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Trader Tyra:<br>
-The Malrukian Wine is of the highest quality, which was made by distilling the spider's poison. The secrets of making it is only inherited by the chosen ones, even among the Dark Elves. I cannot give it out to just anyone.<br>
-I shall make a proposal. If you can find<font color="LEVEL"> 10 pouches of the Red Spore Dust </font>I shall trade them with the wine. What do you say? Will you accept my proposal?<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30420-01a.htm">Say that you will accept the proposal</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-01a.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-01a.htm
deleted file mode 100644
index ba94020e7e..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-01a.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Trader Tyra:<br>
-You shall be able to find the Red Spore Dust from the<font color="LEVEL"> Giant Fungus</font>. The Giant Fungus can be found in the<font color="LEVEL"> Sea of Spores</font>. If you bring me<font color="LEVEL"> 10 pouches of the Spore Dust</font>, I shall give you the Malrukian Wine. I wrote this down on the contract. Here, you sign here... Yes, it's done. May the protection of Shilen be with you.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-02.htm
deleted file mode 100644
index 754880f9aa..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Trader Tyra:<br>
-Did you forget our contract? Shall we take a look at the papers?<font color="LEVEL"> 'A bottle of Malrukian Wine shall be traded with 10 pouches of the Red Spore Dust'</font>. You can see our signatures, both mine and yours, down here. You'll be able to get the Red Spore Dust by killing the<font color="LEVEL"> Giant Fungus</font> of the<font color="LEVEL"> Sea of Spores</font>. I hope you fulfill the contract soon.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-04.htm
deleted file mode 100644
index 6f5d0b7609..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Trader Tyra:<br>
-How did you like the profound taste of the Malrukian Wine? Well... It could be hard for a non-Dark Elf to understand its true flavor...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30627-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30627-01.htm
deleted file mode 100644
index 3ef498a65e..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30627-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Tree:<br>
-It is an oak tree which can easily be seen in the northern part of Dion.<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30627-01a.htm">Dig the root of the tree</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30627-01a.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30627-01a.htm
deleted file mode 100644
index 79ffb183dc..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30627-01a.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Tree:<br>
-A hard wooden box and a rusty key was found.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30628-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30628-01.htm
deleted file mode 100644
index 244911dcfb..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30628-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Strong Wooden Chest:<br>
-It is a strong wooden chest. It's locked up.<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30628-01a.htm">Use the rusty key</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30628-01a.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30628-01a.htm
deleted file mode 100644
index ff2f4d437a..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30628-01a.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Strong Wooden Chest:<br>
-The box is open.<font color="LEVEL"> Twenty gold bars</font>.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-01.htm
deleted file mode 100644
index e9759f7664..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Master Luther:<br>
-Did you come for the Mark of the Searcher? The Mark is given to those who's ability for 'finding hidden things' is recognized. Every year, numerous Hunters, Scouts, Excavators and even some Assassins come to me in hope of receiving the<font color="LEVEL"> Test of the Searcher</font> though you don't seem like one of them... Are you sure I am the right person you are looking for?<br>
-(Quest only available for Rogue, Scout, Assassin, or Scavenger above level 39.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-02.htm
deleted file mode 100644
index 1c91c865d8..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-02.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Master Luther:<br>
-Did you come for the Mark of the Searcher? The Searcher's Mark is given to those who's ability for 'finding hidden things' is recognized. Every year, numerous Hunters, Scouts, Excavators and even some Assassins come to me in hope of receiving the<font color="LEVEL"> 'Test of the Searcher'</font> but I don't think that you are experienced enough to take the examination. Come back after you have improved your abilities.<br>
-(Quest only available for Rogue, Scout, Assassin, or Scavenger above level 39.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-03.htm
deleted file mode 100644
index ff26179f0e..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-03.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Master Luther:<br>
-Did you come for the Mark of Searcher? The Mark is given to those who's ability for 'finding hidden things' is recognized. Every year, numerous Hunters, Scouts, Excavators and even some Assassins come to me in hope of receiving the<font color="LEVEL"> Test of the Searcher</font>. Are you also one of them?<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30690-05.htm">Say that you will try the Test of the Searcher</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-04.htm
deleted file mode 100644
index 4bc3e4799e..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Master Luther:<br>
-Did you come for the Mark of the Searcher? The Mark is given to those who's ability for 'finding hidden things' is recognized. Every year, numerous Hunters, Scouts, Excavators and even some Assassins come to me in hope of receiving the<font color="LEVEL"> Test of the Searcher</font> but a Dwarf like you.... Are you a Master Raider applicant by any chance? I heard that they were the best Hunters among the Dwarfs. But even within the Dwarf Guild, not everybody is given such title... It is said that only those who have proven their hunting skills and acquired the Mark of the Searcher are qualified for a Master Raider. If you wish to take the examination, I will gladly arrange it for you.<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30690-05.htm">Say that you will try the Test of the Searcher</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-05.htm
deleted file mode 100644
index 4c8a2a72fc..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-05.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Master Luther:<br>
-Then first of all you must visit<font color="LEVEL"> Alex in Floran Village</font>. He was once known as the kingdom's best Scout, and is also famous for his activities as King Cadmus' immediate spy and messenger at the time of the war with Gracia.<br>
-But he was too disappointed by the royal family and aristocrats at the time of the peasant's uprising and now he is fighting in the militia corps of Floran. They say that they are having a hard time with lack of soldiers and supplies. So go and see him.<br>
-I will ask Alex to test you and write a letter of recommendation if he feels that you are qualified.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-06.htm
deleted file mode 100644
index c526376fed..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-06.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Master Luther:<br>
-You haven't left yet? I heard that<font color="LEVEL"> Alex's</font> militia corps are in need of much help.. Go now to<font color="LEVEL"> Floran Village</font>.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-07.htm
deleted file mode 100644
index 02050488ce..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-07.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Master Luther:<br>
-Are you doing a good job with<font color="LEVEL"> Alex</font>? I assume that you haven't yet got the recommendation. But shouldn't he be in trouble if you are killing your time here doing nothing? I bet that he gave you some tasks to do...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-08.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-08.htm
deleted file mode 100644
index 665b3f81cd..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30690-08.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Master Luther:<br>
-Ha ha! I guess that Alex didn't want to let you go. At the end of the recommendation letter he wrote jestingly that he would like me to come up with a fault and send you back to him. I am already aware of the story that you have won back Baron Ashton's gold from the delu lizardmen. I guess that it was quite interesting for you, am I right?<br>
-What do you think? How about going back to Alex as he had suggested? Ha ha! It was a joke. Here, take it! It is the<font color="LEVEL"> Mark of the Searcher</font>. Thank you for the good job you have done!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-01.htm
deleted file mode 100644
index a3f5560e9e..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Militiaman Leirynn:<br>
-Welcome. Recently a lot of delu lizardmen are gathering together. I guess that they are watching for a town with a weak defense. The villagers are relying heavily on us, it makes me anxious that we don't know a way to escape it either... We are relatively weak compared to them so our only choice is the guerilla tactic...<br>
-I know it must be too sudden for you, but please find the<font color="LEVEL"> Delu Lizardmen's Shaman</font> and get rid of them. They say that there are<font color="LEVEL"> 10</font> of them all together.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-02.htm
deleted file mode 100644
index ece0db06f4..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Militiaman Leirynn:<br>
-There are some more shamans left. Find the rest of them and kill them all.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-03.htm
deleted file mode 100644
index 975c8a0f40..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Militiaman Leirynn:<br>
-Thank you. Thanks to your help, we now can pause for breath a while... One more thing. According to the latest news it seems that their real purpose is not the invasion of Floran Village... They seem to be looking for something in this area. What kind of precious thing could it be that the whole tribe is looking for it... Perhaps<font color="LEVEL"> Delu Chief Kalkis</font> knows something about it. Will you be able to go and investigate and kill him afterwards?
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-04.htm
deleted file mode 100644
index 6fe59ef27c..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Militiaman Leirynn:<br>
-<font color="LEVEL">The leader of the whole Delu tribe is Chief Kalkis</font>. What could he be looking for in this area with the whole tribe? Check it out and kill the leader.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-05.htm
deleted file mode 100644
index 361cb7c955..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-05.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Militiaman Leirynn:<br>
-This map...? Seems that it's a nearby area, but it looks a bit strange, though. I can't understand anything, anyway. Take this map with the report to<font color="LEVEL"> Hierarch Alex</font>. And follow his directions. Then, excuse me...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-06.htm
deleted file mode 100644
index dc2646c319..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-06.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Militiaman Leirynn:<br>
-Are you still there? Take the report to<font color="LEVEL"> Alex before it is too late</font>. He'll be looking forward to hearing the news. ...In fact , there is something that bothers me about the map...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-07.htm
deleted file mode 100644
index a373fe1fba..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30728-07.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Militiaman Leirynn:<br>
-I heard that you got special missions from<font color="LEVEL">Alex</font>. I am so grateful that a stranger like you who doesn't even belong to this village is working so hard for us. I don't know exactly, but I heard that the militia is no longer starving thanks to you...<br>
-When the time comes, will you let me invite you to dinner?
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-01.htm
deleted file mode 100644
index 8a775d504c..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-01.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Drunkyard Borys:<br>
-Burp. The royal Guards of the Lord? Yeah. They were royal Guards once. The Lord's gold? Of course the stories are true. I heard it all when I was a sentry at the Lord's camp. But I am too thirsty to talk now.<font color="LEVEL"> The finest Malukian wine</font> will do nicely... This wine is only available from the Dark Elves! I heard that the<font color="LEVEL"> Dark Elf trader named 'Tyra' </font> has a stock of it...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-02.htm
deleted file mode 100644
index 27818d0093..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Drunkyard Borys:<br>
-My my...look who's here! Weren't you going to bring me a drink? I hope you brought the<font color="LEVEL"> Malukian Wine</font>, the kind that<font color="LEVEL"> the Dark Elven Trader Tweety</font> sells... If I had a glass of that wine I would probably remember plenty about the gold...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-03.htm
deleted file mode 100644
index 3932b6001a..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-03.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Drunkyard Borys:<br>
-Ahh... This is it! Outstanding! My tongue is loosed by the fragrant nectar...<br>
-Obviously the Lord's gold was being transported from Gludin to Dion. The 4 royal Guards carrying the gold schemed to hide it away... The Lord unsuccessfully pursued them. Somehow people got the idea that they perished in an accident..<br>
-Actually, one of them, named Rovelt, is still alive. Now he goes by<font color="LEVEL"> Guard Jax</font> and guards the Dwarf traders. He is probably somewhere in<font color="LEVEL"> the southern part of the Wastelands</font> now. He will tell you everything if show him this. Take it and go, my young friend.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-04.htm
deleted file mode 100644
index 3dc70bb541..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Drunkyard Borys:<br>
-Rovelt is now called<font color="LEVEL"> Guard Jax</font>... He's been hired by the Dwarf traders in the
-<font color="LEVEL">southern part of the Wastelands</font>. Anyway, when you show him the document
-I gave you he will tell you everything about prince Ashton and the gold.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-05.htm
deleted file mode 100644
index 5daefb9ee1..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30729-05.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Drunkyard Borys:<br>
-Burp...! Haven't you found the gold yet? If you find it you should buy me another drink in gratitude!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01.htm
deleted file mode 100644
index 233bd0405e..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Bodyguard Jax:<br>
-Royal Guards of the Lord? Gold of Prince Ashiton? What are you talking about? Are you drunk?<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30730-01a.htm">Show him the map of Rambert</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01a.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01a.htm
deleted file mode 100644
index 35595e1d9f..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01a.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Bodyguard Jax:<br>
-...! This map... From where...!?. Whew... I never expected to see this map again... Ok. I will tell you.<br>
-Prince was going to hire Soldiers with that gold. The Shark Troop famous for its inhumanity...<br>
-Although I didn't have a duty toward the village people, I coudn't just let the people fall into the shark's mouth. So I instigated my comrades...<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30730-01b.htm">Ask about the gold's location</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01b.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01b.htm
deleted file mode 100644
index 93e2f678b5..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01b.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Bodyguard Jax:<br>
-I buried the gold in the Dion's southern forest. We made a map to the place, divided into 4 pieces and gave took 1 piece each. We could never find it again with just 1 piece...<br>
-I knew that the gold was cursed after I heard about the unfortunate deaths of my 3 comrades. So I decided to forget it all and live quietly here.<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30730-01c.htm">Ask about dead comrades</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-02.htm
deleted file mode 100644
index 9a0e769601..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Bodyguard Jax:<br>
-You have not found the other portions of the map yet. Was there something else you wanted to know?<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30730-02a.htm">Ask about Salt</a><br>
-<a action="bypass -h Quest 225_TestOfSearcher 30730-02b.htm">Ask about Makell</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-02a.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-02a.htm
deleted file mode 100644
index e6fd670e55..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-02a.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Bodyguard Jax:<br>
-Solt was murdered on his way home to the Elmoreden Kingdom. He was murdered by thieves called<font color="LEVEL"> Road Scavengers</font> near<font color="LEVEL"> the Death Pass</font>. He was my best friend... Such a needless death...<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30730-02.htm">Return</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-04.htm
deleted file mode 100644
index 1ba937856b..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Bodyguard Jax:<br>
-Go now and find the gold! I have heard that there are evil spirits searching for the gold in that area as well. Good luck!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py
deleted file mode 100644
index 7ca5e591d1..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py
+++ /dev/null
@@ -1,302 +0,0 @@
-# completely rewritten by Rolarga, original from Mr
-# modified by Ariakas 08.12.2005
-# Version 0.4 by DrLecter
-# Shadow Weapon Coupons contributed by BiTi for the Official L2J Datapack Project
-# Version 0.6 - updated by Kerberos on 2007.11.15
-# Visit http://www.l2jdp.com/forum/ for more details
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-from com.l2jserver.gameserver.network.serverpackets import SocialAction
-
-qn = "225_TestOfSearcher"
-
-LUTHERS_LETTER, ALANKELLS_WARRANT,LEIRYNNS_ORDER1,DELU_TOTEM, \
-LEIRYNNS_ORDER2, CHIEF_KALKIS_FANG,LEIRYNNS_REPORT,STRANGE_MAP, \
-LAMBERTS_MAP, ALANKELLS_LETTER, ALANKELLS_ORDER,WINE_CATALOG,\
-TWEETYS_CONTRACT, RED_SPORE_DUST, MALRUKIAN_WINE, OLD_ORDER, \
-REXS_DIARY, TORN_MAP_PIECE1, TORN_MAP_PIECE2,SOLTS_MAP, \
-MAKELS_MAP, COMBINED_MAP, RUSTED_KEY1, GOLD_BAR, \
-ALANKELLS_RECOMMEND,MARK_OF_SEARCHER = range(2784,2810)
-
-#Shadow Weapon Exchange Coupon
-SHADOW_WEAPON_COUPON_CGRADE = 8870
-
-#This handle all mob drops npcId:[condition,maxcount,chance,itemid]
-DROPLIST={
-20781:[3,10,100,DELU_TOTEM],
-27094:[3,10,100,DELU_TOTEM],
-27093:[5,1,100,CHIEF_KALKIS_FANG],
-20555:[10,10,100,RED_SPORE_DUST],
-20551:[14,4,100,TORN_MAP_PIECE1],
-20144:[14,4,100,TORN_MAP_PIECE2]
-}
-
-NPC=[30291,30420,30628,30690,30728,30729,30730,30627]
-
-MOB=DROPLIST.keys()
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = range(2784,2809)
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- if event == "30690-05.htm" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- st.giveItems(LUTHERS_LETTER,1)
- elif event == "30291-07.htm" :
- st.giveItems(ALANKELLS_LETTER,1)
- st.giveItems(ALANKELLS_ORDER,1)
- st.giveItems(LAMBERTS_MAP,1)
- st.takeItems(STRANGE_MAP,1)
- st.takeItems(LEIRYNNS_REPORT,1)
- st.set("cond","8")
- st.playSound("ItemSound.quest_middle")
- elif event == "30420-01a.htm" :
- st.takeItems(WINE_CATALOG,1)
- st.giveItems(TWEETYS_CONTRACT,1)
- st.set("cond","10")
- st.playSound("ItemSound.quest_middle")
- elif event == "30730-01d.htm" :
- st.giveItems(REXS_DIARY,1)
- st.takeItems(OLD_ORDER,1)
- st.set("cond","14")
- st.playSound("ItemSound.quest_middle")
- elif event == "30627-01a.htm" :
- st.giveItems(RUSTED_KEY1,1)
-# st.addSpawn(30628,10011,157449,-2374,300000)
- st.addSpawn(30628,10098,157287,-2406,300000)
- st.set("cond","17")
- st.playSound("ItemSound.quest_middle")
- elif event == "30628-01a.htm" :
- st.giveItems(GOLD_BAR,20)
- st.takeItems(RUSTED_KEY1,1)
- st.set("cond","18")
- st.playSound("ItemSound.quest_middle")
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = self.getQuestState(player, True)
- if not st : return htmltext
- cond = st.getInt("cond")
- npcId = npc.getId()
- id = st.getState()
- if npcId != 30690 and id != State.STARTED : return htmltext
-
- if id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
-
- elif id == State.CREATED :
- st.set("cond","0")
- if npcId == NPC[3]:
- if player.getClassId().getId() in [ 0x07, 0x16, 0x23, 0x36] :
- if player.getLevel() > 38 :
- if player.getClassId().getId() == 0x36 :
- htmltext = "30690-04.htm"
- else:
- htmltext = "30690-03.htm"
- else:
- htmltext = "30690-02.htm"
- st.exitQuest(1)
- else:
- htmltext = "30690-01.htm"
- st.exitQuest(1)
- else:
- if npcId== NPC[3]:
- if cond==1 :
- htmltext = "30690-06.htm"
- elif cond>1 and cond<19 :
- htmltext = "30690-07.htm"
- elif cond==19 :
- st.takeItems(ALANKELLS_RECOMMEND,1)
- st.addExpAndSp(894888,61408)
- st.giveItems(57,161806)
- st.giveItems(7562,82)
- st.giveItems(MARK_OF_SEARCHER,1)
- htmltext = "30690-08.htm"
- st.set("cond","0")
- st.exitQuest(False)
- st.playSound("ItemSound.quest_finish")
- st.getPlayer().sendPacket(SocialAction(st.getPlayer().getObjectId(),3))
- elif npcId == NPC[0] :
- if cond==1 :
- htmltext = "30291-01.htm"
- st.takeItems(LUTHERS_LETTER,1)
- st.giveItems(ALANKELLS_WARRANT,1)
- st.set("cond","2")
- st.playSound("ItemSound.quest_middle")
- elif cond == 2:
- htmltext = "30291-02.htm"
- elif cond>2 and cond<7 :
- htmltext = "30291-03.htm"
- elif cond==7 :
- htmltext = "30291-04.htm"
- elif cond==8 :
- htmltext = "30291-08.htm"
- elif cond==13 or cond==14 :
- htmltext = "30291-09.htm"
- elif cond==16 :
- htmltext = "30291-10.htm"
- elif cond==18 :
- htmltext = "30291-11.htm"
- st.takeItems(ALANKELLS_ORDER,1)
- st.takeItems(COMBINED_MAP,1)
- st.takeItems(GOLD_BAR,-1)
- st.giveItems(ALANKELLS_RECOMMEND,1)
- st.set("cond","19")
- st.playSound("ItemSound.quest_middle")
- elif cond==19 :
- htmltext = "30291-12.htm"
- elif npcId == NPC[4] :
- if cond==2 :
- htmltext = "30728-01.htm"
- st.takeItems(ALANKELLS_WARRANT,1)
- st.giveItems(LEIRYNNS_ORDER1,1)
- st.set("cond","3")
- st.playSound("ItemSound.quest_middle")
- elif cond==3 :
- htmltext = "30728-02.htm"
- elif cond==4 :
- htmltext = "30728-03.htm"
- st.takeItems(DELU_TOTEM,-1)
- st.takeItems(LEIRYNNS_ORDER1,1)
- st.giveItems(LEIRYNNS_ORDER2,1)
- st.set("cond","5")
- st.playSound("ItemSound.quest_middle")
- elif cond==5 :
- htmltext = "30728-04.htm"
- elif cond==6 :
- htmltext = "30728-05.htm"
- st.takeItems(CHIEF_KALKIS_FANG,1)
- st.takeItems(LEIRYNNS_ORDER2,1)
- st.giveItems(LEIRYNNS_REPORT,1)
- st.set("cond","7")
- st.playSound("ItemSound.quest_middle")
- elif cond==7 :
- htmltext = "30728-06.htm"
- elif cond==8 :
- htmltext = "30728-07.htm"
- elif npcId == NPC[5]:
- if cond==8 :
- htmltext = "30729-01.htm"
- st.takeItems(ALANKELLS_LETTER,1)
- st.giveItems(WINE_CATALOG,1)
- st.set("cond","9")
- st.playSound("ItemSound.quest_middle")
- elif cond==9 :
- htmltext = "30729-02.htm"
- elif cond==12 :
- htmltext = "30729-03.htm"
- st.takeItems(WINE_CATALOG,1)
- st.takeItems(MALRUKIAN_WINE,1)
- st.set("cond","13")
- st.playSound("ItemSound.quest_middle")
- st.giveItems(OLD_ORDER,1)
- elif cond==13 :
- htmltext = "30729-04.htm"
- elif cond in [8,14] :
- htmltext = "30729-05.htm"
- elif npcId == NPC[1] :
- if cond==10 :
- htmltext = "30420-02.htm"
- elif cond==11 :
- htmltext = "30420-03.htm"
- st.takeItems(TWEETYS_CONTRACT,1)
- st.takeItems(RED_SPORE_DUST,-1)
- st.set("cond","12")
- st.playSound("ItemSound.quest_middle")
- st.giveItems(MALRUKIAN_WINE,1)
- elif cond in [12,13] :
- htmltext = "30420-04.htm"
- elif cond==9 :
- htmltext = "30420-01.htm"
- elif npcId == NPC[6] :
- if cond==13 :
- htmltext = "30730-01.htm"
- elif cond==14 :
- htmltext = "30730-02.htm"
- elif cond == 15:
- htmltext = "30730-03.htm"
- st.takeItems(LAMBERTS_MAP,1)
- st.takeItems(TORN_MAP_PIECE2,4)
- st.takeItems(TORN_MAP_PIECE1,4)
- st.takeItems(REXS_DIARY,1)
- st.takeItems(SOLTS_MAP,1)
- st.takeItems(MAKELS_MAP,1)
- st.set("cond","16")
- st.giveItems(COMBINED_MAP,1)
- elif cond>15 :
- htmltext = "30730-04.htm"
- elif npcId == NPC[7] and cond==16:
- htmltext = "30627-01.htm"
- elif npcId == NPC[2] :
- if cond==17 :
- htmltext = "30628-01.htm"
- else:
- htmltext = "<html><body>You haven't got a Key for this Chest.</body></html>"
- return htmltext
-
- def onKill(self,npc,player,isPet):
- st = player.getQuestState(qn)
- if not st : return
- if st.getState() != State.STARTED : return
- cond = st.getInt("cond")
- npcId = npc.getId()
- status,maxcount,chance,itemid=DROPLIST[npcId]
- random = self.getRandom(100)
- count=st.getQuestItemsCount(itemid)
- if cond==status and count<maxcount and random<chance :
- if cond == 14:
- if npcId==20144:
- if st.getQuestItemsCount(MAKELS_MAP) ==0:
- st.giveItems(itemid,1)
- if count==maxcount-1:
- st.playSound("ItemSound.quest_middle")
- st.giveItems(MAKELS_MAP,1)
- st.takeItems(TORN_MAP_PIECE2,4)
- if st.getQuestItemsCount(MAKELS_MAP) ==1 and st.getQuestItemsCount(SOLTS_MAP) ==1 :
- st.set("cond",str(cond+1))
- else:
- st.playSound("ItemSound.quest_itemget")
- elif npcId==20551:
- if st.getQuestItemsCount(SOLTS_MAP) ==0:
- st.giveItems(itemid,1)
- if count==maxcount-1:
- st.playSound("ItemSound.quest_middle")
- st.giveItems(SOLTS_MAP,1)
- st.takeItems(TORN_MAP_PIECE1,4)
- if st.getQuestItemsCount(MAKELS_MAP) ==1 and st.getQuestItemsCount(SOLTS_MAP) ==1 :
- st.set("cond",str(cond+1))
- else:
- st.playSound("ItemSound.quest_itemget")
- else:
- st.giveItems(itemid,1)
- if count==maxcount-1:
- st.playSound("ItemSound.quest_middle")
- st.set("cond",str(cond+1))
- if npcId == 27093:
- st.giveItems(STRANGE_MAP,1)
- else:
- st.playSound("ItemSound.quest_itemget")
- if npcId==20781 and random<30 and count<maxcount:
- st.addSpawn(27094,npc.getX(),npc.getY(),npc.getZ(),npc.getHeading(),True,300000)
- return
-
-QUEST = Quest(225,qn,"Test Of Searcher")
-
-QUEST.addStartNpc(30690)
-
-for npcId in NPC:
- QUEST.addTalkId(npcId)
-
-for mobId in MOB:
- QUEST.addKillId(mobId)
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-01.html
similarity index 52%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-01.html
index 57908c1505..a74463ea82 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-01.html
@@ -1,7 +1,7 @@
<html><body>Alex:<br>
-Welcome, my friend. If Master Luther sent you here you must be ready to get to work.<br>
+Welcome, my friend. If Master Luther sent you here you must be ready to get to work.<br>
Floran Village needs more good workers like you. We don't have a guard or even a single skilled person!<br>
-I have been waiting for you since I received the warrant of appointment. Take this and give it to my adjutant<font color="LEVEL"> Militia Leirynn</font>...<br>
+I have been waiting for you since I received the warrant of appointment. Take this and give it to my adjutant <font color="LEVEL">Militia Leirynn</font>...<br>
She is a modest lady. I am afraid that work here may not be as easy as you think... I thank you in advance.<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30291-01t.htm">Ask about the Floran Militia</a>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30291-01t.html">Ask about the Floran Militia</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-01t.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-01t.html
similarity index 86%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-01t.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-01t.html
index da5fd3ab84..c9c809962a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-01t.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-01t.html
@@ -1,4 +1,4 @@
<html><body>Alex:<br>
Most of the villagers who are left are the ones lucky enough to have escaped the Lord's tyranny. The troops are not defending the village so the villagers must defend themselves!<br>
-Strangers and thieves overwhelm us as a sick tyrant oppresses us! These dark days may get darker still...
+Strangers and thieves overwhelm us as a sick tyrant oppresses us! These dark days may get darker still...
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-02.html
new file mode 100644
index 0000000000..908801b087
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-02.html
@@ -0,0 +1,5 @@
+<html><body>Alex:<br>
+What are you still doing here? You must take the warrant I gave you to my adjutant <font color="LEVEL">Leirynn</font>.<br>
+Do whatever she says!<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30291-01t.html">Ask about the Floran Militia</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-03.html
similarity index 58%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-03.html
index 18190515ab..a3b8e62ceb 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-03.html
@@ -1,4 +1,4 @@
<html><body>Alex:<br>
-No one understands the situation here better than Leirynn. Follow her instuctions explicitly.<br>
-I know you won't disappoint me.
+No one understands the situation here better than Leirynn. Follow her instructions explicitly.<br>
+I know you won't disappoint me.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-04.html
new file mode 100644
index 0000000000..60e0af9f0b
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-04.html
@@ -0,0 +1,8 @@
+<html><body>Alex:<br>
+Thank you for dealing with the delu Lizardman. I heard of your triumph from Leirynn.<br>
+What's this, you found a <font color="LEVEL">Strange Map</font>? Let me see it...<br>
+Hmm... Dion territory... I can barely make out this name in the lower corner... 'Lambert'... Where have I heard that...?<br>
+Oh yes... One of the Lord's royal guards had that name!<br>
+I was under the impression that he absconded with Duke Ashton's Gold Bar during the farmer's revolt.<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30291-05.html">Inquire about the Gold Bar</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-05.html
similarity index 55%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-05.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-05.html
index 85f2aafd04..0f897bf74b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-05.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-05.html
@@ -1,5 +1,5 @@
<html><body>Alex:<br>
-It is said that the source of this gold was relics collected by Duke Ashton's men from ancient ruins. No one has seen this gold since it vanished enroute from Gludio to Dion to support the war.<br>
-It is rumored to be a vast amount, no one really knows. But now we have this map!<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30291-06.htm">Ask about the map</a>
+It is said that the source of this gold was relics collected by Duke Ashton's men from ancient ruins. No one has seen this gold since it vanished en route from Gludio to Dion to support the war.<br>
+It is rumored to be a vast amount, no one really knows. But now we have this Map!<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30291-06.html">Ask about the Map</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-06.html
new file mode 100644
index 0000000000..9626916b6b
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-06.html
@@ -0,0 +1,7 @@
+<html><body>Alex:<br>
+I believe this Map will lead us to the prince's gold! I wonder how that delu Lizardman got this?<br>
+If we can get to the gold before our opponents we will be able to hire soldiers and buy weapons with which to defend the village.<br>
+Think of this as your last test. You must find the other parts of this Map and <font color="LEVEL">get the prince's lost Gold Bar</font>.<br>
+Whether you are successful or not, I will write you the letter of Recommendation you need.<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30291-07.html">Agree to search for the Gold Bar</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-07.html
similarity index 81%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-07.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-07.html
index d0189fca2f..c21b564cc3 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-07.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-07.html
@@ -1,3 +1,3 @@
<html><body>Alex:<br>
-I have a friend named Borys who used to be one of the Lord's royal guards. He was an excellent soldier until the death of his wife sent him into an alcoholic haze and he lost his position. He is in<font color="LEVEL"> Gludio Castle Town</font> now, take this letter and find him. He may be able to tell you more.
+I have a friend named Borys who used to be one of the Lord's royal guards. He was an excellent soldier until the death of his wife sent him into an alcoholic haze and he lost his position. He is in <font color="LEVEL">the Town of Gludio</font> now, take this letter and find him. He may be able to tell you more.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-08.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-08.html
similarity index 60%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-08.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-08.html
index 1332195ee7..4876b9fc27 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-08.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-08.html
@@ -1,4 +1,4 @@
<html><body>Alex:<br>
-So you still have not met Borys? Go to Gludio Castle Town, you will find him there.<br>
+So you still have not met Borys? Go to the Town of Gludio, you will find him there.<br>
Tell him Alex sent you, he will be sure to help you. Don't forget to ask him about the prince's lost gold!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-09.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-09.html
similarity index 57%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-09.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-09.html
index 2ebb25cfb4..2ddb20ff4f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-09.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-09.html
@@ -1,5 +1,5 @@
<html><body>Alex:<br>
-Hmmm, it seems the royal guards hid the gold before it reached the prince! Now we can be sure that the gold exists, our only problem remaining is how to find it. First, of course, we must find the<font color="LEVEL"> other 3 parts of the map</font>...<br>
+Hmmm, it seems the royal guards hid the gold before it reached the prince! Now we can be sure that the gold exists, our only problem remaining is how to find it. First, of course, we must find the <font color="LEVEL">other 3 parts of the Map</font>...<br>
I am afraid that the delu lizardmen are also on the search for the gold, and their numbers are increasing...<br>
We must find the gold before they do! Please hurry!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-10.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-10.html
new file mode 100644
index 0000000000..dd1ca1aa6d
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-10.html
@@ -0,0 +1,5 @@
+<html><body>Alex:<br>
+You have found the Map! Good job!<br>
+Ahhh, the World Map... Hurry to the place marked here and find the <font color="LEVEL">lost gold</font>.<br>
+I have heard from my adjutant Leirynn that the delu lizardmen have sent assassins to retrieve the Map, so be very careful.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-11.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-11.html
new file mode 100644
index 0000000000..261d7903ca
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-11.html
@@ -0,0 +1,4 @@
+<html><body>Alex:<br>
+Excellent work, my friend! Isn't it ironic that this gold collected at the behest of such a selfish Lord should be used for the good of the ones he oppressed?<br>
+We all have you to thank for this. Please take this <font color="LEVEL">letter of Recommendation</font> to <font color="LEVEL">Master Luther</font>. I am honored to call you my comrade-in-arms. May God smile on your future ...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-12.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-12.html
similarity index 62%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-12.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-12.html
index 42216cd976..c4415b904e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30291-12.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30291-12.html
@@ -1,4 +1,4 @@
<html><body>Alex:<br>
You are still here? You are welcome to stay here and fight for Floran's people, however, you must follow your own faith. I pray you find it.<br>
-If you give the<font color="LEVEL"> letter of recommendation</font> to<font color="LEVEL"> Master Luther</font>, he will bestow upon you the Mark of the Searcher.
+If you give the <font color="LEVEL">letter of Recommendation</font> to <font color="LEVEL">Master Luther</font>, he will bestow upon you the Mark of the Searcher.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-01.html
new file mode 100644
index 0000000000..002b7ed4bf
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-01.html
@@ -0,0 +1,5 @@
+<html><body>Trader Tyra:<br>
+This Malrukian Wine is of the highest quality. It was made by distilling the spider's poison. The secret recipe is only inherited by the chosen ones, even amongst the Dark Elves. I cannot give it out freely.<br>
+I shall make you a proposition. If you will find <font color="LEVEL">10 pouches of the Red Spore Dust</font> I shall trade the wine for them. What do you say? Is this acceptable?<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30420-01a.html">I accept the proposal.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-01a.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-01a.html
new file mode 100644
index 0000000000..21b70c4749
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-01a.html
@@ -0,0 +1,3 @@
+<html><body>Trader Tyra:<br>
+You will find the Red Spore Dust within the <font color="LEVEL">giant fungus</font>. The giant fungus can be found in the <font color="LEVEL">Sea of Spores</font>. If you bring me <font color="LEVEL">10 pouches of the Spore Dust</font>, I shall give you the Malrukian Wine. I wrote this down on the Contract. Here, you sign here... Yes, it's done. May the protection of Shilen be with you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-02.html
new file mode 100644
index 0000000000..16c907f1cb
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-02.html
@@ -0,0 +1,3 @@
+<html><body>Trader Tyra:<br>
+Have you forgetten our Contract? Shall we take a look at the document? <font color="LEVEL">'A bottle of Malrukian Wine shall be traded for 10 pouches of the Red Spore Dust</font>. There are our signatures, both mine and yours, right there. You will find the Red Spore Dust by killing the <font color="LEVEL">giant fungus</font> of the <font color="LEVEL">Sea of Spores</font>. I hope you fulfill the Contract soon.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-03.html
similarity index 55%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-03.html
index 467c0c79eb..4d0df14589 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30420-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-03.html
@@ -1,3 +1,3 @@
<html><body>Trader Tyra:<br>
-You have brought 10 pouches of the Red Spore Dust. I shall give you the<font color="LEVEL"> Malrukian Wine</font> as I promised. Here, enjoy it...!
+You have brought 10 pouches of the Red Spore Dust. I shall give you the <font color="LEVEL">Malrukian Wine</font> as promised. Here you go! Enjoy!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-04.html
new file mode 100644
index 0000000000..2f9183bf07
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30420-04.html
@@ -0,0 +1,3 @@
+<html><body>Trader Tyra:<br>
+Did you like the incredible flavor of the Malrukian Wine? Well... Only a Dark Elf can truly appreciate its complex flavor...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30627-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30627-01.html
new file mode 100644
index 0000000000..503d5cc035
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30627-01.html
@@ -0,0 +1,4 @@
+<html><body>Tree:<br>
+An oak tree which can easily be seen in the northern part of Dion.<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30627-01a.html">Dig the root of the tree</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30627-01a.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30627-01a.html
new file mode 100644
index 0000000000..0692c61172
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30627-01a.html
@@ -0,0 +1,3 @@
+<html><body>Tree:<br>
+A wooden box and a rusty key was found.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30628-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30628-01.html
new file mode 100644
index 0000000000..bf2f7378f6
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30628-01.html
@@ -0,0 +1,4 @@
+<html><body>Strong Wooden Chest:<br>
+It is a strong wooden chest, locked up tight.<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30628-01a.html">Use the rusty key</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30628-01a.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30628-01a.html
new file mode 100644
index 0000000000..440d3cb841
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30628-01a.html
@@ -0,0 +1,3 @@
+<html><body>Strong Wooden Chest:<br>
+The box is opened. <font color="LEVEL">Twenty Gold Bars</font> are inside.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-01.html
new file mode 100644
index 0000000000..16ba00e866
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-01.html
@@ -0,0 +1,4 @@
+<html><body>Master Luther:<br>
+Have you come for the Mark of the Searcher? The Mark is reserved for those with proven detection skills. Every year, many Hunters, Scouts, Excavators and even some Assassins come to me in hope of taking the <font color="LEVEL">Test of the Searcher</font>, though you seem different from them... Are you sure that you are in the right place?<br>
+(Quest only available for Human Rogue, Elven Scout, Assassin, or Scavenger above level 39.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-02.html
new file mode 100644
index 0000000000..3012c01de4
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-02.html
@@ -0,0 +1,4 @@
+<html><body>Master Luther:<br>
+Have you come for the Mark of the Searcher? This mark is reserved for those who's ability for 'finding hidden things' is recognized. Every year, many Hunters, Scouts, Excavators and even some Assassins come to me in hope of taking the <font color="LEVEL">'Test of the Searcher</font>, but you do not have enough experience. Come back after you have improved your abilities.<br>
+(Quest only available for Rogue, Elven Scout, Assassin, or Scavenger above level 39.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-03.htm
new file mode 100644
index 0000000000..82ef7f40d2
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-03.htm
@@ -0,0 +1,4 @@
+<html><body>Master Luther:<br>
+Have you come for the Mark of the Searcher? This mark is reserved for those with recognized detection skills. Every year, many Hunters, Scouts, Excavators and even some Assassins come to me in hope of taking the <font color="LEVEL">Test of the Searcher</font>. Is this what you seek?<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher ACCEPT">Say that you will take the Test of the Searcher</a>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-04.htm
new file mode 100644
index 0000000000..7e57046f5f
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-04.htm
@@ -0,0 +1,4 @@
+<html><body>Master Luther:<br>
+Have you come for the Mark of the Searcher? This mark is reserved for those with recognized detection skills. Every year, many Hunters, Scouts, Excavators and even some Assassins come to me in hope of taking the <font color="LEVEL">Test of the Searcher</font>, but a Dwarf like you? Do you happen to be a Bounty Hunter applicant? They are reputed to be the best Hunters among the Dwarves. But even within the Dwarf Guild, such titles are rare... It is said that only those who have proven their hunting skills and acquired the Mark of the Searcher are qualified to be a Bounty Hunter. If you wish to take the examination, I will gladly arrange it for you.<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher ACCEPT">Say that you will take the Test of the Searcher</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-05.htm
new file mode 100644
index 0000000000..a3b65ed8ca
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-05.htm
@@ -0,0 +1,5 @@
+<html><body>Master Luther:<br>
+First you must visit <font color="LEVEL">Alex in Floran Village</font>. He was once the kingdom's best Scout, and is famous for his activities as King Cadmus' immediate spy and messenger during the war with Gracia.<br>
+But he grew disillusioned by the royal family and aristocrats at the time of the peasant's uprising and joined the militia corps of Floran. I have heard that they are lacking soldiers and supplies. Go and see him.<br>
+Alex will test you and write a letter of Recommendation for you if you qualify.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-05a.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-05a.htm
new file mode 100644
index 0000000000..f53c8a7168
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-05a.htm
@@ -0,0 +1,6 @@
+<html><body>Master Luther:<br>
+Visit <font color="LEVEL">Alex in Floran Village</font>. Once the best scout in the kingdom, he served as King Cadmus' special messenger and spy during the Grecian War.<br>
+Disenchanted by the nobility by their actions during the peasant revolt, he now fights alongside the Floran militia. I have heard that he is hard pressed for supplies and manpower, though. Go see him.<br>
+If he evaluates you and is satisfied, he will let me know.<br>
+Oh, take this <font color="LEVEL">Dimension Diamond</font>. You can trade it to the village gatekeeper for something special that may help you on your journey.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-06.html
new file mode 100644
index 0000000000..18d8393221
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-06.html
@@ -0,0 +1,3 @@
+<html><body>Master Luther:<br>
+Why are you still here? <font color="LEVEL">Alex's</font> militia corps are in dire need of help.. Now go to <font color="LEVEL">Floran Village</font>!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-07.html
new file mode 100644
index 0000000000..b926eb09ff
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-07.html
@@ -0,0 +1,3 @@
+<html><body>Master Luther:<br>
+How was your visit with <font color="LEVEL">Alex</font>? I assume he hasn't given you the letter yet. I would think that he would be in need of your help right now! He must have given you a task...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-08.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-08.html
new file mode 100644
index 0000000000..2f20230f78
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30690-08.html
@@ -0,0 +1,5 @@
+<html><body>Master Luther:<br>
+Ha, I guess Alex grew somewhat attached to you... At the end of the Recommendation letter he joked that he would like me to come up with a reason to send you back to him. I heard that you recovered Ashton's gold from the delu lizardmen! That must have been interesting...<br>
+So how about it, would you like to go back to see Alex? Ha, just kidding!<br>
+Here is the <font color="LEVEL">Mark of the Searcher</font>. Thank you for the good work you have done!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-01.html
new file mode 100644
index 0000000000..387ef321fd
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-01.html
@@ -0,0 +1,4 @@
+<html><body>Militiaman Leirynn:<br>
+Welcome. Recently a large group of delu lizardmen have gathered, threatening the village. We are badly outnumbered and may have to resort to guerrilla tactics.<br>
+I realize that this is rather sudden, but could you please find the <font color="LEVEL">delu lizardmen's shaman</font> and kill them? There are <font color="LEVEL">10</font> of them all together.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-02.html
new file mode 100644
index 0000000000..ab33bff74d
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-02.html
@@ -0,0 +1,3 @@
+<html><body>Militiaman Leirynn:<br>
+There are some shamans left. You must find all of them and kill them!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-03.html
new file mode 100644
index 0000000000..25c06f5809
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-03.html
@@ -0,0 +1,3 @@
+<html><body>Militiaman Leirynn:<br>
+Thank you so much for your help! One more thing... Apparently the delu lizardmen do not intend to attack the village... They seem to be looking for something... What could be so precious that the whole tribe would be looking for it? I am sure that <font color="LEVEL">Delu Chief Kalkis</font> knows something. Could you please go find out what he knows and then kill him? If you follow the path that heads towards the East, you will run into him.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-04.html
new file mode 100644
index 0000000000..701dabbd79
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-04.html
@@ -0,0 +1,3 @@
+<html><body>Militiaman Leirynn:<br>
+<font color="LEVEL">Chief Kalkis is the leader of the whole delu tribe</font>. Why would he have brought his whole tribe here to look for something? Find out what they are looking for and kill Chief Kalkis. If you follow the path that heads towards the East, you will run into him.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-05.html
new file mode 100644
index 0000000000..2126d3d9fd
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-05.html
@@ -0,0 +1,3 @@
+<html><body>Militiaman Leirynn:<br>
+This Map looks somehow familiar but also strange... Seems that it's a nearby area, but its not quite right. I can't make heads or tails of it. Take this Map and report to <font color="LEVEL">Captain Alex</font>. You must follow his directions.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-06.html
new file mode 100644
index 0000000000..a64cde6065
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-06.html
@@ -0,0 +1,3 @@
+<html><body>Militiaman Leirynn:<br>
+What are you still doing here? You must take this report to <font color="LEVEL">Alex before it is too late</font>. He's waiting for the news. You know, something about that Map really bothers me...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-07.html
new file mode 100644
index 0000000000..b8aebd4d3f
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30728-07.html
@@ -0,0 +1,4 @@
+<html><body>Militiaman Leirynn:<br>
+I understand that <font color="LEVEL">Alex</font> gave you a task. It is very noble for you, an outsider, to help us like this. It is said that you saved our militia from starving...<br>
+When the time is right, will you join me for dinner?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-01.html
new file mode 100644
index 0000000000..45ff7ee6a5
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-01.html
@@ -0,0 +1,3 @@
+<html><body>The drunken fool Boris:<br>
+Burp. The royal Guards of the Lord? Yeah. They were royal Guards once. The Lord's gold? Of course the stories are true. I heard it all when I was a sentry at the Lord's camp. But I am too thirsty to talk now. <font color="LEVEL">The finest Malrukian Wine</font> will do nicely... This wine is only available from the Dark Elves! I heard that the <font color="LEVEL">Dark Elf trader named 'Tyra' </font> has a stock of it...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-02.html
new file mode 100644
index 0000000000..10a82de3c7
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-02.html
@@ -0,0 +1,3 @@
+<html><body>Drunkard Borys:<br>
+My my...look who's here! Weren't you going to bring me a drink? I hope you brought the <font color="LEVEL">Malrukian Wine</font>, the kind that <font color="LEVEL">the Dark Elven Trader Tyra</font> sells... If I had a glass of that wine I would probably remember plenty about the gold...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-03.html
new file mode 100644
index 0000000000..c6081fcbb4
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-03.html
@@ -0,0 +1,5 @@
+<html><body>The drunken fool Boris:<br>
+Ahh... This is it! Outstanding! My tongue is loosed by the fragrant nectar...<br>
+Obviously the Lord's gold was being transported from Gludin to Dion. The 4 royal Guards carrying the gold schemed to hide it away... The Lord unsuccessfully pursued them. Somehow people got the idea that they perished in an accident..<br>
+Actually, one of them, named Rovelt, is still alive. Now he goes by <font color="LEVEL">Bodyguard Jax</font> and guards the Dwarf traders. He is probably somewhere in <font color="LEVEL">the southern part of the Wastelands</font> now. He will tell you everything if show him this. Take it and go, my young friend.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-04.html
new file mode 100644
index 0000000000..141dfb4c0f
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-04.html
@@ -0,0 +1,3 @@
+<html><body>The drunken fool Boris:<br>
+Rovelt is now called <font color="LEVEL">Bodyguard Jax</font>... He's been hired by the Dwarf traders in the <font color="LEVEL">southern part of the Wastelands</font>. Anyway, when you show him the document I gave you he will tell you everything about prince Ashton and the gold.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-05.html
new file mode 100644
index 0000000000..ffef200152
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30729-05.html
@@ -0,0 +1,3 @@
+<html><body>The drunken fool Boris:<br>
+Burp...! Haven't you found the gold yet? If you find it you should buy me another drink in gratitude!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01.html
new file mode 100644
index 0000000000..0f8410c739
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01.html
@@ -0,0 +1,4 @@
+<html><body>Bodyguard Jax:<br>
+Royal Guards of the Lord? Gold of Prince Ashiton? What are you talking about? Are you drunk?<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30730-01a.html">Show him the Map of Rambert</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01a.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01a.html
new file mode 100644
index 0000000000..7f5d3ef9f4
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01a.html
@@ -0,0 +1,6 @@
+<html><body>Bodyguard Jax:<br>
+Where did you find this? I never expected to see this Map again... Ok. I will tell you.<br>
+Prince intended to hire Soldiers with that gold, The Shark Troop, famous for its inhumanity...<br>
+Although I didn't owe the villagers anything, I could not allow the innocent people to fall into the shark's mouth. So I instigated my comrades...<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30730-01b.html">"Where is the gold?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01b.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01b.html
new file mode 100644
index 0000000000..381415c9e0
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01b.html
@@ -0,0 +1,5 @@
+<html><body>Bodyguard Jax:<br>
+I buried the gold in Dion's southern forest. We made a map to the place, divided it into 4 pieces, and took 1 piece each. It meant none of us could return there without the others...<br>
+I first knew the gold was cursed when I heard about the unfortunate deaths of my 3 comrades. So I decided to forget it all and live quietly here.<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30730-01c.html">Ask about the dead comrades</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01c.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01c.html
similarity index 55%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01c.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01c.html
index 657c0314ff..6640034f97 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01c.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01c.html
@@ -1,7 +1,7 @@
<html><body>Bodyguard Jax:<br>
-Solt and I were very close... He died on his way home to Elmoreden. Murdered by thieves called<font color="LEVEL"> Road Scavengers</font>...<br>
-Makell was the idealist, he joined the rebel army... In the end, he was caught and executed. His body was hung from a tree as a reminder to others... This tree grew animated, and is now known as the<font color="LEVEL"> Hanged Man Ripper</font>.<br>
-Rambert was very much like me, working as a high trader's Guard. He lost his life in battle with a delu lizardman.<br>
-And now you hold the map!<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30730-01d.htm">Say you want other pieces</a>
+Solt and I were very close... He died on his way home to Elmoreden. Murdered by thieves called <font color="LEVEL">Road Scavengers</font>...<br>
+Makell was the idealist, he joined the rebel army... In the end, he was caught and executed. His body was hung from a tree as a reminder to others... This tree grew animated, and is now known as the <font color="LEVEL">Hangman Tree</font>.<br>
+Rambert was very much like me, working as a high trader's Guard. He lost his life in battle with a Delu Lizardman.<br>
+And now you hold the Map!<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30730-01d.html">Say you want other pieces</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01d.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01d.html
similarity index 64%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01d.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01d.html
index 6b6424c4a2..53a2c2ad5c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-01d.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-01d.html
@@ -1,3 +1,3 @@
<html><body>Bodyguard Jax:<br>
-My memory is not so good...I will give you my diary instead. If you can find the maps of Solt and Makell with this, I will give you my portion of the map. I have quit my job and am trying to come to terms with my past. I have no desire for gold. I just hope that if the gold is found it is used for a good cause...
+My memory is not so good...I will give you my diary instead. If you can find the Maps of Solt and Makell with this, I will give you my portion of the Map. I have quit my job and am trying to come to terms with my past. I have no desire for gold. I just hope that if the gold is found it is used for a good cause...
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-02.html
new file mode 100644
index 0000000000..0d5cd2e9d7
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-02.html
@@ -0,0 +1,5 @@
+<html><body>Bodyguard Jax:<br>
+You have not found the other portions of the Map yet. Was there something else you wanted to know?<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30730-02a.html">Ask about Salt</a><br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30730-02b.html">Ask about Makell</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-02a.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-02a.html
new file mode 100644
index 0000000000..410fcd44e3
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-02a.html
@@ -0,0 +1,4 @@
+<html><body>Bodyguard Jax:<br>
+Solt was murdered on his way home to the Elmoreden Kingdom. He was murdered by thieves called <font color="LEVEL">Road Scavengers</font> near <font color="LEVEL">the Death Pass</font>. He was my best friend... Such a needless death...<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30730-02.html">Return</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-02b.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-02b.html
similarity index 63%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-02b.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-02b.html
index 3444ae7c45..052ed0fe6b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-02b.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-02b.html
@@ -1,5 +1,5 @@
<html><body>Bodyguard Jax:<br>
Makell was incensed by Prince Ashton's tyranny and joined a rebel army of farmers. Eventually he was caught and executed. He was hanged with other rebels.<br>
-Prince Ashton decreed that his body be hung from a tree as a lesson to others...but the tree itself became animated and is now called<font color="LEVEL"> Hangman Tree</font>, and roams about the<font color="LEVEL"> Execution Grounds</font>.<br>
-<a action="bypass -h Quest 225_TestOfSearcher 30730-02.htm">Return</a>
+Prince Ashton decreed that his body be hung from a tree as a lesson to others...but the tree itself became animated and is now called <font color="LEVEL">Hangman Tree</font>, and roams about the <font color="LEVEL">scaffold</font>.<br>
+<a action="bypass -h Quest Q00225_TestOfTheSearcher 30730-02.html">Return</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-03.html
similarity index 53%
rename from L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-03.html
index 98ffe45f1c..02ba375386 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/225_TestOfSearcher/30730-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-03.html
@@ -1,4 +1,4 @@
<html><body>Bodyguard Jax:<br>
-You have found the maps of Solt and Makell! Now with my portion all 4 pieces are reunited! Let us put them together and hold it close to the candle...<br>
-These four dots create a cross... Here, the gold is buried in this place!<font color="LEVEL"> I will mark it on your world map.</font> No payment is necessary, but I do expect you to use the gold for a good cause as you promised. Maybe you should go to Alex again, to get more Informations.
+You have found the Maps of Solt and Makell! Now with my portion all 4 pieces are reunited! Let us put them together and hold it close to the candle...<br>
+These four dots create a cross... Here, the gold is buried in this place! <font color="LEVEL">I will mark it on your World Map.</font> No payment is necessary, but I do expect you to use the gold for a good cause as you promised.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-04.html
new file mode 100644
index 0000000000..d078f24127
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/30730-04.html
@@ -0,0 +1,3 @@
+<html><body>Bodyguard Jax:<br>
+Go now and find the gold! I have heard that there are evil spirits searching for the gold in that area as well. Good luck!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
new file mode 100644
index 0000000000..38389571ba
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00225_TestOfTheSearcher/Q00225_TestOfTheSearcher.java
@@ -0,0 +1,620 @@
+/*
+ * Copyright (C) 2004-2014 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 quests.Q00225_TestOfTheSearcher;
+
+import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.model.actor.L2Attackable;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.base.ClassId;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Test Of The Searcher (225)
+ * @author ivantotov
+ */
+public final class Q00225_TestOfTheSearcher extends Quest
+{
+ // NPCs
+ private static final int CAPTAIN_ALEX = 30291;
+ private static final int TYRA = 30420;
+ private static final int TREE = 30627;
+ private static final int STRONG_WOODEN_CHEST = 30628;
+ private static final int MASTER_LUTHER = 30690;
+ private static final int MILITIAMAN_LEIRYNN = 30728;
+ private static final int DRUNKARD_BORYS = 30729;
+ private static final int BODYGUARD_JAX = 30730;
+ // Items
+ private static final int LUTHERS_LETTER = 2784;
+ private static final int ALEXS_WARRANT = 2785;
+ private static final int LEIRYNNS_1ST_ORDER = 2786;
+ private static final int DELU_TOTEM = 2787;
+ private static final int LEIRYNNS_2ND_ORDER = 2788;
+ private static final int CHIEF_KALKIS_FANG = 2789;
+ private static final int LEIRYNNS_REPORT = 2790;
+ private static final int STRINGE_MAP = 2791;
+ private static final int LAMBERTS_MAP = 2792;
+ private static final int ALEXS_LETTER = 2793;
+ private static final int ALEXS_ORDER = 2794;
+ private static final int WINE_CATALOG = 2795;
+ private static final int TYRAS_CONTRACT = 2796;
+ private static final int RED_SPORE_DUST = 2797;
+ private static final int MALRUKIAN_WINE = 2798;
+ private static final int OLD_ORDER = 2799;
+ private static final int JAXS_DIARY = 2800;
+ private static final int TORN_MAP_PIECE_1ST = 2801;
+ private static final int TORN_MAP_PIECE_2ND = 2802;
+ private static final int SOLTS_MAP = 2803;
+ private static final int MAKELS_MAP = 2804;
+ private static final int COMBINED_MAP = 2805;
+ private static final int RUSTED_KEY = 2806;
+ private static final int GOLD_BAR = 2807;
+ private static final int ALEXS_RECOMMEND = 2808;
+ // Reward
+ private static final int MARK_OF_SEARCHER = 2809;
+ private static final int DIMENSIONAL_DIAMOND = 7562;
+ // Monster
+ private static final int HANGMAN_TREE = 20144;
+ private static final int ROAD_SCAVENGER = 20551;
+ private static final int GIANT_FUNGUS = 20555;
+ private static final int DELU_lIZARDMAN_SHAMAN = 20781;
+ // Quest Monster
+ private static final int NEER_BODYGUARD = 27092;
+ private static final int DELU_CHIEF_KALKIS = 27093;
+ // Misc
+ private static final int MIN_LEVEL = 39;
+
+ public Q00225_TestOfTheSearcher()
+ {
+ super(225, Q00225_TestOfTheSearcher.class.getSimpleName(), "Test Of The Searcher");
+ addStartNpc(MASTER_LUTHER);
+ addTalkId(MASTER_LUTHER, CAPTAIN_ALEX, TYRA, TREE, STRONG_WOODEN_CHEST, MILITIAMAN_LEIRYNN, DRUNKARD_BORYS, BODYGUARD_JAX);
+ addKillId(HANGMAN_TREE, ROAD_SCAVENGER, GIANT_FUNGUS, DELU_lIZARDMAN_SHAMAN, NEER_BODYGUARD, DELU_CHIEF_KALKIS);
+ addAttackId(DELU_lIZARDMAN_SHAMAN);
+ registerQuestItems(LUTHERS_LETTER, ALEXS_WARRANT, LEIRYNNS_1ST_ORDER, DELU_TOTEM, LEIRYNNS_2ND_ORDER, CHIEF_KALKIS_FANG, LEIRYNNS_REPORT, STRINGE_MAP, LAMBERTS_MAP, ALEXS_LETTER, ALEXS_ORDER, WINE_CATALOG, TYRAS_CONTRACT, RED_SPORE_DUST, MALRUKIAN_WINE, OLD_ORDER, JAXS_DIARY, TORN_MAP_PIECE_1ST, TORN_MAP_PIECE_2ND, SOLTS_MAP, MAKELS_MAP, COMBINED_MAP, RUSTED_KEY, GOLD_BAR, ALEXS_RECOMMEND);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "ACCEPT":
+ {
+ if (qs.isCreated())
+ {
+ qs.startQuest();
+ qs.setMemoState(1);
+ playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ giveItems(player, LUTHERS_LETTER, 1);
+ if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
+ {
+ if (player.getClassId() == ClassId.scavenger)
+ {
+ giveItems(player, DIMENSIONAL_DIAMOND, 82);
+ }
+ else
+ {
+ giveItems(player, DIMENSIONAL_DIAMOND, 96);
+ }
+ player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1);
+ htmltext = "30690-05a.htm";
+ }
+ else
+ {
+ htmltext = "30690-05.htm";
+ }
+ }
+ break;
+ }
+ case "30291-05.html":
+ case "30291-01t.html":
+ case "30291-06.html":
+ case "30730-01a.html":
+ case "30730-01b.html":
+ case "30730-01c.html":
+ case "30730-02.html":
+ case "30730-02a.html":
+ case "30730-02b.html":
+ {
+ htmltext = event;
+ break;
+ }
+ case "30291-07.html":
+ {
+ if (hasQuestItems(player, LEIRYNNS_REPORT, STRINGE_MAP))
+ {
+ takeItems(player, LEIRYNNS_REPORT, 1);
+ takeItems(player, STRINGE_MAP, 1);
+ giveItems(player, LAMBERTS_MAP, 1);
+ giveItems(player, ALEXS_LETTER, 1);
+ giveItems(player, ALEXS_ORDER, 1);
+ qs.setCond(8, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "30420-01a.html":
+ {
+ if (hasQuestItems(player, WINE_CATALOG))
+ {
+ takeItems(player, WINE_CATALOG, 1);
+ giveItems(player, TYRAS_CONTRACT, 1);
+ qs.setCond(10, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "30627-01a.html":
+ {
+ if (npc.getSummonedNpcCount() < 5)
+ {
+ giveItems(player, RUSTED_KEY, 1);
+ addSpawn(npc, STRONG_WOODEN_CHEST, npc, true, 0);
+ qs.setCond(17, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "30628-01a.html":
+ {
+ takeItems(player, RUSTED_KEY, 1);
+ giveItems(player, GOLD_BAR, 20);
+ qs.setCond(18, true);
+ npc.deleteMe();
+ htmltext = event;
+ break;
+ }
+ case "30730-01d.html":
+ {
+ if (hasQuestItems(player, OLD_ORDER))
+ {
+ takeItems(player, OLD_ORDER, 1);
+ giveItems(player, JAXS_DIARY, 1);
+ qs.setCond(14, true);
+ htmltext = event;
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onAttack(L2Npc npc, L2PcInstance attacker, int damage, boolean isSummon)
+ {
+ final QuestState qs = getQuestState(attacker, false);
+ if ((qs != null) && qs.isStarted())
+ {
+ if (npc.isScriptValue(0) && hasQuestItems(attacker, LEIRYNNS_1ST_ORDER))
+ {
+ npc.setScriptValue(1);
+ final L2Attackable monster1 = (L2Attackable) addSpawn(NEER_BODYGUARD, npc, true, 200000);
+ attackPlayer(monster1, attacker);
+ }
+ }
+ return super.onAttack(npc, attacker, damage, isSummon);
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+ {
+ final QuestState qs = getQuestState(killer, false);
+ if ((qs != null) && qs.isStarted() && Util.checkIfInRange(1500, npc, killer, true))
+ {
+ switch (npc.getId())
+ {
+ case HANGMAN_TREE:
+ {
+ if (hasQuestItems(killer, JAXS_DIARY) && !hasQuestItems(killer, MAKELS_MAP) && (getQuestItemsCount(killer, TORN_MAP_PIECE_2ND) < 4))
+ {
+ if (getQuestItemsCount(killer, TORN_MAP_PIECE_2ND) < 3)
+ {
+ if (getRandom(100) < 50)
+ {
+ giveItems(killer, TORN_MAP_PIECE_2ND, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ else if (getRandom(100) < 50)
+ {
+ takeItems(killer, TORN_MAP_PIECE_2ND, -1);
+ giveItems(killer, MAKELS_MAP, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ if (getQuestItemsCount(killer, SOLTS_MAP) >= 1)
+ {
+ qs.setCond(15);
+ }
+ }
+ }
+ break;
+ }
+ case ROAD_SCAVENGER:
+ {
+ if (hasQuestItems(killer, JAXS_DIARY) && !hasQuestItems(killer, SOLTS_MAP) && (getQuestItemsCount(killer, TORN_MAP_PIECE_1ST) < 4))
+ {
+ if (getQuestItemsCount(killer, TORN_MAP_PIECE_1ST) < 3)
+ {
+ giveItems(killer, TORN_MAP_PIECE_1ST, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ else
+ {
+ takeItems(killer, TORN_MAP_PIECE_1ST, -1);
+ giveItems(killer, SOLTS_MAP, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ if (getQuestItemsCount(killer, MAKELS_MAP) >= 1)
+ {
+ qs.setCond(15);
+ }
+ }
+ }
+ break;
+ }
+ case GIANT_FUNGUS:
+ {
+ if (hasQuestItems(killer, TYRAS_CONTRACT) && (getQuestItemsCount(killer, RED_SPORE_DUST) < 10))
+ {
+ giveItems(killer, RED_SPORE_DUST, 1);
+ if (getQuestItemsCount(killer, RED_SPORE_DUST) >= 10)
+ {
+ qs.setCond(11, true);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ break;
+ }
+ case DELU_lIZARDMAN_SHAMAN:
+ {
+ if (hasQuestItems(killer, LEIRYNNS_1ST_ORDER) && (getQuestItemsCount(killer, DELU_TOTEM) < 10))
+ {
+ giveItems(killer, DELU_TOTEM, 1);
+ if (getQuestItemsCount(killer, RED_SPORE_DUST) >= 10)
+ {
+ qs.setCond(4, true);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ break;
+ }
+ case DELU_CHIEF_KALKIS:
+ {
+ if (hasQuestItems(killer, LEIRYNNS_2ND_ORDER) && !hasAtLeastOneQuestItem(killer, CHIEF_KALKIS_FANG, STRINGE_MAP))
+ {
+ giveItems(killer, CHIEF_KALKIS_FANG, 1);
+ giveItems(killer, STRINGE_MAP, 1);
+ qs.setCond(6, true);
+ }
+ break;
+ }
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, true);
+ String htmltext = getNoQuestMsg(player);
+ if (qs.isCreated())
+ {
+ if (npc.getId() == MASTER_LUTHER)
+ {
+ if ((player.getClassId() == ClassId.rogue) || (player.getClassId() == ClassId.elvenScout) || (player.getClassId() == ClassId.assassin) || (player.getClassId() == ClassId.scavenger))
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ if (player.getClassId() == ClassId.scavenger)
+ {
+ htmltext = "30690-04.htm";
+ }
+ else
+ {
+ htmltext = "30690-03.htm";
+ }
+ }
+ else
+ {
+ htmltext = "30690-02.html";
+ }
+ }
+ else
+ {
+ htmltext = "30690-01.html";
+ }
+ }
+ }
+ else if (qs.isStarted())
+ {
+ switch (npc.getId())
+ {
+ case MASTER_LUTHER:
+ {
+ if (hasQuestItems(player, LUTHERS_LETTER) && !hasQuestItems(player, ALEXS_RECOMMEND))
+ {
+ htmltext = "30690-06.html";
+ }
+ else if (!hasAtLeastOneQuestItem(player, LUTHERS_LETTER, ALEXS_RECOMMEND))
+ {
+ htmltext = "30690-07.html";
+ }
+ else if (!hasQuestItems(player, LUTHERS_LETTER) && hasQuestItems(player, ALEXS_RECOMMEND))
+ {
+ giveAdena(player, 161806, true);
+ giveItems(player, MARK_OF_SEARCHER, 1);
+ addExpAndSp(player, 894888, 61408);
+ qs.exitQuest(false, true);
+ player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ htmltext = "30690-08.html";
+ }
+ break;
+ }
+ case CAPTAIN_ALEX:
+ {
+ if (hasQuestItems(player, LUTHERS_LETTER))
+ {
+ takeItems(player, LUTHERS_LETTER, 1);
+ giveItems(player, ALEXS_WARRANT, 1);
+ qs.setCond(2, true);
+ htmltext = "30291-01.html";
+ }
+ else if (hasQuestItems(player, ALEXS_WARRANT))
+ {
+ htmltext = "30291-02.html";
+ }
+ else if (hasAtLeastOneQuestItem(player, LEIRYNNS_1ST_ORDER, LEIRYNNS_2ND_ORDER))
+ {
+ htmltext = "30291-03.html";
+ }
+ else if (hasQuestItems(player, LEIRYNNS_REPORT))
+ {
+ htmltext = "30291-04.html";
+ }
+ else if (hasQuestItems(player, ALEXS_ORDER))
+ {
+ if (hasQuestItems(player, ALEXS_LETTER))
+ {
+ htmltext = "30291-08.html";
+ }
+ else if (hasAtLeastOneQuestItem(player, OLD_ORDER, JAXS_DIARY))
+ {
+ htmltext = "30291-09.html";
+ }
+ else if (hasQuestItems(player, COMBINED_MAP))
+ {
+ if (getQuestItemsCount(player, GOLD_BAR) == 20)
+ {
+ takeItems(player, ALEXS_ORDER, 1);
+ takeItems(player, COMBINED_MAP, 1);
+ takeItems(player, GOLD_BAR, -1);
+ giveItems(player, ALEXS_RECOMMEND, 1);
+ player.getRadar().removeMarker(10133, 157155, -2383);
+ qs.setCond(19, true);
+ htmltext = "30291-11.html";
+ }
+ else
+ {
+ htmltext = "30291-10.html";
+ }
+ }
+ }
+ else if (hasQuestItems(player, ALEXS_RECOMMEND))
+ {
+ htmltext = "30291-12.html";
+ }
+ break;
+ }
+ case TYRA:
+ {
+ if (hasQuestItems(player, WINE_CATALOG))
+ {
+ htmltext = "30420-01.html";
+ }
+ else if (hasQuestItems(player, TYRAS_CONTRACT))
+ {
+ if (getQuestItemsCount(player, RED_SPORE_DUST) < 10)
+ {
+ htmltext = "30420-02.html";
+ }
+ else
+ {
+ takeItems(player, TYRAS_CONTRACT, 1);
+ takeItems(player, RED_SPORE_DUST, -1);
+ giveItems(player, MALRUKIAN_WINE, 1);
+ qs.setCond(12, true);
+ htmltext = "30420-03.html";
+ }
+ }
+ else if (hasAtLeastOneQuestItem(player, JAXS_DIARY, OLD_ORDER, COMBINED_MAP, ALEXS_RECOMMEND, MALRUKIAN_WINE))
+ {
+ htmltext = "30420-04.html";
+ }
+ break;
+ }
+ case TREE:
+ {
+ if (hasQuestItems(player, COMBINED_MAP))
+ {
+ if (!hasAtLeastOneQuestItem(player, RUSTED_KEY, GOLD_BAR))
+ {
+ htmltext = "30627-01.html";
+ }
+ else if (hasQuestItems(player, RUSTED_KEY) && (getQuestItemsCount(player, GOLD_BAR) >= 20))
+ {
+ htmltext = "30627-01.html";
+ }
+ }
+ break;
+ }
+ case STRONG_WOODEN_CHEST:
+ {
+ if (hasQuestItems(player, RUSTED_KEY))
+ {
+ htmltext = "30628-01.html";
+ }
+ break;
+ }
+ case MILITIAMAN_LEIRYNN:
+ {
+ if (hasQuestItems(player, ALEXS_WARRANT))
+ {
+ takeItems(player, ALEXS_WARRANT, 1);
+ giveItems(player, LEIRYNNS_1ST_ORDER, 1);
+ qs.setCond(3, true);
+ htmltext = "30728-01.html";
+ }
+ else if (hasQuestItems(player, LEIRYNNS_1ST_ORDER))
+ {
+ if (getQuestItemsCount(player, DELU_TOTEM) < 10)
+ {
+ htmltext = "30728-02.html";
+ }
+ else
+ {
+ takeItems(player, LEIRYNNS_1ST_ORDER, 1);
+ takeItems(player, DELU_TOTEM, -1);
+ giveItems(player, LEIRYNNS_2ND_ORDER, 1);
+ qs.setCond(5, true);
+ htmltext = "30728-03.html";
+ }
+ }
+ else if (hasQuestItems(player, LEIRYNNS_2ND_ORDER))
+ {
+ if (!hasQuestItems(player, CHIEF_KALKIS_FANG))
+ {
+ htmltext = "30728-04.html";
+ }
+ else
+ {
+ takeItems(player, LEIRYNNS_2ND_ORDER, 1);
+ takeItems(player, CHIEF_KALKIS_FANG, 1);
+ giveItems(player, LEIRYNNS_REPORT, 1);
+ qs.setCond(7, true);
+ htmltext = "30728-05.html";
+ }
+ }
+ else if (hasQuestItems(player, LEIRYNNS_REPORT))
+ {
+ htmltext = "30728-06.html";
+ }
+ else if (hasAtLeastOneQuestItem(player, ALEXS_RECOMMEND, ALEXS_ORDER))
+ {
+ htmltext = "30728-07.html";
+ }
+ break;
+ }
+ case DRUNKARD_BORYS:
+ {
+ if (hasQuestItems(player, ALEXS_LETTER))
+ {
+ takeItems(player, ALEXS_LETTER, 1);
+ giveItems(player, WINE_CATALOG, 1);
+ qs.setCond(9, true);
+ htmltext = "30729-01.html";
+ }
+ else if (hasQuestItems(player, WINE_CATALOG) && !hasQuestItems(player, MALRUKIAN_WINE))
+ {
+ htmltext = "30729-02.html";
+ }
+ else if (hasQuestItems(player, MALRUKIAN_WINE) && !hasQuestItems(player, WINE_CATALOG))
+ {
+ takeItems(player, MALRUKIAN_WINE, 1);
+ giveItems(player, OLD_ORDER, 1);
+ qs.setCond(13, true);
+ htmltext = "30729-03.html";
+ }
+ else if (hasQuestItems(player, OLD_ORDER))
+ {
+ htmltext = "30729-04.html";
+ }
+ else if (hasAtLeastOneQuestItem(player, JAXS_DIARY, COMBINED_MAP, ALEXS_RECOMMEND))
+ {
+ htmltext = "30729-05.html";
+ }
+ break;
+ }
+ case BODYGUARD_JAX:
+ {
+ if (hasQuestItems(player, OLD_ORDER))
+ {
+ htmltext = "30730-01.html";
+ }
+ else if (hasQuestItems(player, JAXS_DIARY))
+ {
+ if (((getQuestItemsCount(player, SOLTS_MAP) + getQuestItemsCount(player, MAKELS_MAP)) < 2))
+ {
+ htmltext = "30730-02.html";
+ }
+ else if (((getQuestItemsCount(player, SOLTS_MAP) + getQuestItemsCount(player, MAKELS_MAP)) == 2))
+ {
+ takeItems(player, LAMBERTS_MAP, 1);
+ takeItems(player, JAXS_DIARY, 1);
+ takeItems(player, SOLTS_MAP, 1);
+ takeItems(player, MAKELS_MAP, -1);
+ giveItems(player, COMBINED_MAP, 1);
+ qs.setCond(16, true);
+ htmltext = "30730-03.html";
+ }
+ }
+ else if (hasAtLeastOneQuestItem(player, COMBINED_MAP, ALEXS_RECOMMEND))
+ {
+ htmltext = "30730-04.html";
+ }
+ break;
+ }
+ }
+ }
+ else if (qs.isCompleted())
+ {
+ if (npc.getId() == MASTER_LUTHER)
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ }
+ }
+ return htmltext;
+ }
+
+ private static void attackPlayer(L2Attackable npc, L2PcInstance player)
+ {
+ if ((npc != null) && (player != null))
+ {
+ npc.setIsRunning(true);
+ npc.addDamageHate(player, 0, 999);
+ npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
+ }
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
index d181d2bfc7..4629449a70 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -201,6 +201,7 @@ import quests.Q00220_TestimonyOfGlory.Q00220_TestimonyOfGlory;
import quests.Q00221_TestimonyOfProsperity.Q00221_TestimonyOfProsperity;
import quests.Q00223_TestOfTheChampion.Q00223_TestOfTheChampion;
import quests.Q00224_TestOfSagittarius.Q00224_TestOfSagittarius;
+import quests.Q00225_TestOfTheSearcher.Q00225_TestOfTheSearcher;
import quests.Q00235_MimirsElixir.Q00235_MimirsElixir;
import quests.Q00237_WindsOfChange.Q00237_WindsOfChange;
import quests.Q00238_SuccessFailureOfBusiness.Q00238_SuccessFailureOfBusiness;
@@ -644,6 +645,7 @@ public class QuestMasterHandler
Q00221_TestimonyOfProsperity.class,
Q00223_TestOfTheChampion.class,
Q00224_TestOfSagittarius.class,
+ Q00225_TestOfTheSearcher.class,
Q00235_MimirsElixir.class,
Q00237_WindsOfChange.class,
Q00238_SuccessFailureOfBusiness.class,
diff --git a/L2J_DataPack/dist/sql/game/updates/20141120update.sql b/L2J_DataPack/dist/sql/game/updates/20141120update.sql
index 13aeeef240..d7fead57d6 100644
--- a/L2J_DataPack/dist/sql/game/updates/20141120update.sql
+++ b/L2J_DataPack/dist/sql/game/updates/20141120update.sql
@@ -1,3 +1,4 @@
UPDATE character_quests SET name='Q00220_TestimonyOfGlory' WHERE name='220_TestimonyOfGlory';
UPDATE character_quests SET name='Q00223_TestOfTheChampion' WHERE name='223_TestOfChampion';
-UPDATE character_quests SET name='Q00224_TestOfSagittarius' WHERE name='224_TestOfSagittarius';
\ No newline at end of file
+UPDATE character_quests SET name='Q00224_TestOfSagittarius' WHERE name='224_TestOfSagittarius';
+UPDATE character_quests SET name='Q00225_TestOfTheSearcher' WHERE name='225_TestOfSearcher';
\ No newline at end of file
--
GitLab