From 403db933bcfb57a79c058e919ced269736172697 Mon Sep 17 00:00:00 2001
From: ivantotov <gmtotov@gmail.com>
Date: Fri, 5 Dec 2014 21:40:46 +0200
Subject: [PATCH] Quest: Test Of The War Spirit (233) Reviewed by: @Zoey76
---
L2J_DataPack/dist/game/data/scripts.cfg | 1 -
.../quests/233_TestOfWarspirit/30030-01.htm | 4 -
.../quests/233_TestOfWarspirit/30030-02.htm | 5 -
.../quests/233_TestOfWarspirit/30030-03.htm | 6 -
.../quests/233_TestOfWarspirit/30030-07.htm | 3 -
.../quests/233_TestOfWarspirit/30436-03.htm | 3 -
.../quests/233_TestOfWarspirit/30507-01.htm | 7 -
.../quests/233_TestOfWarspirit/30507-03.htm | 3 -
.../quests/233_TestOfWarspirit/30507-04.htm | 3 -
.../quests/233_TestOfWarspirit/30507-06.htm | 4 -
.../quests/233_TestOfWarspirit/30507-07.htm | 3 -
.../quests/233_TestOfWarspirit/30510-01.htm | 4 -
.../quests/233_TestOfWarspirit/30510-05.htm | 9 -
.../quests/233_TestOfWarspirit/30510-06.htm | 8 -
.../quests/233_TestOfWarspirit/30510-10.htm | 4 -
.../quests/233_TestOfWarspirit/30515-01.htm | 7 -
.../quests/233_TestOfWarspirit/30515-02.htm | 5 -
.../quests/233_TestOfWarspirit/30515-04.htm | 5 -
.../quests/233_TestOfWarspirit/30630-01.htm | 4 -
.../quests/233_TestOfWarspirit/30630-02.htm | 6 -
.../quests/233_TestOfWarspirit/30630-03.htm | 5 -
.../quests/233_TestOfWarspirit/30630-07.htm | 3 -
.../quests/233_TestOfWarspirit/30649-01.htm | 11 -
.../quests/233_TestOfWarspirit/30649-03.htm | 10 -
.../quests/233_TestOfWarspirit/30682-01.htm | 5 -
.../quests/233_TestOfWarspirit/30682-04.htm | 4 -
.../quests/233_TestOfWarspirit/30682-05.htm | 3 -
.../quests/233_TestOfWarspirit/__init__.py | 396 -----------
.../Q00233_TestOfTheWarSpirit/30030-01.html | 4 +
.../Q00233_TestOfTheWarSpirit/30030-02.html | 5 +
.../Q00233_TestOfTheWarSpirit/30030-03.html | 6 +
.../30030-04.html} | 2 +-
.../30030-05.html} | 2 +-
.../30030-06.html} | 0
.../Q00233_TestOfTheWarSpirit/30030-07.html | 3 +
.../30436-01.html} | 2 +-
.../30436-02.html} | 4 +-
.../Q00233_TestOfTheWarSpirit/30436-03.html | 3 +
.../Q00233_TestOfTheWarSpirit/30507-01.html | 6 +
.../30507-02.html} | 4 +-
.../Q00233_TestOfTheWarSpirit/30507-03.html | 3 +
.../Q00233_TestOfTheWarSpirit/30507-04.html | 3 +
.../30507-05.html} | 0
.../Q00233_TestOfTheWarSpirit/30507-06.html | 4 +
.../Q00233_TestOfTheWarSpirit/30507-07.html | 3 +
.../Q00233_TestOfTheWarSpirit/30510-01.html | 4 +
.../30510-02.html} | 3 +-
.../30510-03.html} | 0
.../30510-04.htm | 2 +-
.../Q00233_TestOfTheWarSpirit/30510-05.htm | 9 +
.../Q00233_TestOfTheWarSpirit/30510-05.html | 9 +
.../30510-05a.html} | 4 +-
.../30510-05b.html} | 4 +-
.../30510-05c.html} | 4 +-
.../30510-05d.html} | 8 +-
.../Q00233_TestOfTheWarSpirit/30510-05e.htm | 10 +
.../Q00233_TestOfTheWarSpirit/30510-06.html | 8 +
.../30510-07.html} | 2 +-
.../30510-08.html} | 0
.../30510-09.html} | 4 +-
.../Q00233_TestOfTheWarSpirit/30510-10.html | 4 +
.../Q00233_TestOfTheWarSpirit/30515-01.html | 6 +
.../Q00233_TestOfTheWarSpirit/30515-02.html | 5 +
.../30515-03.html} | 2 +-
.../Q00233_TestOfTheWarSpirit/30515-04.html | 5 +
.../30515-05.html} | 0
.../Q00233_TestOfTheWarSpirit/30630-01.html | 4 +
.../Q00233_TestOfTheWarSpirit/30630-02.html | 7 +
.../Q00233_TestOfTheWarSpirit/30630-03.html | 5 +
.../30630-04.html} | 4 +-
.../30630-05.html} | 2 +-
.../30630-06.html} | 2 +-
.../Q00233_TestOfTheWarSpirit/30630-07.html | 3 +
.../Q00233_TestOfTheWarSpirit/30649-01.html | 7 +
.../30649-02.html} | 2 +-
.../Q00233_TestOfTheWarSpirit/30649-03.html | 10 +
.../Q00233_TestOfTheWarSpirit/30682-01.html | 5 +
.../30682-02.html} | 4 +-
.../30682-03.html} | 2 +-
.../Q00233_TestOfTheWarSpirit/30682-04.html | 4 +
.../Q00233_TestOfTheWarSpirit/30682-05.html | 3 +
.../Q00233_TestOfTheWarSpirit.java | 642 ++++++++++++++++++
.../scripts/quests/QuestMasterHandler.java | 2 +
.../dist/sql/game/updates/20141205update.sql | 3 +-
84 files changed, 825 insertions(+), 564 deletions(-)
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-07.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30436-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-06.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-07.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-06.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-10.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-07.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30649-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30649-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-05.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/__init__.py
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-03.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30030-04.htm => Q00233_TestOfTheWarSpirit/30030-04.html} (59%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30030-05.htm => Q00233_TestOfTheWarSpirit/30030-05.html} (50%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30030-06.htm => Q00233_TestOfTheWarSpirit/30030-06.html} (100%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-07.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30436-01.htm => Q00233_TestOfTheWarSpirit/30436-01.html} (96%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30436-02.htm => Q00233_TestOfTheWarSpirit/30436-02.html} (79%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30436-03.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-01.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30507-02.htm => Q00233_TestOfTheWarSpirit/30507-02.html} (78%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-03.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-04.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30507-05.htm => Q00233_TestOfTheWarSpirit/30507-05.html} (100%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-06.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-07.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-01.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30510-02.htm => Q00233_TestOfTheWarSpirit/30510-02.html} (54%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30510-03.htm => Q00233_TestOfTheWarSpirit/30510-03.html} (100%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit => Q00233_TestOfTheWarSpirit}/30510-04.htm (84%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30510-05a.htm => Q00233_TestOfTheWarSpirit/30510-05a.html} (86%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30510-05b.htm => Q00233_TestOfTheWarSpirit/30510-05b.html} (80%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30510-05c.htm => Q00233_TestOfTheWarSpirit/30510-05c.html} (81%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30510-05d.htm => Q00233_TestOfTheWarSpirit/30510-05d.html} (68%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05e.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-06.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30510-07.htm => Q00233_TestOfTheWarSpirit/30510-07.html} (90%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30510-08.htm => Q00233_TestOfTheWarSpirit/30510-08.html} (100%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30510-09.htm => Q00233_TestOfTheWarSpirit/30510-09.html} (68%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-10.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-02.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30515-03.htm => Q00233_TestOfTheWarSpirit/30515-03.html} (78%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-04.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30515-05.htm => Q00233_TestOfTheWarSpirit/30515-05.html} (100%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-03.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30630-04.htm => Q00233_TestOfTheWarSpirit/30630-04.html} (59%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30630-05.htm => Q00233_TestOfTheWarSpirit/30630-05.html} (81%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30630-06.htm => Q00233_TestOfTheWarSpirit/30630-06.html} (77%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-07.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30649-01.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30649-02.htm => Q00233_TestOfTheWarSpirit/30649-02.html} (67%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30649-03.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-01.html
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30682-02.htm => Q00233_TestOfTheWarSpirit/30682-02.html} (66%)
rename L2J_DataPack/dist/game/data/scripts/quests/{233_TestOfWarspirit/30682-03.htm => Q00233_TestOfTheWarSpirit/30682-03.html} (75%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-04.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-05.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
diff --git a/L2J_DataPack/dist/game/data/scripts.cfg b/L2J_DataPack/dist/game/data/scripts.cfg
index 35d053fb5c..c6e8a89563 100644
--- a/L2J_DataPack/dist/game/data/scripts.cfg
+++ b/L2J_DataPack/dist/game/data/scripts.cfg
@@ -219,7 +219,6 @@ quests/184_Nikolas_Cooperation_Contract/__init__.py
quests/185_Nikolas_Cooperation_Consideration/__init__.py
quests/227_TestOfReformer/__init__.py
quests/230_TestOfSummoner/__init__.py
-quests/233_TestOfWarspirit/__init__.py
quests/234_FatesWhisper/__init__.py
quests/236_SeedsOfChaos/__init__.py
quests/255_Tutorial/__init__.py
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-01.htm
deleted file mode 100644
index cbab281515..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Priestess Vivyan:<br>
-Oh my... What has an Orc Shaman to do with me? You just name it! I will help you in every way!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30030_1">Ask about Kiruna the Brave</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-02.htm
deleted file mode 100644
index 8017dd00de..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Priestess Vivyan:<br>
-Ah! You mean Commander Kiruna. The only Commander in the Orc Kingdom. She who fell in love with Paladin Gelhaas... The love story of Gelhaas and Kiruna is written in the history of the shrine, and I liked it so much that I read it several times.<br>
-Ah! Don't give me that scary look! I bet you Orcs don't like to hear that an Orc fell in love with a Human being. I am so sorry... but, but... Their story... it is so romantic...<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30030_2">Ask about Kiruna's death</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-03.htm
deleted file mode 100644
index ab81f2e73a..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-03.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Priestess Vivyan:<br>
-Kiruna and Gelhaas were 2 Warriors who fought bravely against the army of the devil, Beleth. Their army won every battle, but then one day, Gelhaas was killed by the evil spirits of Beleth. Imagine Kiruna's sorrow when she heard the news that her lover was killed. A few days after the incident took place, it is said that she went to the battlefield with her lips tightly sealed and won a great victory over the army of Beleth.<br>
-But unfortunately, in the final battle Kiruna was wounded deeply. She was removed to the shrine for remedy, but in the end she died and was buried beside Gelhaas. Some say that she refused to be treated herself...<br>
-Sometimes, the feelings which you call as a sign of weak-mindedness, can be the source of powerfulness. Can't you see...?<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30030_3">Ask the whereabouts of Kiruna's Remains</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-07.htm
deleted file mode 100644
index 94f499acb7..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-07.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Priestess Vivyan:<br>
-You have found every piece of Kiruna's Remains in that extensive Wastelands? That is awesome! I am really surprised! How devoted you Orcs are in respecting your ancestors!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30436-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30436-03.htm
deleted file mode 100644
index 55ff7122ec..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30436-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Trader Sarien:<br>
-You finally found out what you wanted from the Ant's Nest. I really appreciate the guts you Orcs have. You'll be successful in business if you could apply the same patience and efforts in it.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-01.htm
deleted file mode 100644
index f0afc5d5bc..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-01.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>Seer Racoy:<br>
-Young shaman, have you come to find the remains of Kiruna? Then first listen! The story of the legendary Warrior, Kiruna the brave!<br>
-Once in the past, there was a time when the supreme commander of the national army asked for our support during a tough battle with devil Beleth. So the crack contingent of Urutu with Kiruna as its leader, set off to the battlefields. Kiruna and her soldiers fought bravely against the numerous undead and firmly maintained in the front line, defending againt the evil Black magic.<br>
-But when the Death Knight Mordreous showed up in the battlefield, all the soliders got frightened and started to retreat from their lines. How could an Orc Warrior possibly back off! It's all because of Beleth's magic.<br>
-However, Kiruna knew no fear. She sang out the hymns of victory and killed hundreds of undead until the last one, the death Knight Mordreous!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30507_1">Ask about Kiruna's death</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-03.htm
deleted file mode 100644
index 0fc150796a..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Seer Racoy:<br>
-What are you waiting for? Ask Kiruna at the Temple of Einhasad of this village.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-04.htm
deleted file mode 100644
index e7534f125d..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Seer Racoy:<br>
-The place where Kiruna is buried is the Wastelands of Gludio? I wonder if I will be able to find the traces of an ancient heroine in such a deserted area...! Don't give up yet, young shaman. As long as the graces of our forefathers are with us, I am sure you'll be able to find it.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-06.htm
deleted file mode 100644
index 6098499b81..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-06.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Seer Racoy:<br>
-What a pity! Our great ancestor's body has been ripped into pieces by some mere ants! I cannot bring anymore shame to the remains of the dead! Give me the bones of Kiruna. I , Seer Racoy, shall shroud the dead body into a decent shape according to our funeral traditions.<br>
-...now, young shaman, take these bones with solemnity. Have courtesy while carrying it. Always remember, no matter what road you shall take in the future. The fighting sprits of the great heroine! The glory of our forefathers who fought for our tribe!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-07.htm
deleted file mode 100644
index 5cd238fb48..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-07.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Seer Racoy:<br>
-Young shaman, I see that you haven't yet completed the Test of War Spirit. But there is no need to be anxious. I am quite sure. That before long, you shall become one of the greatest Warcryer who praise highest the glory of Paagrio!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-01.htm
deleted file mode 100644
index bd79260005..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Seer Somak:<br>
-Thou, who has no ties to the blood of flames! What brought you here! Did you come to steal the secrets of Orc magic in dealing with the spirits? Go back now, before I summon the war spirits and tear off your head!<br>
-(Quest for Orc Shaman characters of level 39 and above.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05.htm
deleted file mode 100644
index d3133f0bca..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body>Seer Somak:<br>
-To pass the test, you must first find the bones of the ancestors who passed away while fighting in a war! Then through a trial thou can win over the power of the spirits to your side!<br>
-This place, the kingdom of Aden, is a place where numerous Orc warriors fought and bled! However, now it is a territory where Humans reign, and our glorious history is gradually being forgotten! Isn't it reasonable for us to celebrate the victory we achieved in this land, and collect the remains and place them on the Immortal Plateau!<br>
-I, seer Somak investigated the biography of our tribe, which was handed down from mouth to mouth, and found out about 4 warriors. Braki the clever, Kiruna the brave, Toner the super, and Hermort the indomitable! When you find the bones of all 4, bring them to me!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05a.htm">Ask about Braki the clever</a><br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05b.htm">Ask about Kiruna the brave</a><br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05c.htm">Ask about Tonar the super</a><br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05d.htm">Ask about Hermort the indomitable</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-06.htm
deleted file mode 100644
index b6e0c68098..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-06.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body>Seer Somak:<br>
-To pass the test, you must first find the bones of the ancestors who died in battle! Then through a trial you can win over the power of the spirits to your side!<br>
-The ancient heroes that I told you are 4 altogether! Braki the clever, Kiruna the brave, Tonar the super, and Hermort the indomitable! Find their remains and bring them back to me!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05a.htm">Ask about Braki the clever</a><br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05b.htm">Ask about Kiruna the brave</a><br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05c.htm">Ask about Tonar the super</a><br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05d.htm">Ask about Hermort the indomitable</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-10.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-10.htm
deleted file mode 100644
index caadf28244..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-10.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Seer Somak:<br>
- To carry out the ceremony of the war spirits, you need to see the forefather spirit of Martankus. Now take the heroes' remains to the eternal holy land for Orcs, the Immortal Plateau. And meet the forefather spirit Martankus which dwells in the Cave of Ordeal.<br>
-Remember to show your utmost respect to the great ancestors. Politely offer your gift and tell him that you wish to go through the War Spirit's Trial. Tejakar Paagrio! May the powers of fire be with you!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-01.htm
deleted file mode 100644
index 624c305d78..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-01.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>Seer Manakia:<br>
-The indomitable Hermodt! The greatest Warrior of the Neruga tribe. If you came here for his remains, listen carefully. It is the story of the great Warrior Hermodt.<br>
-Hermodt was the tribe's leader when he set off to conquer the serpent family who invaded their territory. He managed to force the serpents out of the territory.<br>
-And chased them to the last one, the Queen Gorgon, so that the snake family would never ever think about invading the Orcs again. However during the chase, he was injured by a poisoned arrow shot by the enemy. But he didn't give up and endured the piercing pain until he finally caught the Queen. At the same time, he himself breathed his last breath because of the poison.<br>
-Hermodt, he was a true Warrior indeed, who even stopped death from coming until he had killed the last of the enemy!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30515_1">Ask where the remains lie</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-02.htm
deleted file mode 100644
index e8c2cc5fa6..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Seer Manakia:<br>
-Ever since the kingdom of Orcs first fell, Giran, has been ruled by the Humans. But Humans are weak, so the outsiders we once beat have started attacking again! What a mess!<br>
- Take this totem to begin with which has our ancestors' spirits within it and it will guide you on your way! In eastern Giran, live medusas who are kin to serpents. Slay them and obtain the remains of Hermodt from them! The medusas split the bones into five pieces and distributed them among several of their kind.<br>
- The important remains are held by the Gorgon Queen, Stenoa! There is no doubt that she is the descendent of the Queen that Hermodt killed! I, Seer Manakia, order you to go and kill the Queen of medusas, to revenge the death of Hermodt, and take back his skull! After you've killed the Queen, go after the other medusas as well to recover his rib-bones, backbone, arm bones, and shinbones too!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-04.htm
deleted file mode 100644
index 83f25a1abe..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-04.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Seer Manakia:<br>
-That was magnificent, young shaman! You have swept the medusas clear out and won back the remains of great hero!<br>
-But I am so sorry that our forefather's remains are in such wretched condition! I have no face to see our ancestor's spirit! We are to blame for abandoning our forefather's spirit! I, Seer Manakia shall readjust<font color="LEVEL"> Hermodt's Remains</font>, to a well-preserved shape!<br>
-Thou, young man of Orc, even when you pass the Test and become a higher level shaman, never forget! The spirits of our great heroes! The glory of our forefathers who fought for the tribe!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-01.htm
deleted file mode 100644
index 3e5458b753..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Orim of the Shadow:<br>
-Nice to meet you Sorcerer of the Orcs. My name is Orim and I serve the great magician Hardin as my master. What brought you here to this desolated place where the shadows of the green dragon Antharas fall?<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30630_1">Ask him to give the Remains of Braki</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-02.htm
deleted file mode 100644
index f9dfa7e03c..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-02.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Orim of the Shadow:<br>
-You are indeed one of the Orcs... So straight forward... That is right. The remains of Braki who you Oaks worship as your hero, is in my hands.<br>
-I bet that you will take it from me anyway, even though I resist to give it to you. I am well aware of the Oak's great power. To tell the truth, I don't want to fight you. This is not showing off, so don't take me wrong, but if we fight, I'm telling you, it is not likely that you will survive, either. Therefore, let's prevent from getting involved in a fight which is damaging for both of us.<br>
-As you know, the remains of Braki is powerful fetish filled with strong magic. If you can find me a thing that has equal magical power, I shall gladly give you your hero's remains. Don't you think it is reasonable enough?<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30630_2">Accept proposal</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-03.htm
deleted file mode 100644
index ccc01db83e..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-03.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Orim of the Shadow:<br>
-Then I shall tell you. I want you to find something for me. If you go to northern Dion, there is a place called the Cruma Marshlands. In its center, there is a huge tower from the giant era.<br>
- Inside the tower there dwells all sorts of weird creatures that have a special thing that grows in their bodies. More specifically, it's a strong spirit power dwelling in their bio matter. To solve the secrets of the ancient treasure of Aklantoth's chest, I need that substance.<br>
- <a action="bypass -h Quest 233_TestOfWarspirit 30630_3">Ask what is needed exactly.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-07.htm
deleted file mode 100644
index ed9c9f855d..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-07.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Orim of the Shadow:<br>
-Shaman of the Oaks, good to see you again. Braki's Remains that I gave you the other day, contained quite powerful magic indeed, but I don't regret giving it away since it went to the right owner.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30649-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30649-01.htm
deleted file mode 100644
index c0e49578f2..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30649-01.htm
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><body> Ancestor Martankus:<br>
-Tejakar Oroka! I am Hestui Martankus, Lord of the Grizzly Tribe who died during the war between Men on the Indomitable Plateau a thousand years ago!<br>
- My descendent, heed your ancestor!<br>
-
-I have experienced a thousand years of pain watching the collapse of the kingdom
-and the disintegration of my race! The unending, unbearable sorrow of seeing my
-descendents lose the memory of their glorious past.<br>
-
-My offspring, present me with a gift that matches my dignity and power!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30649_1">Give the heads of Tamlin Orcs</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30649-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30649-03.htm
deleted file mode 100644
index fca8e43720..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30649-03.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html><body>Ancestor Martankus:<br>
-Young Shaman of our race, I feel great strength in the bones you brought. They are bones of great heroes, no doubt!<br>
- Take this strength of past Fighters and make it your own. This is the ritual of the war spirit!<br>
- Pass those bones one by one to me. I, the great Martankus, give the power of spirit in the bones to you.<br>
- Braki of the Duda-Mara, I give his cleverness to you!<br>
- Kiruna of the Urutu, I give you his bravery!<br>
- Tonar of the Hestui, I give his will of iron to you!<br>
- Hermodt of the Neruga, I give his faith to you!<br>
- You, a young Shaman of our race, now own the sprits of the great warriors! As proof, you will be issued the Mark of the War Spirit. It will be of great help for becoming a high-level Shaman. Do not forget the fiery spirit when you lead the warriors of your race into war! Tejakar Oroka!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-01.htm
deleted file mode 100644
index 6b080aa887..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Seer Pekiron:<br>
-I heard the story from Seer Somak! So, you are looking for the bones of Tonar? Then, first I must tell you about superman Tonar, our great hero!<br>
-As you may know, Tonar lead the crack contingent of Hetsui and drove out all the Leto lizardmen from Oren. But as a last resort, the lizardmen shaman called out the flame worm. One by one, the warriors of Hetsui fell down to the ground by the flames shot out from the worm's mouth. Just then, Tonar, unarmed, leapt on the worm and broke off its neck! But Tonar himself was severely burnt and died soon after!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30682_1">Ask where the remains are</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-04.htm
deleted file mode 100644
index 68cf1477d3..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Seer Pekiron:<br>
-It's tragic! I can't believe they damaged the body so badly by splitting them into pieces! Give me the bones. I shall readjust them into a well-preserved shape!<br>
-Young sorcerer, thou shall contemplate solemnly when carrying back the bones! The high spirits of the great hero! The glory of our forefathers who fought for our tribe!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-05.htm
deleted file mode 100644
index 5792aaa4ee..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-05.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Seer Pekiron:<br>
-Thou, young shaman, go ahead and finish the Test of the War Spirit, and become a proud Warcryer! Until that day when we march in the battlefield singing the hymns of victory! Tejakar Paagrio!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/__init__.py
deleted file mode 100644
index 405bd3ff05..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/__init__.py
+++ /dev/null
@@ -1,396 +0,0 @@
-# Made by Mr. Have fun! Version 0.2
-# rewritten by Rolarga, Version 0.3
-# 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
-from com.l2jserver.gameserver.network.serverpackets import SocialAction
-
-qn = "233_TestOfWarspirit"
-
-MARK_OF_WARSPIRIT = 2879
-VENDETTA_TOTEM = 2880
-TAMLIN_ORC_HEAD = 2881
-WARSPIRIT_TOTEM = 2882
-ORIMS_CONTRACT = 2883
-PORTAS_EYE = 2884
-BRAKIS_REMAINS1 = 2887
-HERMODTS_REMAINS1 = 2901
-KIRUNAS_REMAINS1 = 2910
-TONARS_REMAINS1 = 2894
-BRAKIS_REMAINS2 = 2911
-HERMODTS_REMAINS2 = 2913
-KIRUNAS_REMAINS2 = 2914
-TONARS_REMAINS2 = 2912
-EXCUROS_SCALE = 2885
-MORDEOS_TALON = 2886
-PEKIRONS_TOTEM = 2888
-TONARS_SKULL = 2889
-TONARS_RIB_BONE = 2890
-TONARS_SPINE = 2891
-TONARS_ARM_BONE = 2892
-TONARS_THIGH_BONE = 2893
-MANAKIAS_TOTEM = 2895
-HERMODTS_SKULL = 2896
-HERMODTS_RIB_BONE = 2897
-HERMODTS_SPINE = 2898
-HERMODTS_ARM_BONE = 2899
-HERMODTS_THIGH_BONE = 2900
-RACOYS_TOTEM = 2902
-KIRUNAS_SKULL = 2905
-KIRUNAS_RIB_BONE = 2906
-KIRUNAS_SPINE = 2907
-KIRUNAS_ARM_BONE = 2908
-KIRUNAS_THIGH_BONE = 2909
-INSECT_DIAGRAM_BOOK = 2904
-VIVIANTES_LETTER = 2903
-SHADOW_WEAPON_COUPON_CGRADE = 8870
-
-NPC=[30030,30436,30507,30510,30515,30630,30649,30682]
-
-STATS=["cond","step","Orim","Racoy","Perkiron","Manakia","Manakia_Queen"]
-
-#npcId=[[accepted values for this part],variable for the current part from the mob,maxcount,chance in %, items to give(one per kill max)]
-DROPLIST={
-20213:[[2,3,4],"Orim",10,100,[PORTAS_EYE]],
-20214:[[2,3,4],"Orim",10,100,[EXCUROS_SCALE]],
-20215:[[2,3,4],"Orim",10,100,[MORDEOS_TALON]],
-20601:[[1],"step",13,100,[TAMLIN_ORC_HEAD]],
-20602:[[1],"step",13,100,[TAMLIN_ORC_HEAD]],
-27108:[[2],"Manakia_Queen",1,100,[HERMODTS_SKULL]],
-20581:[[2,3,4,5,6],"Perkiron",1,50,[TONARS_RIB_BONE,TONARS_SPINE,TONARS_ARM_BONE,TONARS_SKULL,TONARS_THIGH_BONE]],
-20582:[[2,3,4,5,6],"Perkiron",1,50,[TONARS_SKULL,TONARS_ARM_BONE,TONARS_RIB_BONE,TONARS_SPINE,TONARS_THIGH_BONE]],
-20158:[[2,3,4,5],"Manakia",1,100,[HERMODTS_RIB_BONE,HERMODTS_SPINE,HERMODTS_ARM_BONE,HERMODTS_THIGH_BONE]],
-20089:[[4,5,6,7,8,9],"Racoy",1,100,[[KIRUNAS_THIGH_BONE,KIRUNAS_ARM_BONE],[KIRUNAS_SPINE,KIRUNAS_RIB_BONE],[KIRUNAS_SKULL]]],
-20090:[[4,5,6,7,8,9],"Racoy",1,100,[[KIRUNAS_THIGH_BONE,KIRUNAS_ARM_BONE],[KIRUNAS_SPINE,KIRUNAS_RIB_BONE],[KIRUNAS_SKULL]]]
-}
-
-# Mob List initialisation for the different Parts
-PART2_MOBS = [20601,20602]
-PART1_MOBS = []
-
-for mob in DROPLIST.keys():
- if mob in PART2_MOBS:
- continue
- PART1_MOBS.append(mob)
-
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = range(2880,2915)
-
- def onEvent (self,event,st) :
- htmltext = event
- if event == "1" :
- htmltext = "30510-05.htm"
- for var in STATS:
- st.set(var,"1")
- st.setState(State.STARTED)
- st.set("progress","PART1")
- st.playSound("ItemSound.quest_accept")
- elif event == "30630_1" :
- htmltext = "30630-02.htm"
- elif event == "30630_2" :
- htmltext = "30630-03.htm"
- elif event == "30630_3" :
- htmltext = "30630-04.htm"
- st.giveItems(ORIMS_CONTRACT,1)
- st.set("Orim","2")
- elif event == "30682_1" :
- htmltext = "30682-02.htm"
- st.giveItems(PEKIRONS_TOTEM,1)
- st.set("Perkiron","2")
- elif event == "30515_1" :
- htmltext = "30515-02.htm"
- st.giveItems(MANAKIAS_TOTEM,1)
- st.set("Manakia","2")
- st.set("Manakia_Queen","2")
- elif event == "30507_1" :
- htmltext = "30507-02.htm"
- st.giveItems(RACOYS_TOTEM,1)
- st.set("Racoy","2")
- elif event == "30030_1" :
- htmltext = "30030-02.htm"
- elif event == "30030_2" :
- htmltext = "30030-03.htm"
- elif event == "30030_3" :
- htmltext = "30030-04.htm"
- st.giveItems(VIVIANTES_LETTER,1)
- st.set("Racoy","3")
- elif event == "30649_1" :
- htmltext = "30649-02.htm"
- elif event == "30649_2" :
- st.takeItems(WARSPIRIT_TOTEM,-1)
- st.takeItems(BRAKIS_REMAINS2,-1)
- st.takeItems(HERMODTS_REMAINS2,-1)
- st.takeItems(KIRUNAS_REMAINS2,-1)
- st.takeItems(TONARS_REMAINS2,-1)
- st.addExpAndSp(894888,61408)
- st.giveItems(57,161806)
- st.giveItems(MARK_OF_WARSPIRIT,1)
- st.giveItems(7562,92)
- st.getPlayer().sendPacket(SocialAction(st.getPlayer().getObjectId(),3))
- htmltext = "30649-03.htm"
- for var in STATS:
- st.unset(var)
- st.exitQuest(False)
- st.playSound("ItemSound.quest_finish")
- 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()
-
- # first time when a player join the quest
- if id == State.CREATED:
- for var in STATS:
- st.set(var,"0")
- if player.getClassId().getId() == 0x32:
- if player.getLevel() > 38:
- htmltext = "30510-04.htm"
- else :
- htmltext = "30510-03.htm"
- st.exitQuest(1)
- elif player.getRace().ordinal() == 3:
- htmltext = "30510-02.htm"
- st.exitQuest(1)
- else:
- htmltext = "30510-01.htm"
- st.exitQuest(1)
- return htmltext
- # if quest is already State.COMPLETED
- elif id == State.COMPLETED:
- return Quest.getAlreadyCompletedMsg(player)
-
- # if quest is accepted and in progress
- elif id == State.STARTED and st.get("progress") == "PART1":
- step=st.getInt("step")
- Orim=st.getInt("Orim")
- Racoy=st.getInt("Racoy")
- Perkiron=st.getInt("Perkiron")
- Manakia=st.getInt("Manakia")
- #Somak
- if npcId == NPC[3]:
- if Orim == 6 and Racoy == 11 and Perkiron == 8 and Manakia == 7: # Step 1 finished
- htmltext = "30510-07.htm"
- st.takeItems(BRAKIS_REMAINS1,1)
- st.takeItems(HERMODTS_REMAINS1,1)
- st.takeItems(KIRUNAS_REMAINS1,1)
- st.takeItems(TONARS_REMAINS1,1)
- st.giveItems(VENDETTA_TOTEM,1)
- st.setState(State.STARTED)
- st.set("progress","PART2")
- st.set("cond","3")
- else: # shows you again his List
- htmltext = "30510-06.htm"
- # Orim and his Part, he sends you out to hunt Portas, Mordeos and Excuros
- elif npcId == NPC[5]:
- if Orim == 1:
- htmltext = "30630-01.htm"
- elif Orim in [2,3,4]:
- htmltext = "30630-05.htm"
- elif Orim == 5:
- htmltext = "30630-06.htm"
- st.takeItems(ORIMS_CONTRACT,-1)
- st.takeItems(PORTAS_EYE,-1)
- st.takeItems(EXCUROS_SCALE,-1)
- st.takeItems(MORDEOS_TALON,-1)
- st.giveItems(BRAKIS_REMAINS1,1)
- if st.getQuestItemsCount(2887) and st.getQuestItemsCount(2901) and st.getQuestItemsCount(2910) and st.getQuestItemsCount(2894) :
- st.set("cond","2")
- st.set("Orim","6")
- else:
- htmltext = "30630-07.htm"
- # Racyos Part he sends you into the church and then to the wastelands... after wastelands he give you his item
- elif npcId == NPC[2]:
- if Racoy == 1:
- htmltext = "30507-01.htm"
- elif Racoy == 2:
- htmltext = "30507-03.htm"
- elif Racoy == 3:
- htmltext = "30507-04.htm"
- elif 10 > Racoy > 3:
- htmltext = "30507-05.htm"
- elif Racoy == 10:
- htmltext = "30507-06.htm"
- st.takeItems(RACOYS_TOTEM,-1)
- st.takeItems(KIRUNAS_SKULL,-1)
- st.takeItems(KIRUNAS_RIB_BONE,-1)
- st.takeItems(KIRUNAS_SPINE,-1)
- st.takeItems(KIRUNAS_ARM_BONE,-1)
- st.takeItems(KIRUNAS_THIGH_BONE,-1)
- st.takeItems(INSECT_DIAGRAM_BOOK,-1)
- st.giveItems(KIRUNAS_REMAINS1,1)
- if st.getQuestItemsCount(2887) and st.getQuestItemsCount(2901) and st.getQuestItemsCount(2910) and st.getQuestItemsCount(2894) :
- st.set("cond","2")
- st.set("Racoy","11")
- else:
- htmltext = "30507-07.htm"
- # Racoy Part, lady in the church (Viviana)
- elif npcId == NPC[0]:
- if Racoy == 2: # explainations
- htmltext = "30030-01.htm"
- elif Racoy == 3: # go to sarien, hurry up
- htmltext = "30030-05.htm"
- elif 10 > Racoy > 3: # bring more
- htmltext = "30030-06.htm"
- elif Racoy in [10,11]: # this part is finished, for this npc
- htmltext = "30030-07.htm"
- # Racoy Part, Wastelands Trader Sarien tells: "Hunt noble ant leaders and bring the items to Racoy"
- elif npcId == NPC[1]:
- if Racoy == 3: # explanation about hunting noble ants
- htmltext = "30436-01.htm"
- st.giveItems(INSECT_DIAGRAM_BOOK,1)
- st.takeItems(VIVIANTES_LETTER,1)
- st.set("Racoy","4")
- elif 10 > Racoy > 3: # bring more
- htmltext = "30436-02.htm"
- elif Racoy in [10,11]: # this part is finished, for this npc
- htmltext = "30436-03.htm"
- # Perkirons Part, just hunt Lizzardsman near Oren
- elif npcId == NPC[7]:
- if Perkiron == 1: # explanation
- htmltext = "30682-01.htm"
- elif Perkiron in [2,3,4,5,6]: # bring more
- htmltext = "30682-03.htm"
- elif Perkiron == 7: # ah you got anything i need
- htmltext = "30682-04.htm"
- st.takeItems(PEKIRONS_TOTEM,1)
- st.takeItems(TONARS_SKULL,1)
- st.takeItems(TONARS_RIB_BONE,1)
- st.takeItems(TONARS_SPINE,1)
- st.takeItems(TONARS_ARM_BONE,1)
- st.takeItems(TONARS_THIGH_BONE,1)
- st.giveItems(TONARS_REMAINS1,1)
- if st.getQuestItemsCount(2887) and st.getQuestItemsCount(2901) and st.getQuestItemsCount(2910) and st.getQuestItemsCount(2894) :
- st.set("cond","2")
- st.set("Perkiron","8")
- else: # part is finished for this npc
- htmltext = "30682-05.htm"
- # Manakias Part, hunt Medusas Steona Gorgogon Queen
- elif npcId == NPC[4]:
- if Manakia == 1: # explanation
- htmltext = "30515-01.htm"
- elif Manakia == 7: # this part is finished for this npc
- htmltext = "30515-05.htm"
- elif Manakia == 6 and st.getInt("Manakia_Queen")==3: # ah you got both items i need
- htmltext = "30515-04.htm"
- st.takeItems(MANAKIAS_TOTEM,1)
- st.takeItems(HERMODTS_SKULL,1)
- st.takeItems(HERMODTS_RIB_BONE,1)
- st.takeItems(HERMODTS_SPINE,1)
- st.takeItems(HERMODTS_ARM_BONE,1)
- st.takeItems(HERMODTS_THIGH_BONE,1)
- st.giveItems(HERMODTS_REMAINS1,1)
- if st.getQuestItemsCount(2887) and st.getQuestItemsCount(2901) and st.getQuestItemsCount(2910) and st.getQuestItemsCount(2894) :
- st.set("cond","2")
- st.set("Manakia","7")
- else: # bring me more, because two vars are required , Manakia and Manakia_Queen
- htmltext = "30515-03.htm"
- elif id == State.STARTED and st.get("progress")=="PART2":
- step=st.getInt("step")
- if npcId == NPC[3]:
- if step == 1: # explain Part 2 again or bring more skulls
- htmltext = "30510-08.htm"
- elif step == 2: # ah you got the items i need
- htmltext = "30510-09.htm"
- st.takeItems(VENDETTA_TOTEM,1)
- st.takeItems(TAMLIN_ORC_HEAD,st.getQuestItemsCount(TAMLIN_ORC_HEAD))
- st.giveItems(WARSPIRIT_TOTEM,1)
- st.giveItems(BRAKIS_REMAINS2,1)
- st.giveItems(HERMODTS_REMAINS2,1)
- st.giveItems(KIRUNAS_REMAINS2,1)
- st.giveItems(TONARS_REMAINS2,1)
- st.set("cond","5")
- st.set("step","3")
- else: # this part is finished for this npc
- htmltext = "30510-10.htm"
- elif npcId == NPC[6] and step == 3:
- htmltext = "30649-01.htm" # ah thx.. i will give you the mark of War Spirit
- return htmltext
-
- def onKill(self,npc,player,isPet):
- st = self.getQuestState(player, False)
- if not st : return
- npcId=npc.getId()
-
- if (st.getState() == State.STARTED) and (st.get("progress")=="PART1") and not (npcId in PART1_MOBS) : return
- if (st.getState() == State.STARTED) and (st.get("progress")=="PART2") and not (npcId in PART2_MOBS) : return
-
-# [accepted values for this part],variable for the current part from the mob,maxcount,chance in %, items to give(one per kill max)=DROPLIST[npcId]
- value,var,maxcount,chance,itemList=DROPLIST[npcId]
- random=self.getRandom(100)
-# return the current value of the var
- isValue = st.getInt(var)
- if isValue in value and random < chance:
- # special part for Noble Ants
- if npcId in [20089,20090]:
- if not (st.getQuestItemsCount(KIRUNAS_THIGH_BONE) and st.getQuestItemsCount(KIRUNAS_ARM_BONE)) :
- list = 0
- chance = 70
- elif not (st.getQuestItemsCount(KIRUNAS_SPINE) and st.getQuestItemsCount(KIRUNAS_RIB_BONE)) :
- list = 1
- chance = 40
- elif not st.getQuestItemsCount(KIRUNAS_SKULL) :
- list = 2
- chance = 10
- else :
- return
- if random > chance :
- return
- for item in itemList[list]:
- count = st.getQuestItemsCount(item)
- if count >= maxcount : continue
- st.giveItems(item,1)
- if st.getInt(var) < 9:
- isValue = isValue + 1
- st.set(var,str(isValue))
- if st.getQuestItemsCount(KIRUNAS_SKULL) and st.getInt(var)==9:
- st.set(var,"10")
- st.playSound("ItemSound.quest_middle")
- else :
- st.playSound("ItemSound.quest_itemget")
- # Drop part for any other mobs
- else:
- for item in itemList:
- count = st.getQuestItemsCount(item)
- if count<maxcount:
- amount = 1
- if item in [EXCUROS_SCALE,MORDEOS_TALON]: amount = 5
- if item == [PORTAS_EYE]: amount = 2
- st.giveItems(item,amount)
- # spawns 5 new medusas around the dead queen *muha*
- if npcId == 27108:
- for i in range(5):
- st.addSpawn(20158)
- if st.getQuestItemsCount(item) >= maxcount:
- isValue = isValue + 1
- st.playSound("ItemSound.quest_middle")
- st.set(var,str(isValue))
- else:
- st.playSound("ItemSound.quest_itemget")
- if st.getQuestItemsCount(2881) >= 13:
- st.set("cond","4")
-
- return
-
-QUEST = Quest(233,qn,"Test Of Warspirit")
-
-QUEST.addStartNpc(30510)
-
-for npcId in NPC:
- QUEST.addTalkId(npcId)
-
-for mobId in PART1_MOBS:
- QUEST.addKillId(mobId)
-
-for mobId in PART2_MOBS:
- QUEST.addKillId(mobId)
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-01.html
new file mode 100644
index 0000000000..50b85d3ef9
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-01.html
@@ -0,0 +1,4 @@
+<html><body>Priestess Vivyan:<br>
+What has an Orc Shaman to do with me? Just name it! I will help you in any way I can!<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30030-02.html">Ask about Kiruna the Brave</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-02.html
new file mode 100644
index 0000000000..0f17b2a326
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-02.html
@@ -0,0 +1,5 @@
+<html><body>Priestess Vivyan:<br>
+Ah! Commander Kiruna, the only Commander in the whole Orc Kingdom. She fell in love with Paladin Kelhas... The love story of Kelhas and Kiruna is written in the history of the shrine, and I found it so touching that I read it several times.<br>
+Oh, don't give me that look! I know you Orcs don't like to hear about an Orc that fell in love with a Human being. So sorry... but their story... it is so romantic...<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30030-03.html">How did Commander Kiruna die?</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-03.html
new file mode 100644
index 0000000000..0d4080c3aa
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-03.html
@@ -0,0 +1,6 @@
+<html><body>Priestess Vivyan:<br>
+Kiruna and Kelhas were Warriors who fought bravely against the army of the devil Beleth. They won every battle, but one day Kelhas was killed by the evil spirits of Beleth. Imagine Kiruna's sorrow when the news reached her that her lover had been killed. A few days after Kelhas's death, she took to the battlefield with grim determination and won a great victory over the army of Beleth.<br>
+But unfortunately she received a mortal wound in the final battle. She was taken to the shrine for treatment, but soon died and was buried beside Kelhas. Some say that she refused treatment...<br>
+Sometimes the feelings which appear to be weak-mindedness can be the source of great power. Do you see?<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30030-04.html">Where was Kiruna buried?</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-04.html
similarity index 59%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-04.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-04.html
index f4d425435b..44553327f5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-04.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-04.html
@@ -1,4 +1,4 @@
<html><body>Priestess Vivyan:<br>
According to the records, the graves of Kelhas and Kiruna are in the south of Gludio, a place which has now turned into a Wasteland area. But that was already a thousand years ago... I am not sure if their remains will still be there...<br>
-Perhaps Salient who knows the area well, might know of its whereabouts! I shall write you a letter. You'd better go and meet him. He is doing commerce near the southern entrance of the Wasteland.
+Perhaps Sarien who knows the area well, might know of its whereabouts! I shall write you a letter. You'd better go and meet him. He is doing commerce near the southern entrance of the Wasteland.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-05.html
similarity index 50%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-05.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-05.html
index 8cca6ee618..84df5bdfba 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-05.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-05.html
@@ -1,3 +1,3 @@
<html><body>Priestess Vivyan:<br>
-It is said that the grave of Kiruna was built in the wasteland area. But that was a thousand years ago, so it might have disappeared already. Take the letter that I gave you to Salient who lives in the southern border of the Wasteland. He knows the area well, so he will be able to give you some help.
+It is said that the grave of Kiruna was built in the wasteland area. But that was a thousand years ago, so it might have disappeared already. Take the letter that I gave you to Sarien who lives in the southern border of the Wasteland. He knows the area well, so he will be able to give you some help.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-06.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30030-06.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-06.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-07.html
new file mode 100644
index 0000000000..a7f23c63cd
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30030-07.html
@@ -0,0 +1,3 @@
+<html><body>Priestess Vivyan:<br>
+You have recovered every piece of Kiruna's Remains in the Wasteland? That is awesome! I am really surprised at how devoted you Orcs are to respecting your ancestors!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30436-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30436-01.html
similarity index 96%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30436-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30436-01.html
index ee3f03ceb7..da83d88b42 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30436-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30436-01.html
@@ -1,4 +1,4 @@
-<html><body>Trader Salient:<br>
+<html><body>Trader Sarien:<br>
A letter from Priestess Vivyan? The grave of Paladin Kelhas and Commander Kiruna? Well... Surely there were many graves of the Elmoreden era here... But sandwind was vicious, and what's even more, the giant ants excavated the place... I bet that all the graves and the relics in it have disappeared by now.<br>
Although chances are scarce... I would try the ants tunnel if I were you. According to the adventurers who investigate the Wastelands, they say that the ancient relics are found in the ant tunnel now and then. Perhaps the remains that you are looking for might have been excavated by the ants as well.<br>
If my guesses aren't wrong, it must be the soldier ants who carry such things as bones and remains. They normally cut things into pieces, such as a human corpse. Well... Perhaps 5 pieces...? I'll give you this illustrated book for reference. It will help you when you are exploring the ant tunnel. Good luck, then!
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30436-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30436-02.html
similarity index 79%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30436-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30436-02.html
index 3f86deb923..98d495b421 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30436-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30436-02.html
@@ -1,4 +1,4 @@
-<html><body>Trader Salient:<br>
-I bet that the grave of the Orc warrior that you are looking for was already excavated and destroyed. But they say that once in a while, the ancient relics are found in the ant tunnel so if you are lucky enough you might find the bones that you are looking for.<br>
+<html><body>Trader Sarien:<br>
+I bet that the grave of the Orc Warrior that you are looking for was already excavated and destroyed. But they say that once in a while, the ancient relics are found in the ant tunnel so if you are lucky enough you might find the bones that you are looking for.<br>
If my guesses aren't wrong, it must be the soldier ants who carry such things as bones and remains. I think they'll have cut it into 5 pieces more or less. Good luck, then!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30436-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30436-03.html
new file mode 100644
index 0000000000..db3a1f17ea
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30436-03.html
@@ -0,0 +1,3 @@
+<html><body>Trader Sarien:<br>
+You finally got what you wanted from the Ant Nest. You Orcs are extremely brave! You will succeed in business if you apply the same patience and skill to it.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-01.html
new file mode 100644
index 0000000000..94c219f464
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-01.html
@@ -0,0 +1,6 @@
+<html><body>Seer Racoy:<br>
+Young shaman, do you seek the remains of the legendary Warrior Kiruna? First you must listen to her story!<br>
+In a time long ago the supreme commander of our army asked for our support in a tough battle with the devil Beleth. Kiruna led a crack contingent off to the battlefield. Kiruna and her soldiers fought bravely against numerous undead and the front line did not waver.<br>That is, until the dreaded Death Knight Mordreous appeared on the battlefield. The soldiers, overwhelmed by fear and Beleth's magic, began to retreat...<br>
+However, Kiruna was fearless. She took the battlefield alone, singing hymns of victory and slaughtering hundreds of undead, and finally the death Knight Mordreous!<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30507-02.html">"How did Kiruna die?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-02.html
similarity index 78%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-02.html
index 7944907d02..de9cef9d78 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-02.html
@@ -1,5 +1,5 @@
<html><body>Seer Racoy:<br>
After the death of beleth, Kiruna remained in the Human's world and became the Commanding General of the kingdom's west army. Some human poets said that Kiruna fell in love with Kelhas, the Einhasad Paladin, but that's absolute nonsense! Why would an Orc Amazon fall in love with a weak Human!<br>
-Kiruna died after suffering from a mysterious fever. The Humans buried her with the other Human Warriors in the cemetery. It is obvious that a great hero like her should have a grand funeral in the Cave of Ordeal! However Kiruna herself asked to be buried with the other Human soldiers.<br>
-I don't know where that place is exactly. But I found out that there are records left about Kiruna in the Einhasad temple of this village. Go to the temple and find out about Kiruna's remains! I also heard that a female Human called Vyvyan knows something about it. I shall give you this totem. It is a precious thing which contains our ancestor's spirits. I think it will help you in finding the heroine's remains. Now it is time for you to leave. Meet Priestess Vyvyan of the village temple.
+Kiruna died after suffering from a mysterious fever. The Humans buried her with the other Human Warriors in the cemetery. It is obvious that a great hero like her should have a grand funeral in the Cave of Trials! However Kiruna herself asked to be buried with the other Human soldiers.<br>
+I don't know where that place is exactly. But I found out that there are records left about Kiruna in the Einhasad temple of this village. Go to the temple and find out about Kiruna's Remains! I also heard that a female Human called Vivyan knows something about it. I shall give you this totem. It is a precious thing which contains our ancestor's spirits. I think it will help you in finding the heroine's remains. Now it is time for you to leave. Meet Priestess Vivyan of the village temple.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-03.html
new file mode 100644
index 0000000000..ccbb889843
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-03.html
@@ -0,0 +1,3 @@
+<html><body>Seer Racoy:<br>
+What are you waiting for? Ask about Kiruna at the Temple of Einhasad of this village.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-04.html
new file mode 100644
index 0000000000..40ad789ae6
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-04.html
@@ -0,0 +1,3 @@
+<html><body>Seer Racoy:<br>
+She is buried in the Wastelands. Where, I do not know. But you should not give up, young shaman. As long as the blessings of our ancestors are with us, I am sure you'll find her remains.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-05.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30507-05.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-05.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-06.html
new file mode 100644
index 0000000000..fb6b39773d
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-06.html
@@ -0,0 +1,4 @@
+<html><body>Seer Racoy:<br>
+It pains my soul to see the body of Kiruna in this condition. I will enbalm the body according to our funeral traditions.<br>
+...Now, young shaman, carry these contemplatively. Handle them gently. Always remember the fighting spirit of our great heroine, no matter what road you take in the future. The glory of our forefathers who fought so nobly for our tribe is within you!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-07.html
new file mode 100644
index 0000000000..65889e9c02
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30507-07.html
@@ -0,0 +1,3 @@
+<html><body>Seer Racoy:<br>
+Young shaman, I see that you have not yet completed the Test of War Spirit. But there is no need to worry. I am quite sure that before long you shall become one of the greatest Warcryers, praising loudly the glory of Pa'agrio!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-01.html
new file mode 100644
index 0000000000..cd886fe000
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-01.html
@@ -0,0 +1,4 @@
+<html><body>Seer Somak:<br>
+You have no allegiance to the Lord of Flame! Why are you here! Have you come to steal the secrets of Orc magic? Go now, before I summon the war spirits and tear off your head!<br>
+(Quest for Orc Shaman characters of level 39 and above.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-02.html
similarity index 54%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-02.html
index 29ae50d114..4c17e8e4cf 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-02.html
@@ -1,5 +1,4 @@
<html><body>Seer Somak:<br>
-A Warcryer is a supreme level Mystic who deals with the war spirits! Their fierce roar makes our soldiers burn with combativeness and dooms the enemies! Their hymn inspires our troop's morale and freezes the heart of our enemies!<br>
-Thou, great Warrior of the Orcs! Do not forget that the Mystic is one of the most appreciated strengths on the battlefield! Thou shall bow the knees to their bright wisdom and unyielding spirits!<br>
+A Warcryer is a supreme level Mystic who deals with the war spirits! Their fierce roar makes our soldiers burn with combativeness and dooms the enemies! Their hymn inspires our troop's morale and freezes the heart of our enemies!<br>Thou, great Warrior of the Orcs! Do not forget that the Mystic is one of the most appreciated strengths on the battlefield! Thou shall bow the knees to their bright wisdom and unyielding spirits!<br>
(Quest for Orc Shaman characters of level 39 and above.)
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-03.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-03.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-04.htm
similarity index 84%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-04.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-04.htm
index 1e0cf05d9e..a99a1dd259 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-04.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-04.htm
@@ -1,5 +1,5 @@
<html><body>Seer Somak:<br>
A Warcryer is a supreme level Mystic who deals with the war spirits! Their fierce roar makes our soldiers burn with combativeness and dooms the enemies! Their hymn inspires our troop's morale and freezes the heart of our enemies!<br>
Thou, Shaman of Orc! If you truly wish to be Warcryer, you can't avoid the War Spirit's Trial! The war spirits are the ghosts of our ancestors who died in the battlefields! You must be able to win their power over to your side! That is what the trial is all about! Will you challenge the trial?<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 1">Say that you will challenge the trial</a>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit ACCEPT">Say that you will challenge the trial</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05.htm
new file mode 100644
index 0000000000..2bcd4333c1
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05.htm
@@ -0,0 +1,9 @@
+<html><body>Seer Somak:<br>
+To pass the test, you must first find the bones of the ancestors who passed away while fighting in a war! Then through a trial thou can win over the power of the spirits to your side!<br>
+The kingdom of Aden is a place where numerous Orc Warriors fought and bled! However, now it is a territory where Humans reign, and our glorious history is gradually being forgotten! Isn't it reasonable for us to celebrate the victory we achieved in this land, and collect the remains and place them on the Immortal Plateau?<br>
+I, seer Somak investigated the biography of our tribe, which was handed down from mouth to mouth, and found out about 4 warriors. Braki the clever, Kiruna the brave, Tonar the super, and Hermodt the indomitable! When you find the bones of all 4, bring them to me!<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05a.html">Ask about Braki the clever</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05b.html">Ask about Kiruna the brave</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05c.html">Ask about Tonar the super</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05d.html">Ask about Hermodt the indomitable</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05.html
new file mode 100644
index 0000000000..2bcd4333c1
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05.html
@@ -0,0 +1,9 @@
+<html><body>Seer Somak:<br>
+To pass the test, you must first find the bones of the ancestors who passed away while fighting in a war! Then through a trial thou can win over the power of the spirits to your side!<br>
+The kingdom of Aden is a place where numerous Orc Warriors fought and bled! However, now it is a territory where Humans reign, and our glorious history is gradually being forgotten! Isn't it reasonable for us to celebrate the victory we achieved in this land, and collect the remains and place them on the Immortal Plateau?<br>
+I, seer Somak investigated the biography of our tribe, which was handed down from mouth to mouth, and found out about 4 warriors. Braki the clever, Kiruna the brave, Tonar the super, and Hermodt the indomitable! When you find the bones of all 4, bring them to me!<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05a.html">Ask about Braki the clever</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05b.html">Ask about Kiruna the brave</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05c.html">Ask about Tonar the super</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05d.html">Ask about Hermodt the indomitable</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05a.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05a.html
similarity index 86%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05a.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05a.html
index d18e415f9e..5599693498 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05a.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05a.html
@@ -1,6 +1,6 @@
<html><body>Seer Somak:<br>
Braki of the Duda-Mara tribe, fought against the 3000 army troops of Elmore with only 200 soldiers, some 500 years ago. He didn't yield the camp site of Horsehoof Valley and resisted for 100 days! Braki took advantage of the steep landscape and overcame the inferiority in numbers! Moreover, there were only 3 Sorcerers in the camp but he made the most out of them and managed to weaken the leader and cause disruption among the enemies.<br>
But the very day the back-up troops arrived, Braki died of hunger, thirst, and fever! It is said that he grieved bitterly about the fact that he couldn't die in the battlefields! He was an Orc who was not only clever in the head, but also burning with combativeness in his heart!<br>
-According to my research, Braki's remains are in the hands of a Human evil magician called Orim the Shadow. How dare a filthy and wicked magician touch the remains of our honored ancestor! I shall not tolerate that! Hurry and win back the remains of Braki from him!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05.htm">Return</a>
+According to my research, Braki's Remains are in the hands of a Human evil magician called Orim the Shadow. How dare a filthy and wicked magician touch the remains of our honored ancestor! I shall not tolerate that! Hurry and win back the remains of Braki from him!<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05.html">Return</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05b.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05b.html
similarity index 80%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05b.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05b.html
index e554be3e48..62a3df50aa 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05b.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05b.html
@@ -1,6 +1,6 @@
<html><body>Seer Somak:<br>
Kiruna, the amazon of Urutu! I shall tell you about she who knew no fear even in front of the hundreds and thousands of monsters.<br>
-When the war between devil beleth and the Elmoreden empire broke, we Orcs sent out a crack contingent at the request of the Human emperor! While the weak Human soldiers were busy running away from the dark troop of bereth, Kiruna alone roared out victory and knocked down hundreds of undead and struck death Knight Mordreous to death!<br>
+When the war between devil beleth and the Elmoreden empire broke, we Orcs sent out a crack contingent at the request of the Human emperor! While the weak Human soldiers were busy running away from the dark troop of beleth, Kiruna alone roared out victory and knocked down hundreds of undead and struck death Knight Mordreous to death!<br>
Seer Racoy of Gludio town will tell you more about Kiruna the brave! Hurry to meet him! He will tell you where you can find the bones of Kiruna!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05.htm">Return</a>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05.html">Return</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05c.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05c.html
similarity index 81%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05c.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05c.html
index b0ec246859..1e9956083b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05c.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05c.html
@@ -1,6 +1,6 @@
<html><body>Seer Somak:<br>
Tonar of Hetsui tribe! He was a superman who had the strength to knock down a giant wild boar with his bare hands!<br>
Long time ago, in the land which is now called Oren, there was a fierce battle between the Orcs and the lizardmen. The Hetsui warriors lead by Tonar won an overwhelming victory over the lizardmen and drove them out of the kingdom!<br>
-But the lizardman shamans played some wicked tricks on him, and he died. Afterwards they even stole his remains and ran away! You must win back the remains of the great hero from those inferior tribes! Go right now to the village of Oren and meet Seer Pekiron! He will tell you about the lizardmen who have the remains of Tonar!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05.htm">Return</a>
+But the Lizardman shamans played some wicked tricks on him, and he died. Afterwards they even stole his remains and ran away! You must win back the remains of the great hero from those inferior tribes! Go right now to the village of Oren and meet Seer Pekiron! He will tell you about the lizardmen who have the remains of Tonar!<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05.html">Return</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05d.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05d.html
similarity index 68%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05d.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05d.html
index 8354739352..f22b9a0421 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-05d.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05d.html
@@ -1,6 +1,6 @@
<html><body>Seer Somak:<br>
-Hermort of the Neruga tribe! He is the one who killed more medusas than anyone else, during our bloody battle with the serpents!<br>
-At that time, the Human tribe who were under our protection asked us for aid, so we sent troops to help the Human beings. Hermort who lead that troop was called 'the indomitable warrior because he had a strong body which could fight for 3 days and 3 nights, and had the patience not to yield to the enemies.<br>
-His body is said lie in the town of Giran. Hear the story in detail from Seer Manakia of Giran! And bring back the remains of Hermort!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30510-05.htm">Return</a>
+Hermodt of the Neruga tribe! He is the one who killed more medusas than anyone else, during our bloody battle with the serpents!<br>
+At that time, the Human tribe who were under our protection asked us for aid, so we sent troops to help the Human beings. Hermodt who lead that troop was called 'the indomitable warrior because he had a strong body which could fight for 3 days and 3 nights, and had the patience not to yield to the enemies.<br>
+His body is said lie in the town of Giran. Hear the story in detail from Seer Manakia of Giran! And bring back the remains of Hermodt!<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05.html">Return</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05e.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05e.htm
new file mode 100644
index 0000000000..80466e84d9
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-05e.htm
@@ -0,0 +1,10 @@
+<html><body>Seer Somak:<br>
+To pass the test, you should first <font color="LEVEL">find the ashes of the ancestors who lost their lives warring for this land!</font> With their ashes, you can use a ritual to harness the power of their spirits.<br>
+Perhaps even more important, we can finally lay their remains to rest in the Immortal Plateau. What more fitting tribute can there be to our ancestors, whose victories once sounded from one end of this land to the other. Ah, but that was before Aden Kingdom, before the Humans began their rule. Now even our own Orc children forget our noble heritage!<br>
+I, Seer Somak, have long studied our tribe's chronicle, handed down from generation to generation, and have learned the identity of the 4 warriors whose ashes you must recover: <font color="LEVEL">Braki the Clever, Kiruna the Brave, Tonar the Super and Hermodt the Indomitable!</font>When you have found all of these great warriors' ashes, return here.<br>
+Before you go, take this <font color="LEVEL">Dimension Diamond</font>. You can trade it for something special from the village gatekeeper to assist you on your journey.<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05a.html">Ask about the Braki the Clever.</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05b.html">Ask about Kiruna the Brave.</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05c.html">Ask about Tonar the Super.</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05d.html">Ask about Hermodt the Indomitable.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-06.html
new file mode 100644
index 0000000000..8e8b8c84c5
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-06.html
@@ -0,0 +1,8 @@
+<html><body>Seer Somak:<br>
+To pass the test, you must first find the bones of the ancestors who died in battle! Then through a trial you can win over the power of the spirits to your side!<br>
+The ancient heroes that I told you are 4 altogether! Braki the clever, Kiruna the brave, Tonar the super, and Hermodt the indomitable! Find their remains and bring them back to me!<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05a.html">Ask about Braki the clever.</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05b.html">Ask about Kiruna the brave.</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05c.html">Ask about Tonar the super.</a><br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30510-05d.html">Ask about Hermodt the indomitable.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-07.html
similarity index 90%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-07.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-07.html
index 22d4e242d0..bde71234c0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-07.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-07.html
@@ -1,5 +1,5 @@
<html><body>Seer Somak:<br>
Tejakar Oroka! You have found the remains of all 4 heroes! I shall place these bones in the blessed pot. Meanwhile, you prepare for the next stage of the trial.<br>
-To win over the power hidden in the remains of heroes, you must go through the War Spirit's Trial. To carry out this holy and solemn trial, you must see the forefather spirit Martankus in the Cave of Ordeal. But before seeing him, you should prepare an appropriate present for him.<br>
+To win over the power hidden in the remains of heroes, you must go through the War Spirit's Trial. To carry out this holy and solemn trial, you must see the forefather spirit Martankus in the Cave of Trials. But before seeing him, you should prepare an appropriate present for him.<br>
I think he will be most pleased to receive the heads of the betrayers, so go to the south of Aden and kill the Tamlin Orcs there. Bring back their heads as the present to give to Martankus! You must bring at least 13 heads!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-08.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-08.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-08.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-08.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-09.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-09.html
similarity index 68%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-09.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-09.html
index 5fe67e2961..849be631dd 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30510-09.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-09.html
@@ -1,5 +1,5 @@
<html><body>Seer Somak:<br>
Well done! Death to the filthy betrayers! That is what they asked for! Their decapitated heads will be the best gift for our ancestor spirits.<br>
-Now take the hero's remains to the eternal holy land for Orcs, the Immortal Plateau. And meet the forefather spirit Martankus which dwells in the Cave of Ordeal. To carry out the War Spirit's Trial we need his help for sure.<br>
-If you carry this totem with you, he'll know that you came for the ceremony. Be careful to show your respect to the great ancestors. Politely offer your gift and tell him that you wish to go through the War Spirit's Trial. Tejakar Paagrio! May the powers of fire be with you!
+Now take the hero's remains to the eternal Holy Land for Orcs, the Immortal Plateau. And meet the forefather spirit Martankus which dwells in the Cave of Trials. To carry out the War Spirit's Trial we need his help for sure.<br>
+If you carry this totem with you, he'll know that you came for the ceremony. Be careful to show your respect to the great ancestors. Politely offer your gift and tell him that you wish to go through the War Spirit's Trial. Tejakar Pa'agrio! May the powers of fire be with you!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-10.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-10.html
new file mode 100644
index 0000000000..b511ed3dfd
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30510-10.html
@@ -0,0 +1,4 @@
+<html><body>Seer Somak:<br>
+To carry out the ceremony of the war spirits, you need to see the forefather spirit of Martankus. Now take the heroes' remains to the eternal Holy Land for Orcs, the Immortal Plateau. And meet the forefather spirit Martankus which dwells in the Cave of Trials.<br>
+Remember to show your utmost respect to the great ancestors. Politely offer your gift and tell him that you wish to go through the War Spirit's Trial. Tejakar Pa'agrio! May the powers of fire be with you!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-01.html
new file mode 100644
index 0000000000..2301acb66c
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-01.html
@@ -0,0 +1,6 @@
+<html><body>Seer Manakia:<br>
+That indomitable Hermodt! The greatest Warrior of the Neruga tribe. If you are here for his remains, first you should hear his story...<br>
+Hermodt was the tribal leader when he set off to kill the serpents threatening his territory. He fought bravely and at last, drove them out.<br>
+Alas he was shot by a poison arrow and died immediately after killing the leader of the serpents, Queen Gorgon! He was a true hero!<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30515-02.html">Ask where the remains lie</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-02.html
new file mode 100644
index 0000000000..63b81cbb8b
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-02.html
@@ -0,0 +1,5 @@
+<html><body>Seer Manakia:<br>
+Ever since the kingdom of Orcs first fell, Giran, has been ruled by the Humans. But Humans are weak, so the outsiders we once beat have started attacking again! What a mess!<br>
+Take this totem to begin with which has our ancestors' spirits within it and it will guide you on your way! In eastern Giran, live medusas who are kin to serpents. Slay them and obtain the remains of Hermodt from them! The medusas split the bones into five pieces and distributed them among several of their kind.<br>
+The important remains are held by the Gorgon Queen, Stenoa! There is no doubt that she is the descendent of the Queen that Hermodt killed! I, Seer Manakia, order you to go and kill the Queen of medusas, to revenge the death of Hermodt, and take back his skull! After you've killed the Queen, go after the other medusas as well to recover his rib-bones, backbone, arm bones, and shinbones too!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-03.html
similarity index 78%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-03.html
index d9de06790a..13f9e3a694 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-03.html
@@ -1,4 +1,4 @@
<html><body>Seer Manakia:<br>
-Didn't I appoint you a task? I told you to recover Hermodt's remains, from the medusas!<br>
+Didn't I appoint you a task? I told you to recover Hermodt's Remains, from the medusas!<br>
Hurry up and get to work! Go and kill those medusas, and recover the remains of Hermodt! And take heed! The important remains are possessed by the Gorgon Queen, Stenoa!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-04.html
new file mode 100644
index 0000000000..01c130ea6c
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-04.html
@@ -0,0 +1,5 @@
+<html><body>Seer Manakia:<br>
+That was magnificent, young shaman! You have driven out the medusas and taken back the remains of our fallen hero!<br>
+It is sad to see this Warrior's remains in such poor condition. I cannot feel his spirit while his remains are like this! I, Seer Manakia shall readjust <font color="LEVEL">Hermodt's Remains</font>, to a more discernible shape!<br>
+Oh, young Orc, even after you pass the Test and move on to a higher level, you must never forget the spirits of our great heroes! The glory of our forefathers who fought for the tribe!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-05.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30515-05.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30515-05.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-01.html
new file mode 100644
index 0000000000..1e79d07cce
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-01.html
@@ -0,0 +1,4 @@
+<html><body>Orim of the Shadow:<br>
+Nice to meet you, Sorcerer of the Orcs. My name is Orim and my master is the great magician Hardin. What brought you to this desolate place of the shadows of the green dragon Antharas?<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30630-02.html">Ask him for the Remains of Braki</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-02.html
new file mode 100644
index 0000000000..828d187361
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-02.html
@@ -0,0 +1,7 @@
+<html><body>Orim of the Shadow:<br>
+You are indeed an Orc... So straightforward... That's right, I have the remains of Braki.<br>
+I am sure that you will attempt to take it from me anyway if I resist giving it to you. I am well aware of the Oak's great power and their devotion to their hero.<br>
+To tell you the truth, I don't want to fight you. I hope you don't take this the wrong way, but if we fight, you will most likely be killed. If possible we should avoid a fight that could be devastating to us both.<br>
+As you know, the remains of Braki are filled with strong magic. If you will find me something that has equal power I shall gladly give you your hero's remains. Doesn't that seem fair?<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30630-03.html">Accept proposal</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-03.html
new file mode 100644
index 0000000000..3a0e176bfb
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-03.html
@@ -0,0 +1,5 @@
+<html><body>Orim of the Shadow:<br>
+Then I shall tell you. I want you to find something for me. If you go to northern Dion, there is a place called the Cruma Marshlands. In its center, there is a huge tower from the giant era.<br>
+Inside the tower there dwells all sorts of weird creatures that have a special thing that grows in their bodies. More specifically, it's a strong spirit power dwelling in their bio matter. To solve the secrets of the ancient treasure of Aklantoth's chest, I need that substance.<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30630-04.html">Ask what is needed exactly.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-04.html
similarity index 59%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-04.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-04.html
index c7a6293c08..2618344fdd 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-04.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-04.html
@@ -1,4 +1,4 @@
<html><body>Orim of the Shadow:<br>
-First, I need the eye of a creature called a porta. They call it the eye but in fact it is a small and solid thing like a jewel. And scales of an excuro. Those scales of the excuro are as hard as steel but once you kill it, it is easy to peel them off. And finally, I need a mordeo talon. It is a silver-white, hook shaped claw. I want you to find ten of each item. All the creatures that I mentioned can be found in the Cruma Tower of northern Dion.<br>
- I have written down our contract in this document. I know that it may seem absurd to you, but it is meant to prevent any shameful events that may take place later on. Take it, just in case. I will be waiting for your safe return.
+First, I need the eye of a creature called a porta. They call it the eye but in fact it is a small and solid thing like a jewel. And scales of an excuro. Those scales of the excuro are as hard as Steel but once you kill it, it is easy to peel them off. And finally, I need a mordeo talon. It is a silver-white, hook shaped claw. I want you to find ten of each item. All the creatures that I mentioned can be found in the Cruma Tower of northern Dion.<br>
+I have written down our Contract in this document. I know that it may seem absurd to you, but it is meant to prevent any shameful events that may take place later on. Take it, just in case. I will be waiting for your safe return.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-05.html
similarity index 81%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-05.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-05.html
index a4933711ee..53cd5a541d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-05.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-05.html
@@ -1,4 +1,4 @@
<html><body>Orim of the Shadow:<br>
-Like it is said in the document, I will give you Braki's remains if you find me the materials that I asked for.<br>
+Like it is said in the document, I will give you Braki's Remains if you find me the materials that I asked for.<br>
I will repeat one more time, just to make sure. The things that I need are porta eyes, excuro scales, and mordeo talons. Ten of each is what I need. You can find them all in the Cruma Tower.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-06.html
similarity index 77%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-06.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-06.html
index 9b289c6013..320d4d2423 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30630-06.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-06.html
@@ -1,3 +1,3 @@
<html><body>Orim of the Shadow:<br>
-Good job, thank you. You have brought ten each of porta eyes, excuro scales, and mordeo talons. Therefore, I shall give you Braki's remains, as promised. May the shades of light lead you to the truth. Farewell then, Shaman of the Orcs.
+Good job, thank you. You have brought ten each of porta eyes, excuro scales, and mordeo talons. Therefore, I shall give you Braki's Remains, as promised. May the shades of light lead you to the truth. Farewell then, Shaman of the Orcs.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-07.html
new file mode 100644
index 0000000000..c61e5c5673
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30630-07.html
@@ -0,0 +1,3 @@
+<html><body>Orim of the Shadow:<br>
+Shaman of the Oaks, good to see you again. I am glad that I was able to return the remains of your hero to his people.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30649-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30649-01.html
new file mode 100644
index 0000000000..eb373cee1f
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30649-01.html
@@ -0,0 +1,7 @@
+<html><body>Ancestor Martankus:<br>
+Tejakar Oroka! I am Hestui Martankus, Lord of the Grizzly Tribe who died during the war between Men on the Immortal Plateau a thousand years ago!<br>
+My descendent, heed your ancestor!<br>
+I have experienced a thousand years of pain watching the collapse of the kingdom and the disintegration of my race! The unending, unbearable sorrow of seeing my descendents lose the memory of their glorious past.<br>
+My offspring, present me with a gift that matches my dignity and power!<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30649-02.html">Give the heads of Tamlin Orcs </a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30649-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30649-02.html
similarity index 67%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30649-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30649-02.html
index 4be7c477d4..c9170d1dbf 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30649-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30649-02.html
@@ -1,5 +1,5 @@
<html><body>Ancestor Martankus:<br>
Death to the traitorous pigs that have deserted the great glory of the Orc kingdom!<br>
I am satisfied with your offering, now tell me what you want! I, Hestui Martankus, your ancestor, will grant your wish!<br>
-<a action="bypass -h Quest 233_TestOfWarspirit 30649_2">"Say you want to take the Ritual of War Spirit."</a>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30649-03.html">"Say you want to take the Ritual of War Spirit."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30649-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30649-03.html
new file mode 100644
index 0000000000..9ad8c147e0
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30649-03.html
@@ -0,0 +1,10 @@
+<html><body>Ancestor Martankus:<br>
+Young Shaman of our race, I feel great strength in the bones you brought. They are bones of great heroes, no doubt!<br>
+Take this strength of past Fighters and make it your own. This is the ritual of the war spirit!<br>
+Pass those bones one by one to me. I, the great Martankus, give the power of spirit in the bones to you.<br>
+Braki of the Duda-Mara, I give his cleverness to you!<br>
+Kiruna of the Urutu, I give you her bravery!<br>
+Tonar of the Hestui, I give his will of iron to you!<br>
+Hermodt of the Neruga, I give his faith to you!<br>
+You, a young Shaman of our race, now own the spirits of the great warriors! As proof, you will be issued the Mark of the War Spirit. It will be of great help for becoming a high-level Shaman. Do not forget the fiery spirit when you lead the warriors of your race into war! Tejakar Oroka!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-01.html
new file mode 100644
index 0000000000..824616560f
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-01.html
@@ -0,0 +1,5 @@
+<html><body>Seer Pekiron:<br>
+I heard the story from Seer Somak! So, you are looking for the bones of Tonar? Then, first I must tell you about superman Tonar, our great hero!<br>
+As you may know, Tonar lead the crack contingent of Hetsui and drove out all the Leto Lizardmen from Oren. But as a last resort, the lizardmen shaman called out the flame wyrm. One by one, the warriors of Hetsui fell down to the ground by the fire spewing from the Wyrm's mouth. Just then, Tonar, unarmed, leapt on the Wyrm and broke its neck! But Tonar himself was severely burnt and died soon after!<br>
+<a action="bypass -h Quest Q00233_TestOfTheWarSpirit 30682-02.html">Ask where the remains are.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-02.html
similarity index 66%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-02.html
index cba0955e39..33846c4e52 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-02.html
@@ -1,4 +1,4 @@
<html><body>Seer Pekiron:<br>
-The lizardman shamans understood the power hidden in Tornar's body. So they ran off with the remains. Then afterwards, with the bones, they made several fetishes. Those fetishes are still handed down among the Leto lizardmen until this day!<br>
-The Leto lizardmen formed a strong force in the southern part of Oren. I suppose the Leto chiefs or shamans who lead the group, have the amulet made from Tonar's remains. Go ahead and take back the remains of our hero! Those bloody lizardmen, dared to split the bones into a skull, rib bones, backbone, arm bones and shin bones. There are 5 pieces altogether! Take this with you! Our forefathers' spirits dwelling in this totem will guide you on your way!
+The Lizardman shamans understood the power hidden in Tornar's body. So they ran off with the remains. Then afterwards, with the bones, they made several fetishes. Those fetishes are still handed down among the Leto Lizardmen until this day!<br>
+The Leto Lizardmen formed a strong force in the southern part of Oren. I suppose the Leto chiefs or shamans who lead the group, have the amulet made from Tonar's Remains. Go ahead and take back the remains of our hero! Those bloody lizardmen, dared to split the bones into a skull, rib bones, backbone, arm bones and shin bones. There are 5 pieces altogether! Take this with you! Our forefathers' spirits dwelling in this totem will guide you on your way!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-03.html
similarity index 75%
rename from L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-03.html
index 0b51ef5d60..7fafaf338a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/233_TestOfWarspirit/30682-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-03.html
@@ -1,3 +1,3 @@
<html><body>Seer Pekiron:<br>
-The bones of Tonar are in the hands of Leto lizardmen. They say that the Leto tribe chiefs or shamans have an amulet made of Tonar's bones, so beat them and recover our hero's remains, which were divided into skull, rib bones, backbone, arm bones, and shin bones!
+The bones of Tonar are in the hands of Leto Lizardmen. They say that the Leto tribe chiefs or shamans have an amulet made of Tonar's bones, so beat them and recover our hero's remains, which were divided into skull, rib bones, backbone, arm bones, and shin bones!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-04.html
new file mode 100644
index 0000000000..b7cb50362b
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-04.html
@@ -0,0 +1,4 @@
+<html><body>Seer Pekiron:<br>
+How could they have desecrated the body of our hero so? I shall adjust the pieces into a recognizable shape!<br>
+Young sorcerer, you must be contemplative while carrying back the bones. You are bearing the symbol of our heroes and forefathers!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-05.html
new file mode 100644
index 0000000000..427d6e9dbd
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/30682-05.html
@@ -0,0 +1,3 @@
+<html><body>Seer Pekiron:<br>
+Go, young shaman, and finish the Test of the War Spirit. I believe that you shall become a proud Warcryer! Until that day when we march onto the battlefield singing the hymns of victory! Tejakar Pa'agrio!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
new file mode 100644
index 0000000000..21f294361d
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -0,0 +1,642 @@
+/*
+ * 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.Q00233_TestOfTheWarSpirit;
+
+import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.enums.Race;
+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 War Spirit (233)
+ * @author ivantotov
+ */
+public final class Q00233_TestOfTheWarSpirit extends Quest
+{
+ // NPCs
+ private static final int PRIESTESS_VIVYAN = 30030;
+ private static final int TRADER_SARIEN = 30436;
+ private static final int SEER_RACOY = 30507;
+ private static final int SEER_SOMAK = 30510;
+ private static final int SEER_MANAKIA = 30515;
+ private static final int SHADOW_ORIM = 30630;
+ private static final int ANCESTOR_MARTANKUS = 30649;
+ private static final int SEER_PEKIRON = 30682;
+ // Items
+ private static final int VENDETTA_TOTEM = 2880;
+ private static final int TAMLIN_ORC_HEAD = 2881;
+ private static final int WARSPIRIT_TOTEM = 2882;
+ private static final int ORIMS_CONTRACT = 2883;
+ private static final int PORTAS_EYE = 2884;
+ private static final int EXCUROS_SCALE = 2885;
+ private static final int MORDEOS_TALON = 2886;
+ private static final int BRAKIS_REMAINS1 = 2887;
+ private static final int PEKIRONS_TOTEM = 2888;
+ private static final int TONARS_SKULL = 2889;
+ private static final int TONARS_RIB_BONE = 2890;
+ private static final int TONARS_SPINE = 2891;
+ private static final int TONARS_ARM_BONE = 2892;
+ private static final int TONARS_THIGH_BONE = 2893;
+ private static final int TONARS_REMAINS1 = 2894;
+ private static final int MANAKIAS_TOTEM = 2895;
+ private static final int HERMODTS_SKULL = 2896;
+ private static final int HERMODTS_RIB_BONE = 2897;
+ private static final int HERMODTS_SPINE = 2898;
+ private static final int HERMODTS_ARM_BONE = 2899;
+ private static final int HERMODTS_THIGH_BONE = 2900;
+ private static final int HERMODTS_REMAINS1 = 2901;
+ private static final int RACOYS_TOTEM = 2902;
+ private static final int VIVIANTES_LETTER = 2903;
+ private static final int INSECT_DIAGRAM_BOOK = 2904;
+ private static final int KIRUNAS_SKULL = 2905;
+ private static final int KIRUNAS_RIB_BONE = 2906;
+ private static final int KIRUNAS_SPINE = 2907;
+ private static final int KIRUNAS_ARM_BONE = 2908;
+ private static final int KIRUNAS_THIGH_BONE = 2909;
+ private static final int KIRUNAS_REMAINS1 = 2910;
+ private static final int BRAKIS_REMAINS2 = 2911;
+ private static final int TONARS_REMAINS2 = 2912;
+ private static final int HERMODTS_REMAINS2 = 2913;
+ private static final int KIRUNAS_REMAINS2 = 2914;
+ // Reward
+ private static final int MARK_OF_WARSPIRIT = 2879;
+ private static final int DIMENSIONAL_DIAMOND = 7562;
+ // Monster
+ private static final int NOBLE_ANT = 20089;
+ private static final int NOBLE_ANT_LEADER = 20090;
+ private static final int MEDUSA = 20158;
+ private static final int PORTA = 20213;
+ private static final int EXCURO = 20214;
+ private static final int MORDERO = 20215;
+ private static final int LETO_LIZARDMAN_SHAMAN = 20581;
+ private static final int LETO_LIZARDMAN_OVERLORD = 20582;
+ private static final int TAMLIN_ORC = 20601;
+ private static final int TAMLIN_ORC_ARCHER = 20602;
+ // Quest Monster
+ private static final int STENOA_GORGON_QUEEN = 27108;
+ // Misc
+ private static final int MIN_LEVEL = 39;
+
+ public Q00233_TestOfTheWarSpirit()
+ {
+ super(233, Q00233_TestOfTheWarSpirit.class.getSimpleName(), "Test Of The War Spirit");
+ addStartNpc(SEER_SOMAK);
+ addTalkId(SEER_SOMAK, PRIESTESS_VIVYAN, TRADER_SARIEN, SEER_RACOY, SEER_MANAKIA, SHADOW_ORIM, ANCESTOR_MARTANKUS, SEER_PEKIRON);
+ addKillId(NOBLE_ANT, NOBLE_ANT_LEADER, MEDUSA, PORTA, EXCURO, MORDERO, LETO_LIZARDMAN_SHAMAN, LETO_LIZARDMAN_OVERLORD, TAMLIN_ORC, TAMLIN_ORC_ARCHER, STENOA_GORGON_QUEEN);
+ registerQuestItems(VENDETTA_TOTEM, TAMLIN_ORC_HEAD, WARSPIRIT_TOTEM, ORIMS_CONTRACT, PORTAS_EYE, EXCUROS_SCALE, MORDEOS_TALON, BRAKIS_REMAINS1, PEKIRONS_TOTEM, TONARS_SKULL, TONARS_RIB_BONE, TONARS_SPINE, TONARS_ARM_BONE, TONARS_THIGH_BONE, TONARS_REMAINS1, MANAKIAS_TOTEM, HERMODTS_SKULL, HERMODTS_RIB_BONE, HERMODTS_SPINE, HERMODTS_ARM_BONE, HERMODTS_THIGH_BONE, HERMODTS_REMAINS1, RACOYS_TOTEM, VIVIANTES_LETTER, INSECT_DIAGRAM_BOOK, KIRUNAS_SKULL, KIRUNAS_RIB_BONE, KIRUNAS_SPINE, KIRUNAS_ARM_BONE, KIRUNAS_THIGH_BONE, KIRUNAS_REMAINS1, BRAKIS_REMAINS2, TONARS_REMAINS2, HERMODTS_REMAINS2, KIRUNAS_REMAINS2);
+ }
+
+ @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();
+ if (player.getVariables().getInt("2ND_CLASS_DIAMOND_REWARD", 0) == 0)
+ {
+ giveItems(player, DIMENSIONAL_DIAMOND, 92);
+ player.getVariables().set("2ND_CLASS_DIAMOND_REWARD", 1);
+ htmltext = "30510-05e.htm";
+ }
+ else
+ {
+ htmltext = "30510-05.htm";
+ }
+ }
+ break;
+ }
+ case "30510-05a.html":
+ case "30510-05b.html":
+ case "30510-05c.html":
+ case "30510-05d.html":
+ case "30510-05.html":
+ case "30030-02.html":
+ case "30030-03.html":
+ case "30630-02.html":
+ case "30630-03.html":
+ case "30649-02.html":
+ {
+ htmltext = event;
+ break;
+ }
+ case "30030-04.html":
+ {
+ giveItems(player, VIVIANTES_LETTER, 1);
+ htmltext = event;
+ break;
+ }
+ case "30507-02.html":
+ {
+ giveItems(player, RACOYS_TOTEM, 1);
+ htmltext = event;
+ break;
+ }
+ case "30515-02.html":
+ {
+ giveItems(player, MANAKIAS_TOTEM, 1);
+ htmltext = event;
+ break;
+ }
+ case "30630-04.html":
+ {
+ giveItems(player, ORIMS_CONTRACT, 1);
+ htmltext = event;
+ break;
+ }
+ case "30649-03.html":
+ {
+ if (hasQuestItems(player, TONARS_REMAINS2))
+ {
+ giveAdena(player, 161806, true);
+ giveItems(player, MARK_OF_WARSPIRIT, 1);
+ addExpAndSp(player, 894888, 61408);
+ qs.exitQuest(false, true);
+ player.sendPacket(new SocialAction(player.getObjectId(), 3));
+ htmltext = event;
+ }
+ break;
+ }
+ case "30682-02.html":
+ {
+ giveItems(player, PEKIRONS_TOTEM, 1);
+ htmltext = event;
+ 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 NOBLE_ANT:
+ case NOBLE_ANT_LEADER:
+ {
+ if (hasQuestItems(killer, RACOYS_TOTEM, INSECT_DIAGRAM_BOOK))
+ {
+ final int i0 = getRandom(100);
+ if (i0 > 65)
+ {
+ if (!hasQuestItems(killer, KIRUNAS_THIGH_BONE))
+ {
+ giveItems(killer, KIRUNAS_THIGH_BONE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else if (!hasQuestItems(killer, KIRUNAS_ARM_BONE))
+ {
+ giveItems(killer, KIRUNAS_ARM_BONE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ }
+ else if (i0 > 30)
+ {
+ if (!hasQuestItems(killer, KIRUNAS_SPINE))
+ {
+ giveItems(killer, KIRUNAS_SPINE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else if (!hasQuestItems(killer, KIRUNAS_RIB_BONE))
+ {
+ giveItems(killer, KIRUNAS_RIB_BONE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ }
+ else if (i0 > 0)
+ {
+ if (!hasQuestItems(killer, KIRUNAS_SKULL))
+ {
+ giveItems(killer, KIRUNAS_SKULL, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ }
+ }
+ break;
+ }
+ case MEDUSA:
+ {
+ if (hasQuestItems(killer, MANAKIAS_TOTEM))
+ {
+ if (!hasQuestItems(killer, HERMODTS_RIB_BONE))
+ {
+ giveItems(killer, HERMODTS_RIB_BONE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else if (!hasQuestItems(killer, HERMODTS_SPINE))
+ {
+ giveItems(killer, HERMODTS_SPINE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else if (!hasQuestItems(killer, HERMODTS_ARM_BONE))
+ {
+ giveItems(killer, HERMODTS_ARM_BONE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else if (!hasQuestItems(killer, HERMODTS_THIGH_BONE))
+ {
+ giveItems(killer, HERMODTS_THIGH_BONE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ }
+ break;
+ }
+ case PORTA:
+ {
+ if (hasQuestItems(killer, ORIMS_CONTRACT))
+ {
+ giveItemRandomly(killer, npc, PORTAS_EYE, 2, 10, 1.0, true);
+ }
+ break;
+ }
+ case EXCURO:
+ {
+ if (hasQuestItems(killer, ORIMS_CONTRACT))
+ {
+ giveItemRandomly(killer, npc, EXCUROS_SCALE, 5, 10, 1.0, true);
+ }
+ break;
+ }
+ case MORDERO:
+ {
+ if (hasQuestItems(killer, ORIMS_CONTRACT))
+ {
+ giveItemRandomly(killer, npc, MORDEOS_TALON, 5, 10, 1.0, true);
+ }
+ break;
+ }
+ case LETO_LIZARDMAN_SHAMAN:
+ case LETO_LIZARDMAN_OVERLORD:
+ {
+ if (hasQuestItems(killer, PEKIRONS_TOTEM))
+ {
+ if (!hasQuestItems(killer, TONARS_SKULL))
+ {
+ giveItems(killer, TONARS_SKULL, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else if (!hasQuestItems(killer, TONARS_RIB_BONE))
+ {
+ giveItems(killer, TONARS_RIB_BONE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else if (!hasQuestItems(killer, TONARS_SPINE))
+ {
+ giveItems(killer, TONARS_SPINE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else if (!hasQuestItems(killer, TONARS_ARM_BONE))
+ {
+ giveItems(killer, TONARS_ARM_BONE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else if (!hasQuestItems(killer, TONARS_THIGH_BONE))
+ {
+ giveItems(killer, TONARS_THIGH_BONE, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ }
+ break;
+ }
+ case TAMLIN_ORC:
+ case TAMLIN_ORC_ARCHER:
+ {
+ if (hasQuestItems(killer, VENDETTA_TOTEM))
+ {
+ if (giveItemRandomly(killer, npc, TAMLIN_ORC_HEAD, 1, 13, 1.0, true))
+ {
+ qs.setCond(4, true);
+ }
+ }
+ break;
+ }
+ case STENOA_GORGON_QUEEN:
+ {
+ if (hasQuestItems(killer, MANAKIAS_TOTEM) && !hasQuestItems(killer, HERMODTS_SKULL))
+ {
+ giveItems(killer, HERMODTS_SKULL, 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);
+ String htmltext = getNoQuestMsg(player);
+ if (qs.isCreated())
+ {
+ if (npc.getId() == SEER_SOMAK)
+ {
+ if (player.getRace() == Race.ORC)
+ {
+ if (player.getClassId() == ClassId.orcShaman)
+ {
+ if (player.getLevel() < MIN_LEVEL)
+ {
+ htmltext = "30510-03.html";
+ }
+ else
+ {
+ htmltext = "30510-04.htm";
+ }
+ }
+ else
+ {
+ htmltext = "30510-02.html";
+ }
+ }
+ else
+ {
+ htmltext = "30510-01.html";
+ }
+ }
+ }
+ else if (qs.isStarted())
+ {
+ switch (npc.getId())
+ {
+ case SEER_SOMAK:
+ {
+ if (!hasAtLeastOneQuestItem(player, VENDETTA_TOTEM, WARSPIRIT_TOTEM))
+ {
+ if (hasQuestItems(player, BRAKIS_REMAINS1, HERMODTS_REMAINS1, KIRUNAS_REMAINS1, TONARS_REMAINS1))
+ {
+ giveItems(player, VENDETTA_TOTEM, 1);
+ takeItems(player, BRAKIS_REMAINS1, 1);
+ takeItems(player, TONARS_REMAINS1, 1);
+ takeItems(player, HERMODTS_REMAINS1, 1);
+ takeItems(player, KIRUNAS_REMAINS1, 1);
+ qs.setCond(3);
+ htmltext = "30510-07.html";
+ }
+ else
+ {
+ htmltext = "30510-06.html";
+ }
+ }
+ else if (hasQuestItems(player, VENDETTA_TOTEM))
+ {
+ if (getQuestItemsCount(player, TAMLIN_ORC_HEAD) < 13)
+ {
+ htmltext = "30510-08.html";
+ }
+ else
+ {
+ takeItems(player, VENDETTA_TOTEM, 1);
+ giveItems(player, WARSPIRIT_TOTEM, 1);
+ giveItems(player, BRAKIS_REMAINS2, 1);
+ giveItems(player, TONARS_REMAINS2, 1);
+ giveItems(player, HERMODTS_REMAINS2, 1);
+ giveItems(player, KIRUNAS_REMAINS2, 1);
+ qs.setCond(5);
+ htmltext = "30510-09.html";
+ }
+ }
+ else if (hasQuestItems(player, WARSPIRIT_TOTEM))
+ {
+ htmltext = "30510-10.html";
+ }
+ break;
+ }
+ case PRIESTESS_VIVYAN:
+ {
+ if (hasQuestItems(player, RACOYS_TOTEM) && !hasAtLeastOneQuestItem(player, VIVIANTES_LETTER, INSECT_DIAGRAM_BOOK))
+ {
+ htmltext = "30030-01.html";
+ }
+ else if (hasQuestItems(player, RACOYS_TOTEM, VIVIANTES_LETTER) && !hasQuestItems(player, INSECT_DIAGRAM_BOOK))
+ {
+ htmltext = "30030-05.html";
+ }
+ else if (hasQuestItems(player, RACOYS_TOTEM, INSECT_DIAGRAM_BOOK) && !hasQuestItems(player, VIVIANTES_LETTER))
+ {
+ htmltext = "30030-06.html";
+ }
+ else if (!hasQuestItems(player, RACOYS_TOTEM) && hasAtLeastOneQuestItem(player, KIRUNAS_REMAINS1, KIRUNAS_REMAINS2, VENDETTA_TOTEM))
+ {
+ htmltext = "30030-07.html";
+ }
+ break;
+ }
+ case TRADER_SARIEN:
+ {
+ if (hasQuestItems(player, RACOYS_TOTEM, VIVIANTES_LETTER) && !hasQuestItems(player, INSECT_DIAGRAM_BOOK))
+ {
+ takeItems(player, VIVIANTES_LETTER, 1);
+ giveItems(player, INSECT_DIAGRAM_BOOK, 1);
+ htmltext = "30436-01.html";
+ }
+ else if (hasQuestItems(player, RACOYS_TOTEM, INSECT_DIAGRAM_BOOK) && !hasQuestItems(player, VIVIANTES_LETTER))
+ {
+ htmltext = "30436-02.html";
+ }
+ else if (!hasQuestItems(player, RACOYS_TOTEM) && hasAtLeastOneQuestItem(player, KIRUNAS_REMAINS1, KIRUNAS_REMAINS2, VENDETTA_TOTEM))
+ {
+ htmltext = "30436-03.html";
+ }
+ break;
+ }
+ case SEER_RACOY:
+ {
+ if (!hasAtLeastOneQuestItem(player, RACOYS_TOTEM, KIRUNAS_REMAINS1, KIRUNAS_REMAINS2, VENDETTA_TOTEM))
+ {
+ htmltext = "30507-01.html";
+ }
+ else if (hasQuestItems(player, RACOYS_TOTEM) && !hasAtLeastOneQuestItem(player, VIVIANTES_LETTER, INSECT_DIAGRAM_BOOK))
+ {
+ htmltext = "30507-03.html";
+ }
+ else if (hasQuestItems(player, RACOYS_TOTEM, VIVIANTES_LETTER) && !hasQuestItems(player, INSECT_DIAGRAM_BOOK))
+ {
+ htmltext = "30507-04.html";
+ }
+ else if (hasQuestItems(player, RACOYS_TOTEM, INSECT_DIAGRAM_BOOK) && !hasQuestItems(player, VIVIANTES_LETTER))
+ {
+ if (hasQuestItems(player, KIRUNAS_SKULL, KIRUNAS_RIB_BONE, KIRUNAS_SPINE, KIRUNAS_ARM_BONE, KIRUNAS_THIGH_BONE))
+ {
+ takeItems(player, RACOYS_TOTEM, 1);
+ takeItems(player, INSECT_DIAGRAM_BOOK, 1);
+ takeItems(player, KIRUNAS_SKULL, 1);
+ takeItems(player, KIRUNAS_RIB_BONE, 1);
+ takeItems(player, KIRUNAS_SPINE, 1);
+ takeItems(player, KIRUNAS_ARM_BONE, 1);
+ takeItems(player, KIRUNAS_THIGH_BONE, 1);
+ giveItems(player, KIRUNAS_REMAINS1, 1);
+ if (hasQuestItems(player, BRAKIS_REMAINS1, HERMODTS_REMAINS1, TONARS_REMAINS1))
+ {
+ qs.setCond(2);
+ }
+ htmltext = "30507-06.html";
+ }
+ else
+ {
+ htmltext = "30507-05.html";
+ }
+ }
+ else if (!hasQuestItems(player, RACOYS_TOTEM) && hasAtLeastOneQuestItem(player, KIRUNAS_REMAINS1, KIRUNAS_REMAINS2, VENDETTA_TOTEM))
+ {
+ htmltext = "30507-07.html";
+ }
+ break;
+ }
+ case SEER_MANAKIA:
+ {
+ if (!hasAtLeastOneQuestItem(player, MANAKIAS_TOTEM, HERMODTS_REMAINS2, VENDETTA_TOTEM, HERMODTS_REMAINS1))
+ {
+ htmltext = "30515-01.html";
+ }
+ else if (hasQuestItems(player, MANAKIAS_TOTEM))
+ {
+ if (hasQuestItems(player, HERMODTS_SKULL, HERMODTS_RIB_BONE, HERMODTS_SPINE, HERMODTS_ARM_BONE, HERMODTS_THIGH_BONE))
+ {
+ takeItems(player, MANAKIAS_TOTEM, 1);
+ takeItems(player, HERMODTS_SKULL, 1);
+ takeItems(player, HERMODTS_RIB_BONE, 1);
+ takeItems(player, HERMODTS_SPINE, 1);
+ takeItems(player, HERMODTS_ARM_BONE, 1);
+ takeItems(player, HERMODTS_THIGH_BONE, 1);
+ giveItems(player, HERMODTS_REMAINS1, 1);
+ if (hasQuestItems(player, BRAKIS_REMAINS1, KIRUNAS_REMAINS1, TONARS_REMAINS1))
+ {
+ qs.setCond(2);
+ }
+ htmltext = "30515-04.html";
+ }
+ else
+ {
+ htmltext = "30515-03.html";
+ }
+ }
+ else if (!hasQuestItems(player, MANAKIAS_TOTEM) && hasAtLeastOneQuestItem(player, HERMODTS_REMAINS1, HERMODTS_REMAINS2, VENDETTA_TOTEM))
+ {
+ htmltext = "30515-05.html";
+ }
+ break;
+ }
+ case SHADOW_ORIM:
+ {
+ if (!hasAtLeastOneQuestItem(player, ORIMS_CONTRACT, BRAKIS_REMAINS1, BRAKIS_REMAINS2, VENDETTA_TOTEM))
+ {
+ htmltext = "30630-01.html";
+ }
+ else if (hasQuestItems(player, ORIMS_CONTRACT))
+ {
+ if ((getQuestItemsCount(player, PORTAS_EYE) + getQuestItemsCount(player, EXCUROS_SCALE) + getQuestItemsCount(player, MORDEOS_TALON)) < 30)
+ {
+ htmltext = "30630-05.html";
+ }
+ else
+ {
+ takeItems(player, ORIMS_CONTRACT, 1);
+ takeItems(player, PORTAS_EYE, -1);
+ takeItems(player, EXCUROS_SCALE, -1);
+ takeItems(player, MORDEOS_TALON, -1);
+ giveItems(player, BRAKIS_REMAINS1, 1);
+ if (hasQuestItems(player, HERMODTS_REMAINS1, KIRUNAS_REMAINS1, TONARS_REMAINS1))
+ {
+ qs.setCond(2);
+ }
+ htmltext = "30630-06.html";
+ }
+ }
+ else if (!hasQuestItems(player, ORIMS_CONTRACT) && hasAtLeastOneQuestItem(player, BRAKIS_REMAINS1, BRAKIS_REMAINS2, VENDETTA_TOTEM))
+ {
+ htmltext = "30630-07.html";
+ }
+ break;
+ }
+ case ANCESTOR_MARTANKUS:
+ {
+ if (hasQuestItems(player, WARSPIRIT_TOTEM))
+ {
+ htmltext = "30649-01.html";
+ }
+ break;
+ }
+ case SEER_PEKIRON:
+ {
+ if (!hasAtLeastOneQuestItem(player, PEKIRONS_TOTEM, TONARS_REMAINS1, TONARS_REMAINS2, VENDETTA_TOTEM))
+ {
+ htmltext = "30682-01.html";
+ }
+ else if (hasQuestItems(player, PEKIRONS_TOTEM))
+ {
+ if (hasQuestItems(player, TONARS_SKULL, TONARS_RIB_BONE, TONARS_SPINE, TONARS_ARM_BONE, TONARS_THIGH_BONE))
+ {
+ takeItems(player, PEKIRONS_TOTEM, 1);
+ takeItems(player, TONARS_SKULL, 1);
+ takeItems(player, TONARS_RIB_BONE, 1);
+ takeItems(player, TONARS_SPINE, 1);
+ takeItems(player, TONARS_ARM_BONE, 1);
+ takeItems(player, TONARS_THIGH_BONE, 1);
+ giveItems(player, TONARS_REMAINS1, 1);
+ if (hasQuestItems(player, BRAKIS_REMAINS1, HERMODTS_REMAINS1, KIRUNAS_REMAINS1))
+ {
+ qs.setCond(2);
+ }
+ htmltext = "30682-04.html";
+ }
+ else
+ {
+ htmltext = "30682-03.html";
+ }
+ }
+ else if (!hasQuestItems(player, PEKIRONS_TOTEM) && hasAtLeastOneQuestItem(player, TONARS_REMAINS1, TONARS_REMAINS2, VENDETTA_TOTEM))
+ {
+ htmltext = "30682-05.html";
+ }
+ break;
+ }
+ }
+ }
+ else if (qs.isCompleted())
+ {
+ if (npc.getId() == SEER_SOMAK)
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ }
+ }
+ return htmltext;
+ }
+}
\ 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 2c99f5b777..1def399b95 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -211,6 +211,7 @@ 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.Q00233_TestOfTheWarSpirit.Q00233_TestOfTheWarSpirit;
import quests.Q00235_MimirsElixir.Q00235_MimirsElixir;
import quests.Q00237_WindsOfChange.Q00237_WindsOfChange;
import quests.Q00238_SuccessFailureOfBusiness.Q00238_SuccessFailureOfBusiness;
@@ -666,6 +667,7 @@ public class QuestMasterHandler
Q00229_TestOfWitchcraft.class,
Q00231_TestOfTheMaestro.class,
Q00232_TestOfTheLord.class,
+ Q00233_TestOfTheWarSpirit.class,
Q00235_MimirsElixir.class,
Q00237_WindsOfChange.class,
Q00238_SuccessFailureOfBusiness.class,
diff --git a/L2J_DataPack/dist/sql/game/updates/20141205update.sql b/L2J_DataPack/dist/sql/game/updates/20141205update.sql
index 0eecce64cc..02ca772431 100644
--- a/L2J_DataPack/dist/sql/game/updates/20141205update.sql
+++ b/L2J_DataPack/dist/sql/game/updates/20141205update.sql
@@ -1 +1,2 @@
-UPDATE character_quests SET name='Q00222_TestOfTheDuelist' WHERE name='222_TestOfDuelist';
\ No newline at end of file
+UPDATE character_quests SET name='Q00222_TestOfTheDuelist' WHERE name='222_TestOfDuelist';
+UPDATE character_quests SET name='Q00233_TestOfTheWarSpirit' WHERE name='233_TestOfWarspirit';
\ No newline at end of file
--
GitLab