From 9824b1cbf41b932c9b892264e0d40a83b168c9f0 Mon Sep 17 00:00:00 2001
From: ivantotov <gmtotov@gmail.com>
Date: Sat, 27 Dec 2014 18:30:20 +0200
Subject: [PATCH] Retail-like quest Acts Of Evil (171). Reviewed by: @Zoey76
---
L2J_DataPack/dist/game/data/scripts.cfg | 1 -
.../quests/171_ActsOfEvil/30207-01.htm | 6 -
.../quests/171_ActsOfEvil/30207-01a.htm | 3 -
.../quests/171_ActsOfEvil/30207-03.htm | 2 -
.../quests/171_ActsOfEvil/30381-03.htm | 2 -
.../quests/171_ActsOfEvil/30381-04.htm | 3 -
.../quests/171_ActsOfEvil/30381-04a.htm | 2 -
.../quests/171_ActsOfEvil/30381-05.htm | 5 -
.../quests/171_ActsOfEvil/30381-05a.htm | 2 -
.../quests/171_ActsOfEvil/30381-06.htm | 4 -
.../quests/171_ActsOfEvil/30381-07a.htm | 2 -
.../quests/171_ActsOfEvil/30381-08.htm | 3 -
.../quests/171_ActsOfEvil/30425-02.htm | 3 -
.../quests/171_ActsOfEvil/30437-03.htm | 3 -
.../quests/171_ActsOfEvil/30617-04.htm | 4 -
.../quests/171_ActsOfEvil/30617-04a.htm | 2 -
.../scripts/quests/171_ActsOfEvil/__init__.py | 220 -------
.../quests/Q00171_ActsOfEvil/30207-01.html | 7 +
.../30207-01a.html} | 2 +-
.../quests/Q00171_ActsOfEvil/30207-02.html | 5 +
.../quests/Q00171_ActsOfEvil/30207-03.html | 3 +
.../quests/Q00171_ActsOfEvil/30207-04.html | 4 +
.../30207-05.html} | 3 +-
.../30381-01.htm} | 7 +-
.../30381-02.htm} | 5 +-
.../30381-03.htm} | 4 +-
.../30381-04.html} | 2 +-
.../quests/Q00171_ActsOfEvil/30381-05.html | 3 +
.../quests/Q00171_ActsOfEvil/30381-06.html | 5 +
.../quests/Q00171_ActsOfEvil/30381-07.html | 5 +
.../quests/Q00171_ActsOfEvil/30381-08.html | 4 +
.../quests/Q00171_ActsOfEvil/30381-09.html | 6 +
.../quests/Q00171_ActsOfEvil/30381-10.html | 3 +
.../quests/Q00171_ActsOfEvil/30381-11.html | 6 +
.../30381-12.html} | 5 +-
.../quests/Q00171_ActsOfEvil/30381-13.html | 3 +
.../quests/Q00171_ActsOfEvil/30381-14.html | 5 +
.../quests/Q00171_ActsOfEvil/30381-15.html | 3 +
.../quests/Q00171_ActsOfEvil/30381-16.html | 3 +
.../quests/Q00171_ActsOfEvil/30381-17.html | 3 +
.../30420-01.html} | 0
.../30420-02.html} | 5 +-
.../30420-03.html} | 5 +-
.../30420-04.html} | 0
.../30425-01.html} | 7 +-
.../quests/Q00171_ActsOfEvil/30425-02.html | 4 +
.../quests/Q00171_ActsOfEvil/30425-03.html | 4 +
.../30437-02.html} | 7 +-
.../30437-03.html} | 5 +-
.../quests/Q00171_ActsOfEvil/30437-04.html | 4 +
.../30437-05.html} | 5 +-
.../quests/Q00171_ActsOfEvil/30437-06.html | 5 +
.../quests/Q00171_ActsOfEvil/30617-01.html | 4 +
.../30617-02.html} | 5 +-
.../30617-03.html} | 3 +-
.../30617-04.html} | 3 +-
.../quests/Q00171_ActsOfEvil/30617-05.html | 4 +
.../quests/Q00171_ActsOfEvil/30617-06.html | 3 +
.../30617-07.html} | 5 +-
.../quests/Q00171_ActsOfEvil/30617-08.html | 4 +
.../Q00171_ActsOfEvil/Q00171_ActsOfEvil.java | 615 ++++++++++++++++++
.../scripts/quests/QuestMasterHandler.java | 2 +
.../dist/sql/game/updates/20141227update.sql | 1 +
63 files changed, 764 insertions(+), 299 deletions(-)
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-01a.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-04a.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-05.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-05a.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-06.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-07a.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-08.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30425-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-04a.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/__init__.py
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-01.html
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30207-02.htm => Q00171_ActsOfEvil/30207-01a.html} (50%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-03.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-04.html
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30207-03a.htm => Q00171_ActsOfEvil/30207-05.html} (87%)
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30381-01a.htm => Q00171_ActsOfEvil/30381-01.htm} (65%)
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30381-01.htm => Q00171_ActsOfEvil/30381-02.htm} (81%)
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30381-02.htm => Q00171_ActsOfEvil/30381-03.htm} (54%)
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30381-02a.htm => Q00171_ActsOfEvil/30381-04.html} (59%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-05.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-06.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-07.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-08.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-09.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-10.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-11.html
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30381-07.htm => Q00171_ActsOfEvil/30381-12.html} (71%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-13.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-14.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-15.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-16.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-17.html
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30420-01b.htm => Q00171_ActsOfEvil/30420-01.html} (100%)
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30420-01.htm => Q00171_ActsOfEvil/30420-02.html} (80%)
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30420-01a.htm => Q00171_ActsOfEvil/30420-03.html} (57%)
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30420-02.htm => Q00171_ActsOfEvil/30420-04.html} (100%)
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30425-01.htm => Q00171_ActsOfEvil/30425-01.html} (54%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30425-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30425-03.html
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30437-01.htm => Q00171_ActsOfEvil/30437-02.html} (52%)
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30437-02.htm => Q00171_ActsOfEvil/30437-03.html} (69%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-04.html
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30437-03a.htm => Q00171_ActsOfEvil/30437-05.html} (52%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-06.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-01.html
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30617-01.htm => Q00171_ActsOfEvil/30617-02.html} (50%)
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30617-02.htm => Q00171_ActsOfEvil/30617-03.html} (64%)
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30617-03.htm => Q00171_ActsOfEvil/30617-04.html} (53%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-05.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-06.html
rename L2J_DataPack/dist/game/data/scripts/quests/{171_ActsOfEvil/30617-05.htm => Q00171_ActsOfEvil/30617-07.html} (80%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-08.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
create mode 100644 L2J_DataPack/dist/sql/game/updates/20141227update.sql
diff --git a/L2J_DataPack/dist/game/data/scripts.cfg b/L2J_DataPack/dist/game/data/scripts.cfg
index bea8b0f255..206896492b 100644
--- a/L2J_DataPack/dist/game/data/scripts.cfg
+++ b/L2J_DataPack/dist/game/data/scripts.cfg
@@ -214,7 +214,6 @@ quests/60_GoodWorkReward/__init__.py
quests/65_CertifiedSoulBreaker/__init__.py
quests/118_ToLeadAndBeLed/__init__.py
quests/123_TheLeaderAndTheFollower/__init__.py
-quests/171_ActsOfEvil/__init__.py
quests/178_IconicTrinity/__init__.py
quests/227_TestOfReformer/__init__.py
quests/230_TestOfSummoner/__init__.py
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-01.htm
deleted file mode 100644
index ba7eb39f43..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-01.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Trader Arodin:<br>
-Are you a mercenary sent by the guards?<br>
-I suppose you know about my situation?<font color="LEVEL"> 20 sword blade molds</font> that were to be delivered to the Dark Elves were stolen by orcs. Dark Elves are very strict about such things... If they don't receive their order on time, they might sever our business relationship. If that happens, we stand to lose vast amounts of adena...<br>
-Please help us!<font color="LEVEL"> Recover the cargo stolen by the Turek orcs and deliver it to Dark Elven Trader Tyra</font>. You will find her in her store in the western part of the Altar of Rites.<br>Ah, before you go, let me tell you something interesting. Recently, I heard a rumor...<br>
-<a action="bypass -h Quest 171_ActsOfEvil 30207-02.htm">"Tell me about the rumor!"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-01a.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-01a.htm
deleted file mode 100644
index b8768dc527..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-01a.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Trader Arodin:<br>
-You must recover the cargo stolen by<font color="LEVEL"> Turek orcs</font>. The cargo consists of<font color="LEVEL"> 20 sword Blade Molds</font>. When you have recovered all of them, take them to<font color="LEVEL"> Dark Elven Trader Tyra</font>. You will find her in her store in the western part of the Altar of Rites.<br>Have you heard the rumor?<br>
-<a action="bypass -h Quest 171_ActsOfEvil 30207-02.htm">"Tell me about the rumor."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-03.htm
deleted file mode 100644
index 4b103c5d58..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-03.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Trader Arodin:<br>
-Good job! You have saved our business relationship with the Dark Elves. Guard Alvah is expecting you. You should report to him right away.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-03.htm
deleted file mode 100644
index 74de367f05..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-03.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Guard Alvah:<br>I just received a message from Trader Arodin detailing the success of your mission! He asked me to extend his gratitude to you for your efforts. Good job!<br>Unfortunately, now we have another, even more dangerous problem! Word has come that the ol mahums are planning an all-out attack on Gludin Village! Sir Klaus Jasper discounts the danger of this, but...<br>
-<a action="bypass -h Quest 171_ActsOfEvil 30381-04.htm">"It appears that the Turek orcs have joined forces with the ol mahums."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-04.htm
deleted file mode 100644
index 4a47043a3f..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Guard Alvah:<br>What's that? Ol mahums in the Orc Barracks...? Certainly this proves they are planning an attack! This is most distressing!<br>
-... I fear this still won't be enough to persuade Sir Klaus Vasper. We must try to get more information from the patrols that were sent to spy on the ol mahums... They were last known to be hiding from the ol mahums in the<font color="LEVEL"> Ruins of Agony</font>. I fear they may have been killed by the<font color="LEVEL"> Tumran bugbears</font> that roam that desolate place...<br>
-Please find out what has become of our patrols. This is of utmost importance! I must know what happened to them!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-04a.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-04a.htm
deleted file mode 100644
index b97f3e8116..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-04a.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Guard Alvah:<br>
-The patrols that we sent to spy on the ol mahums must have gotten some valuable information about them. The last message we got from them said that they were hiding from the ol mahums in the<font color="LEVEL"> Ruins of Agony</font>. I fear that they may have been killed by the<font color="LEVEL"> Tumran bugbears</font> that frequent that desolate place...<br>Please hurry and find out what happened to the patrols!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-05.htm
deleted file mode 100644
index a382014919..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-05.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Guard Alvah:<br>
-So sad. Those heroic patrolmen gave their lives for this information...<br>
-Let's see... What's this? ol mahums allied with Dwarves...?! What treachery!<br>
-This is treason! We must tread carefully, my friend. The influence of the Dwarven Guild cannot be ignored. If we rushed in and made such charges that were later proven j untrue, we would be in serious trouble.<br>
-We need proof of this conspiracy of Dwarves and ol mahums! Go to the<font color="LEVEL"> Abandoned Camp</font> and check out the<font color="LEVEL"> ol mahum generals</font>. That should yield some proof.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-05a.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-05a.htm
deleted file mode 100644
index d0f9465fa8..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-05a.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Guard Alvah:<br>
-Don't you realize how important this Is? You must find proof of the alliance between Dwarves and ol mahums! Go to the<font color="LEVEL"> Abandoned Camp</font> and check out the<font color="LEVEL"> ol mahum generals</font>. You will find the proof there.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-06.htm
deleted file mode 100644
index c216a4577a..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-06.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Guard Alvah:<br>
-Have you found proof of the alliance? What's this? Ol mahum's operation orders? Let me see that... This is unbelievable...! The ol mahums' target is not Gludin Village after all! They intend to seize the Orc Barracks! Those deceitful beasts plan to falsely pledge an alliance with the orcs, send them off to train for the attack on Gludin Village and then seize their unguarded barracks! What treacherous creatures they are!<br>
-If the ol mahums are allowed to take the take the western part of Gludin Village and also establish a base in the north, we will be completely cut off!<br>
-<a action="bypass -h Quest 171_ActsOfEvil 30381-07.htm">Show him the Weapons Trade Contract.</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-07a.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-07a.htm
deleted file mode 100644
index c89b1e44d7..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-07a.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Guard Alvah:<br>
-Ask<font color="LEVEL"> Neti</font> about the Dwarven Guild seal on the weapons Contract. We must determine which guild is aiding the ol mahums!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-08.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-08.htm
deleted file mode 100644
index 5e66355d89..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-08.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Guard Alvah:<br>
-Good job! The invasion has failed! Now Turek orcs and ol mahums will only be concerned with killing each other. What a turn of fate.<br>
-It has been said that one dedicated warrior can defeat an army, and you have proven this to be true. Please accept this token of appreciation from the Gludio Guards.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30425-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30425-02.htm
deleted file mode 100644
index adc84fa883..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30425-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Neti:<br>
-Please do what you can to clear<font color="LEVEL"> Trader Rolento's</font> name as soon as possible. It Is just appalling that a man of his character could have such scurrilous rumors circulated about him! He would never have supplied weapons to the ol mahums!<br>
-Please, go to the<font color="LEVEL"> south entrance of the Wasteland</font> and meet Rolento.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-03.htm
deleted file mode 100644
index ecaad0dfef..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Trader Rolento:<br>
-Go to the<font color="LEVEL"> Orc Barracks</font> and deliver the weapons. You'll meet<font color="LEVEL"> Turek Chief Burai</font> there. Tell him of the ol mahums treachery. That should set his blood to boil!<br>
-Take this mark from the Silver Scale Guild, and this Cargo Box as well. Don't worry. It's filled with crude weapons made of cheap brass.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-04.htm
deleted file mode 100644
index 79f99b406a..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Turek Chief Burai:<br>
-Kaaah aak!!! Listen to me, brave Turek Warriors! Gludin Is no longer our target! We must annihilate our true enemy! Tomorrow morning we shall attack the barracks of the ol mahums!<br>
-You're a mercenary, right? Then I want to hire you to go and cut off the heads of the<font color="LEVEL"> ol mahum captains</font>!<br>
-Bring me back<font color="LEVEL"> at least 30 of their heads</font>! Then I will give you a wonderful prize!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-04a.htm b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-04a.htm
deleted file mode 100644
index bd6eea6c96..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-04a.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Turek Chief Burai:<br>
-Go and cut off the heads of the<font color="LEVEL"> ol mahum captains</font>! Bring back at least<font color="LEVEL"> 30</font> of them and I will give you a prize!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/__init__.py
deleted file mode 100644
index bd02072cef..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/__init__.py
+++ /dev/null
@@ -1,220 +0,0 @@
-# Made by mtrix
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-qn = "171_ActsOfEvil"
-
-BLADE_MOLD,TYRAS_BILL,RANGERS_REPORT1,RANGERS_REPORT2,RANGERS_REPORT3,RANGERS_REPORT4,\
-WEAPON_TRADE_CONTRACT,ATTACK_DIRECTIVES,CERTIFICATE,CARGOBOX,OL_MAHUM_HEAD = range(4239,4250)
-
-ADENA = 57
-
-CHANCE1 = 50
-CHANCE11 = 10
-CHANCE2 = 100
-CHANCE21 = 20
-CHANCE22 = 20
-CHANCE23 = 20
-CHANCE24 = 10
-CHANCE25 = 10
-CHANCE3 = 50
-
-ALVAH,ARODIN,TYRA,ROLENTO,NETI,BURAI=30381,30207,30420,30437,30425,30617
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [RANGERS_REPORT1, RANGERS_REPORT2, RANGERS_REPORT3, RANGERS_REPORT4, OL_MAHUM_HEAD, CARGOBOX, TYRAS_BILL, CERTIFICATE, BLADE_MOLD, WEAPON_TRADE_CONTRACT]
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = self.getQuestState(player, False)
- if not st : return
- cond = st.getInt("cond")
- if st.getState() != State.COMPLETED :
- if event == "30381-02.htm" and cond == 0 :
- st.setState(State.STARTED)
- st.set("cond","1")
- st.playSound("ItemSound.quest_accept")
- elif event == "30207-02.htm" and cond == 1 :
- st.set("cond","2")
- elif event == "30381-04.htm" and cond == 4:
- st.set("cond","5")
- elif event == "30381-07.htm" and cond == 6:
- st.set("cond","7")
- st.takeItems(WEAPON_TRADE_CONTRACT,-1)
- st.playSound("ItemSound.quest_middle")
- elif event == "30437-03.htm" and cond == 8:
- st.giveItems(CARGOBOX,1)
- st.giveItems(CERTIFICATE,1)
- st.set("cond","9")
- elif event == "30617-04.htm" and cond == 9:
- st.takeItems(CERTIFICATE,-1)
- st.takeItems(ATTACK_DIRECTIVES,-1)
- st.takeItems(CARGOBOX,-1)
- st.set("cond","10")
- 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()
- level = player.getLevel()
- cond = st.getInt("cond")
- if npcId==ALVAH :
- if id == State.CREATED :
- if level > 26:
- htmltext = "30381-01.htm"
- else :
- htmltext = "30381-01a.htm"
- st.exitQuest(1)
- elif id == State.COMPLETED :
- htmltext = Quest.getAlreadyCompletedMsg(player)
- elif cond==1 :
- htmltext = "30381-02a.htm"
- elif cond==4 :
- htmltext = "30381-03.htm"
- elif cond==5 :
- if st.getQuestItemsCount(RANGERS_REPORT1) and st.getQuestItemsCount(RANGERS_REPORT2) and st.getQuestItemsCount(RANGERS_REPORT3) and st.getQuestItemsCount(RANGERS_REPORT4) :
- htmltext = "30381-05.htm"
- st.takeItems(RANGERS_REPORT1,-1)
- st.takeItems(RANGERS_REPORT2,-1)
- st.takeItems(RANGERS_REPORT3,-1)
- st.takeItems(RANGERS_REPORT4,-1)
- st.set("cond","6")
- else :
- htmltext = "30381-04a.htm"
- elif cond==6 :
- if st.getQuestItemsCount(WEAPON_TRADE_CONTRACT) and st.getQuestItemsCount(ATTACK_DIRECTIVES) :
- htmltext = "30381-06.htm"
- else :
- htmltext = "30381-05a.htm"
- elif cond==7 :
- htmltext = "30381-07a.htm"
- elif cond==11 :
- htmltext = "30381-08.htm"
- st.giveItems(ADENA,95000)
- st.addExpAndSp(159820,9182)
- st.playSound("ItemSound.quest_finish")
- st.exitQuest(False)
- elif id == State.STARTED :
- if npcId==ARODIN :
- if cond==1 :
- htmltext = "30207-01.htm"
- elif cond==2 :
- htmltext = "30207-01a.htm"
- elif cond==3 :
- if st.getQuestItemsCount(TYRAS_BILL) :
- st.takeItems(TYRAS_BILL,-1)
- htmltext = "30207-03.htm"
- st.set("cond","4")
- else :
- htmltext = "30207-01a.htm"
- elif cond==4 :
- htmltext = "30207-03a.htm"
- elif npcId==TYRA :
- if cond==2 :
- if st.getQuestItemsCount(BLADE_MOLD)>=20 :
- st.takeItems(BLADE_MOLD,-1)
- st.giveItems(TYRAS_BILL,1)
- htmltext = "30420-01.htm"
- st.set("cond","3")
- else :
- htmltext = "30420-01b.htm"
- elif cond==3 :
- htmltext = "30420-01a.htm"
- elif cond > 3 :
- htmltext = "30420-02.htm"
- elif npcId==NETI :
- if cond==7 :
- htmltext = "30425-01.htm"
- st.set("cond","8")
- elif cond==8 :
- htmltext = "30425-02.htm"
- elif npcId==ROLENTO :
- if cond==8 :
- htmltext = "30437-01.htm"
- elif cond==9 :
- htmltext = "30437-03a.htm"
- elif npcId==BURAI :
- if cond==9 and st.getQuestItemsCount(CERTIFICATE) and st.getQuestItemsCount(CARGOBOX) and st.getQuestItemsCount(ATTACK_DIRECTIVES) :
- htmltext = "30617-01.htm"
- if cond==10 :
- if st.getQuestItemsCount(OL_MAHUM_HEAD)>=30 :
- htmltext = "30617-05.htm"
- st.giveItems(ADENA,8000)
- st.takeItems(OL_MAHUM_HEAD,-1)
- st.set("cond","11")
- st.playSound("ItemSound.quest_itemget")
- else :
- htmltext = "30617-04a.htm"
- return htmltext
-
- def onKill(self,npc,player,isPet):
- st = self.getQuestState(player, False)
- if not st : return
- if st.getState() != State.STARTED : return
-
- npcId = npc.getId()
- cond = st.getInt("cond")
- chance=self.getRandom(100)
- if cond==2 and npcId in range(20496,20500) :
- blades = st.getQuestItemsCount(BLADE_MOLD)
- if chance < CHANCE11 :
- st.addSpawn(27190)
- if chance < CHANCE1 and blades < 20 :
- st.giveItems(BLADE_MOLD,1)
- if blades == 19 :
- st.playSound("ItemSound.quest_middle")
- else :
- st.playSound("ItemSound.quest_itemget")
- elif cond==5 and npcId == 20062 :
- if not st.getQuestItemsCount(RANGERS_REPORT1) and chance < CHANCE2:
- st.giveItems(RANGERS_REPORT1,1)
- st.playSound("ItemSound.quest_itemget")
- elif not st.getQuestItemsCount(RANGERS_REPORT2) and chance < CHANCE21:
- st.giveItems(RANGERS_REPORT2,1)
- st.playSound("ItemSound.quest_itemget")
- elif not st.getQuestItemsCount(RANGERS_REPORT3) and chance < CHANCE22:
- st.giveItems(RANGERS_REPORT3,1)
- st.playSound("ItemSound.quest_itemget")
- elif not st.getQuestItemsCount(RANGERS_REPORT4) and chance < CHANCE23:
- st.giveItems(RANGERS_REPORT4,1)
- st.playSound("ItemSound.quest_itemget")
- elif cond==6 and npcId==20438 :
- if not st.getQuestItemsCount(WEAPON_TRADE_CONTRACT) and chance < CHANCE24:
- st.giveItems(WEAPON_TRADE_CONTRACT,1)
- st.playSound("ItemSound.quest_itemget")
- elif not st.getQuestItemsCount(ATTACK_DIRECTIVES) and chance < CHANCE25:
- st.giveItems(ATTACK_DIRECTIVES,1)
- st.playSound("ItemSound.quest_itemget")
- elif cond==10 and npcId==20066 :
- heads=st.getQuestItemsCount(OL_MAHUM_HEAD)
- if heads < 30 and chance < CHANCE3 :
- st.giveItems(OL_MAHUM_HEAD,1)
- if heads == 29 :
- st.playSound("ItemSound.quest_middle")
- else :
- st.playSound("ItemSound.quest_itemget")
- return
-
-QUEST = Quest(171,qn,"Acts of Evil")
-
-QUEST.addStartNpc(ALVAH)
-
-QUEST.addTalkId(ALVAH)
-
-QUEST.addTalkId(ARODIN)
-QUEST.addTalkId(TYRA)
-QUEST.addTalkId(ROLENTO)
-QUEST.addTalkId(NETI)
-QUEST.addTalkId(BURAI)
-
-for i in range(20494,20500)+[20062,20066,20438] :
- QUEST.addKillId(i)
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-01.html
new file mode 100644
index 0000000000..3e1bedea2d
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-01.html
@@ -0,0 +1,7 @@
+<html><body>Trader Arodin:<br>
+Are you a mercenary sent by the guards?<br>
+I suppose you know about my situation? <font color="LEVEL">20 sword blade molds</font> that were to be delivered to the Dark Elves were stolen by orcs. Dark Elves are very strict about such things... If they don't receive their order on time, they might sever our business relationship. If that happens, we stand to lose vast amounts of Adena...<br>
+Please help us! <font color="LEVEL">Recover the cargo stolen by the Turek orcs and deliver it to Dark Elven Trader Tyra.</font> You will find her in her store in the western part of the Altar of Rites.<br>
+Ah, before you go, let me tell you something interesting. Recently, I heard a rumor...<br>
+<a action="bypass -h Quest Q00171_ActsOfEvil 30207-01a.html">"Tell me about the rumor!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-01a.html
similarity index 50%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-01a.html
index c6cf1c9122..ede4ea1401 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-01a.html
@@ -1,3 +1,3 @@
<html><body>Trader Arodin:<br>
-Witnesses said that several ol mahums were with the orcs when they raided the cargo wagon. This is the first I've heard of orcs and ol mahums working cooperatively... Something strange is going on. Please be careful.
+Witnesses said that several Ol Mahums were with the orcs when they raided the cargo wagon. This is the first I've heard of orcs and Ol Mahums working cooperatively... Something strange is going on. Please be careful.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-02.html
new file mode 100644
index 0000000000..1b2f237cc7
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-02.html
@@ -0,0 +1,5 @@
+<html><body>Trader Arodin:<br>
+You must recover the cargo stolen by <font color="LEVEL">Turek orcs</font>. The cargo consists of <font color="LEVEL">20 sword Blade Molds</font>. When you have recovered all of them, take them to <font color="LEVEL">Dark Elven Trader Tyra</font>. You will find her in her store in the western part of the Altar of Rites.<br>
+Have you heard the rumor?<br>
+<a action="bypass -h Quest Q00171_ActsOfEvil 30207-01a.html">"Tell me about the rumor."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-03.html
new file mode 100644
index 0000000000..6a4bc2893e
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-03.html
@@ -0,0 +1,3 @@
+<html><body>Trader Arodin:<br>
+You have recovered all of the molds stolen by the Turek orcs! Thank you so much! Now, <font color="LEVEL">please deliver the recovered cargo to Dark Elven Trader Tyra.</font> You will find her in her store in the western part of the Altar of Rites. Please be careful on your journey.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-04.html
new file mode 100644
index 0000000000..61078e7fd4
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-04.html
@@ -0,0 +1,4 @@
+<html><body>Trader Arodin:<br>
+Good job! You have saved our business relationship with the Dark Elves.<br>
+<font color="LEVEL">Guard Alvah</font> is expecting you. You should report to him right away.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-03a.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-05.html
similarity index 87%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-03a.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-05.html
index f713eb1f77..f913a3c23a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30207-03a.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30207-05.html
@@ -1,2 +1,3 @@
<html><body>Trader Arodin:<br>
-You're the one who recovered the stolen cargo, aren't you? You look well! I really appreciate what you did for us. Thanks to you, our guild was able to sustain our business relationship with the Dark Elves.</body></html>
\ No newline at end of file
+You're the one who recovered the stolen cargo, aren't you? You look well! I really appreciate what you did for us. Thanks to you, our guild was able to sustain our business relationship with the Dark Elves.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-01a.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-01.htm
similarity index 65%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-01a.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-01.htm
index c5673cb6ef..7ff38c9e41 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-01a.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-01.htm
@@ -1,6 +1,5 @@
<html><body>Guard Alvah:<br>
We have had many problems lately from the Turek orcs. The worst has been their looting and pillaging! Recently a wagon crossing the Dark Elven Forest was attacked and all the cargo stolen. The Aden Trade Union has filed a formal request for assistance from the Gludio Guards!<br>
-Unfortunately, since the ol mahums are constantly trying to sneak into Gludin Village, the guards cannot leave their posts even for a moment! There has been much discussion on this subject, and we have come to the conclusion that our only option at this point is to hire mercenaries to drive out the Turek orcs.<br>
-It is quite troubling to be compelled to trust our future to outsiders...<br>
-What's that? You are a mercenary? What a stroke of luck! Would you consider helping us?<br>
-(Quest for characters level 27 or above)</body></html>
\ No newline at end of file
+Unfortunately, since the Ol Mahums are constantly trying to sneak into Gludin Village, the guards cannot leave their posts even for a moment! There has been much discussion on this subject, and we have come to the conclusion that our only option at this point is to hire mercenaries to drive out the Turek orcs.<br>
+(This quest can only be undertaken by a character of level 27 or above.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-02.htm
similarity index 81%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-02.htm
index c00c4f57dc..715e1aba3a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-02.htm
@@ -1,6 +1,7 @@
<html><body>Guard Alvah:<br>
We have had many problems lately from the Turek orcs. The worst has been their looting and pillaging! Recently a wagon crossing the Dark Elven Forest was attacked and all the cargo stolen. The Aden Trade Union has filed a formal request for assistance from the Gludio Guards!<br>
-Unfortunately, since the ol mahums are constantly trying to sneak into Gludin Village, the guards cannot leave their posts even for a moment! There has been much discussion on this subject, and we have come to the conclusion that our only option at this point is to hire mercenaries to drive out the Turek orcs.<br>
+Unfortunately, since the Ol Mahums are constantly trying to sneak into Gludin Village, the guards cannot leave their posts even for a moment! There has been much discussion on this subject, and we have come to the conclusion that our only option at this point is to hire mercenaries to drive out the Turek orcs.<br>
It is quite troubling to be compelled to trust our future to outsiders...<br>
What's that? You are a mercenary? What a stroke of luck! Would you consider helping us?<br>
-<a action="bypass -h Quest 171_ActsOfEvil 30381-02.htm">"Yes, I will help"</a></body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00171_ActsOfEvil 30381-03.htm">"Yes, I will help."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-03.htm
similarity index 54%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-03.htm
index 6fdfbf1ea7..7c3ed89905 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-03.htm
@@ -1,3 +1,5 @@
<html><body>Guard Alvah:<br>
Excellent! Now listen carefully.<br>
-First you must meet with<font color="LEVEL"> Trader Arodin</font> and get the details of the raid that occurred day before yesterday. Determine exactly which items were stolen from the cargo wagon. Trader Arodin can be found in the<font color="LEVEL"> Weapons Store</font>.</body></html>
\ No newline at end of file
+First you must meet with <font color="LEVEL">Trader Arodin</font> and get the details of the raid that occurred day before yesterday. Determine exactly which items were stolen from the cargo wagon. Trader Arodin can be found in the
+<font color="LEVEL">Weapons Store</font>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-02a.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-04.html
similarity index 59%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-02a.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-04.html
index e5c1528a49..552df7604e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-02a.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-04.html
@@ -1,3 +1,3 @@
<html><body>Guard Alvah:<br>
-Surely you couldn't have forgotten already!? You must meet with<font color="LEVEL"> Trader Arodin at the Weapons Store</font>. He will tell you exactly which items were stolen from the cargo wagon by the Turek orcs. Please do this quickly, before the guild files a complaint!
+Surely you couldn't have forgotten already!? You must meet with <font color="LEVEL">Trader Arodin at the Weapons Store</font>. He will tell you exactly which items were stolen from the cargo wagon by the Turek orcs. Please do this quickly, before the guild files a complaint!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-05.html
new file mode 100644
index 0000000000..60889882ac
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-05.html
@@ -0,0 +1,3 @@
+<html><body>Guard Alvah:<br>
+I trust that you met with Trader Arodin and found out what was stolen from the cargo wagon? Good! Now there is just the task of killing the Turek orcs and recovering the cargo!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-06.html
new file mode 100644
index 0000000000..a9369d1dac
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-06.html
@@ -0,0 +1,5 @@
+<html><body>Guard Alvah:<br>
+I just received a message from Trader Arodin detailing the success of your mission! He asked me to extend his gratitude to you for your efforts. Good job!<br>
+Unfortunately, now we have another, even more dangerous problem! Word has come that the Ol Mahums are planning an all-out attack on Gludin Village! Sir Klaus Vasper discounts the danger of this, but...<br>
+<a action="bypass -h Quest Q00171_ActsOfEvil 30381-07.html">"It appears that the Turek orcs have joined forces with the Ol Mahums."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-07.html
new file mode 100644
index 0000000000..8513ec23b3
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-07.html
@@ -0,0 +1,5 @@
+<html><body>Guard Alvah:<br>
+What's that? Ol Mahums in the Orc Barracks...? Certainly this proves they are planning an attack! This is most distressing!<br>
+... I fear this still won't be enough to persuade Sir Klaus Vasper. We must try to get more information from the patrols that were sent to spy on the Ol Mahums... They were last known to be hiding from the Ol Mahums in the <font color="LEVEL">Ruins of Agony</font>. I fear they may have been killed by the <font color="LEVEL">Tumran bugbears</font> that roam that desolate place...<br>
+Please find out what has become of our patrols. This is of utmost importance! I must know what happened to them!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-08.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-08.html
new file mode 100644
index 0000000000..ba59560e38
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-08.html
@@ -0,0 +1,4 @@
+<html><body>Guard Alvah:<br>
+The patrols that we sent to spy on the Ol Mahums must have gotten some valuable information about them. The last message we got from them said that they were hiding from the Ol Mahums in the <font color="LEVEL">Ruins of Agony</font>. I fear that they may have been killed by the <font color="LEVEL">Tumran bugbears</font> that frequent that desolate place...<br>
+Please hurry and find out what happened to the patrols!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-09.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-09.html
new file mode 100644
index 0000000000..ac47983e58
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-09.html
@@ -0,0 +1,6 @@
+<html><body>Guard Alvah:<br>
+So sad. Those heroic patrolmen gave their lives for this information...<br>
+Let's see... What's this? Ol Mahums allied with Dwarves...?! What treachery!<br>
+This is treason! We must tread carefully, my friend. The influence of the Dwarven Guild cannot be ignored. If we rushed in and made such charges that were later proven untrue, we would be in serious trouble.<br>
+We need proof of this conspiracy of Dwarves and Ol Mahums! Go to the <font color="LEVEL">Abandoned Camp</font> and check out the <font color="LEVEL">Ol Mahum generals</font>. That should yield some proof.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-10.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-10.html
new file mode 100644
index 0000000000..6aec79996c
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-10.html
@@ -0,0 +1,3 @@
+<html><body>Guard Alvah:<br>
+Don't you realize how important this is? You must find proof of the alliance between Dwarves and Ol Mahums! Go to the <font color="LEVEL">Abandoned Camp</font> and check out the <font color="LEVEL">Ol Mahum generals</font>. You will find the proof there.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-11.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-11.html
new file mode 100644
index 0000000000..d31f548410
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-11.html
@@ -0,0 +1,6 @@
+<html><body>Guard Alvah:<br>
+Have you found proof of the alliance? What's this? Ol mahum's operation orders? Let me see that...<br>
+This is unbelievable...! The Ol Mahums' target is not Gludin Village after all! They intend to seize the Orc Barracks! Those deceitful beasts plan to falsely pledge an alliance with the orcs, send them off to train for the attack on Gludin Village and then seize their unguarded barracks! What treacherous creatures they are!<br>
+If the Ol Mahums are allowed to take the take the western part of Gludin Village and also establish a base in the north, we will be completely cut off!<br>
+<a action="bypass -h Quest Q00171_ActsOfEvil 30381-12.html">Show him the Weapons Trade Contract.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-12.html
similarity index 71%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-07.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-12.html
index cf8aee75ed..0f91ea9f91 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30381-07.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-12.html
@@ -1,4 +1,5 @@
<html><body>Guard Alvah:<br>
-A Contract? What's this? Hmmm, a Contract to purchase a large supplies of weapons. Look at this seal at the bottom! The mark of a Dwarven Guild! Could this be the proof we need that Dwarves are providing ol mahums with weapons?
+A Contract? What's this? Hmmm, a Contract to purchase a large supplies of weapons. Look at this seal at the bottom! The mark of a Dwarven Guild! Could this be the proof we need that Dwarves are providing ol mahums with weapons?<br>
We must find out which guild uses this seal, but we can't ask the Dwarves directly...<br>
-Have you met<font color="LEVEL"> Neti</font>, who lives in this village? Ask her! She used to live among the Dwarves in Schuttgart and knows their ways.</body></html>
\ No newline at end of file
+Have you met <font color="LEVEL">Neti</font>, who lives in this village? Ask her! She used to live among the Dwarves in Schuttgart and knows their ways.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-13.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-13.html
new file mode 100644
index 0000000000..af90ebf260
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-13.html
@@ -0,0 +1,3 @@
+<html><body>Guard Alvah:<br>
+Ask <font color="LEVEL">Neti</font> about the Dwarven Guild seal on the weapons Contract. We must determine which guild is aiding the Ol Mahums!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-14.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-14.html
new file mode 100644
index 0000000000..78917c14f2
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-14.html
@@ -0,0 +1,5 @@
+<html><body>Guard Alvah:<br>
+What did Neti say? <font color="LEVEL">Trader Rolento</font>? That Dwarf with the business near the <font color="LEVEL">southern entrance of the Wasteland</font> drafted the Weapons Trade Contract?<br>
+I knew that guy wasn't on the level... Such an odd place for a business... He must have done that to avoid notice of his nefarious dealings...<br>
+You must confront Trader Rolento with this Contract. If he confesses to dealing with the Ol Mahums I will have him arrested!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-15.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-15.html
new file mode 100644
index 0000000000..b93394678e
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-15.html
@@ -0,0 +1,3 @@
+<html><body>Guard Alvah:<br>
+We must take Trader Rolento's word for now. First you must visit <font color="LEVEL">the Orc Barracks</font> and meet with <font color="LEVEL">Turek Chief Burai</font>. Show him the Ol Mahums' Operation Order, he'll call off his dogs. Better these evil ones attack each other than us.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-16.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-16.html
new file mode 100644
index 0000000000..50c977c279
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-16.html
@@ -0,0 +1,3 @@
+<html><body>Guard Alvah:<br>
+Well that explains everything! The Turek Chief, eh? This is brilliant! It sets both of our enemies back on their heels with one stroke!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-17.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-17.html
new file mode 100644
index 0000000000..c547e92ed2
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30381-17.html
@@ -0,0 +1,3 @@
+<html><body>Guard Alvah:<br>Good job! The invasion has failed! Now Turek orcs and ol mahums will only be concerned with killing each other. What a turn of fate.<br>
+It has been said that one dedicated warrior can defeat an army, and you have proven this to be true. Please accept this token of appreciation from the Gludio Guards.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30420-01b.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30420-01.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30420-01b.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30420-01.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30420-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30420-02.html
similarity index 80%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30420-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30420-02.html
index a3ab4c8f76..23561714ac 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30420-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30420-02.html
@@ -1,3 +1,4 @@
-<html><body>Traider Tyra:<br>
+<html><body>Trader Tyra:<br>
Hmm, I ordered the mold over a month ago... This merchandise is a week late and it looks like it's been damaged.<br>
-Regardless of whether the cargo was stolen or not, you're responsible for delivering the goods on time. However, it is true that Turek orcs are carrying out raids of unprecedented audacity. I will make an exception this time. This time I will pay you, as specified in the Contract. From now on, please make sure that my orders arrive on time. Give this bill to Trader Arodin.</body></html>
\ No newline at end of file
+Regardless of whether the cargo was stolen or not, you're responsible for delivering the goods on time. However, it is true that Turek orcs are carrying out raids of unprecedented audacity. I will make an exception this time. This time I will pay you, as specified in the Contract. From now on, please make sure that my orders arrive on time.Give this bill to Trader Arodin.<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30420-01a.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30420-03.html
similarity index 57%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30420-01a.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30420-03.html
index 1a75df3409..cedeb984f2 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30420-01a.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30420-03.html
@@ -1,2 +1,3 @@
-<html><body>Traider Tyra:<br>
-Please take the bill I gave you to Trader Arodin. You will find him in the weapons shop in Gludin Village. Remind him that from now on he should keep the terms of our Contract.</body></html>
\ No newline at end of file
+<html><body>Trader Tyra:<br>
+Please take the bill I gave you to Trader Arodin. You will find him in the weapons shop in Gludin Village. Remind him that from now on he should keep the terms of our Contract.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30420-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30420-04.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30420-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30420-04.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30425-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30425-01.html
similarity index 54%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30425-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30425-01.html
index 4740d0f3d5..5ae9ee6f58 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30425-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30425-01.html
@@ -1,4 +1,5 @@
<html><body>Neti:<br>
-I have a basic idea of your situation... Could I take a look at the Contract?
-This is the mark of the Silver Scale guild.<font color="LEVEL"> Trader Rolento</font> is the only Dwarf in this area who belongs to that guild... However, he would never supply weapons to the ol mahums...<br>
-I'm sure there must have been a misunderstanding! Or, maybe someone framed him... If you met him you would realize that I know what I'm talking about. Please! Go and meet Rolento at the<font color="LEVEL"> south entrance of the Wasteland</font>, you'll realize he would never have done such a thing.</body></html>
\ No newline at end of file
+I have a basic idea of your situation... Could I take a look at the Contract?<br>
+This is the mark of the Silver Scale guild. <font color="LEVEL">Trader Rolento</font> is the only Dwarf in this area who belongs to that guild... However, he would never supply weapons to the Ol Mahums...<br>
+I'm sure there must have been a misunderstanding! Or, maybe someone framed him... If you met him you would realize that I know what I'm talking about. Please! Go and meet Rolento at <font color="LEVEL">the south entrance of the Wasteland</font>, you'll realize he would never have done such a thing.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30425-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30425-02.html
new file mode 100644
index 0000000000..e0d7633197
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30425-02.html
@@ -0,0 +1,4 @@
+<html><body>Neti:<br>
+Please do what you can to clear <font color="LEVEL">Trader Rolento's</font> name as soon as possible. It is just appalling that a man of his character could have such scurrilous rumors circulated about him! He would never have supplied weapons to the Ol Mahums!<br>
+Please, go to the <font color="LEVEL">south entrance of the Wasteland</font> and meet Rolento.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30425-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30425-03.html
new file mode 100644
index 0000000000..9d65db7d09
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30425-03.html
@@ -0,0 +1,4 @@
+<html><body>Neti:<br>
+Well, I hear what you say, but I don't understand why Rolento would give weapons to the Ol Mahums... Surely he must have had some noble purpose? He must be aware of the seriousness of this offense...<br>
+Let's hope for the best!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-02.html
similarity index 52%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-02.html
index 35d04bea7a..bd16e9a313 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-02.html
@@ -1,5 +1,6 @@
<html><body>Trader Rolento:<br>
Ah, yes, this is my Contract. Is there a problem?<br>
-What do you mean the ol mahums? What are you talking about? No way! That's not what happened...!<br>
-Listen to me for a minute! A while back an ol mahum general came to me looking for a gift for the orcs. Apparently they had signed a peace agreement. He said that he wanted to present them with gifts as an expression of trust...<br>
-<a action="bypass -h Quest 171_ActsOfEvil 30437-02.htm">Tell him about the invasion plans of the Turek orcs.</a></body></html>
\ No newline at end of file
+What do you mean the Ol Mahums? What are you talking about? No way! That's not what happened...!<br>
+Listen to me for a minute! A while back an Ol Mahum general came to me looking for a gift for the orcs. Apparently they had signed a peace agreement. He said that he wanted to present them with gifts as an expression of trust...<br>
+<a action="bypass -h Quest Q00171_ActsOfEvil 30437-03.html">Tell him about the invasion plans of the Turek orcs.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-03.html
similarity index 69%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-03.html
index 854efeb9b9..7bb151f333 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-03.html
@@ -1,5 +1,6 @@
<html><body>Trader Rolento:<br>
He told me that the weapons would be used for hunting! He said that the Turek orcs were starving in the snow and needed the weapons to hunt wild hogs! He didn't say anything about an invasion. This is the first I've heard of that! Please believe me!<br>
Sigh! And I thought I had really hammered out a good deal with that creature...<br>
-Damn those ol mahums! They're not going to get away with this! I have a plan!<br>
-<a action="bypass -h Quest 171_ActsOfEvil 30437-03.htm">"Tell me about vour plan."</a></body></html>
\ No newline at end of file
+Damn those Ol Mahums! They're not going to get away with this! I have a plan!<br>
+<a action="bypass -h Quest Q00171_ActsOfEvil 30437-04.html">"Tell me about your plan."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-04.html
new file mode 100644
index 0000000000..85c16c30da
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-04.html
@@ -0,0 +1,4 @@
+<html><body>Trader Rolento:<br>
+Go to <font color="LEVEL">the Orc Barracks</font> and deliver the weapons. You'll meet <font color="LEVEL">Turek Chief Burai</font> there. Tell him of the Ol Mahums treachery. That should set his blood to boil!<br>
+Take this mark from the Silver Scale Guild, and this Cargo Box as well. Don't worry. It's filled with crude weapons made of cheap brass.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-03a.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-05.html
similarity index 52%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-03a.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-05.html
index 974cebb9c8..f72bd51d2e 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30437-03a.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-05.html
@@ -1,3 +1,4 @@
<html><body>Trader Rolento:<br>
-Why are you still here? Have you already forgotten our plan? Take the weapons to the<font color="LEVEL"> Orc Barracks</font>. Tell<font color="LEVEL"> Turek Chief Burai</font> of the ol mahums treachery. The orcs will take care of them.<br>
-Keep the mark of the Silver Scale guild with you always! When you show it to them, they will know that I sent you. Now be on your way!</body></html>
\ No newline at end of file
+Why are you still here? Have you already forgotten our plan? Take the weapons to <font color="LEVEL">the Orc Barracks</font>. Tell <font color="LEVEL">Turek Chief Burai</font> of the Ol Mahums' treachery. The orcs will take care of them.<br>
+Keep the mark of the Silver Scale guild with you always! When you show it to them, they will know that I sent you. Now be on your way!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-06.html
new file mode 100644
index 0000000000..f27bbb0440
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30437-06.html
@@ -0,0 +1,5 @@
+<html><body>Trader Rolento:<br>
+What happened?<br>
+I knew it! They should keep each other busy for a while! Har har!<br>
+You saved me on that one. I owe you one, buddy.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-01.html
new file mode 100644
index 0000000000..b2350468ab
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-01.html
@@ -0,0 +1,4 @@
+<html><body>Turek Chief Burai:<br>
+Tejakar Turek! May glory be heaped upon the soldiers of our tribe!<br>
+The Humans will soon feel our wrath!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-02.html
similarity index 50%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-02.html
index 2f6fe8d44e..fe60b73a02 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-02.html
@@ -1,4 +1,5 @@
<html><body>Turek Chief Burai:<br>
Who let you in here? Did you see my soldiers out there? You're very brave, stranger!<br>
-What's that about weapons? Ah, yes, the shipment from the ol mahums! But you don't look like a trader?! You look more like a mercenary!<br>
-<a action="bypass -h Quest 171_ActsOfEvil 30617-02.htm">Show him the mark from the Silver Scale Guild.</a></body></html>
\ No newline at end of file
+What's that about weapons? Ah, yes, the shipment from the Ol Mahums! But you don't look like a trader?! You look more like a mercenary!<br>
+<a action="bypass -h Quest Q00171_ActsOfEvil 30617-03.html">Show him the mark from the Silver Scale Guild.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-03.html
similarity index 64%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-03.html
index 9a4d1c5637..cb21d83866 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-03.html
@@ -1,4 +1,5 @@
<html><body>Turek Chief Burai:<br>
That is just so Dwarf! They are such cowards!<br>
These weapons will mean that brave Turek Warriors no longer need fear the Humans! We shall crush them mercilessly! Tejakar Turek!<br>
-<a action="bypass -h Quest 171_ActsOfEvil 30617-03.htm">Show him the ol mahums operation order.</a></body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00171_ActsOfEvil 30617-04.html">Show him the Ol Mahums' operation order.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-04.html
similarity index 53%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-04.html
index 734d42413b..ce191786fc 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-04.html
@@ -2,4 +2,5 @@
...?<br>
This is unbelievable!<br>
How dare they deceive us! Those filthy traitors!<br>
-<a action="bypass -h Quest 171_ActsOfEvil 30617-04.htm">"You've been played!"</a></body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00171_ActsOfEvil 30617-05.html">"You've been played!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-05.html
new file mode 100644
index 0000000000..56fe122fbd
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-05.html
@@ -0,0 +1,4 @@
+<html><body>Turek Chief Burai:<br>
+Kaaah aak!!! Listen to me, brave Turek Warriors! Gludin is no longer our target! We must annihilate our true enemy! Tomorrow morning we shall attack the barracks of the Ol Mahums!<br>
+You're a mercenary, right? Then I want to hire you to go and cut off the heads of the <font color="LEVEL">Ol Mahum captains</font>! Bring me back at least <font color="LEVEL">30 of their heads</font>! Then I will give you a wonderful prize!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-06.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-06.html
new file mode 100644
index 0000000000..46a75bfe99
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-06.html
@@ -0,0 +1,3 @@
+<html><body>Turek Chief Burai:<br>
+Go and cut off the heads of the <font color="LEVEL">Ol Mahum captains</font>! Bring back at least <font color="LEVEL">30</font> of them and I will give you a prize!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-07.html
similarity index 80%
rename from L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-05.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-07.html
index 05ca033c4f..3ee2609cfa 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/171_ActsOfEvil/30617-05.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-07.html
@@ -1,4 +1,5 @@
<html><body>Turek Chief Burai:<br>
-Good job! 30 good ol mahums!<br>
+Good job! 30 good Ol Mahums!<br>
This is just the beginning of the carnage! They shall rue the day they deceived us! We will attack their barracks at dawn and give no quarter!<br>
-Go to Gludin and tell them that they are off the hook... For now. One day the mighty Turek tribe will sweep down like a black cloud and destroy them!</body></html>
\ No newline at end of file
+Go to Gludin and tell them that they are off the hook... For now. One day the mighty Turek tribe will sweep down like a black cloud and destroy them!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-08.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-08.html
new file mode 100644
index 0000000000..849a149628
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/30617-08.html
@@ -0,0 +1,4 @@
+<html><body>Turek Chief Burai:<br>
+This is just the beginning of the carnage! The Ol Mahums will rue the day they deceived us! We will attack their barracks at dawn and give no quarter!<br>
+Go to Gludin and tell them that they are off the hook... For now. One day the mighty Turek tribe will sweep down like a black cloud and destroy them!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
new file mode 100644
index 0000000000..24383f4b73
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00171_ActsOfEvil/Q00171_ActsOfEvil.java
@@ -0,0 +1,615 @@
+/*
+ * 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.Q00171_ActsOfEvil;
+
+import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Acts Of Evil (171)
+ * @author ivantotov
+ */
+public final class Q00171_ActsOfEvil extends Quest
+{
+ // NPCs
+ private final static int TRADER_ARODIN = 30207;
+ private static final int GUARD_ALVAH = 30381;
+ private final static int TYRA = 30420;
+ private final static int NETI = 30425;
+ private final static int TRADER_ROLENTO = 30437;
+ private final static int TUREK_CHIEF_BURAI = 30617;
+ // Items
+ private final static int BLADE_MOLD = 4239;
+ private final static int TYRAS_BILL = 4240;
+ private final static int RANGERS_REPORT1 = 4241;
+ private final static int RANGERS_REPORT2 = 4242;
+ private final static int RANGERS_REPORT3 = 4243;
+ private final static int RANGERS_REPORT4 = 4244;
+ private final static int WEAPONS_TRADE_CONTRACT = 4245;
+ private final static int ATTACK_DIRECTIVES = 4246;
+ private final static int CERTIFICATE_OF_THE_SILVER_GUILD = 4247;
+ private final static int ROLENTOS_CARGOBOX = 4248;
+ private final static int OL_MAHUM_CAPTAINS_HEAD = 4249;
+ // Monster
+ private static final int TUMRAN_BUGBEAR = 20062;
+ private static final int TUMRAN_BUGBEAR_WARRIOR = 20064;
+ private static final int OL_MAHUM_CAPTAIN = 20066;
+ private static final int OL_MAHUM_GENERAL = 20438;
+ private static final int TUREK_ORC_ARCHER = 20496;
+ private static final int TUREK_ORC_SKIRMISHER = 20497;
+ private static final int TUREK_ORC_SUPPLIER = 20498;
+ private static final int TUREK_ORC_FOOTMAN = 20499;
+ // Quest Monster
+ private static final int OL_MAHUM_SUPPORT_TROOP = 27190;
+ // Misc
+ private static final int MIN_LEVEL = 27;
+
+ public Q00171_ActsOfEvil()
+ {
+ super(171, Q00171_ActsOfEvil.class.getSimpleName(), "Acts Of Evil");
+ addStartNpc(GUARD_ALVAH);
+ addTalkId(GUARD_ALVAH, TRADER_ARODIN, TYRA, NETI, TRADER_ROLENTO, TUREK_CHIEF_BURAI);
+ addKillId(TUMRAN_BUGBEAR, TUMRAN_BUGBEAR_WARRIOR, OL_MAHUM_CAPTAIN, OL_MAHUM_GENERAL, TUREK_ORC_ARCHER, TUREK_ORC_SKIRMISHER, TUREK_ORC_SUPPLIER, TUREK_ORC_FOOTMAN, OL_MAHUM_SUPPORT_TROOP);
+ addSpawnId(OL_MAHUM_SUPPORT_TROOP);
+ registerQuestItems(BLADE_MOLD, TYRAS_BILL, RANGERS_REPORT1, RANGERS_REPORT2, RANGERS_REPORT3, RANGERS_REPORT4, WEAPONS_TRADE_CONTRACT, ATTACK_DIRECTIVES, CERTIFICATE_OF_THE_SILVER_GUILD, ROLENTOS_CARGOBOX, OL_MAHUM_CAPTAINS_HEAD);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ if ("DESPAWN".equals(event))
+ {
+ if (npc != null)
+ {
+ npc.broadcastPacket(new NpcSay(npc, Say2.NPC_ALL, NpcStringId.YOU_SHOULD_CONSIDER_GOING_BACK));
+ npc.deleteMe();
+ }
+ return super.onAdvEvent(event, npc, player);
+ }
+
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "30381-03.htm":
+ {
+ if (qs.isCreated())
+ {
+ qs.startQuest();
+ qs.setMemoState(1);
+ htmltext = event;
+ }
+ break;
+ }
+ case "30381-07.html":
+ {
+ qs.setMemoState(5);
+ qs.setCond(5, true);
+ htmltext = event;
+ break;
+ }
+ case "30381-12.html":
+ {
+ qs.setMemoState(7);
+ qs.setCond(7, true);
+ htmltext = event;
+ break;
+ }
+ case "30437-04.html":
+ {
+ takeItems(player, WEAPONS_TRADE_CONTRACT, 1);
+ giveItems(player, CERTIFICATE_OF_THE_SILVER_GUILD, 1);
+ giveItems(player, ROLENTOS_CARGOBOX, 1);
+ qs.setMemoState(9);
+ qs.setCond(9, true);
+ htmltext = event;
+ break;
+ }
+ case "30207-01a.html":
+ case "30437-02.html":
+ case "30437-03.html":
+ case "30617-03.html":
+ case "30617-04.html":
+ {
+ htmltext = event;
+ break;
+ }
+ case "30617-05.html":
+ {
+ takeItems(player, ATTACK_DIRECTIVES, 1);
+ takeItems(player, CERTIFICATE_OF_THE_SILVER_GUILD, 1);
+ takeItems(player, ROLENTOS_CARGOBOX, 1);
+ qs.setMemoState(10);
+ qs.setCond(10, true);
+ 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 TUMRAN_BUGBEAR:
+ case TUMRAN_BUGBEAR_WARRIOR:
+ {
+ if (qs.isMemoState(5))
+ {
+ if (!hasQuestItems(killer, RANGERS_REPORT1))
+ {
+ giveItems(killer, RANGERS_REPORT1, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ else if (hasQuestItems(killer, RANGERS_REPORT1) && !hasQuestItems(killer, RANGERS_REPORT2))
+ {
+ if (getRandom(100) <= 19)
+ {
+ giveItems(killer, RANGERS_REPORT2, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ else if (hasQuestItems(killer, RANGERS_REPORT1, RANGERS_REPORT2) && !hasQuestItems(killer, RANGERS_REPORT3))
+ {
+ if (getRandom(100) <= 19)
+ {
+ giveItems(killer, RANGERS_REPORT3, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ else if (hasQuestItems(killer, RANGERS_REPORT1, RANGERS_REPORT2, RANGERS_REPORT3) && !hasQuestItems(killer, RANGERS_REPORT4))
+ {
+ if (getRandom(100) <= 19)
+ {
+ giveItems(killer, RANGERS_REPORT4, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ }
+ break;
+ }
+ case OL_MAHUM_CAPTAIN:
+ {
+ if (qs.isMemoState(10) && (getQuestItemsCount(killer, OL_MAHUM_CAPTAINS_HEAD) < 30))
+ {
+ if (getRandom(100) <= 49)
+ {
+ giveItems(killer, OL_MAHUM_CAPTAINS_HEAD, 1);
+ if (getQuestItemsCount(killer, OL_MAHUM_CAPTAINS_HEAD) == 30)
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ }
+ break;
+ }
+ case OL_MAHUM_GENERAL:
+ {
+ if (qs.isMemoState(6))
+ {
+ if (getRandom(100) <= 9)
+ {
+ if (!hasQuestItems(killer, WEAPONS_TRADE_CONTRACT))
+ {
+ giveItems(killer, WEAPONS_TRADE_CONTRACT, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ if (!hasQuestItems(killer, ATTACK_DIRECTIVES))
+ {
+ giveItems(killer, ATTACK_DIRECTIVES, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ }
+ break;
+ }
+ case TUREK_ORC_ARCHER:
+ {
+ if (qs.isMemoState(2) && (getQuestItemsCount(killer, BLADE_MOLD) < 20))
+ {
+ if (getRandom(100) < 53)
+ {
+ giveItems(killer, BLADE_MOLD, 1);
+ if (getQuestItemsCount(killer, BLADE_MOLD) == 20)
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ if (getQuestItemsCount(killer, BLADE_MOLD) == 5)
+ {
+ addAttackPlayerDesire(addSpawn(OL_MAHUM_SUPPORT_TROOP, npc, true, 0, false), killer);
+ }
+ if (getQuestItemsCount(killer, BLADE_MOLD) >= 10)
+ {
+ if (getRandom(100) <= 24)
+ {
+ addAttackPlayerDesire(addSpawn(OL_MAHUM_SUPPORT_TROOP, npc, true, 0, false), killer);
+ }
+ }
+ }
+ break;
+ }
+ case TUREK_ORC_SKIRMISHER:
+ {
+ if (qs.isMemoState(2) && (getQuestItemsCount(killer, BLADE_MOLD) < 20))
+ {
+ if (getRandom(100) < 55)
+ {
+ giveItems(killer, BLADE_MOLD, 1);
+ if (getQuestItemsCount(killer, BLADE_MOLD) == 20)
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ if (getQuestItemsCount(killer, BLADE_MOLD) == 5)
+ {
+ addAttackPlayerDesire(addSpawn(OL_MAHUM_SUPPORT_TROOP, npc, true, 0, false), killer);
+ }
+ if (getQuestItemsCount(killer, BLADE_MOLD) >= 10)
+ {
+ if (getRandom(100) <= 24)
+ {
+ addAttackPlayerDesire(addSpawn(OL_MAHUM_SUPPORT_TROOP, npc, true, 0, false), killer);
+ }
+ }
+ }
+ break;
+ }
+ case TUREK_ORC_SUPPLIER:
+ {
+ if (qs.isMemoState(2) && (getQuestItemsCount(killer, BLADE_MOLD) < 20))
+ {
+ if (getRandom(100) < 51)
+ {
+ giveItems(killer, BLADE_MOLD, 1);
+ if (getQuestItemsCount(killer, BLADE_MOLD) == 20)
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ if (getQuestItemsCount(killer, BLADE_MOLD) == 5)
+ {
+ addAttackPlayerDesire(addSpawn(OL_MAHUM_SUPPORT_TROOP, npc, true, 0, false), killer);
+ }
+ if (getQuestItemsCount(killer, BLADE_MOLD) >= 10)
+ {
+ if (getRandom(100) <= 24)
+ {
+ addAttackPlayerDesire(addSpawn(OL_MAHUM_SUPPORT_TROOP, npc, true, 0, false), killer);
+ }
+ }
+ }
+ break;
+ }
+ case TUREK_ORC_FOOTMAN:
+ {
+ if (qs.isMemoState(2) && (getQuestItemsCount(killer, BLADE_MOLD) < 20))
+ {
+ if (getRandom(2) < 1)
+ {
+ giveItems(killer, BLADE_MOLD, 1);
+ if (getQuestItemsCount(killer, BLADE_MOLD) == 20)
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ if (getQuestItemsCount(killer, BLADE_MOLD) == 5)
+ {
+ addAttackPlayerDesire(addSpawn(OL_MAHUM_SUPPORT_TROOP, npc, true, 0, false), killer);
+ }
+ if (getQuestItemsCount(killer, BLADE_MOLD) >= 10)
+ {
+ if (getRandom(100) <= 24)
+ {
+ addAttackPlayerDesire(addSpawn(OL_MAHUM_SUPPORT_TROOP, npc, true, 0, false), killer);
+ }
+ }
+ }
+ break;
+ }
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, true);
+ final int memoState = qs.getMemoState();
+ String htmltext = getNoQuestMsg(player);
+ if (qs.isCreated())
+ {
+ if (npc.getId() == GUARD_ALVAH)
+ {
+ if (player.getLevel() < MIN_LEVEL)
+ {
+ htmltext = "30381-01.htm";
+ }
+ else
+ {
+ htmltext = "30381-02.htm";
+ }
+ }
+ }
+ else if (qs.isStarted())
+ {
+ switch (npc.getId())
+ {
+ case GUARD_ALVAH:
+ {
+ switch (qs.getCond())
+ {
+ case 1:
+ {
+ htmltext = "30381-04.html";
+ break;
+ }
+ case 2:
+ case 3:
+ {
+ htmltext = "30381-05.html";
+ break;
+ }
+ case 4:
+ {
+ htmltext = "30381-06.html";
+ break;
+ }
+ case 5:
+ {
+ if (hasQuestItems(player, RANGERS_REPORT1, RANGERS_REPORT2, RANGERS_REPORT3, RANGERS_REPORT4))
+ {
+ takeItems(player, RANGERS_REPORT1, 1);
+ takeItems(player, RANGERS_REPORT2, 1);
+ takeItems(player, RANGERS_REPORT3, 1);
+ takeItems(player, RANGERS_REPORT4, 1);
+ qs.setMemoState(6);
+ qs.setCond(6, true);
+ htmltext = "30381-09.html";
+ }
+ else
+ {
+ htmltext = "30381-08.html";
+ }
+ break;
+ }
+ case 6:
+ {
+ if (hasQuestItems(player, WEAPONS_TRADE_CONTRACT, ATTACK_DIRECTIVES))
+ {
+ htmltext = "30381-11.html";
+ }
+ else
+ {
+ htmltext = "30381-10.html";
+ }
+ break;
+ }
+ case 7:
+ {
+ htmltext = "30381-13.html";
+ break;
+ }
+ case 8:
+ {
+ htmltext = "30381-14.html";
+ break;
+ }
+ case 9:
+ {
+ htmltext = "30381-15.html";
+ break;
+ }
+ case 10:
+ {
+ htmltext = "30381-16.html";
+ break;
+ }
+ case 11:
+ {
+ giveAdena(player, 95000, true);
+ addExpAndSp(player, 159820, 9182);
+ htmltext = "30381-17.html";
+ qs.exitQuest(false, true);
+ break;
+ }
+ }
+ break;
+ }
+ case TRADER_ARODIN:
+ {
+ if (memoState == 1)
+ {
+ qs.setMemoState(2);
+ qs.setCond(2, true);
+ htmltext = "30207-01.html";
+ }
+ else if (memoState == 2)
+ {
+ if (getQuestItemsCount(player, BLADE_MOLD) < 20)
+ {
+ htmltext = "30207-02.html";
+ }
+ else
+ {
+ htmltext = "30207-03.html";
+ }
+ }
+ else if (memoState == 3)
+ {
+ takeItems(player, TYRAS_BILL, 1);
+ qs.setMemoState(4);
+ qs.setCond(4, true);
+ htmltext = "30207-04.html";
+ }
+ else if (memoState >= 4)
+ {
+ htmltext = "30207-05.html";
+ }
+ break;
+ }
+ case TYRA:
+ {
+ if (memoState == 2)
+ {
+ if (getQuestItemsCount(player, BLADE_MOLD) < 20)
+ {
+ htmltext = "30420-01.html";
+ }
+ else
+ {
+ takeItems(player, BLADE_MOLD, -1);
+ giveItems(player, TYRAS_BILL, 1);
+ qs.setMemoState(3);
+ qs.setCond(3, true);
+ htmltext = "30420-02.html";
+ }
+ }
+ else if (memoState == 3)
+ {
+ htmltext = "30420-03.html";
+ }
+ else if (memoState >= 4)
+ {
+ htmltext = "30420-04.html";
+ }
+ break;
+ }
+ case NETI:
+ {
+ if (memoState == 7)
+ {
+ qs.setMemoState(8);
+ qs.setCond(8, true);
+ htmltext = "30425-01.html";
+ }
+ else if (memoState == 8)
+ {
+ htmltext = "30425-02.html";
+ }
+ else if (memoState >= 9)
+ {
+ htmltext = "30425-03.html";
+ }
+ break;
+ }
+ case TRADER_ROLENTO:
+ {
+ if (memoState == 8)
+ {
+ htmltext = "30437-02.html";
+ }
+ else if (memoState == 9)
+ {
+ htmltext = "30437-05.html";
+ }
+ else if (memoState >= 10)
+ {
+ htmltext = "30437-06.html";
+ }
+ break;
+ }
+ case TUREK_CHIEF_BURAI:
+ {
+ if (memoState < 9)
+ {
+ htmltext = "30617-01.html";
+ }
+ else if (memoState == 9)
+ {
+ htmltext = "30617-02.html";
+ }
+ else if (memoState == 10)
+ {
+ if (getQuestItemsCount(player, OL_MAHUM_CAPTAINS_HEAD) < 30)
+ {
+ htmltext = "30617-06.html";
+ }
+ else
+ {
+ giveAdena(player, 8000, true);
+ takeItems(player, OL_MAHUM_CAPTAINS_HEAD, -1);
+ qs.setMemoState(11);
+ qs.setCond(11, true);
+ htmltext = "30617-07.html";
+ }
+ }
+ else if (memoState == 11)
+ {
+ htmltext = "30617-08.html";
+ }
+ break;
+ }
+ }
+ }
+ else if (qs.isCompleted())
+ {
+ if (npc.getId() == GUARD_ALVAH)
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onSpawn(L2Npc npc)
+ {
+ startQuestTimer("DESPAWN", 200000, npc, null);
+ return super.onSpawn(npc);
+ }
+}
\ 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 326915861c..9f4768a3c3 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -170,6 +170,7 @@ import quests.Q00167_DwarvenKinship.Q00167_DwarvenKinship;
import quests.Q00168_DeliverSupplies.Q00168_DeliverSupplies;
import quests.Q00169_OffspringOfNightmares.Q00169_OffspringOfNightmares;
import quests.Q00170_DangerousSeduction.Q00170_DangerousSeduction;
+import quests.Q00171_ActsOfEvil.Q00171_ActsOfEvil;
import quests.Q00172_NewHorizons.Q00172_NewHorizons;
import quests.Q00173_ToTheIsleOfSouls.Q00173_ToTheIsleOfSouls;
import quests.Q00174_SupplyCheck.Q00174_SupplyCheck;
@@ -628,6 +629,7 @@ public class QuestMasterHandler
Q00168_DeliverSupplies.class,
Q00169_OffspringOfNightmares.class,
Q00170_DangerousSeduction.class,
+ Q00171_ActsOfEvil.class,
Q00172_NewHorizons.class,
Q00173_ToTheIsleOfSouls.class,
Q00174_SupplyCheck.class,
diff --git a/L2J_DataPack/dist/sql/game/updates/20141227update.sql b/L2J_DataPack/dist/sql/game/updates/20141227update.sql
new file mode 100644
index 0000000000..b7c17f8aec
--- /dev/null
+++ b/L2J_DataPack/dist/sql/game/updates/20141227update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='Q00171_ActsOfEvil' WHERE name='171_ActsOfEvil';
\ No newline at end of file
--
GitLab