diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 35bd938e41d144e442bd7732b99a165c4b804852..bd4a60478dd9dd26121b34a8e935261a4957acb8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -231,7 +231,6 @@ quests/171_ActsOfEvil/__init__.py
 quests/178_IconicTrinity/__init__.py
 quests/184_Nikolas_Cooperation_Contract/__init__.py
 quests/185_Nikolas_Cooperation_Consideration/__init__.py
-quests/211_TrialOfChallenger/__init__.py
 quests/213_TrialOfSeeker/__init__.py
 quests/214_TrialOfScholar/__init__.py
 quests/215_TrialOfPilgrim/__init__.py
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30535-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30535-01.htm
deleted file mode 100644
index 0275be69354411e3ee0fbef40b51bf0d8f7eff36..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30535-01.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Elder Filaur:<br>
-What am I to do? What if the shield is really destroyed? Arrgh! I can't even think about it!<br>
-Hmm, must stay calm.<br>
-If someone wanted to destroy the shield... Where would they go? Ah-Hah!! There is only one place I know of!<font color="LEVEL"> The deepest parts of the Mithril Mines</font>, where the Earth Worm was slain and its blood spilled! The shield is most vulnerable in places where evil is rampant. Could it be that those who seek to destroy the magic shield are led by the evil<font color="LEVEL"> Queen of the Succubus</font>? In fact I am quite sure of it!<br>
-You must leave at once and foil their evil plan! Please!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30535-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30535-02.htm
deleted file mode 100644
index 1a923fa23db2afc059c7f7a14eeb59d9e08d46bb..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30535-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Elder Filaur:<br>
-You fool! Why are you still here? Can you not even manage such an easy task on your own?<br>
-Well... I understand the burden of having the responsibility of saving the world on your shoulders... But if you want to prove your valor to Fighter Raldo, you must take care of this!<br>
-Go to the<font color="LEVEL"> deepest parts of the Mithril Mines</font> and put an end to the monsters that are attempting to destroy the shield! Leave at once!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30535-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30535-03.htm
deleted file mode 100644
index c00c1741321ef825a5e6b41d9f49aedc7c1839ff..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30535-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Eldar Filaur:<br>
-I thought Raldo would send me a skilled fighter. You are useless. You would not last one minute in battle.<font color="LEVEL"> Go and train yourself!</font>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-01.htm
deleted file mode 100644
index 60be31ec5cc7939f2cbac7bc8330550e97ac8579..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Kash:<br>
-You wish to earn the<font color="LEVEL"> Mark of the Challenger</font>? Of course, you already know that it is not an easy task, right? It is not something that can be taken lightly, especially by unskilled persons like yourself... Do not act so rashly, but think of your abilities...!<br>
-(This quest may only be performed by Warriors, Elven Knights, Palus Knights, Orc Marauders, or Orc Monks of level 35 or higher.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-02.htm
deleted file mode 100644
index f92873b315f685a1924f0eacc6a6d3eb4c3df92b..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-02.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Kash:<br>
-You say you are looking for the Mark of the Challenger? Hey, you! Are you sure you are not mistaken? That mark is not something that you would be able to possess.<br>
-(This quest may only be performed by Warriors, Elven Knights, Palus Knights, Orc Marauders, or Orc Monks of level 35 or higher.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-03.htm
deleted file mode 100644
index d6e7136a6fd6c80a7fcd0be1e4d732a93c4880ae..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-03.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Kash:<br>
-You wish to earn the<font color="LEVEL"> Mark of the Challenger</font>? Of course, you already know that it is not an easy task, right? Plus, I do not have the mark in my possession. Don't be impatient. I know where it is, though. If I tell you where it is... will you do something for me?<br>
-<a action="bypass -h Quest 211_TrialOfChallenger 30644_1">Ask what kind of adventure it is.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-05.htm
deleted file mode 100644
index f557f72681593f370e6590511da0f01c82fee0a9..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-05.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Kash:<br>
-Ha! You get points of courage, if nothink else! But I wouldn't advise that you hunt there all by yourself. Couragealnoe won't get you very far against a centuries-old Medusa, youngster! That thing must have learned a few tricks over the years, eh?<font color="LEVEL"> I think you'd best round up a group of your friends before trying your luck against the stone-looker.</font>
-Here, take this<font color="LEVEL"> Dimension Diamond</font> and hold on to it. 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_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-06.htm
deleted file mode 100644
index c360b91a31f2c4b4160f7406e44c6dcdaaae6ca9..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-06.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Kash:<br>
-It has lived off of many warriors in its hundreds of years of existence. I do not want to take you lightly, but I am sure that there are better Warriors than you that have ended up as the creature's lunch. By the way, I have received additional information that its cave is within the<font color="LEVEL"> cave near the waterfalls</font>. Bear that in mind.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-07.htm
deleted file mode 100644
index e2359de268f511cdafc0add7a40720926f05e3c5..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-07.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Kash:<br>
-You are true to your word. Yes, this is it! I am sure of it... He he, only one more to go... Ah, don't pay any attention to me. I am just talking to myself.<br>
-Yes,<font color="LEVEL"> the Mark of the Challenger</font>. I have entrusted it to<font color="LEVEL"> Martian</font>, a friend that lives in the<font color="LEVEL"> Giran Castle Town</font>. Go to him and ask him for it. I will write you an introduction, so show him my letter.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-08.htm
deleted file mode 100644
index 2bec8d3762088a5d11df4e98171f6a9fda2663c1..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-08.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Kash:<br>
-<font color="LEVEL">Martian</font>is a person of great influence within<font color="LEVEL"> Giran Castle Town</font>. So it is hard to meet him unless you have an introduction letter... Hmmph, acting all busy and all! 
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-09.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-09.htm
deleted file mode 100644
index e52d4c3676cd321b82392a71e46baad2a765d9e8..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-09.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Kash:<br>
-Hey, what a pleasant surprise to see you again. Nice to see that you are still alive. I see you have yet to complete the task assigned to you by Martian? Hey, don't frown. You know. Martian is the bad one, not I. I have never told a lie in my entire life. He he!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-01.htm
deleted file mode 100644
index c96f22e5bcbc0030a5ea51a373bcab7ef1e8f627..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-01.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Martian:<br>
-What , Kash? Bloody man... I guess I will have to thank you for reminding me of a person that I miss. Of course, I have the mark with me. But I can't simply give it to a person who is not even qualified... Do you mind if I test you?<br>
-<a action="bypass -h Quest 211_TrialOfChallenger 30645_1">Say you will take the trial.</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-02.htm
deleted file mode 100644
index 08a285fdb98522c339624fe45697e10b1a032d46..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-02.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body>Martien:<br>
-Let me see then, what would be appropriate...? Ah, yes!<br>
-There is<font color="LEVEL"> an evil creature attacking the villagers of Floran</font><br>
-in recent days.He has been called<font color="LEVEL"> 'Gorr'</font>.He lives in a<font color="LEVEL"> cave</font><br>
-and attacks innocent villagers at random.<br><br>
-Go and kills the evil creature. "The hero who saved a<br>
-village"... Doesn't this sound like someone who might<br>
-carry such a mark?
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-03.htm
deleted file mode 100644
index 0d5ec9425e9e7a53b7748a3279fb6f8682fc8172..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Martian:<br>
-Hmm, it takes longer than I had expected... Hey dude, even at this moment when you are taking a rest, the woman and children are trembling with fear. Some are even getting killed...<br>
-I repeat once more. That evil creature called<font color="LEVEL"> 'Gorr'</font> lives in a<font color="LEVEL"> cave near Floran</font></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-04.htm
deleted file mode 100644
index ecb7e9144bfa7da5be45805f5f13d5f75f7e4734..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Martian:<br>
-So, you have killed the Gorr? But just before, the villagers of Floran were attacked again by another evil creature.<br>
-This time the creature is called<font color="LEVEL"> 'Baraham'</font>. Perhaps he came to revenge the death of his fellow. Anyway,<font color="LEVEL"> how about searching the other caves near the 'Gorr's shelter?</font></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-05.htm
deleted file mode 100644
index b3eeadf858d3181e8c3a4a8b5abdc683cefdd7d3..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-05.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Martian:<br>
-Find the evil creature<font color="LEVEL"> 'Baraham'</font> and kill him for us. I suggest that you search the other caves near the one where 'Gorr' was found.<br>
-I won't push you for this. After all, you weren't qualified to receive the Mark of Challenger... That will remain as a fact.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-06a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-06a.htm
deleted file mode 100644
index e90938133a1a44d0250f8c3fbe1ad3d327354363..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-06a.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Martian:<br>
-Hikk...! D,d...did you meet Raldo? I,i...in case he asks about me, t,t...tell him that you have never seen me...! I beg you...!<br>
-<a action="bypass -h Quest 211_TrialOfChallenger 30645-06b.htm">Ask where you can meet Raldo</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-06b.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-06b.htm
deleted file mode 100644
index 0f45a8267c541beb5663761d7d34943726cbe83a..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-06b.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Martian:<br>
-D,don't know...! He is always wandering around everywhere...! He is the watcher of the magic field... I suppose you'll be able to meet him near the<font color="LEVEL"> Cave of 'Baraham'</font>, which you have killed ...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-01.htm
deleted file mode 100644
index 3ef32ee26a5883ed2eb5fd9df005e8a7ef24e495..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Raldo:<br>
-You rascal! Who provoked you to harm the guardians?<br>
- <a action="bypass -h Quest 211_TrialOfChallenger 30646_1">"I came to exterminate the magical creatures who are doing harm to the village people."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-02.htm
deleted file mode 100644
index b1ab04170baa6d5aef1163dd4e15f4ace8dbdc10..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-02.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Raldo:<br>
-What the hell are you talking about? I know everything that's going on in the town of Floran! Tell me the truth. Who sent you here?<br>
-<a action="bypass -h Quest 211_TrialOfChallenger 30646_2">Tell him about the Mark of Challenger and Martien</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-03.htm
deleted file mode 100644
index 5e1c0addc89a41ab757e45451760f5dc9d5f1191..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-03.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Raldo:<br>
-You fool! The two devils completely took advantage of you! They have no right to receive the Mark of Challenger. The only person who has the qualifications is me, Raldo!<br>
-You have some fault in the weakening of the magic field, so you are responsible for it also.<br>
-<a action="bypass -h Quest 211_TrialOfChallenger 30646_3">Say you will help</a><br>
-<a action="bypass -h Quest 211_TrialOfChallenger 30646_4">Say that it's none of my business.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-04.htm
deleted file mode 100644
index dc48cff6cdee5c5871853ff32c091e982e319f98..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Raldo:<br>
-Good! I shall go and look at the other magic fields, meanwhile you should to to the<font color="LEVEL"> Dwarven Village</font>. It is likely that it is their next destination.<br>
-Ask the<font color="LEVEL"> Elder Filaur</font> of the Dwarven Village about the location of the magic field. I suppose they sent the succubus flock to break down the magic field. Keep watching the place and when the evil creatures show up, kill them all! Perhaps this is the last chance! If the magic field is destroyed as well, 'the thing' will revive!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-06.htm
deleted file mode 100644
index 199b6ad912d7eb873f15089dcca512f068970c1d..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-06.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Raldo:<br>
-So that means that you'll give up the Mark of the Challenger... Damn you! I see! So you have no intention of going to the Dwarven Village to meet Elder Filaur, or to protect the last seal?
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-06a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-06a.htm
deleted file mode 100644
index 067e7e68488721e8df5bec2815187bb8d50316a4..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-06a.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Raldo:<br>
-What are you doing here? Set off for the<font color="LEVEL"> Dwarven Village</font> right now! Confirm the location of the magic field from<font color="LEVEL"> Elder Philar</font> and kill all the succubus so that they cannot destroy the magic field!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-07.htm
deleted file mode 100644
index f312bd771ebf7132eef941f540f78e0eac8bc467..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30646-07.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Raldo:<br>
-That chick is the leader, I think. Don't bother with the small fry,that's my motto! Oh, don't worry about my friends. They're off guarding other places, and honestly they'd dust the floor with you, anyway. But they, no hard feelings, right? You were a big help in protecting this place, and no one can say that Raldo doesn't know how to replay bravery when he sees it.<br>
-Here, take this! It's a gift for your efforts. In fact, it's the<font color="LEVEL"> Mark of the Challenger</font>, the one you were looking for. Well, enough talk -- I'd best get out there and slay them all before they get away. Excelsior!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/__init__.py
deleted file mode 100644
index 3f709cde5588a5cdfefc8ae14e7070a434365179..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/__init__.py
+++ /dev/null
@@ -1,215 +0,0 @@
-# Fix by Cromir for Kilah
-# Quest: Trial Of Challenger
-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 = "211_TrialOfChallenger"
-
-LETTER_OF_KASH = 2628
-SCROLL_OF_SHYSLASSY = 2631
-WATCHERS_EYE1 = 2629
-BROKEN_KEY = 2632
-MITHRIL_SCALE_GAITERS_MATERIAL = 2918
-BRIGANDINE_GAUNTLET_PATTERN = 2927
-MANTICOR_SKIN_GAITERS_PATTERN = 1943
-GAUNTLET_OF_REPOSE_OF_THE_SOUL_PATTERN = 1946
-IRON_BOOTS_DESIGN = 1940
-TOME_OF_BLOOD_PAGE = 2030
-ELVEN_NECKLACE_BEADS = 1904
-WHITE_TUNIC_PATTERN = 1936
-ADENA = 57
-MARK_OF_CHALLENGER = 2627
-WATCHERS_EYE2 = 2630
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
-     JQuest.__init__(self,id,name,descr)
-     self.questItemIds = [SCROLL_OF_SHYSLASSY, LETTER_OF_KASH, WATCHERS_EYE1, BROKEN_KEY, WATCHERS_EYE2]
-
- def onAdvEvent (self,event,npc, player) :
-    htmltext = event
-    st = player.getQuestState(qn)
-    if not st : return
-    if event == "1" :
-      htmltext = "30644-05.htm"
-      st.set("cond","1")
-      st.setState(State.STARTED)
-      st.playSound("ItemSound.quest_accept")
-    elif event == "30644_1" :
-          htmltext = "30644-04.htm"
-    elif event == "30645_1" :
-          htmltext = "30645-02.htm"
-          st.takeItems(LETTER_OF_KASH,1)
-          st.set("cond","4")
-          st.playSound("ItemSound.quest_middle")
-    elif event == "30647_1" :
-          if st.getQuestItemsCount(BROKEN_KEY) == 1 :
-             st.giveItems(SCROLL_OF_SHYSLASSY,1)
-             st.playSound("ItemSound.quest_middle")
-             if self.getRandom(10) < 2 :
-              htmltext = "30647-03.htm"
-              st.takeItems(BROKEN_KEY,1)
-              st.playSound("ItemSound.quest_jackpot")
-              n = self.getRandom(100)
-              if n > 90 :
-                 st.giveItems(MITHRIL_SCALE_GAITERS_MATERIAL,1)
-                 st.giveItems(BRIGANDINE_GAUNTLET_PATTERN,1)
-                 st.giveItems(MANTICOR_SKIN_GAITERS_PATTERN,1)
-                 st.giveItems(GAUNTLET_OF_REPOSE_OF_THE_SOUL_PATTERN,1)
-                 st.giveItems(IRON_BOOTS_DESIGN,1)
-                 st.playSound("ItemSound.quest_middle")
-              elif n > 70 :
-                 st.giveItems(TOME_OF_BLOOD_PAGE,1)
-                 st.giveItems(ELVEN_NECKLACE_BEADS,1)
-                 st.playSound("ItemSound.quest_middle")
-              elif n > 40 :
-                 st.giveItems(WHITE_TUNIC_PATTERN,1)
-                 st.playSound("ItemSound.quest_middle")
-              else:
-                 st.giveItems(IRON_BOOTS_DESIGN,1)
-                 st.playSound("ItemSound.quest_middle")
-             else:
-              htmltext = "30647-02.htm"
-              n = self.getRandom(1000)+1
-              st.takeItems(BROKEN_KEY,1)
-              st.giveItems(ADENA,n)
-              st.playSound("ItemSound.quest_middle")
-          else:
-            htmltext = "30647-04.htm"
-            st.takeItems(BROKEN_KEY,1)
-    elif event == "30646_1" :
-          htmltext = "30646-02.htm"
-    elif event == "30646_2" :
-          htmltext = "30646-03.htm"
-    elif event == "30646_3" :
-          htmltext = "30646-04.htm"
-          st.set("cond","8")
-          st.takeItems(WATCHERS_EYE2,1)
-    elif event == "30646_4" :
-          htmltext = "30646-06.htm"
-          st.set("cond","8")
-          st.takeItems(WATCHERS_EYE2,1)
-    return htmltext
-
-
- def onTalk (self,npc,player):
-   htmltext = Quest.getNoQuestMsg(player)
-   st = player.getQuestState(qn)
-   if not st : return htmltext
-   npcId = npc.getId()
-   id = st.getState()
-   if npcId != 30644 and id != State.STARTED : return htmltext
-   cond=st.getInt("cond")
-   if id == State.CREATED :
-     if npcId == 30644 :
-        if player.getClassId().ordinal() in [0x01,0x13,0x20,0x2d,0x2f] :
-           if player.getLevel() >= 35 :
-              htmltext = "30644-03.htm"
-           else :
-              htmltext = "30644-01.htm"
-              st.exitQuest(1)
-        else :
-           htmltext = "30644-02.htm"
-           st.exitQuest(1)
-   elif npcId == 30644 and id == State.COMPLETED :
-      htmltext = Quest.getAlreadyCompletedMsg(player)
-
-   elif npcId == 30644 and cond == 1 :
-      htmltext = "30644-06.htm"
-   elif npcId == 30644 and cond == 2 and st.getQuestItemsCount(SCROLL_OF_SHYSLASSY) == 1 :
-      htmltext = "30644-07.htm"
-      st.takeItems(SCROLL_OF_SHYSLASSY,1)
-      st.giveItems(LETTER_OF_KASH,1)
-      st.set("cond","3")
-      st.playSound("ItemSound.quest_middle")
-   elif npcId == 30644 and cond == 1 and st.getQuestItemsCount(LETTER_OF_KASH) == 1 :
-      htmltext = "30644-08.htm"
-   elif npcId == 30644 and cond >= 7 :
-      htmltext = "30644-09.htm"
-   elif npcId == 30645 and cond == 3 and st.getQuestItemsCount(LETTER_OF_KASH) == 1 :
-      htmltext = "30645-01.htm"
-   elif npcId == 30645 and cond == 4 and st.getQuestItemsCount(WATCHERS_EYE1) == 0 :
-      htmltext = "30645-03.htm"
-   elif npcId == 30645 and cond == 5 and st.getQuestItemsCount(WATCHERS_EYE1) :
-      htmltext = "30645-04.htm"
-      st.takeItems(WATCHERS_EYE1,1)
-      st.set("cond","6")
-      st.playSound("ItemSound.quest_middle")
-   elif npcId == 30645 and cond == 6 :
-      htmltext = "30645-05.htm"
-   elif npcId == 30645 and cond >= 7 :
-      htmltext = "30645-06.htm"
-   elif npcId == 30647 and cond == 2 :
-      htmltext = "30647-01.htm"
-   elif npcId == 30646 and cond == 7 and st.getQuestItemsCount(WATCHERS_EYE2) :
-      htmltext = "30646-01.htm"
-   elif npcId == 30646 and cond == 7 :
-      htmltext = "30646-06a.htm"
-   elif npcId == 30646 and cond == 10 :
-      st.takeItems(BROKEN_KEY,1)
-      st.addExpAndSp(1067606,69242)
-      st.giveItems(57,194556)
-      st.giveItems(7562,8)
-      st.giveItems(MARK_OF_CHALLENGER,1)
-      htmltext = "30646-07.htm"
-      st.exitQuest(False)
-      st.playSound("ItemSound.quest_finish")
-      st.set("cond","0")
-   elif npcId == 30535 and cond == 7 :
-      if player.getLevel() >= 35 :
-        htmltext = "30535-01.htm"
-        st.addRadar(176560,-184969,-3729);
-        st.set("cond","8")
-        st.playSound("ItemSound.quest_middle")
-      else:
-        htmltext = "30535-03.htm"
-   elif npcId == 30535 and cond == 8 :
-      htmltext = "30535-02.htm"
-      st.addRadar(176560,-184969,-3729);
-      st.set("cond","9")
-      st.playSound("ItemSound.quest_middle")
-   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()
-   if npcId == 27110 and cond == 1 and not st.getQuestItemsCount(BROKEN_KEY) :
-      st.giveItems(BROKEN_KEY,1)
-      st.addSpawn(30647,npc,True,0)
-      st.playSound("ItemSound.quest_middle")
-      st.set("cond","2")
-   elif npcId == 27112 and cond == 4 and not st.getQuestItemsCount(WATCHERS_EYE1) :
-      st.giveItems(WATCHERS_EYE1,1)
-      st.set("cond","5")
-      st.playSound("ItemSound.quest_middle")
-   elif npcId == 27113 and cond == 6 and not st.getQuestItemsCount(WATCHERS_EYE2) :
-      st.giveItems(WATCHERS_EYE2,1)
-      st.playSound("ItemSound.quest_middle")
-      st.set("cond","7")
-      st.addSpawn(30646,npc,0,300000)
-   elif npcId == 27114 and cond == 9 :
-      st.set("cond","10")
-      st.playSound("ItemSound.quest_middle")
-      st.addSpawn(30646,npc,0,300000)
-   return
-
-QUEST       = Quest(211,qn,"Trial Of Challenger")
-
-QUEST.addStartNpc(30644)
-
-QUEST.addTalkId(30535)
-QUEST.addTalkId(30644)
-QUEST.addTalkId(30645)
-QUEST.addTalkId(30646)
-QUEST.addTalkId(30647)
-
-QUEST.addKillId(27110)
-QUEST.addKillId(27112)
-QUEST.addKillId(27113)
-QUEST.addKillId(27114)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..82f6342a539e7677ff4c08c7491ab232b60e1f4d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-01.html
@@ -0,0 +1,5 @@
+<html><body>Elder Filaur:<br>
+Ah, it was you!<br>
+I have recently received reports that dark energies have been felt emanating from the <font color="LEVEL">Abandoned Coal Mine</font>. It's because you weakened the force field's power, isn't it?<br>
+The investigators I dispatched found the <font color="LEVEL">Succubus Queen</font> there. This monster must be the leader of group which tried to break the force field. You must stop them. Hurry!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..63f02b55043840bb60221bba8ee6ed62b970a413
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-02.html
@@ -0,0 +1,4 @@
+<html><body>Elder Filaur:<br>
+Fool! Why are you still here? Are you saying you cannot accomplish even such a simple thing without my help? How will you ever prove your bravery to Champion Raldo?<br>
+Go to the <font color="LEVEL">Abandoned Coal Mine</font> and there defeat the monsters trying to break the force field. Hurry!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..78f2b79ee9e88e47bac447759fbd160b47ed292b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-03.html
@@ -0,0 +1,3 @@
+<html><body>Elder Filaur:<br>
+I thought anyone Raldo sent would have excellent skills. You, however, are clearly incompetent. If you go there again, you will only die a useless death.<font color="LEVEL">Come back only after devoting yourself to improving your abilities!</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..95d2c56943f1abbfe5419fa09d9bbd8e60668fdd
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30535-04.html
@@ -0,0 +1,4 @@
+<html><body>Elder Filaur:<br>
+You there! <font color="LEVEL">Champion Raldo</font> is looking for you. He said he wants to give you some sort of "Mark of the Challenger" or somesuch.<br>
+He went to the <font color="LEVEL">Abandoned Mine</font> in case the Succubus Queen appears again. You should go there.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..7adb130e3c5f3c664e9ac89ba05479ffd8765eb2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-01.html
@@ -0,0 +1,4 @@
+<html><body>Kash:<br>
+You wish to earn the <font color="LEVEL">Mark of the Challenger</font>? You are certainly aware of the difficulty of this task... It is not to be taken lightly, especially by an unskilled person like yourself... You must realistically assess your abilities!<br>
+(This quest may only be performed by Warriors, Elven Knights, Palus Knights, Orc Raiders, or Monks of level 35 or higher.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..802192ce2f4ee7650df01f5c1e453f4cfb7ad539
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-02.html
@@ -0,0 +1,4 @@
+<html><body>Kash:<br>
+You seek the Mark of the Challenger? You must be mistaken. That mark is out of your league.<br>
+(This quest may only be performed by Warriors, Elven Knights, Palus Knights, Orc Raiders, or Monks of level 35 or higher.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-03.htm
new file mode 100644
index 0000000000000000000000000000000000000000..7657eb7860c68b954a5ca8bf03597f62c94eb4a6
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-03.htm
@@ -0,0 +1,4 @@
+<html><body>Kash:<br>
+You wish to earn the <font color="LEVEL">Mark of the Challenger</font>? You are certainly aware of the difficulty of this task... I don't have the mark, but I can tell you where it is... if you will you do something for me...<br>
+<a action="bypass -h Quest Q00211_TrialOfTheChallenger 30644-04.htm">Ask what kind of adventure it is.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-04.htm
similarity index 51%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-04.htm
index 014a00efac980fe2aba648b002af3c4c88582b91..ad620ba9c4de9b9c6b1096ac12615e51f21bbb4b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30644-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-04.htm
@@ -1,4 +1,4 @@
-<html><body>Kash:<br>
-Are you familiar with the Neutral Zone between the lands of the Elves and the Dark Elves?<font color="LEVEL"> Shyslyssys</font>, an ancient medusa, makes her home there. Of course, these stories always include an extraordinary amount of treasure. You must go to her cave and kill everyone there. You may keep all the treasure you find, all I ask is that you bring back any<font color="LEVEL"> old parchment</font> that is there. Will you accept?<br>
-<a action="bypass -h Quest 211_TrialOfChallenger 1">I accept.</a>
+<html><body>Kash:<br>
+Are you familiar with the Neutral Zone between the lands of the Elves and the Dark Elves? <font color="LEVEL">Shyslyssys</font>, an ancient medusa, makes her home there. Of course, these stories always include an extraordinary amount of treasure. You must go to her cave and kill everyone there. You may keep all the treasure you find, all I ask is that you bring back any <font color="LEVEL">old parchment</font> that is there. Will you accept?<br>
+<a action="bypass -h Quest Q00211_TrialOfTheChallenger 30644-06.htm">I accept.</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-05.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b3ba4f21470d50060051dd39a729b3aeee0afcd0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-05.htm
@@ -0,0 +1,3 @@
+<html><body>Kash:<br>
+Your bravery is impressive, my young friend, but you must not go alone. Not that I don't trust your abilities... But this is a medusa that has lived for hundreds of years! She must be guarding something important...<font color="LEVEL"> It would be best to gather some friends to go with you.</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-06.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0ef1a635d564e6195bdc7ec7b28f3ad5822e1547
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-06.htm
@@ -0,0 +1,4 @@
+<html><body>Kash:<br>
+Ha! You get points for courage, if nothing else! But I wouldn't advise that you hunt there all by yourself. Courage alone won't get you very far against a centuries-old Medusa, youngster! That thing must have learned a few tricks over the years, eh? <font color="LEVEL">I think you'd best round up a group of your friends before trying your luck against the stone-looker.</font><br>
+Here, take this <font color="LEVEL">Dimension Diamond</font> and hold on to it. 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_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..92c62014763e937b2b0bd158a8d2b0730ab0807b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-07.html
@@ -0,0 +1,3 @@
+<html><body>Kash:<br>
+The medusa has feasted on many warriors in its hundreds of years of existence. Not to dismiss your skills lightly, but better warriors than you have ended up as this creature's lunch. By the way, I have learned that it lives in the <font color="LEVEL">cave near the waterfalls</font>. 
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..43d8dc718ced787f21947f265a8683ee55776bd1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-08.html
@@ -0,0 +1,4 @@
+<html><body>Kash:<br>
+You are true to your word. Ha, only one more to go... Oh, don't pay any attention to me. I am just talking to myself.<br>
+Yes, <font color="LEVEL">the Mark of the Challenger</font>. I have entrusted it to <font color="LEVEL">Martien</font>, a friend living in <font color="LEVEL">the Town of Giran</font>. Take him this Letter of Introduction and he will give you the mark.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..5b8f5f3a880d5720d2241cce41f93a8066389eea
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-09.html
@@ -0,0 +1,3 @@
+<html><body>Kash:<br>
+<font color="LEVEL">Martien</font> is a very influential person in <font color="LEVEL">the Town of Giran</font>. It is hard to meet him without a Letter of Introduction! 
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-10.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-10.html
new file mode 100644
index 0000000000000000000000000000000000000000..206e164c607be64013bdcb17260f1646c3e14587
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30644-10.html
@@ -0,0 +1,3 @@
+<html><body>Kash:<br>
+What a nice surprise to see that you are still alive! You haven't yet performed the task Martien asked of you? Don't blame me, Martien is the villain here. Ha, I have never told a lie in my entire life!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..ca64d7bf17f60a312616acd7806076d3520e5df5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-01.html
@@ -0,0 +1,4 @@
+<html><body>Martien:<br>
+Yes, I have the mark, but it is not for sale. I could not risk giving it to someone who is not qualified... Would you mind taking a challenge?<br>
+<a action="bypass -h Quest Q00211_TrialOfTheChallenger 30645-02.html">Take the challenge</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..d54ebdf0505f9750bfeb2555294069586c0322b3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-02.html
@@ -0,0 +1,4 @@
+<html><body>Martien:<br>
+Let's see then, what would be appropriate...? Ah, yes! There is <font color="LEVEL">an evil creature attacking the villagers of Floran</font> in recent days. He has been called <font color="LEVEL">'Gorr'</font>. He lives in a <font color="LEVEL">cave near Floran</font> and attacks innocent villagers at random.<br>
+Go and kill this evil creature. "The hero who saved a village"... Doesn't this sound like someone who might carry such a mark?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..0326cfcd7f91b95dc9b25abc17dabda7912ffaa4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-03.html
@@ -0,0 +1,4 @@
+<html><body>Martien:<br>
+Hmmm, it must be more of a challenge for you than I thought it would be. Oh, well, while you're sitting here resting the monster is devouring a mother and her baby...<br>
+If you have any integrity at all you will get off your ass and go kill <font color="LEVEL">'Gorr'</font> now! Remember, he lives in a <font color="LEVEL">cave near Floran</font>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..bf52cfa3888edc0e667b7a8621522fffa67765b7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-04.html
@@ -0,0 +1,4 @@
+<html><body>Martien:<br>
+So, you have killed Gorr? Congratulations! Unfortunately, just now the villagers of Floran were attacked again by another evil creature.<br>
+This time the creature is called <font color="LEVEL">'Baraham'</font>. Perhaps he came to avenge the death of Gorr... Anyway, <font color="LEVEL">you should search the other caves near Gorr's shelter...</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..00fbf0910022cfe618d899f30992efe8594f9ea9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-05.html
@@ -0,0 +1,4 @@
+<html><body>Martien:<br>
+Please find the evil creature <font color="LEVEL">'Baraham'</font> and kill it! I suggest that you search the other caves nearby where Gorr was found.<br>
+I'll understand if you are not up to this task... After all, you weren't qualified to receive the Mark of Challenger... 
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-06.html
similarity index 72%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-06.html
index 2ccdfb75d15da37061468aa5414bfe7696874256..27cea8c907211a1056c5ea554bea218c93830744 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30645-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-06.html
@@ -1,5 +1,5 @@
-<html><body>Martian:<br>
-This man, Kash... I don't trust him... Who was it that said he was an idiot and that I'd easily be able to push him around? He is smarter than I thought!<br>
-All right, I admit it. I took advantage of you. I don't have the mark of the challenger... So what? You can't do anything.<br>
-<a action="bypass -h Quest 211_TrialOfChallenger 30645-06a.htm">Ask about Raldo</a>
+<html><body>Martien:<br>
+This man, Kash... I don't trust him... Who was it that said he was an idiot and that I'd easily be able to push him around? He is smarter than I thought!<br>
+All right, I admit it. I took advantage of you. I don't have the mark of the challenger... So what? You can't do anything.<br>
+<a action="bypass -h Quest Q00211_TrialOfTheChallenger 30645-07.html">Ask about Raldo</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..9c9d14dd2756820379f07e4bc3a0bd146c1b6488
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-07.html
@@ -0,0 +1,4 @@
+<html><body>Martien:<br>
+Hiccup!...! Duh,duh,...did you meet Raldo? In case huh, huh, he asks about muh, me, tuh, tuh...tell him that you have nuh, nuh, never seen me...! Puh, puh, please...!<br>
+<a action="bypass -h Quest Q00211_TrialOfTheChallenger 30645-08.html">Ask where to meet Raldo</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..39337a927fbdccc8bcbf1777b472065de9ead4fd
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-08.html
@@ -0,0 +1,3 @@
+<html><body>Martien:<br>
+I duh, duh, don't know...! He is always wandering around eh, eh, everywhere...! He is the watcher of the magic field... I think you can find huh, huh, him near the <font color="LEVEL">Cave of 'Baraham'</font>...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..e11b171249ec32e741ee8c23d07afc8d772eaa08
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30645-09.html
@@ -0,0 +1,4 @@
+<html><body>Martien:<br>
+Did you kill Baraham? Magnificent! You have fulfilled your task well. About that Mark of the Challenger...<br>
+<a action="bypass -h Quest Q00211_TrialOfTheChallenger 30645-08.html">Ask about Raldo</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..ab0af7a4d7c5646771334531eeb13b1720016439
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-01.html
@@ -0,0 +1,4 @@
+<html><body>Raldo:<br>
+You rascal! Why would you harm the guardians?<br>
+<a action="bypass -h Quest Q00211_TrialOfTheChallenger 30646-02.html">"I have come to kill the monsters threatening the villagers."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..97675378a970fe7feda2b2582ce02aec7c7aa5da
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-02.html
@@ -0,0 +1,4 @@
+<html><body>Raldo:<br>
+What the hell do you mean? I know everything that goes on in the town of Floran! Now confess! Who sent you here?<br>
+<a action="bypass -h Quest Q00211_TrialOfTheChallenger 30646-03.html">Tell him about the Mark of the Challenger and Martien</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..aa3d4e23b3056f05bbcdc5549ba54366aa360ce5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-03.html
@@ -0,0 +1,6 @@
+<html><body>Raldo:<br>
+You fool! You were completely bamboozled by those two devils! They have no right to the Mark of Challenger! I, Raldo, alone possess that right!<br>
+You bear the responsibility for weakening the magic field.<br>
+<a action="bypass -h Quest Q00211_TrialOfTheChallenger 30646-04.html">"I will help."</a><br>
+<a action="bypass -h Quest Q00211_TrialOfTheChallenger 30646-05.html">"It is none of my business."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..1237543c5b4a44c0410252d17d7cc5f7f8b80417
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-04.html
@@ -0,0 +1,4 @@
+<html><body>Raldo:<br>
+Good! I must examine the other magic fields, meanwhile you should to the <font color="LEVEL">Dwarven Village</font>. That is where the two devils most likely have gone.<br>
+Ask <font color="LEVEL">Filaur of the Gray Pillar</font> of the Dwarven Village for the location of the magic field. They have probably sent a flock of succubus to drain it. Guard the field and when the evil creatures show up, kill them all! This is probably the last chance! If the magic field is destroyed 'the thing' will revive!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..3e2aa03b62156751473574711de79812fa50cb3b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-05.html
@@ -0,0 +1,3 @@
+<html><body>Raldo:<br>
+So you would abandon the Mark of the Challenger... Damn you! Your true nature emerges! Naturally you have no intention of going to the Dwarven Village to meet Filaur of the Gray Pillar, or to protect the last seal?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..e3027f11ebb732bc398ca57fbada8150e7774a75
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-06.html
@@ -0,0 +1,3 @@
+<html><body>Raldo:<br>
+Why are you still here? You must leave for the <font color="LEVEL">Dwarven Village</font> right away! Find the location of the magic field with the help of <font color="LEVEL">Elder Philar</font> and then kill all the succubus so that they cannot destroy it!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..4beb4bc559a05af18bc2f55ff8f7ac0de9920fe1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30646-07.html
@@ -0,0 +1,4 @@
+<html><body>Champion Raldo:<br>
+That chick is the leader, I think. Don't bother with the small fry, that's my motto! Oh, don't worry about my friends. They're off guarding other places, and honestly they'd dust the floor with you, anyway. But hey, no hard feelings, right? You were a big help in protecting this place, and no one can say that Champion Raldo doesn't know how to repay bravery when he sees it.<br>
+Here, take this! It's a gift for your efforts. In fact, it's the <font color="LEVEL">Mark of Challenger</font>, the one you were looking for. Well, enough talk -- I'd best get out there and slay them all before they get away. Excelsior!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-01.html
similarity index 51%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-01.html
index 1fa640d06ab141bc96004d516c2634bc55f79788..df22c7e66817aac7a631eba5a6e8877cf108610a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-01.html
@@ -1,4 +1,4 @@
-<html><body>Chest of Shyslassys:<br>
-There is a keyhole in the middle of the chest.<br>
-<a action="bypass -h Quest 211_TrialOfChallenger 30647_1">Will you use the key?</a>
+<html><body>Chest of Shyslassys:<br>
+There is a keyhole in the middle of the chest.<br>
+<a action="bypass -h Quest Q00211_TrialOfTheChallenger 30647-02.html">Will you use the key?</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-02.html
similarity index 97%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-02.html
index 695c640ea452817734113376c922d14d2f0bf8b9..87b6ca696b1ef76b8957e9b1ec9848189bfa3629 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-02.html
@@ -1,3 +1,3 @@
-<html><body>Chest of Shyslassys:<br>
-The gold is inside the chest.
+<html><body>Chest of Shyslassys:<br>
+The gold is inside the chest.
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-03.html
similarity index 98%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-03.html
index 9ba07d639dc1fd5c8246cd8c1638b2ca6c9fd13c..07a07f1efab5a6515dd3596821cc6a7e19cfc6c4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-03.html
@@ -1,3 +1,3 @@
-<html><body>Chest of Shyslassys:<br>
-There are glittering materials inside the box.
+<html><body>Chest of Shyslassys:<br>
+There are glittering materials inside the box.
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-04.html
similarity index 98%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-04.html
index de5951c6f040b6971b2b1b550c191e3ec2fca69d..7b9224fdaefec2d029cc7b9765fd77f3e1d040a0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/30647-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/30647-04.html
@@ -1,3 +1,3 @@
-<html><body>Chest of Shyslassys:<br>
-You cannot open the chest if you do not have the correct key!
+<html><body>Chest of Shyslassys:<br>
+You cannot open the chest if you do not have the correct key!
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
new file mode 100644
index 0000000000000000000000000000000000000000..f878b10104bdac53c2af1dbfdcd200ea2a753a2a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00211_TrialOfTheChallenger/Q00211_TrialOfTheChallenger.java
@@ -0,0 +1,446 @@
+/*
+ * 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.Q00211_TrialOfTheChallenger;
+
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.enums.CategoryType;
+import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.variables.PlayerVariables;
+import com.l2jserver.gameserver.network.serverpackets.RadarControl;
+import com.l2jserver.gameserver.network.serverpackets.SocialAction;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Trial of the Challenger (211)
+ * @author Pandragon
+ */
+public final class Q00211_TrialOfTheChallenger extends Quest
+{
+	// NPCs
+	private static final int FILAUR = 30535;
+	private static final int KASH = 30644;
+	private static final int MARTIAN = 30645;
+	private static final int RALDO = 30646;
+	private static final int CHEST_OF_SHYSLASSYS = 30647;
+	private static final int MARKETEER_OF_MAMMON = 31092;
+	// Items
+	private static final int LETTER_OF_KASH = 2628;
+	private static final int WATCHERS_EYE1 = 2629;
+	private static final int WATCHERS_EYE2 = 2630;
+	private static final int SCROLL_OF_SHYSLASSYS = 2631;
+	private static final int BROKEN_KEY = 2632;
+	// Monsters
+	private static final int SHYSLASSYS = 27110;
+	private static final int GORR = 27112;
+	private static final int BARAHAM = 27113;
+	private static final int QUEEN_OF_SUCCUBUS = 27114;
+	// Rewards
+	private static final int ELVEN_NECKLACE_BEADS = 1904;
+	private static final int WHITE_TUNIC_PATTERN = 1936;
+	private static final int IRON_BOOTS_DESIGN = 1940;
+	private static final int MANTICOR_SKIN_GAITERS_PATTERN = 1943;
+	private static final int GAUNTLET_OF_REPOSE_PATTERN = 1946;
+	private static final int MITHRIL_SCALE_GAITERS_MATERIAL = 2918;
+	private static final int BRIGAMDINE_GAUNTLET_PATTERN = 2927;
+	private static final int TOME_OF_BLOOD_PAGE = 2030;
+	private static final int MARK_OF_CHALLENGER = 2627;
+	private static final ItemHolder DIMENSIONAL_DIAMONDS = new ItemHolder(7562, 61);
+	// Misc
+	private static final int MIN_LVL = 35;
+	
+	public Q00211_TrialOfTheChallenger()
+	{
+		super(211, Q00211_TrialOfTheChallenger.class.getSimpleName(), "Trial of the Challenger");
+		addStartNpc(KASH);
+		addTalkId(FILAUR, KASH, MARTIAN, RALDO, CHEST_OF_SHYSLASSYS, MARKETEER_OF_MAMMON);
+		addKillId(SHYSLASSYS, GORR, BARAHAM, QUEEN_OF_SUCCUBUS);
+		registerQuestItems(LETTER_OF_KASH, WATCHERS_EYE1, WATCHERS_EYE2, SCROLL_OF_SHYSLASSYS, BROKEN_KEY);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		String htmltext = null;
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		switch (event)
+		{
+			case "30644-04.htm":
+			{
+				htmltext = event;
+				break;
+			}
+			case "30645-07.html":
+			case "30645-08.html":
+			case "30646-02.html":
+			case "30646-03.html":
+			{
+				if (qs.isStarted())
+				{
+					htmltext = event;
+				}
+				break;
+			}
+			case "30644-06.htm":
+			{
+				if (qs.isCreated())
+				{
+					final PlayerVariables vars = player.getVariables();
+					if (!vars.getBoolean("2ND_CLASS_DIAMOND_REWARD", false))
+					{
+						giveItems(player, DIMENSIONAL_DIAMONDS);
+						vars.set("2ND_CLASS_DIAMOND_REWARD", true);
+						htmltext = event;
+					}
+					else
+					{
+						htmltext = "30644-05.htm";
+					}
+					qs.startQuest();
+				}
+				break;
+			}
+			case "30647-02.html":
+			{
+				if (qs.isCond(2) && hasQuestItems(player, BROKEN_KEY))
+				{
+					takeItems(player, BROKEN_KEY, -1);
+					if (getRandom(10) < 2)
+					{
+						playSound(player, QuestSound.ITEMSOUND_QUEST_JACKPOT);
+						final int random = getRandom(100);
+						if (random > 90)
+						{
+							rewardItems(player, MITHRIL_SCALE_GAITERS_MATERIAL, 1);
+							rewardItems(player, BRIGAMDINE_GAUNTLET_PATTERN, 1);
+							rewardItems(player, MANTICOR_SKIN_GAITERS_PATTERN, 1);
+							rewardItems(player, GAUNTLET_OF_REPOSE_PATTERN, 1);
+							rewardItems(player, IRON_BOOTS_DESIGN, 1);
+						}
+						else if (random > 70)
+						{
+							rewardItems(player, TOME_OF_BLOOD_PAGE, 1);
+							rewardItems(player, ELVEN_NECKLACE_BEADS, 1);
+						}
+						else if (random > 40)
+						{
+							rewardItems(player, WHITE_TUNIC_PATTERN, 1);
+						}
+						else
+						{
+							rewardItems(player, IRON_BOOTS_DESIGN, 1);
+						}
+						htmltext = "30647-03.html";
+					}
+					else
+					{
+						giveAdena(player, getRandom(1000) + 1, true);
+						htmltext = event;
+					}
+				}
+				else
+				{
+					htmltext = "30647-04.html";
+				}
+				break;
+			}
+			case "30645-02.html":
+			{
+				if (qs.isCond(3) && hasQuestItems(player, LETTER_OF_KASH))
+				{
+					qs.setCond(4, true);
+					htmltext = event;
+				}
+				break;
+			}
+			case "30646-04.html":
+			case "30646-05.html":
+			{
+				if (qs.isCond(7) && hasQuestItems(player, WATCHERS_EYE2))
+				{
+					takeItems(player, WATCHERS_EYE2, -1);
+					qs.setCond(8, true);
+					htmltext = event;
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onTalk(L2Npc npc, L2PcInstance talker)
+	{
+		final QuestState qs = getQuestState(talker, true);
+		String htmltext = getNoQuestMsg(talker);
+		switch (npc.getId())
+		{
+			case KASH:
+			{
+				if (qs.isCreated())
+				{
+					if (!talker.isInCategory(CategoryType.WARRIOR_GROUP))
+					{
+						htmltext = "30644-02.html";
+					}
+					else if (talker.getLevel() < MIN_LVL)
+					{
+						htmltext = "30644-01.html";
+					}
+					else
+					{
+						htmltext = "30644-03.htm";
+					}
+				}
+				else if (qs.isStarted())
+				{
+					switch (qs.getCond())
+					{
+						case 1:
+						{
+							htmltext = "30644-07.html";
+							break;
+						}
+						case 2:
+						{
+							if (hasQuestItems(talker, SCROLL_OF_SHYSLASSYS))
+							{
+								takeItems(talker, SCROLL_OF_SHYSLASSYS, -1);
+								giveItems(talker, LETTER_OF_KASH, 1);
+								qs.setCond(3, true);
+								htmltext = "30644-08.html";
+							}
+							break;
+						}
+						case 3:
+						{
+							if (hasQuestItems(talker, LETTER_OF_KASH))
+							{
+								htmltext = "30644-09.html";
+							}
+							break;
+						}
+						case 8:
+						case 9:
+						case 10:
+						{
+							htmltext = "30644-10.html";
+							break;
+						}
+					}
+				}
+				else if (qs.isCompleted())
+				{
+					htmltext = getAlreadyCompletedMsg(talker);
+				}
+				break;
+			}
+			case MARTIAN:
+			{
+				switch (qs.getCond())
+				{
+					case 3:
+					{
+						if (hasQuestItems(talker, LETTER_OF_KASH))
+						{
+							htmltext = "30645-01.html";
+						}
+						break;
+					}
+					case 4:
+					{
+						htmltext = "30645-03.html";
+						break;
+					}
+					case 5:
+					{
+						if (hasQuestItems(talker, WATCHERS_EYE1))
+						{
+							takeItems(talker, WATCHERS_EYE1, -1);
+							qs.setCond(6, true);
+							htmltext = "30645-04.html";
+						}
+						break;
+					}
+					case 6:
+					{
+						htmltext = "30645-05.html";
+						break;
+					}
+					case 7:
+					{
+						htmltext = "30645-06.html";
+						break;
+					}
+					case 8:
+					case 9:
+					{
+						htmltext = "30645-09.html";
+						break;
+					}
+				}
+				break;
+			}
+			case CHEST_OF_SHYSLASSYS:
+			{
+				if (qs.isStarted())
+				{
+					htmltext = "30647-01.html";
+				}
+				break;
+			}
+			case RALDO:
+			{
+				switch (qs.getCond())
+				{
+					case 7:
+					{
+						if (hasQuestItems(talker, WATCHERS_EYE2))
+						{
+							htmltext = "30646-01.html";
+						}
+						break;
+					}
+					case 8:
+					{
+						htmltext = "30646-06.html";
+						break;
+					}
+					case 10:
+					{
+						addExpAndSp(talker, 1067606, 69242);
+						giveAdena(talker, 194556, true);
+						giveItems(talker, MARK_OF_CHALLENGER, 1);
+						
+						// redundant retail check - already rewarded at beginning of quest
+						final PlayerVariables vars = talker.getVariables();
+						if (!vars.getBoolean("2ND_CLASS_DIAMOND_REWARD", false))
+						{
+							giveItems(talker, DIMENSIONAL_DIAMONDS);
+							vars.set("2ND_CLASS_DIAMOND_REWARD", true);
+						}
+						
+						talker.sendPacket(new SocialAction(talker.getObjectId(), 3));
+						qs.exitQuest(false, true);
+						htmltext = "30646-07.html";
+						break;
+					}
+				}
+				break;
+			}
+			case FILAUR:
+			{
+				switch (qs.getCond())
+				{
+					case 8:
+					{
+						htmltext = "30535-01.html";
+						qs.setCond(9, true);
+						break;
+					}
+					case 9:
+					{
+						talker.sendPacket(new RadarControl(0, 2, 151589, -174823, -1776));
+						htmltext = "30535-02.html";
+						break;
+					}
+					case 10:
+					{
+						htmltext = "30535-03.html";
+						break;
+					}
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+	{
+		final QuestState qs = getQuestState(killer, false);
+		if ((qs == null) || !Util.checkIfInRange(1500, npc, killer, true))
+		{
+			return super.onKill(npc, killer, isSummon);
+		}
+		
+		switch (npc.getId())
+		{
+			case SHYSLASSYS:
+			{
+				if (qs.isCond(1))
+				{
+					if (SpawnTable.getInstance().getSpawns(npc.getId()).size() < 10)
+					{
+						addSpawn(CHEST_OF_SHYSLASSYS, npc, false, 200000);
+					}
+					giveItems(killer, SCROLL_OF_SHYSLASSYS, 1);
+					giveItems(killer, BROKEN_KEY, 1);
+					qs.setCond(2, true);
+				}
+				break;
+			}
+			case GORR:
+			{
+				if (qs.isCond(4))
+				{
+					giveItems(killer, WATCHERS_EYE1, 1);
+					qs.setCond(5, true);
+				}
+				break;
+			}
+			case BARAHAM:
+			{
+				if (qs.isCond(6))
+				{
+					if (SpawnTable.getInstance().getSpawns(npc.getId()).size() < 10)
+					{
+						addSpawn(RALDO, npc, false, 100000);
+					}
+					giveItems(killer, WATCHERS_EYE2, 1);
+					qs.setCond(7, true);
+				}
+				break;
+			}
+			case QUEEN_OF_SUCCUBUS:
+			{
+				if (qs.isCond(9))
+				{
+					if (SpawnTable.getInstance().getSpawns(npc.getId()).size() < 10)
+					{
+						addSpawn(RALDO, npc, false, 100000);
+					}
+					qs.setCond(10, true);
+				}
+				break;
+			}
+		}
+		return super.onKill(npc, killer, isSummon);
+	}
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/QuestMasterHandler.java
index 9ccd6dd52a6353410b73189a593902f2d6bd0c5b..06c400989a9bbe69c2309359acff94e6652d1abc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -149,6 +149,7 @@ import quests.Q00195_SevenSignsSecretRitualOfThePriests.Q00195_SevenSignsSecretR
 import quests.Q00196_SevenSignsSealOfTheEmperor.Q00196_SevenSignsSealOfTheEmperor;
 import quests.Q00197_SevenSignsTheSacredBookOfSeal.Q00197_SevenSignsTheSacredBookOfSeal;
 import quests.Q00198_SevenSignsEmbryo.Q00198_SevenSignsEmbryo;
+import quests.Q00211_TrialOfTheChallenger.Q00211_TrialOfTheChallenger;
 import quests.Q00212_TrialOfDuty.Q00212_TrialOfDuty;
 import quests.Q00235_MimirsElixir.Q00235_MimirsElixir;
 import quests.Q00237_WindsOfChange.Q00237_WindsOfChange;
@@ -512,6 +513,7 @@ public class QuestMasterHandler
 		Q00196_SevenSignsSealOfTheEmperor.class,
 		Q00197_SevenSignsTheSacredBookOfSeal.class,
 		Q00198_SevenSignsEmbryo.class,
+		Q00211_TrialOfTheChallenger.class,
 		Q00212_TrialOfDuty.class,
 		Q00235_MimirsElixir.class,
 		Q00237_WindsOfChange.class,
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20140613update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20140613update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..05c2690350ad7c6ceaf171f8f70234be1df5f8fb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20140613update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='Q00211_TrialOfTheChallenger' WHERE name='211_TrialOfChallenger';
\ No newline at end of file