From 6ad8ad63a7430e245c326ff4ea65b9024db19da0 Mon Sep 17 00:00:00 2001
From: ivantotov <gmtotov@gmail.com>
Date: Sun, 23 Nov 2014 21:43:55 +0200
Subject: [PATCH] Quest: Test Of The Maestro (231) Reviewed by: @Zoey76
---
L2J_DataPack/dist/game/data/scripts.cfg | 1 -
.../quests/231_TestOfMaestro/30531-05.htm | 3 -
.../quests/231_TestOfMaestro/30531-06.htm | 3 -
.../quests/231_TestOfMaestro/30533-04.htm | 3 -
.../quests/231_TestOfMaestro/30533-05.htm | 3 -
.../quests/231_TestOfMaestro/30535-01.htm | 4 -
.../quests/231_TestOfMaestro/30535-02.htm | 3 -
.../quests/231_TestOfMaestro/30536-01.htm | 5 -
.../quests/231_TestOfMaestro/30536-04.htm | 3 -
.../quests/231_TestOfMaestro/30556-01.htm | 5 -
.../quests/231_TestOfMaestro/30556-02.htm | 5 -
.../quests/231_TestOfMaestro/30556-03.htm | 3 -
.../quests/231_TestOfMaestro/30556-04.htm | 4 -
.../quests/231_TestOfMaestro/30556-05.htm | 3 -
.../quests/231_TestOfMaestro/30556-06.htm | 3 -
.../quests/231_TestOfMaestro/30556-07.htm | 3 -
.../quests/231_TestOfMaestro/30671-01.htm | 5 -
.../quests/231_TestOfMaestro/30671-04.htm | 6 -
.../quests/231_TestOfMaestro/30673-01.htm | 4 -
.../quests/231_TestOfMaestro/30673-02.htm | 3 -
.../quests/231_TestOfMaestro/30673-03.htm | 6 -
.../quests/231_TestOfMaestro/30673-04.htm | 3 -
.../quests/231_TestOfMaestro/30673-05.htm | 3 -
.../quests/231_TestOfMaestro/30675-01.htm | 2 -
.../quests/231_TestOfMaestro/__init__.py | 250 ---------
.../30531-01.html} | 2 +-
.../30531-02.html} | 0
.../30531-03.htm | 4 +-
.../30531-04.htm | 2 +-
.../Q00231_TestOfTheMaestro/30531-04a.htm | 4 +
.../Q00231_TestOfTheMaestro/30531-05.html | 3 +
.../Q00231_TestOfTheMaestro/30531-06.html | 3 +
.../30532-01.html} | 2 +-
.../30533-01.html} | 2 +-
.../30533-02.html} | 5 +-
.../30533-03.html} | 2 +-
.../Q00231_TestOfTheMaestro/30533-04.html | 2 +
.../Q00231_TestOfTheMaestro/30533-05.html | 3 +
.../Q00231_TestOfTheMaestro/30534-01.html | 3 +
.../Q00231_TestOfTheMaestro/30535-01.html | 4 +
.../Q00231_TestOfTheMaestro/30535-02.html | 3 +
.../30535-03.html} | 4 +-
.../30535-04.html} | 4 +-
.../Q00231_TestOfTheMaestro/30536-01.html | 6 +
.../30536-02.html} | 2 +-
.../30536-03.html} | 3 +-
.../Q00231_TestOfTheMaestro/30536-04.html | 3 +
.../Q00231_TestOfTheMaestro/30556-01.html | 5 +
.../Q00231_TestOfTheMaestro/30556-02.html | 5 +
.../Q00231_TestOfTheMaestro/30556-03.html | 3 +
.../Q00231_TestOfTheMaestro/30556-04.html | 4 +
.../Q00231_TestOfTheMaestro/30556-05.html | 3 +
.../Q00231_TestOfTheMaestro/30556-06.html | 3 +
.../Q00231_TestOfTheMaestro/30556-07.html | 3 +
.../Q00231_TestOfTheMaestro/30671-01.html | 5 +
.../30671-02.html} | 4 +-
.../30671-03.html} | 0
.../Q00231_TestOfTheMaestro/30671-04.html | 6 +
.../30671-05.html} | 0
.../30672-01.html} | 2 +-
.../Q00231_TestOfTheMaestro/30673-01.html | 4 +
.../Q00231_TestOfTheMaestro/30673-02.html | 3 +
.../Q00231_TestOfTheMaestro/30673-03.html | 6 +
.../Q00231_TestOfTheMaestro/30673-04.html | 3 +
.../Q00231_TestOfTheMaestro/30673-05.html | 3 +
.../Q00231_TestOfTheMaestro.java | 498 ++++++++++++++++++
.../scripts/quests/QuestMasterHandler.java | 2 +
.../dist/sql/game/updates/20141123update.sql | 1 +
68 files changed, 610 insertions(+), 355 deletions(-)
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-05.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-06.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-05.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-05.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-06.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-07.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-05.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30675-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30531-01.htm => Q00231_TestOfTheMaestro/30531-01.html} (62%)
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30531-02.htm => Q00231_TestOfTheMaestro/30531-02.html} (100%)
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro => Q00231_TestOfTheMaestro}/30531-03.htm (63%)
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro => Q00231_TestOfTheMaestro}/30531-04.htm (50%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-04a.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-05.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-06.html
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30532-01.htm => Q00231_TestOfTheMaestro/30532-01.html} (77%)
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30533-01.htm => Q00231_TestOfTheMaestro/30533-01.html} (81%)
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30533-02.htm => Q00231_TestOfTheMaestro/30533-02.html} (72%)
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30533-03.htm => Q00231_TestOfTheMaestro/30533-03.html} (65%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-04.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-05.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30534-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-02.html
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30535-03.htm => Q00231_TestOfTheMaestro/30535-03.html} (55%)
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30535-04.htm => Q00231_TestOfTheMaestro/30535-04.html} (50%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-01.html
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30536-02.htm => Q00231_TestOfTheMaestro/30536-02.html} (53%)
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30536-03.htm => Q00231_TestOfTheMaestro/30536-03.html} (51%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-04.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-03.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-04.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-05.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-06.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-07.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-01.html
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30671-02.htm => Q00231_TestOfTheMaestro/30671-02.html} (78%)
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30671-03.htm => Q00231_TestOfTheMaestro/30671-03.html} (100%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-04.html
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30671-05.htm => Q00231_TestOfTheMaestro/30671-05.html} (100%)
rename L2J_DataPack/dist/game/data/scripts/quests/{231_TestOfMaestro/30672-01.htm => Q00231_TestOfTheMaestro/30672-01.html} (85%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-03.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-04.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-05.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
create mode 100644 L2J_DataPack/dist/sql/game/updates/20141123update.sql
diff --git a/L2J_DataPack/dist/game/data/scripts.cfg b/L2J_DataPack/dist/game/data/scripts.cfg
index 318d46e038..1663b0ec57 100644
--- a/L2J_DataPack/dist/game/data/scripts.cfg
+++ b/L2J_DataPack/dist/game/data/scripts.cfg
@@ -223,7 +223,6 @@ quests/216_TrialOfGuildsman/__init__.py
quests/222_TestOfDuelist/__init__.py
quests/227_TestOfReformer/__init__.py
quests/230_TestOfSummoner/__init__.py
-quests/231_TestOfMaestro/__init__.py
quests/233_TestOfWarspirit/__init__.py
quests/234_FatesWhisper/__init__.py
quests/236_SeedsOfChaos/__init__.py
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-05.htm
deleted file mode 100644
index 6383c950fd..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-05.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>First Elder Lockirin:<br>
-The First Elder cannot give recommendations. This is one way his powers are restricted. You must receive recommendations from the other 3 Elders.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-06.htm
deleted file mode 100644
index 7737ddc89e..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-06.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>First Elder Lockirin:<br>
-Let's see, yes they are all here. I am impressed! I'm sure the other Elders are preoccupied with the upcoming election. Did you learn much from them? Many people covet this position and would like it for themselves. Many also fail to realize the deep significance it holds for all of us Dwarves. I pray that you become a perceptive and far-sighted Warsmith.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-04.htm
deleted file mode 100644
index c253752b66..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Elder Balanki:<br>
-Good deal! Well done! Those Orcs... I'm afraid to say I doubted that they would agree for a while, but here is their promise! Thank you so very much! I wish there were more Dwarves around like you! Here js the letter of recommendation that I promised. I shall make a place for you once I am First Elder. I hope we can work together again in the future...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-05.htm
deleted file mode 100644
index fd88ccff89..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-05.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Elder Balanki:<br>
-Gather 3 letters of recommendation and go to the First Elder.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-01.htm
deleted file mode 100644
index 62c0fd4df5..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Elder Filaur:<br>
-I don't mind writing you a letter of recommendation, but first you must do something for me. In anticipation of next year's First Elder election our guild is planning to construct an amazing building. Our current skills are not up to the task. We require the technology of the ancient giants! If we can secure that our dreams will become reality.<br>
- Certainly you know of the Cruma Tower? It is where the skills of the ancient giants are preserved. I have heard that a scout team from the Black Anvil Guild is there, too. They are led by a woman named Loraine or something like that... Go and obtain the technology from them. Do what you must.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-02.htm
deleted file mode 100644
index 455c449150..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Elder Filaur:<br>
-A scout team sent by the Black Anvil guild will be near the entrance to the Cruma Tower. It is lead by a woman named Loraine. You must bring me their research results, regardless of how you get it!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-01.htm
deleted file mode 100644
index c29e393525..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Elder Arin:<br>
-The products of the Black Anvil Guild are considered the cutting edge of Dwarven technology. We are responsible for the renaissance of the ancient giants' technology. If I become guild master, I intend to double the pace of our technological development, and Dwarves will take a new place among the races...<br>
-So, you want a letter of recommendation. Such things do not come freely.<br>
-A mobile teleport device developed by our guild was recently stolen. We suspect Master Toma, but our guild cannot investigate directly. Meet Master Toma to find out if he has the device. If he does, get it from him and return it to me. I can show you where he is on the map you have with you... We will talk about the recommendation letter afterwards.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-04.htm
deleted file mode 100644
index 7e84be5357..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Elder Arin:<br>
-Get letters of recommendation from 3 Elders and take them to the First Elder.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-01.htm
deleted file mode 100644
index 3da1008512..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Master Toma:<br>
-Ha! I guess I got caught! How quick-witted you are, I thought I had been careful enough. But it was not a stealing, don't be misunderstood~! I just borrowed it for a little while to make the incomplete machine complete. By the way, if you want the machine back, please help me finish my test.<br>
-<a action="bypass -h Quest 231_TestOfMaestro 30556_1">Say you will help.</a><br>
-<a action="bypass -h Quest 231_TestOfMaestro 30556_2">Say to return the teleporter at once.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-02.htm
deleted file mode 100644
index 23d540f720..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Master Toma:<br>
-Good decision! Now, hold this machine and press this button here! If you can fly to the Dwarven Village in a blink, then it is a success! Let's try it now.<br>
-<a action="bypass -h Quest 231_TestOfMaestro 30556_3">Press the button.</a><br>
-<a action="bypass -h Quest 231_TestOfMaestro 30556_4">Do not press the button</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-03.htm
deleted file mode 100644
index 5801bc00b0..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Master Toma:<br>
-Hey... foolish! Find me if you can, you fool!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-04.htm
deleted file mode 100644
index cbbaae721e..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Master Toma:<br>
-Hey! This is not fair! You have to cooperate if you want to get it. Easy man, easy--<br>
-<a action="bypass -h Quest 231_TestOfMaestro 30556_3">Press the button.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-05.htm
deleted file mode 100644
index 21ba1bcef0..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-05.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Master Toma:<br>
-Come back quick! The next experiment is waiting for us--
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-06.htm
deleted file mode 100644
index e3cc6d80f1..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-06.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Master Toma:<br>
-He he he. Ho, ho... Don't be too mad. Thanks to that we now know for sure which equipment is connected to the arrival set up! Now give me back the machine, not the one that we broke just now... Tell the old man that we broke 5 of them. Take care, then.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-07.htm
deleted file mode 100644
index 115f12d6c3..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30556-07.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Master Toma:<br>
-Tell that old man that the durability was too poor, next time he'd better send something in good condition.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-01.htm
deleted file mode 100644
index 7d9061f057..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Chief Croto:<br>
-This old fool just doesn't understand... The contract was over last month! You don't know how that Dwarf feels about Orcs? Oh, damn...<br>
-Oh, well, believe what you will. Now leave, I am busy!<br>
-<a action="bypass -h Quest 231_TestOfMaestro 30671_1">Tell him that you will do whatever it takes.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-04.htm
deleted file mode 100644
index 918bcefbff..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-04.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Chief Croto:<br>
-I see. My nephew died a hero's death.<br>
-I am jealous in a way... He was so tragically young. His name will be inscribed forever in Paagrio's temple.<br>
- Now only bitter sorrow is left for this old man...<br>
-I must send reinforcements to Elder Balanki. Well done!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-01.htm
deleted file mode 100644
index 7bd8111c8a..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Researcher Loraine:<br>
-Let's talk about the research paper afterwards! One of the research team was poisoned by a monster in the dungeon! He managed to escape from the monster, but if he doesn't have his antidote quickly, he'll die soon! Fortunately, we can find all the materials for the antidote around here... But we are short of people!<br>
-You said you were an adventurer? We need 10 Needles of Weird Bees, 10 units of Leech's Blood, and 10 Cobwebs of Swamp Spider from the swamp area right now... Can you find these things, please? We'll talk about the research paper after we have saved my colleague.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-02.htm
deleted file mode 100644
index 460b6b0681..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Researcher Loraine:<br>
-What are you doing?! We can't afford to lose one minute... Please collect the materials before it's too late! Do you remember all the materials? They are... 10 Needles of Wierd Bees, 10 units of Leech's Blood, and 10 Cobwebs of the Swamp Spider!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-03.htm
deleted file mode 100644
index 1bc0a3dedb..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-03.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Researcher Loraine:<br>
-Ah, you have found all the materials. Wait a moment please.<br>
-... ...<br>
-Ah, he is starting to breathe regularly. The antidote works! By the way, what did you say you came here for?<br>
-<a action="bypass -h Quest 231_TestOfMaestro 30673_1">Say that you are looking for the research materials.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-04.htm
deleted file mode 100644
index 1e2c079e64..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Researcher Loraine:<br>
-Now! This is a copy of the research paper. I am not sure if it will be of any help to you. As you see there is not much research we can do with this small group. Moreover, we have to fight these monsters and poisonous insects... Ah! My colleague seems to have regained his consciousness. Excuse me now. Thank you very much for your help.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-05.htm
deleted file mode 100644
index 8c9143ef35..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30673-05.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Researcher Loraine:<br>
-The research material that I gave you is everything I have. I don't have anything to add in particular...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30675-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30675-01.htm
deleted file mode 100644
index ae0f29b9c7..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30675-01.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Corpse of Kamur:<br>
-(His arm targetet the wall left to him, maybe there is something dangerous)</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py
deleted file mode 100644
index aa755f3d5a..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py
+++ /dev/null
@@ -1,250 +0,0 @@
-# Made by Mr. - Version 0.3 by DrLecter
-# Shadow Weapon Coupons contributed by BiTi for the Official L2J Datapack Project
-# 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
-
-qn = "231_TestOfMaestro"
-
-#item definition
-RECOMMENDATION_OF_BALANKI = 2864
-RECOMMENDATION_OF_FILAUR = 2865
-RECOMMENDATION_OF_ARIN = 2866
-MARK_OF_MAESTRO = 2867
-LETTER_OF_SOLDER_DETACHMENT = 2868
-PAINT_OF_KAMURU = 2869
-NECKLACE_OF_KAMURU = 2870
-PAINT_OF_TELEPORT_DEVICE = 2871
-TELEPORT_DEVICE = 2872
-ARCHITECTURE_OF_KRUMA = 2873
-REPORT_OF_KRUMA = 2874
-INGREDIENTS_OF_ANTIDOTE = 2875
-WEIRD_BEES_NEEDLE = 2876
-MARSH_SPIDERS_WEB = 2877
-BLOOD_OF_LEECH = 2878
-BROKEN_TELEPORT_DEVICE = 2916
-
-#This handle all Mob-Drop Data. npcId:[progress,maxcount,item]
-DROPLIST={
-20225:[13,10,BLOOD_OF_LEECH],
-20229:[13,10,WEIRD_BEES_NEEDLE],
-20233:[13,10,MARSH_SPIDERS_WEB],
-27133:[4,1,NECKLACE_OF_KAMURU]
-}
-
-#if you have all three recommendation, it sets final progress
-def recommendationCount(st):
- count=0
- for item in [RECOMMENDATION_OF_ARIN,RECOMMENDATION_OF_FILAUR,RECOMMENDATION_OF_BALANKI]:
- count+=st.getQuestItemsCount(item)
- if count == 3:
- st.set("progress","17")
- st.set("cond","2")
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = range(2864,2867)+range(2868,2879)+[2916]
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- progress = st.getInt("progress")
- id=st.getState()
- if id != State.COMPLETED :
- if event == "1" and progress == 0 :
- htmltext = "30531-04.htm"
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- st.set("cond","1")
- st.set("progress","1")
- elif event == "30533_1" and progress in [1,11,16]:
- htmltext = "30533-02.htm"
- st.set("progress","2")
- elif event == "30671_1" and progress == 2:
- htmltext = "30671-02.htm"
- st.giveItems(PAINT_OF_KAMURU,1)
- st.set("progress","3")
- elif event == "30556_1" :
- htmltext = "30556-02.htm"
- elif event == "30556_2" :
- htmltext = "30556-03.htm"
- elif event == "30556_3" and progress == 8 :
- htmltext = "30556-05.htm"
- st.takeItems(PAINT_OF_TELEPORT_DEVICE,1)
- st.getPlayer().teleToLocation(140352,-194133,-2028);
- st.giveItems(BROKEN_TELEPORT_DEVICE,1)
- st.set("progress","9")
- elif event == "30556_4" :
- htmltext = "30556-04.htm"
- elif event == "30673_1" and progress == 14 :
- htmltext = "30673-04.htm"
- st.giveItems(REPORT_OF_KRUMA,1)
- st.takeItems(WEIRD_BEES_NEEDLE,-1)
- st.takeItems(MARSH_SPIDERS_WEB,-1)
- st.takeItems(BLOOD_OF_LEECH,-1)
- st.takeItems(INGREDIENTS_OF_ANTIDOTE,-1)
- st.set("progress","15")
- return htmltext
-
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = self.getQuestState(player, True)
- if not st : return htmltext
-
- npcId = npc.getId()
- id = st.getState()
- if npcId != 30531 and id != State.STARTED : return htmltext
-
- progress = st.getInt("progress")
- if npcId == 30531:
- if id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
-
- elif progress==0 :
- if player.getClassId().getId() == 0x38 and player.getLevel() > 38 :
- htmltext = "30531-03.htm"
- elif player.getClassId().getId() == 0x38 :
- htmltext = "30531-01.htm"
- st.exitQuest(1)
- else:
- htmltext = "30531-02.htm"
- st.exitQuest(1)
- elif progress>0 and progress<17 :
- htmltext = "30531-05.htm"
- elif progress==17 :
- st.takeItems(RECOMMENDATION_OF_BALANKI,1)
- st.takeItems(RECOMMENDATION_OF_FILAUR,1)
- st.takeItems(RECOMMENDATION_OF_ARIN,1)
- st.addExpAndSp(2058244,141240)
- st.giveItems(57,372154)
- st.giveItems(MARK_OF_MAESTRO,1)
- htmltext = "30531-06.htm"
- st.unset("progress")
- st.exitQuest(False)
- st.playSound("ItemSound.quest_finish")
- elif npcId == 30533:
- if progress in [1,11,16] and not st.getQuestItemsCount(RECOMMENDATION_OF_BALANKI):
- htmltext = "30533-01.htm"
- elif progress==2:
- htmltext = "30533-03.htm"
- elif progress==6 :
- htmltext = "30533-04.htm"
- st.giveItems(RECOMMENDATION_OF_BALANKI,1)
- st.takeItems(LETTER_OF_SOLDER_DETACHMENT,1)
- st.set("progress","7")
- recommendationCount(st)
- elif progress in [7,17] :
- htmltext = "30533-05.htm"
- elif npcId == 30671:
- if progress==2 :
- htmltext = "30671-01.htm"
- elif progress==3:
- htmltext = "30671-03.htm"
- elif progress==5 :
- htmltext = "30671-04.htm"
- st.giveItems(LETTER_OF_SOLDER_DETACHMENT,1)
- st.takeItems(NECKLACE_OF_KAMURU,1)
- st.takeItems(PAINT_OF_KAMURU,1)
- st.set("progress","6")
- elif progress==6 :
- htmltext = "30671-05.htm"
- elif npcId == 30672 and progress==3 :
- htmltext = "30672-01.htm"
- elif npcId == 30675 and progress==3:
- st.set("progress","4")
- htmltext="30675-01.htm"
- elif npcId == 30536:
- if progress in [1,7,16] and not st.getQuestItemsCount(RECOMMENDATION_OF_ARIN) :
- htmltext = "30536-01.htm"
- st.giveItems(PAINT_OF_TELEPORT_DEVICE,1)
- st.set("progress","8")
- elif progress==8 :
- htmltext = "30536-02.htm"
- elif progress==10:
- htmltext = "30536-03.htm"
- st.giveItems(RECOMMENDATION_OF_ARIN,1)
- st.takeItems(TELEPORT_DEVICE,5)
- st.set("progress","11")
- recommendationCount(st)
- elif progress in [11,17]:
- htmltext = "30536-04.htm"
- elif npcId==30556:
- if progress==8:
- htmltext = "30556-01.htm"
- elif progress==9:
- htmltext = "30556-06.htm"
- st.giveItems(TELEPORT_DEVICE,5)
- st.takeItems(BROKEN_TELEPORT_DEVICE,1)
- st.set("progress","10")
- elif progress==10 :
- htmltext = "30556-07.htm"
- elif npcId==30535:
- if progress in [1,7,11] and not st.getQuestItemsCount(RECOMMENDATION_OF_FILAUR) :
- htmltext = "30535-01.htm"
- st.giveItems(ARCHITECTURE_OF_KRUMA,1)
- st.set("progress","12")
- elif progress==12 :
- htmltext = "30535-02.htm"
- elif progress==15 :
- htmltext = "30535-03.htm"
- st.giveItems(RECOMMENDATION_OF_FILAUR,1)
- st.takeItems(REPORT_OF_KRUMA,1)
- st.set("progress","16")
- recommendationCount(st)
- elif progress>15:
- htmltext = "30535-04.htm"
- elif npcId == 30673:
- if progress==12 :
- htmltext = "30673-01.htm"
- st.giveItems(INGREDIENTS_OF_ANTIDOTE,1)
- st.takeItems(ARCHITECTURE_OF_KRUMA,1)
- st.set("progress","13")
- elif progress==13 :
- htmltext = "30673-02.htm"
- elif progress==14 :
- htmltext = "30673-03.htm"
- elif progress==15:
- htmltext = "30673-05.htm"
- elif npcId==30532 and progress :
- htmltext = "30532-01.htm"
- return htmltext
-
- def onKill(self,npc,player,isPet):
- st = player.getQuestState(qn)
- if not st : return
- if st.getState() != State.STARTED : return
-
- npcId = npc.getId()
- progress_drop,maxcount,item=DROPLIST[npcId]
- count=st.getQuestItemsCount(item)
- progress = st.getInt("progress")
- if progress == progress_drop and count < maxcount :
- st.giveItems(item,1)
- if count == maxcount-1 :
- st.playSound("ItemSound.quest_middle")
- itemcount=0
- for id in [WEIRD_BEES_NEEDLE,MARSH_SPIDERS_WEB,BLOOD_OF_LEECH]:
- itemcount+=st.getQuestItemsCount(id)
- if npcId==27133 or itemcount>29:
- st.set("progress",str(progress+1))
- else:
- st.playSound("ItemSound.quest_itemget")
- return
-
-QUEST = Quest(231,qn,"Test Of Maestro")
-
-QUEST.addStartNpc(30531)
-
-QUEST.addTalkId(30531)
-
-for npcId in [30532,30533,30535,30536,30556,30671,30672,30673,30675]:
- QUEST.addTalkId(npcId)
-
-for mobId in [20225,20229,20233,27133]:
- QUEST.addKillId(mobId)
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-01.html
similarity index 62%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-01.html
index fab0fee59c..d7e755f653 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-01.html
@@ -1,4 +1,4 @@
<html><body>First Elder Lockirin:<br>
-Patience and dedication are essential if you intend to master a skill. You must remember this as you continue your practice. You are not yet ready for this quest.<br>
+Patience and dedication are essential if you intend to master a skill. You must remember this as you continue your practice. You are not yet ready for this quest.<br>
(Artisans of level 39 and above may undertake this quest.)
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-02.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-02.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-03.htm
similarity index 63%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-03.htm
index 955f5b0e01..c5e3d8ba3c 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-03.htm
@@ -1,6 +1,6 @@
<html><body>First Elder Lockirin:<br>
It has been a long time since a Dwarf has come to take the Maestro test. Youngsters these days do not appreciate the benefits of hard work... You are a notable exception, my ambitious young friend.<br>
-Actually,it is far too easy to become a Maestro these days. In the days of my youth the test was so intense that the stress would often cause physical disfigurement! Many ended up looking like Elves! These days you only need to get recommendations from the 3 Elders...<br>
+Actually,it is far too easy to become a Maestro these days. In the days of my youth the test was so intense that the stress would often cause physical disfigurement! Many ended up looking like Elves! These days you only need to get Recommendations from the 3 Elders...<br>
So would you like to take the test?<br>
-<a action="bypass -h Quest 231_TestOfMaestro 1">I shall take the challenge</a>
+<a action="bypass -h Quest Q00231_TestOfTheMaestro ACCEPT">I shall take the challenge</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-04.htm
similarity index 50%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-04.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-04.htm
index 6a226b3b5b..ceb10a2827 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30531-04.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-04.htm
@@ -1,3 +1,3 @@
<html><body>First Elder Lockirin:<br>
-First, go and find the Elders in this building.
+First, go and find the Elders in this building.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-04a.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-04a.htm
new file mode 100644
index 0000000000..63423ce155
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-04a.htm
@@ -0,0 +1,4 @@
+<html><body>Iron Gate's Lockirin:<br>
+Well, then, you should first meet with the elders in this building.<br>
+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/Q00231_TestOfTheMaestro/30531-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-05.html
new file mode 100644
index 0000000000..193fb6b282
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-05.html
@@ -0,0 +1,3 @@
+<html><body>First Elder Lockirin:<br>
+The First Elder cannot give Recommendations. This is one way his powers are restricted. You must receive Recommendations from the other 3 Elders.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-06.html
new file mode 100644
index 0000000000..93fe9bb657
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30531-06.html
@@ -0,0 +1,3 @@
+<html><body>First Elder Lockirin:<br>
+Let's see, yes they are all here. I am impressed! I'm sure the other Elders are preoccupied with the upcoming election. Did you learn much from them? Many people covet this position and would like it for themselves. Many also fail to realize the deep significance it holds for all of us Dwarves. I pray that you become a perceptive and far-sighted Warsmith.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30532-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30532-01.html
similarity index 77%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30532-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30532-01.html
index 948723e1db..3e5fa1beb8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30532-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30532-01.html
@@ -1,4 +1,4 @@
<html><body>Elder Spiron:<br>
Ah, Balanki... So proud over the success of such a small deal... He'll get a taste of his own medicine soon. He he he.<br>
-Oh! Who are you? What do you want? A letter of recommendation? Can't you see how busy I am? Go get your letter somewhere else!
+Oh! Who are you? What do you want? A letter of Recommendation? Can't you see how busy I am? Go get your letter somewhere else!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-01.html
similarity index 81%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-01.html
index 99a1ed12e6..3a2b495c28 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-01.html
@@ -2,5 +2,5 @@
Obviously you have the skills... But skills alone do not guarantee success.<br>
Could you possibly do me a favor? I would like to spend the rest of my life in service to my race.<br>
Next year is the election for the new First Elder. But that greedy Lockirin and the Steel Gate Guild are a very formidable enemy! But if I can pull this deal off, my political fortunes would rise... But...<br>
-<a action="bypass -h Quest 231_TestOfMaestro 30533_1">"Is there a problem?"</a>
+<a action="bypass -h Quest Q00231_TestOfTheMaestro 30533-02.html">"Is there a problem?"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-02.html
similarity index 72%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-02.html
index 7c3c981c19..5c64e8c391 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-02.html
@@ -1,6 +1,5 @@
<html><body>Elder Balanki:<br>
Well, I can't go into details, but it concerns the delivery of a certain item. I don't know how the news leaked out, but it seems that every thief around here is targeting our wagon.<br>
-I have decided to hire some Guards. The Orcs are perfect for this job.<br>
-But when I tried to hire them, the Orcs staying in the town would not listen!<br>
-Do you think you can go and persuade them? The Orc Leader's name is Kroto or something like that. All I ask is that you extract a promise from them that they will send some of their mercenaries.
+I have decided to hire some Guards. The Orcs are perfect for this job. <br>But when I tried to hire them, the Orcs staying in the town would not listen!<br>
+Do you think you can go and persuade them? The Orc Leader's name is Croto or something like that. All I ask is that you extract a promise from them that they will send some of their mercenaries.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-03.html
similarity index 65%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-03.html
index 1a4c1127af..0decdf9493 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30533-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-03.html
@@ -1,3 +1,3 @@
<html><body>Elder Balanki:<br>
-Time keeps passing, and not an Orc in sight! Have you met with Kroto, the leader of the Orcs? Are you taking this task seriously? If you expect to get a letter of recommendation, go and bring those Orcs to me at once!
+Time keeps passing, and not an Orc in sight! Have you met with Kroto, the leader of the Orcs? Are you taking this task seriously? If you expect to get a letter of Recommendation, go and bring those Orcs to me at once!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-04.html
new file mode 100644
index 0000000000..62725b692e
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-04.html
@@ -0,0 +1,2 @@
+<html><head><body>
+Elder Balanki:<br>Good deal! Well done! Those Orcs... I'm afraid to say I doubted that they would agree for a while, but here is their promise! Thank you so very much! I wish there were more Dwarves around like you! Here is the letter of Recommendation that I promised. I shall make a place for you once I am First Elder. I hope we can work together again in the future...</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-05.html
new file mode 100644
index 0000000000..6d27d754fa
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30533-05.html
@@ -0,0 +1,3 @@
+<html><body>Elder Balanki:<br>
+Gather 3 letters of Recommendation and go to the First Elder.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30534-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30534-01.html
new file mode 100644
index 0000000000..1c3b1c7c95
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30534-01.html
@@ -0,0 +1,3 @@
+<html><body>Bronze Key's Keef:<br>
+Everyone is all atwitter about the upcoming elections! If you are here to ask for a Recommendation, go away! I've had enough of this crap, and certainly wouldn't endorse a complete stranger like you!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-01.html
new file mode 100644
index 0000000000..75dcd8cdb0
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-01.html
@@ -0,0 +1,4 @@
+<html><body>Filaur of the Gray Pillar:<br>
+I don't mind writing you a letter of Recommendation, but first you must do something for me. In anticipation of next year's First Elder election our guild is planning to construct an amazing building. Our current skills are not up to the task. We require the technology of the ancient giants! If we can secure that our dreams will become reality.<br>
+Certainly you know of the Cruma Tower? It is where the skills of the ancient giants are preserved. I have heard that a scout team from the Black Anvil Guild is there, too. They are led by a woman named Loraine or something like that... Go and obtain the technology from them. Do what you must.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-02.html
new file mode 100644
index 0000000000..da39ecf6ab
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-02.html
@@ -0,0 +1,3 @@
+<html><body>Filaur of the Gray Pillar:<br>
+A scout team sent by the Black Anvil guild will be near the entrance to the Cruma Tower. It is lead by a woman named Lorain. You must bring me their research results, regardless of how you get it!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-03.html
similarity index 55%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-03.html
index 10f7683d83..00c6378255 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-03.html
@@ -1,4 +1,4 @@
-<html><body>Elder Filaur:<br>
-Is this what I have been searching for? So I judged you correctly. Well done! Here is your letter of recommendation.<br>
+<html><body>Filaur of the Gray Pillar:<br>
+Is this what I have been searching for? So I judged you correctly. Well done! Here is your letter of Recommendation.<br>
Now there is just to build our amazing building!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-04.html
similarity index 50%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-04.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-04.html
index 348a46dd8e..190571ecbd 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30535-04.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30535-04.html
@@ -1,3 +1,3 @@
-<html><body>Elder Filaur:<br>
-If you have received recommendation letters from 3 Elders, take them to First Elder Lockirin at once. The path of the Warsmith that you desire lies ahead of you!
+<html><body>Filaur of the Gray Pillar:<br>
+If you have received Recommendation letters from 3 Elders, take them to First Elder Lockirin at once. The path of the Warsmith that you desire lies ahead of you!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-01.html
new file mode 100644
index 0000000000..3eb8da2712
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-01.html
@@ -0,0 +1,6 @@
+<html><body>Elder Arin:<br>
+The Black Anvil Guild represents the pinnacle of the Dwarven race. Thanks to our efforts, the lost skills of the ancient Giants have been rediscovered. As an elder, I will ensure that our skills progress even farther and faster. Our reputation among the other races will be unparalleled!<br>
+Oh, did you say that you've come for a letter of recommendation? Very well -- I will assign you a task to determine whether you are indeed worthy of my recommendation.<br>
+A portable teleportation device invented by our guild was stolen from us some time ago. We have determined that Master Toma is the culprit, but we cannot pursue him directly at this time. Your mission is to find Master Toma, determine the truth of the charges and return the device to us if he is indeed guilty.<br>
+You will likely find him on the northern coast. When and if you return, we will talk further about the letter of recommendation...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-02.html
similarity index 53%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-02.html
index c71d5f39ee..6618772692 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-02.html
@@ -1,4 +1,4 @@
<html><body>Elder Arin:<br>
-Where is the device?! If you do not bring me the mobile teleport device, you will never get a recommendation letter! I must have it in order to win the upcoming election!<br>
+Where is the device?! If you do not bring me the mobile Teleport Device, you will never get a Recommendation letter! I must have it in order to win the upcoming election!<br>
Find Master Toma at once! And recover that teleport machine!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-03.html
similarity index 51%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-03.html
index ed2fbe067d..f4ceab5910 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30536-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-03.html
@@ -1,4 +1,5 @@
<html><body>Elder Arin:<br>
Five?! Did you say 5?! My dream... The future of my race... What shall I do...?<br>
-Whew... Yes
+Whew... Yes... A Recommendation letter, you say? OK, here you go.<br>
+I need to think, so please leave me in peace.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-04.html
new file mode 100644
index 0000000000..cd11688efd
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30536-04.html
@@ -0,0 +1,3 @@
+<html><body>Elder Arin:<br>
+Get letters of Recommendation from 3 Elders and take them to the First Elder.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-01.html
new file mode 100644
index 0000000000..3d07827439
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-01.html
@@ -0,0 +1,5 @@
+<html><body>Master Toma:<br>
+Ha! Well I guess you caught me! Can't get anything past you... Don't misunderstand, I didn't steal it, I just borrowed it for a while to make the machine complete. If you want it back, please help me finish my test.<br>
+<a action="bypass -h Quest Q00231_TestOfTheMaestro 30556-02.html">I will help.</a><br>
+<a action="bypass -h Quest Q00231_TestOfTheMaestro 30556-03.html">Return the teleporter at once!</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-02.html
new file mode 100644
index 0000000000..3cd3dec023
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-02.html
@@ -0,0 +1,5 @@
+<html><body>Master Toma:<br>
+Good choice! Now, hold the machine and press this button! If you are transported to the Dwarven Village then it is a success! Let's try it!<br>
+<a action="bypass -h Quest Q00231_TestOfTheMaestro 30556-05.html">Press the button.</a><br>
+<a action="bypass -h Quest Q00231_TestOfTheMaestro 30556-04.html">Do not press the button</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-03.html
new file mode 100644
index 0000000000..843e161126
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-03.html
@@ -0,0 +1,3 @@
+<html><body>Master Toma:<br>
+You fool! Find me if you can!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-04.html
new file mode 100644
index 0000000000..e5e9d355fb
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-04.html
@@ -0,0 +1,4 @@
+<html><body>Master Toma:<br>
+Hey! That's unfair! Just help with the test and you'll get it back!<br>
+<a action="bypass -h Quest Q00231_TestOfTheMaestro 30556-05.html">Press the button.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-05.html
new file mode 100644
index 0000000000..f4435a7eb2
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-05.html
@@ -0,0 +1,3 @@
+<html><body>Master Toma:<br>
+Come back soon! Our next experiment awaits!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-06.html
new file mode 100644
index 0000000000..6715ce3ca0
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-06.html
@@ -0,0 +1,3 @@
+<html><body>Master Toma:<br>
+Ha, Don't be too mad. Now we know what to expect on our arrival! Now give me back the machine, not the broken one... Tell the old man that we broke 5 of them. Take care, then.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-07.html
new file mode 100644
index 0000000000..ea8952ab85
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30556-07.html
@@ -0,0 +1,3 @@
+<html><body>Master Toma:<br>
+Tell that old man that it broke too easily. Next time he should send something more durable.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-01.html
new file mode 100644
index 0000000000..c2bf94c6b2
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-01.html
@@ -0,0 +1,5 @@
+<html><body>Chief Croto:<br>
+This old fool just doesn't understand... The Contract was over last month! You don't know how that Dwarf feels about Orcs? Oh, damn...<br>
+Oh, well, believe what you will. Now leave, I am busy!<br>
+<a action="bypass -h Quest Q00231_TestOfTheMaestro 30671-02.html">Tell him that you will do whatever it takes.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-02.html
similarity index 78%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-02.html
index 745c8ca419..7f999ddfdc 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-02.html
@@ -1,6 +1,6 @@
<html><body>Chief Croto:<br>
-Truthfully, we were exiled from the holy land and have been living in a foreign village. The bitterest pill to swallow is that the altar of our ancestors is in the hands of our betrayers.<br>
- I have tried and failed several times to retrieve the altar which is being kept in the Cave of Trial.<br>
+Truthfully, we were exiled from the Holy Land and have been living in a foreign village. The bitterest pill to swallow is that the altar of our ancestors is in the hands of our betrayers.<br>
+I have tried and failed several times to retrieve the altar which is being kept in the Cave of Trial.<br>
This year we sent the army and not one has returned. My nephew Kamuru is among the lost... Possibly lost in the cave or killed by the monster... Anyway, if something has happened to him I won't be able to face my sister.<br>
Let us make a bargain. Go to the Cave of Trial and find out what has happened to Kamuru. If he was killed by monsters, bring his belongings to me.<br>
If you will do this favor for me, I'll fulfill the request of that old Dwarf! Do you understand?
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-03.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-03.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-04.html
new file mode 100644
index 0000000000..a777a2ac53
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-04.html
@@ -0,0 +1,6 @@
+<html><body>Chief Croto:<br>
+I see. My nephew died a hero's death.<br>
+I am jealous in a way... He was so tragically young. His name will be inscribed forever in Pa'agrio's temple.<br>
+Now only bitter sorrow is left for this old man...<br>
+I must send reinforcements to Elder Balanki. Well done!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-05.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30671-05.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30671-05.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30672-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30672-01.html
similarity index 85%
rename from L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30672-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30672-01.html
index 331fb56445..7ebd81badd 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/231_TestOfMaestro/30672-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30672-01.html
@@ -1,4 +1,4 @@
<html><body>Jailer Dubabah:<br>
Ah, those trespassers I caught in this cave? He he he, you should have heard their screams as their limbs were torn off one by one... They didn't stop until I lopped off their heads! The one that cursed the loudest escaped somehow...<br>
-But he is as good as dead. He has surely become a lovely meal for the evil eye Lord that stalks this cave. He he he...
+But he is as good as dead. He has surely become a lovely meal for the Evil Eye Lord that stalks this cave. He he he...
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-01.html
new file mode 100644
index 0000000000..6b3c80b96c
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-01.html
@@ -0,0 +1,4 @@
+<html><body>Researcher Lorain:<br>
+We will have to discuss the research paper later! One of the team was poisoned by a monster in the dungeon! He managed to escape, but if he doesn't get an Antidote quickly he will surely die. Fortunately, all of the materials we need for the Antidote can be found around here... We must have help gathering them!<br>
+You say you are an adventurer? We must have 10 Needles of Stinger Wasps, 10 units of Leech's Blood, and 10 Cobwebs of Swamp Spider... Can you find these things, please? We'll discuss the research paper after we have saved my colleague's life.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-02.html
new file mode 100644
index 0000000000..92266c3416
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-02.html
@@ -0,0 +1,3 @@
+<html><body>Researcher Lorain:<br>
+Why are you dallying about?! We cannot afford to lose even one minute... Please collect the materials before it's too late! Do you remember all of the materials? We must have 10 Needles of Stinger Wasps, 10 units of Leech's Blood, and 10 Cobwebs of the Swamp Spider!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-03.html
new file mode 100644
index 0000000000..82f9d708c4
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-03.html
@@ -0,0 +1,6 @@
+<html><body>Researcher Lorain:<br>
+Ah, I see that you have gathered all the materials. Wait a moment please.<br>
+... ...<br>
+Ah, his breathing is returning to normal. The Antidote has worked! By the way, what were you here for? <br>
+<a action="bypass -h Quest Q00231_TestOfTheMaestro 30673-04.html">I seek research materials.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-04.html
new file mode 100644
index 0000000000..d74c56e15a
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-04.html
@@ -0,0 +1,3 @@
+<html><body>Researcher Lorain:<br>
+Here is a copy of the research paper. I am not sure if it will be of any help to you. As you see, we cannot do much research with such a small group. Moreover, we constantly have to fight off these monsters and poisonous insects... Ah! My colleague awakes! You must excuse me now. Thank you very much for your help.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-05.html
new file mode 100644
index 0000000000..43a189653f
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/30673-05.html
@@ -0,0 +1,3 @@
+<html><body>Researcher Lorain:<br>
+I have given you all the research materials that I have.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
new file mode 100644
index 0000000000..a213c811ba
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00231_TestOfTheMaestro/Q00231_TestOfTheMaestro.java
@@ -0,0 +1,498 @@
+/*
+ * 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.Q00231_TestOfTheMaestro;
+
+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 Maestro (231)
+ * @author ivantotov
+ */
+public final class Q00231_TestOfTheMaestro extends Quest
+{
+ // NPCs
+ private static final int IRON_GATES_LOCKIRIN = 30531;
+ private static final int GOLDEN_WHEELS_SPIRON = 30532;
+ private static final int SILVER_SCALES_BALANKI = 30533;
+ private static final int BRONZE_KEYS_KEEF = 30534;
+ private static final int GRAY_PILLAR_MEMBER_FILAUR = 30535;
+ private static final int BLACK_ANVILS_ARIN = 30536;
+ private static final int MASTER_TOMA = 30556;
+ private static final int CHIEF_CROTO = 30671;
+ private static final int JAILER_DUBABAH = 30672;
+ private static final int RESEARCHER_LORAIN = 30673;
+ // Items
+ private static final int RECOMMENDATION_OF_BALANKI = 2864;
+ private static final int RECOMMENDATION_OF_FILAUR = 2865;
+ private static final int RECOMMENDATION_OF_ARIN = 2866;
+ private static final int LETTER_OF_SOLDER_DERACHMENT = 2868;
+ private static final int PAINT_OF_KAMURU = 2869;
+ private static final int NECKLACE_OF_KAMUTU = 2870;
+ private static final int PAINT_OF_TELEPORT_DEVICE = 2871;
+ private static final int TELEPORT_DEVICE = 2872;
+ private static final int ARCHITECTURE_OF_CRUMA = 2873;
+ private static final int REPORT_OF_CRUMA = 2874;
+ private static final int INGREDIENTS_OF_ANTIDOTE = 2875;
+ private static final int STINGER_WASP_NEEDLE = 2876;
+ private static final int MARSH_SPIDERS_WEB = 2877;
+ private static final int BLOOD_OF_LEECH = 2878;
+ private static final int BROKEN_TELEPORT_DEVICE = 2916;
+ // Reward
+ private static final int MARK_OF_MAESTRO = 2867;
+ private static final int DIMENSIONAL_DIAMOND = 7562;
+ // Monster
+ private static final int KING_BUGBEAR = 20150;
+ private static final int GIANT_MIST_LEECH = 20225;
+ private static final int STINGER_WASP = 20229;
+ private static final int MARSH_SPIDER = 20233;
+ // Quest Monster
+ private static final int EVIL_EYE_LORD = 27133;
+ // Misc
+ private static final int MIN_LEVEL = 39;
+
+ public Q00231_TestOfTheMaestro()
+ {
+ super(231, Q00231_TestOfTheMaestro.class.getSimpleName(), "Test Of The Maestro");
+ addStartNpc(IRON_GATES_LOCKIRIN);
+ addTalkId(IRON_GATES_LOCKIRIN, GOLDEN_WHEELS_SPIRON, SILVER_SCALES_BALANKI, BRONZE_KEYS_KEEF, GRAY_PILLAR_MEMBER_FILAUR, BLACK_ANVILS_ARIN, MASTER_TOMA, CHIEF_CROTO, JAILER_DUBABAH, RESEARCHER_LORAIN);
+ addKillId(KING_BUGBEAR, GIANT_MIST_LEECH, STINGER_WASP, MARSH_SPIDER, EVIL_EYE_LORD);
+ registerQuestItems(RECOMMENDATION_OF_BALANKI, RECOMMENDATION_OF_FILAUR, RECOMMENDATION_OF_ARIN, LETTER_OF_SOLDER_DERACHMENT, PAINT_OF_KAMURU, NECKLACE_OF_KAMUTU, PAINT_OF_TELEPORT_DEVICE, TELEPORT_DEVICE, ARCHITECTURE_OF_CRUMA, REPORT_OF_CRUMA, INGREDIENTS_OF_ANTIDOTE, STINGER_WASP_NEEDLE, MARSH_SPIDERS_WEB, BLOOD_OF_LEECH, BROKEN_TELEPORT_DEVICE);
+ }
+
+ @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);
+ if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
+ {
+ giveItems(player, DIMENSIONAL_DIAMOND, 23);
+ player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1);
+ htmltext = "30531-04a.htm";
+ }
+ else
+ {
+ htmltext = "30531-04.htm";
+ }
+ }
+ break;
+ }
+ case "30533-02.html":
+ {
+ qs.setMemoState(2);
+ htmltext = event;
+ break;
+ }
+ case "30556-02.html":
+ case "30556-03.html":
+ case "30556-04.html":
+ {
+ htmltext = event;
+ break;
+ }
+ case "30556-05.html":
+ {
+ if (hasQuestItems(player, PAINT_OF_TELEPORT_DEVICE))
+ {
+ giveItems(player, BROKEN_TELEPORT_DEVICE, 1);
+ takeItems(player, PAINT_OF_TELEPORT_DEVICE, 1);
+ player.teleToLocation(140352, -194133, -3146);
+ startQuestTimer("SPAWN_KING_BUGBEAR", 5000, npc, player);
+ htmltext = event;
+ }
+ break;
+ }
+ case "30671-02.html":
+ {
+ giveItems(player, PAINT_OF_KAMURU, 1);
+ htmltext = event;
+ break;
+ }
+ case "30673-04.html":
+ {
+ if (hasQuestItems(player, INGREDIENTS_OF_ANTIDOTE) && (getQuestItemsCount(player, STINGER_WASP_NEEDLE) >= 10) && (getQuestItemsCount(player, MARSH_SPIDERS_WEB) >= 10) && (getQuestItemsCount(player, BLOOD_OF_LEECH) >= 10))
+ {
+ giveItems(player, REPORT_OF_CRUMA, 1);
+ takeItems(player, STINGER_WASP_NEEDLE, -1);
+ takeItems(player, MARSH_SPIDERS_WEB, -1);
+ takeItems(player, BLOOD_OF_LEECH, -1);
+ takeItems(player, INGREDIENTS_OF_ANTIDOTE, 1);
+ htmltext = event;
+ }
+ break;
+ }
+ case "SPAWN_KING_BUGBEAR":
+ {
+ attackPlayer(addSpawn(KING_BUGBEAR, 140395, -194147, -3146, 0, false, 200000, false), player);
+ attackPlayer(addSpawn(KING_BUGBEAR, 140395, -194147, -3146, 0, false, 200000, false), player);
+ attackPlayer(addSpawn(KING_BUGBEAR, 140395, -194147, -3146, 0, false, 200000, false), player);
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @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 GIANT_MIST_LEECH:
+ {
+ if (qs.isMemoState(4) && hasQuestItems(killer, INGREDIENTS_OF_ANTIDOTE) && (getQuestItemsCount(killer, BLOOD_OF_LEECH) < 10))
+ {
+ giveItems(killer, BLOOD_OF_LEECH, 1);
+ if (getQuestItemsCount(killer, BLOOD_OF_LEECH) >= 10)
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ break;
+ }
+ case STINGER_WASP:
+ {
+ if (qs.isMemoState(4) && hasQuestItems(killer, INGREDIENTS_OF_ANTIDOTE) && (getQuestItemsCount(killer, STINGER_WASP_NEEDLE) < 10))
+ {
+ giveItems(killer, STINGER_WASP_NEEDLE, 1);
+ if (getQuestItemsCount(killer, STINGER_WASP_NEEDLE) >= 10)
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ break;
+ }
+ case MARSH_SPIDER:
+ {
+ if (qs.isMemoState(4) && hasQuestItems(killer, INGREDIENTS_OF_ANTIDOTE) && (getQuestItemsCount(killer, MARSH_SPIDERS_WEB) < 10))
+ {
+ giveItems(killer, MARSH_SPIDERS_WEB, 1);
+ if (getQuestItemsCount(killer, MARSH_SPIDERS_WEB) >= 10)
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ break;
+ }
+ case EVIL_EYE_LORD:
+ {
+ if (qs.isMemoState(2) && hasQuestItems(killer, PAINT_OF_KAMURU) && !hasQuestItems(killer, NECKLACE_OF_KAMUTU))
+ {
+ giveItems(killer, NECKLACE_OF_KAMUTU, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ break;
+ }
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, true);
+ final int memoState = qs.getMemoState();
+ String htmltext = getNoQuestMsg(player);
+ if (qs.isCreated())
+ {
+ if (npc.getId() == IRON_GATES_LOCKIRIN)
+ {
+ if (player.getClassId() == ClassId.artisan)
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ htmltext = "30531-03.htm";
+ }
+ else
+ {
+ htmltext = "30531-01.html";
+ }
+ }
+ else
+ {
+ htmltext = "30531-02.html";
+ }
+ }
+ }
+ else if (qs.isStarted())
+ {
+ switch (npc.getId())
+ {
+ case IRON_GATES_LOCKIRIN:
+ {
+ if ((memoState >= 1) && !hasQuestItems(player, RECOMMENDATION_OF_BALANKI, RECOMMENDATION_OF_FILAUR, RECOMMENDATION_OF_ARIN))
+ {
+ htmltext = "30531-05.html";
+ }
+ else if (hasQuestItems(player, RECOMMENDATION_OF_BALANKI, RECOMMENDATION_OF_FILAUR, RECOMMENDATION_OF_ARIN))
+ {
+ giveAdena(player, 372154, true);
+ giveItems(player, MARK_OF_MAESTRO, 1);
+ addExpAndSp(player, 2085244, 141240);
+ qs.exitQuest(false, true);
+ player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ htmltext = "30531-06.html";
+ }
+ break;
+ }
+ case GOLDEN_WHEELS_SPIRON:
+ {
+ htmltext = "30532-01.html";
+ break;
+ }
+ case SILVER_SCALES_BALANKI:
+ {
+ if ((memoState == 1) && !hasQuestItems(player, RECOMMENDATION_OF_BALANKI))
+ {
+ htmltext = "30533-01.html";
+ }
+ else if (memoState == 2)
+ {
+ if (!hasQuestItems(player, LETTER_OF_SOLDER_DERACHMENT))
+ {
+ htmltext = "30533-03.html";
+ }
+ else
+ {
+ giveItems(player, RECOMMENDATION_OF_BALANKI, 1);
+ takeItems(player, LETTER_OF_SOLDER_DERACHMENT, 1);
+ qs.setMemoState(1);
+ if (hasQuestItems(player, RECOMMENDATION_OF_ARIN, RECOMMENDATION_OF_FILAUR))
+ {
+ qs.setCond(2, true);
+ }
+ htmltext = "30533-04.html";
+ }
+ }
+ else if (hasQuestItems(player, RECOMMENDATION_OF_BALANKI))
+ {
+ htmltext = "30533-05.html";
+ }
+ break;
+ }
+ case BRONZE_KEYS_KEEF:
+ {
+ htmltext = "30534-01.html";
+ break;
+ }
+ case GRAY_PILLAR_MEMBER_FILAUR:
+ {
+ if ((memoState == 1) && !hasQuestItems(player, RECOMMENDATION_OF_FILAUR))
+ {
+ giveItems(player, ARCHITECTURE_OF_CRUMA, 1);
+ qs.setMemoState(4);
+ htmltext = "30535-01.html";
+ }
+ else if (memoState == 4)
+ {
+ if (hasQuestItems(player, ARCHITECTURE_OF_CRUMA) && !hasQuestItems(player, REPORT_OF_CRUMA))
+ {
+ htmltext = "30535-02.html";
+ }
+ else if (hasQuestItems(player, REPORT_OF_CRUMA) && !hasQuestItems(player, ARCHITECTURE_OF_CRUMA))
+ {
+ giveItems(player, RECOMMENDATION_OF_FILAUR, 1);
+ takeItems(player, REPORT_OF_CRUMA, 1);
+ qs.setMemoState(1);
+ if (hasQuestItems(player, RECOMMENDATION_OF_BALANKI, RECOMMENDATION_OF_ARIN))
+ {
+ qs.setCond(2, true);
+ }
+ htmltext = "30535-03.html";
+ }
+ }
+ else if (hasQuestItems(player, RECOMMENDATION_OF_FILAUR))
+ {
+ htmltext = "30535-04.html";
+ }
+ break;
+ }
+ case BLACK_ANVILS_ARIN:
+ {
+ if ((memoState == 1) && !hasQuestItems(player, RECOMMENDATION_OF_ARIN))
+ {
+ giveItems(player, PAINT_OF_TELEPORT_DEVICE, 1);
+ qs.setMemoState(3);
+ htmltext = "30536-01.html";
+ }
+ else if (memoState == 3)
+ {
+ if (hasQuestItems(player, PAINT_OF_TELEPORT_DEVICE) && !hasQuestItems(player, TELEPORT_DEVICE))
+ {
+ htmltext = "30536-02.html";
+ }
+ else if (getQuestItemsCount(player, TELEPORT_DEVICE) >= 5)
+ {
+ giveItems(player, RECOMMENDATION_OF_ARIN, 1);
+ takeItems(player, TELEPORT_DEVICE, -1);
+ qs.setMemoState(1);
+ if (hasQuestItems(player, RECOMMENDATION_OF_BALANKI, RECOMMENDATION_OF_FILAUR))
+ {
+ qs.setCond(2, true);
+ }
+ htmltext = "30536-03.html";
+ }
+ }
+ else if (hasQuestItems(player, RECOMMENDATION_OF_ARIN))
+ {
+ htmltext = "30536-04.html";
+ }
+ break;
+ }
+ case MASTER_TOMA:
+ {
+ if (memoState == 3)
+ {
+ if (hasQuestItems(player, PAINT_OF_TELEPORT_DEVICE))
+ {
+ htmltext = "30556-01.html";
+ }
+ else if (hasQuestItems(player, BROKEN_TELEPORT_DEVICE))
+ {
+ giveItems(player, TELEPORT_DEVICE, 5);
+ takeItems(player, BROKEN_TELEPORT_DEVICE, 1);
+ htmltext = "30556-06.html";
+ }
+ else if (getQuestItemsCount(player, TELEPORT_DEVICE) == 5)
+ {
+ htmltext = "30556-07.html";
+ }
+ }
+ break;
+ }
+ case CHIEF_CROTO:
+ {
+ if ((memoState == 2) && !hasAtLeastOneQuestItem(player, PAINT_OF_KAMURU, NECKLACE_OF_KAMUTU, LETTER_OF_SOLDER_DERACHMENT))
+ {
+ htmltext = "30671-01.html";
+ }
+ else if (hasQuestItems(player, PAINT_OF_KAMURU) && !hasQuestItems(player, NECKLACE_OF_KAMUTU))
+ {
+ htmltext = "30671-03.html";
+ }
+ else if (hasQuestItems(player, NECKLACE_OF_KAMUTU))
+ {
+ giveItems(player, LETTER_OF_SOLDER_DERACHMENT, 1);
+ takeItems(player, NECKLACE_OF_KAMUTU, 1);
+ takeItems(player, PAINT_OF_KAMURU, 1);
+ htmltext = "30671-04.html";
+ }
+ else if (hasQuestItems(player, LETTER_OF_SOLDER_DERACHMENT))
+ {
+ htmltext = "30671-05.html";
+ }
+ break;
+ }
+ case JAILER_DUBABAH:
+ {
+ if (hasQuestItems(player, PAINT_OF_KAMURU))
+ {
+ htmltext = "30672-01.html";
+ }
+ break;
+ }
+ case RESEARCHER_LORAIN:
+ {
+ if (memoState == 4)
+ {
+ if (hasQuestItems(player, ARCHITECTURE_OF_CRUMA) && !hasAtLeastOneQuestItem(player, INGREDIENTS_OF_ANTIDOTE, REPORT_OF_CRUMA))
+ {
+ giveItems(player, INGREDIENTS_OF_ANTIDOTE, 1);
+ takeItems(player, ARCHITECTURE_OF_CRUMA, 1);
+ htmltext = "30673-01.html";
+ }
+ else if (hasQuestItems(player, INGREDIENTS_OF_ANTIDOTE) && !hasQuestItems(player, REPORT_OF_CRUMA))
+ {
+ if ((getQuestItemsCount(player, STINGER_WASP_NEEDLE) >= 10) && (getQuestItemsCount(player, MARSH_SPIDERS_WEB) >= 10) && (getQuestItemsCount(player, BLOOD_OF_LEECH) >= 10))
+ {
+ htmltext = "30673-03.html";
+ }
+ else
+ {
+ htmltext = "30673-02.html";
+ }
+ }
+ else if (hasQuestItems(player, REPORT_OF_CRUMA))
+ {
+ htmltext = "30673-05.html";
+ }
+ }
+ break;
+ }
+ }
+ }
+ else if (qs.isCompleted())
+ {
+ if (npc.getId() == IRON_GATES_LOCKIRIN)
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ }
+ }
+ return htmltext;
+ }
+
+ private static void attackPlayer(L2Npc npc, L2PcInstance player)
+ {
+ L2Attackable monster = (L2Attackable) npc;
+ if ((monster != null) && (player != null))
+ {
+ monster.setIsRunning(true);
+ monster.addDamageHate(player, 0, 999);
+ monster.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 a1353092af..e3b83f718d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -205,6 +205,7 @@ import quests.Q00225_TestOfTheSearcher.Q00225_TestOfTheSearcher;
import quests.Q00226_TestOfTheHealer.Q00226_TestOfTheHealer;
import quests.Q00228_TestOfMagus.Q00228_TestOfMagus;
import quests.Q00229_TestOfWitchcraft.Q00229_TestOfWitchcraft;
+import quests.Q00231_TestOfTheMaestro.Q00231_TestOfTheMaestro;
import quests.Q00232_TestOfTheLord.Q00232_TestOfTheLord;
import quests.Q00235_MimirsElixir.Q00235_MimirsElixir;
import quests.Q00237_WindsOfChange.Q00237_WindsOfChange;
@@ -654,6 +655,7 @@ public class QuestMasterHandler
Q00226_TestOfTheHealer.class,
Q00228_TestOfMagus.class,
Q00229_TestOfWitchcraft.class,
+ Q00231_TestOfTheMaestro.class,
Q00232_TestOfTheLord.class,
Q00235_MimirsElixir.class,
Q00237_WindsOfChange.class,
diff --git a/L2J_DataPack/dist/sql/game/updates/20141123update.sql b/L2J_DataPack/dist/sql/game/updates/20141123update.sql
new file mode 100644
index 0000000000..d1f74fb8ba
--- /dev/null
+++ b/L2J_DataPack/dist/sql/game/updates/20141123update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='Q00231_TestOfTheMaestro' WHERE name='231_TestOfMaestro';
\ No newline at end of file
--
GitLab