From 03d9a106ad88b1daabc2c0da2293edc358f6523a Mon Sep 17 00:00:00 2001
From: ivantotov <gmtotov@gmail.com>
Date: Mon, 22 Jun 2015 01:18:19 +0300
Subject: [PATCH] Retail-like quest Repent Your Sins (422). Reviewed by:
@Zoey76
---
L2J_DataPack/dist/game/data/scripts.cfg | 1 -
.../quests/422_RepentYourSins/30597-01.htm | 3 -
.../quests/422_RepentYourSins/30612-02.htm | 3 -
.../quests/422_RepentYourSins/30612-03.htm | 7 -
.../quests/422_RepentYourSins/30668-01.htm | 13 -
.../quests/422_RepentYourSins/30668-02.htm | 6 -
.../quests/422_RepentYourSins/30668-03.htm | 6 -
.../quests/422_RepentYourSins/30668-04.htm | 5 -
.../quests/422_RepentYourSins/30718-01.htm | 3 -
.../quests/422_RepentYourSins/30718-03.htm | 7 -
.../quests/422_RepentYourSins/30718-04.htm | 10 -
.../quests/422_RepentYourSins/30981-02.htm | 6 -
.../quests/422_RepentYourSins/30981-03.htm | 5 -
.../quests/422_RepentYourSins/30981-04.htm | 7 -
.../quests/422_RepentYourSins/30981-05.htm | 8 -
.../quests/422_RepentYourSins/30981-06.htm | 7 -
.../quests/422_RepentYourSins/30981-07.htm | 6 -
.../quests/422_RepentYourSins/30981-08.htm | 4 -
.../quests/422_RepentYourSins/30981-09.htm | 4 -
.../quests/422_RepentYourSins/30981-10.htm | 5 -
.../quests/422_RepentYourSins/30981-12.htm | 10 -
.../quests/422_RepentYourSins/30981-14.htm | 9 -
.../quests/422_RepentYourSins/30981-15.htm | 5 -
.../quests/422_RepentYourSins/30981-17.htm | 6 -
.../quests/422_RepentYourSins/30981-18.htm | 6 -
.../quests/422_RepentYourSins/30981-19.htm | 4 -
.../quests/422_RepentYourSins/30981-20.htm | 4 -
.../quests/422_RepentYourSins/__init__.py | 300 -----------
.../30300-01.html} | 5 +-
.../30300-02.html} | 2 +-
.../30300-03.html} | 0
.../Q00422_RepentYourSins/30597-01.html | 5 +
.../30597-02.html} | 0
.../30597-03.html} | 0
.../30597-04.html} | 0
.../30612-01.html} | 2 +-
.../Q00422_RepentYourSins/30612-02.html | 4 +
.../Q00422_RepentYourSins/30612-03.html | 3 +
.../30612-04.html} | 3 +-
.../Q00422_RepentYourSins/30668-01.html | 5 +
.../Q00422_RepentYourSins/30668-02.html | 3 +
.../Q00422_RepentYourSins/30668-03.html | 4 +
.../Q00422_RepentYourSins/30668-04.html | 3 +
.../Q00422_RepentYourSins/30718-01.html | 3 +
.../30718-02.html} | 4 +-
.../Q00422_RepentYourSins/30718-03.html | 3 +
.../Q00422_RepentYourSins/30718-04.html | 6 +
.../30981-01.htm | 2 +-
.../quests/Q00422_RepentYourSins/30981-02.htm | 5 +
.../quests/Q00422_RepentYourSins/30981-03.htm | 4 +
.../quests/Q00422_RepentYourSins/30981-04.htm | 3 +
.../quests/Q00422_RepentYourSins/30981-05.htm | 4 +
.../quests/Q00422_RepentYourSins/30981-06.htm | 4 +
.../Q00422_RepentYourSins/30981-07.html | 3 +
.../Q00422_RepentYourSins/30981-08.html | 3 +
.../Q00422_RepentYourSins/30981-09.html | 3 +
.../Q00422_RepentYourSins/30981-10.html | 4 +
.../30981-11.html} | 8 +-
.../Q00422_RepentYourSins/30981-12.html | 6 +
.../30981-13.html} | 2 +-
.../Q00422_RepentYourSins/30981-14.html | 4 +
.../Q00422_RepentYourSins/30981-15.html | 3 +
.../30981-15t.html} | 5 +-
.../Q00422_RepentYourSins/30981-16.html | 5 +
.../Q00422_RepentYourSins/30981-16t.html | 5 +
.../Q00422_RepentYourSins/30981-17.html | 4 +
.../Q00422_RepentYourSins/30981-18.html | 3 +
.../Q00422_RepentYourSins.java | 509 ++++++++++++++++++
.../scripts/quests/QuestMasterHandler.java | 2 +
.../dist/sql/game/updates/20150622update.sql | 1 +
70 files changed, 628 insertions(+), 479 deletions(-)
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30597-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-01.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-02.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-03.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-04.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-05.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-06.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-07.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-08.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-09.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-10.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-12.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-14.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-15.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-17.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-18.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-19.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-20.htm
delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/__init__.py
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30300-01.htm => Q00422_RepentYourSins/30300-01.html} (59%)
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30300-02.htm => Q00422_RepentYourSins/30300-02.html} (71%)
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30300-03.htm => Q00422_RepentYourSins/30300-03.html} (100%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30597-01.html
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30597-02.htm => Q00422_RepentYourSins/30597-02.html} (100%)
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30597-03.htm => Q00422_RepentYourSins/30597-03.html} (100%)
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30597-04.htm => Q00422_RepentYourSins/30597-04.html} (100%)
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30612-01.htm => Q00422_RepentYourSins/30612-01.html} (78%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-03.html
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30612-04.htm => Q00422_RepentYourSins/30612-04.html} (56%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-01.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-02.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-03.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-04.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-01.html
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30718-02.htm => Q00422_RepentYourSins/30718-02.html} (64%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-03.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-04.html
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins => Q00422_RepentYourSins}/30981-01.htm (55%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-02.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-03.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-04.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-05.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-06.htm
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-07.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-08.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-09.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-10.html
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30981-11.htm => Q00422_RepentYourSins/30981-11.html} (51%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-12.html
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30981-13.htm => Q00422_RepentYourSins/30981-13.html} (56%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-14.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-15.html
rename L2J_DataPack/dist/game/data/scripts/quests/{422_RepentYourSins/30981-16.htm => Q00422_RepentYourSins/30981-15t.html} (50%)
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-16.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-16t.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-17.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-18.html
create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
create mode 100644 L2J_DataPack/dist/sql/game/updates/20150622update.sql
diff --git a/L2J_DataPack/dist/game/data/scripts.cfg b/L2J_DataPack/dist/game/data/scripts.cfg
index 31ebc54863..5e1cd5e58a 100644
--- a/L2J_DataPack/dist/game/data/scripts.cfg
+++ b/L2J_DataPack/dist/game/data/scripts.cfg
@@ -196,7 +196,6 @@ quests/372_LegacyOfInsolence/__init__.py
quests/384_WarehouseKeepersPastime/__init__.py
quests/386_StolenDignity/__init__.py
quests/419_GetAPet/__init__.py
-quests/422_RepentYourSins/__init__.py
quests/503_PursuitClanAmbition/__init__.py
quests/604_DaimontheWhiteEyedPart2/__init__.py
quests/620_FourGoblets/__init__.py
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30597-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30597-01.htm
deleted file mode 100644
index 6e4ddee4b3..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30597-01.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Piotur:<br>
-Are you here to hunt the <font color="LEVEL">Turek war hounds</font>? A while back a black-clad sage appeared and told me that someone like you was coming and I should ask for help with my needs.<br> When the war was over I returned to find my farm devastated by the filthy orcs! I hired mercenaries and managed to drive them off my land, but their cursed stray war hounds remain and are rampaging and killing my cattle. Recently they have even been threatening the farmers. <br>If you are here to help, please kill the <font color="LEVEL">Turek war hounds</font>. Please kill at least 10 of them! Of course they can be found near the <font color="LEVEL">Orc Barracks</font>!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-02.htm
deleted file mode 100644
index a5f00ec4ce..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Sage Casian:<br>
-Why haven't you brought me the heart of a tyrant kingpin yet? I realize that this is not an easy task. My work shall continue for several years, so there is no hurry. Take your time...<br>Oh, did I happen to mention that you can find quite a few <font color="LEVEL">tyrant kingpins in the western section of the Wasteland</font>?
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-03.htm
deleted file mode 100644
index 8835fed459..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-03.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>Sage Casian:<br>
-Ah, the heart of a tyrant kingpin! Thank you!
-This will advance my research greatly. Now I must confess... In the past I was a
-terrible criminal. I undertook this project seeking redemption, but now I find that
-I am required to commit crimes to further my research! The importance of what I am doing,
-the big picture, is all that keeps me going...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-01.htm
deleted file mode 100644
index a589dc3f5c..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-01.htm
+++ /dev/null
@@ -1,13 +0,0 @@
-<html><body>Katari:<br>
-At last! You have come for me! Oh, pardon me... I had a very vivid dream last night,
-and I've been waiting for someone like you to come for me. Just in case you were the one in my dreams,
-I wanted you to know. Well... then, I may as well ask you.<br>
-I and some religious ol mahums are being threatened by <font color="LEVEL">scavenger wererats</font>.
-They seem to be unaware of the teachings of the god of light. Everyone knows, even after a conversion,
-ol mahums are not to be trifled with. The same can be said of the Dark Elves.
-Our god of light is no coward, and I'm ready to teach them a thing or two.<br>
-Please, would you go kill these creatures? Bring back 10
-<font color="LEVEL">skulls of scavenger wererats</font>.
-They can be found in the <font color="LEVEL">Neutral Zone</font>.
-Put a good scare into them, something to let them know they shouldn't pick on missionaries.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-02.htm
deleted file mode 100644
index 6244cd0c70..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-02.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Katari:<br>
-If I had my way, I would kill every last one of them. But even the most wicked have the chance of redemption.
-Perhaps one day they will come to the god of light... Anyway, now we must spill some blood. Go to the
-<font color="LEVEL">Neutral Zone</font> and hunt <font color="LEVEL">scavenger wererats</font>.
-Bring back 10 of their skulls.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-03.htm
deleted file mode 100644
index eeb674b994..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-03.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Katari:<br>
-That should teach them a lesson. I was dreading having to send the ol mahums to do the killing,
-I hate to get them started. And then, from the mist, you appeared. My savior! And you gave them what for,
-didn't you! Einhasad is truly watching over me.<br>Thank you, my friend... I wish you all the best.
-</body></html>
-
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-04.htm
deleted file mode 100644
index 0745b1867a..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30668-04.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Katari:<br>
-Why are you still here? Would you like to become a missionary? You taught those filthy scavenger
-wererats some respect for the blade, didn't you? We don't need your help right now, but I do
-hope you will drop in from time to time. I would like for you to meet some of our ol mahum believers.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-01.htm
deleted file mode 100644
index 10d9c83890..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-01.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Magister Joan:<br>
-Greetings! I look forward to working with you. I am Magister Joan. I am researching the neutralization of the toxic element found in Sea of Spores. I am sure you are familiar with that poisonous pond... Your task will be to collect three <font color="LEVEL">Trisalim's Venom Sacs</font>. You will find them in the <font color="LEVEL">Sea of Spores.</font> Please bring them to me as soon as possible.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-03.htm
deleted file mode 100644
index 3eebe8b89c..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-03.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-
-<body>
-Magister Joan:<br>
-You brought all three of them! Wonderfull! As agreed, your compensation will be paid at the Ivory Tower...Huh? Wait, what is this... What are trying to pull?! According to my records, an adventurer in service to the Ivory Tower has already left for Innadril...! Who are you?
-</body>
-</html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-04.htm
deleted file mode 100644
index 9706d6aab0..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-04.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-
-<body>
-Magister Joan:<br>
-Ah, it's you again! I'm so dreadfully sorry about the confusion last time. Yes, about your pay... I apologize, I'm waiting for approval and a check from the home office...<br>
-...err, ummm...<br>
-To tell you the truth, I hired you without the approval of the Grand Magisters of Ivory Tower! You may be waiting a very, very, very long time for your compensation. Please forgive me! I am so ashamed of myself... I'm always getting into trouble. I'm also stubborn! And obsessive-conpulsive! Is that a bad thing?<br>
-...By the way, who in the world are you?
-</body>
-</html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-02.htm
deleted file mode 100644
index 8867aeb86f..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-02.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Black Judge:<br>
-Sinning is easy. Atoning for those sins, however, is much more difficult.
-Are you really prepared for this? We will test your resolve to its utmost on your journey of penitence...<br>
-Are you ready to follow the path away from riches and fame?<br>
-<a action="bypass -h Quest 422_RepentYourSins Start">"I seek redemption."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-03.htm
deleted file mode 100644
index 1704615b7d..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-03.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Black Judge:<br>
-Very well, the test can begin. You must go and see <font color="LEVEL">Katari</font>, a Dark Elf.
-She teaches the word of Einhasad to godless heathens, such as the ol mahums... She needs your help.<br>
-Meet her at the <font color="LEVEL">edge of the Dark Elven Forest north of the Marshland</font> and
-offer her your help. Come back to see us after you complete this task.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-04.htm
deleted file mode 100644
index 106f1edba5..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-04.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>Black Judge:<br>
-Very well, the testing can begin. You will go help a farmer who lost all his possessions during the
-war between Grecia and Aden. He was left with less than a handful of seed! But this tenacious farmer
-is bravely trying to cultivate his crops. His name is <font color="LEVEL">Piotur. You will find him
- near the Orc Barracks in the western part of Gludio</font>. Go there and help him.
-Come back and see us after you complete the task.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-05.htm
deleted file mode 100644
index 24e98166e4..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-05.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body>Black Judge:<br>
-This is the first time that <font color="LEVEL">Wiseman Casian</font>
-has ever met with a black judge. He has volunteered to walk the path of endless hardship.
-Right now he is working on a task in <font color="LEVEL">the southern Wasteland in Gludio</font>.
-He is in trouble and needs some help... Go there and find him. Come back and see us when you
-have completed the task.<br>
-(This quest is automatically stopped if any sub-class is added or changed while it is performed.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-06.htm
deleted file mode 100644
index 3905c7180f..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-06.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>Black Judge:<br>
-<font color="LEVEL">Magister Joan of the Ivory Tower</font>,
-the daughter of a forest fairy, does not realize the importance of the work she is doing.
-You must go and help her. You must not ask or answer any questions while dealing with her.
-Come back and see us after completing the task.<br>
-(This quest is automatically stopped if any sub-class is added or changed while it is performed.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-07.htm
deleted file mode 100644
index aa3197dc5b..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-07.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Black Judge:<br>
-You have not even taken one step forward on the path of penance.
-As I said before, this is not the way to fame or fortune.
-Nobody, including us black judges, can force you to follow this path.
-If you are having doubts, leave now and never come back.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-08.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-08.htm
deleted file mode 100644
index 302d5a3962..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-08.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Black Judge:<br>Don't say a word. I can tell that you have completed your
-task. Take this to <font color="LEVEL">Blacksmith Pushkin in Giran Castle
-Town</font>. He will make an item for you. When he finishes it, bring it back to
-us. </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-09.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-09.htm
deleted file mode 100644
index 850afdc946..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-09.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Black Judge:<br>There is no hurry. The path of penance will endlessly
-unfold in front of you. Go to <font color="LEVEL">Blacksmith Pushkin of Giran
-Castle Town</font>. He will make an item for you. Bring this item to us.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-10.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-10.htm
deleted file mode 100644
index 1ad7e13ac3..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-10.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Black Judge:<br>
-Have you brought back the <font color="LEVEL">manacles of penitence</font>?
-You must bring them to me. You shall wear them until you have finished your penitence.<br>
-<a action="bypass -h Quest 422_RepentYourSins 1">Give him the manacles.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-12.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-12.htm
deleted file mode 100644
index d41b284576..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-12.htm
+++ /dev/null
@@ -1,10 +0,0 @@
-<html><body>Black Judge:<br>
-Your brother's hunger for your sins is not yet sated. Your penance must continue...
-All the terrible feelings that you are experiencing... the feelings of embarrassment,
-confusion, loneliness, and boredom etc... they are the manifestation of your sins that are now
-getting dissolved and exposed...<br>
-<font color="LEVEL">(When the Sin Eater advances one level you will have completed this quest.)</font><br>
-<font color="LEVEL">All of the Exp that the character who summoned the Sin Eater has acquired
-will be transferred to the Sin Eater.</font><br><font color="LEVEL">
-When the Sin Eater becomes hungry, you can feed him "Food For Wolves."</font>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-14.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-14.htm
deleted file mode 100644
index bf1eef434f..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-14.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body>Black Judge:<br>
-Your sins have been absolved and you are free to go your separate ways. The
-<font color="LEVEL">Sin Eater</font> will return from whence he came. There, his sin
-is changed to virtue, and virtue to nothing.<br><font color="LEVEL">
-(Note: If you click the link below, the manacle of penitent disappears. At this
-time, all the items contained in the inventory of the Sin Eater disappears as well,
-so please check if you put any items in the inventory.)</font><br>
-<a action="bypass -h Quest 422_RepentYourSins 3">"What about my remaining sins?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-15.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-15.htm
deleted file mode 100644
index 51d7202a6b..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-15.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Black Judge:<br>
-Your sins have been washed away. At least the ones we know about... The
-<font color="LEVEL">Sin Eater</font> can help you no further. You must make your own choices from
-now on, and become your own Sin Eater.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-17.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-17.htm
deleted file mode 100644
index a3d5e2cf5b..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-17.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Black Judge:<br>
-Ah, yes, there are more sins, aren't there... Are you willing to continue to carry out
-your task to atone for your sins?<br>
-<a action="bypass -h Quest 422_RepentYourSins 4">"I wish to atone for my remaining sins."</a><br>
-<a action="bypass -h Quest 422_RepentYourSins Quit">Quit</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-18.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-18.htm
deleted file mode 100644
index 71db0d61fb..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-18.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Black Judge:<br>
-All of your transgressions have not yet been redeemed. You must begin your penitence once again.
-Would you be in need of a <font color="LEVEL">sin eater</font>?<br>
-<a action="bypass -h Quest 422_RepentYourSins 4">"I wish to atone for my sins."</a><br>
-<a action="bypass -h Quest 422_RepentYourSins Quit">Quit</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-19.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-19.htm
deleted file mode 100644
index e26f100fe3..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-19.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Black Judge:<br>
-Very well. Give me your hands.<br>
-<a action="bypass -h Quest 422_RepentYourSins 1">"Extend your wrists.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-20.htm b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-20.htm
deleted file mode 100644
index 3c7717a1d9..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-20.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Black Judge:<br>
-Have you grown weary of the path of penance? Do as you will. No one is forcing you to do this.
-You are the one who made all the wrong choices...
-If you have decided to live with them, we respect that. Walk your own path. </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/__init__.py
deleted file mode 100644
index 67759019b0..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/__init__.py
+++ /dev/null
@@ -1,300 +0,0 @@
-#Fixed by Cromir, expanded upon by Emperorc
-#Quest: Repent Your Sins
-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 = "422_RepentYourSins"
-
-#Items
-SCAVENGER_WERERAT_SKULL = 4326
-TUREK_WARHOUND_TAIL = 4327
-TYRANT_KINGPIN_HEART = 4328
-TRISALIM_TARANTULAS_VENOM_SAC = 4329
-MANUAL_OF_MANACLES = 4331
-PENITENTS_MANACLES = 4425
-PENITENTS_MANACLES1 = 4330
-PENITENTS_MANACLES2 = 4426
-SILVER_NUGGET = 1873
-ADAMANTINE_NUGGET = 1877
-BLACKSMITHS_FRAME = 1892
-COKES = 1879
-STEEL = 1880
-
-#Mobs
-SCAVENGER_WERERAT = 20039
-TUREK_WARHOUND = 20494
-TYRANT_KINGPIN = 20193
-TRISALIM_TARANTULA = 20561
-
-def findPetLvl (player, itemid) :
- pet = player.getSummon()
- if pet:
- if pet.getId() == 12564 :
- level = pet.getStat().getLevel()
- else :
- item = player.getInventory().getItemByItemId(itemid)
- level = item.getEnchantLevel()
- else :
- item = player.getInventory().getItemByItemId(itemid)
- level = item.getEnchantLevel()
- return level
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [SCAVENGER_WERERAT_SKULL, TUREK_WARHOUND_TAIL, TYRANT_KINGPIN_HEART, TRISALIM_TARANTULAS_VENOM_SAC, MANUAL_OF_MANACLES,
- PENITENTS_MANACLES, PENITENTS_MANACLES1]
-
- def onAdvEvent (self,event,npc,player) :
- htmltext = event
- st = self.getQuestState(player, False)
- if not st: return
- if event == "Start" :
- st.playSound("ItemSound.quest_accept")
- st.setState(State.STARTED)
- if player.getLevel() <= 20 :
- htmltext = "30981-03.htm"
- st.set("cond","1")
- st.set("cond","2")
- elif player.getLevel() <= 30 :
- htmltext = "30981-04.htm"
- st.set("cond","3")
- elif player.getLevel() <= 40 :
- htmltext = "30981-05.htm"
- st.set("cond","4")
- else :
- htmltext = "30981-06.htm"
- st.set("cond","5")
- elif event == "1" :
- if st.getQuestItemsCount(PENITENTS_MANACLES1) >= 1:
- st.takeItems(PENITENTS_MANACLES1,-1)
- if st.getQuestItemsCount(PENITENTS_MANACLES2) >= 1:
- st.takeItems(PENITENTS_MANACLES2,-1)
- if st.getQuestItemsCount(PENITENTS_MANACLES) >= 1:
- st.takeItems(PENITENTS_MANACLES,-1)
- htmltext = "30981-11.htm"
- st.set("cond","16")
- st.set("level",str(player.getLevel()))
- st.giveItems(PENITENTS_MANACLES,1)
- elif event == "2" :
- htmltext = "30981-14.htm"
- elif event == "3" :
- plevel = findPetLvl(player,PENITENTS_MANACLES)
- level = player.getLevel()
- olevel = st.getInt("level")
- pet = player.getSummon()
- if pet:
- if pet.getId() == 12564 :
- htmltext = "30981-16.htm"
- else :
- if level > olevel :
- Pk_remove = plevel - level
- else :
- Pk_remove = plevel - olevel
- if Pk_remove < 0 :
- Pk_remove = 0
- Pk_remove = self.getRandom(10 + Pk_remove) + 1
- if player.getPkKills() <= Pk_remove :
- st.giveItems(PENITENTS_MANACLES2,1)
- st.takeItems(PENITENTS_MANACLES,1)
- htmltext = "30981-15.htm"
- player.setPkKills(0)
- st.playSound("ItemSound.quest_finish")
- st.exitQuest(1)
- else :
- st.giveItems(PENITENTS_MANACLES2,1)
- st.takeItems(PENITENTS_MANACLES,1)
- htmltext = "30981-17.htm"
- Pk_new = player.getPkKills() - Pk_remove
- player.setPkKills(Pk_new)
- st.set("level","0")
- elif event == "4" :
- htmltext = "30981-19.htm"
- elif event == "Quit" :
- htmltext = "30981-20.htm"
- st.playSound("ItemSound.quest_finish")
- st.takeItems(SCAVENGER_WERERAT_SKULL,-1)
- st.takeItems(TUREK_WARHOUND_TAIL,-1)
- st.takeItems(TYRANT_KINGPIN_HEART,-1)
- st.takeItems(TRISALIM_TARANTULAS_VENOM_SAC,-1)
- st.takeItems(PENITENTS_MANACLES1,-1)
- st.takeItems(MANUAL_OF_MANACLES,-1)
- st.takeItems(PENITENTS_MANACLES,-1)
- st.exitQuest(1)
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = self.getQuestState(player, True)
- if not st : return htmltext
- condition = st.getInt("cond")
- npcId = npc.getId()
- id = st.getState()
- if npcId == 30981 : #Black Judge
- if id == State.CREATED :
- if player.getPkKills() >= 1:
- htmltext = "30981-02.htm"
- else:
- htmltext = "30981-01.htm"
- st.exitQuest(1)
- elif condition <= 9 :
- htmltext = "30981-07.htm"
- elif condition == 13 and st.getQuestItemsCount(PENITENTS_MANACLES2) :
- htmltext = "30981-10.htm"
- elif condition <= 13 and condition > 9 and st.getQuestItemsCount(MANUAL_OF_MANACLES) == 0 :
- htmltext = "30981-08.htm"
- st.set("cond","14")
- st.giveItems(MANUAL_OF_MANACLES,1)
- elif condition == 14 and st.getQuestItemsCount(MANUAL_OF_MANACLES) > 0 :
- htmltext = "30981-09.htm"
- elif condition == 15 and st.getQuestItemsCount(PENITENTS_MANACLES1) > 0 :
- htmltext = "30981-10.htm"
- elif condition >= 16 :
- if st.getQuestItemsCount(PENITENTS_MANACLES) > 0 :
- plevel = findPetLvl(player,PENITENTS_MANACLES)
- level = player.getLevel()
- if st.getInt("level") > level :
- level = st.getInt("level")
- if plevel :
- if plevel > level:
- htmltext = "30981-13.htm"
- else :
- htmltext = "30981-12.htm"
- else :
- htmltext = "30981-12.htm"
- else :
- htmltext = "30981-18.htm"
- elif npcId == 30668 : # Katari
- if condition == 2 :
- st.set("cond","6")
- htmltext = "30668-01.htm"
- elif condition == 6 :
- if st.getQuestItemsCount(SCAVENGER_WERERAT_SKULL) < 10 :
- htmltext = "30668-02.htm"
- else :
- st.set("cond","10")
- htmltext = "30668-03.htm"
- st.takeItems(SCAVENGER_WERERAT_SKULL,-1)
- elif condition == 10 :
- htmltext = "30668-04.htm"
- elif npcId == 30597 : # Piotur
- if condition == 3 :
- st.set("cond","7")
- htmltext = "30597-01.htm"
- elif condition == 7 :
- if st.getQuestItemsCount(TUREK_WARHOUND_TAIL) < 10 :
- htmltext = "30597-02.htm"
- else :
- st.set("cond","11")
- htmltext = "30597-03.htm"
- st.takeItems(TUREK_WARHOUND_TAIL,-1)
- elif condition == 11 :
- htmltext = "30597-04.htm"
- elif npcId == 30612 : # Casian
- if condition == 4 :
- st.set("cond","8")
- htmltext = "30612-01.htm"
- elif condition == 8 :
- if st.getQuestItemsCount(TYRANT_KINGPIN_HEART) < 1 :
- htmltext = "30612-02.htm"
- else :
- st.set("cond","12")
- htmltext = "30612-03.htm"
- st.takeItems(TYRANT_KINGPIN_HEART,-1)
- elif condition == 12 :
- htmltext = "30612-04.htm"
- elif npcId == 30718 : # Joan
- if condition == 5 :
- st.set("cond","9")
- htmltext = "30718-01.htm"
- elif condition == 9 :
- if st.getQuestItemsCount(TRISALIM_TARANTULAS_VENOM_SAC) < 3 :
- htmltext = "30718-02.htm"
- elif st.getQuestItemsCount(TRISALIM_TARANTULAS_VENOM_SAC) >= 3 :
- st.set("cond","13")
- htmltext = "30718-03.htm"
- st.takeItems(TRISALIM_TARANTULAS_VENOM_SAC,-1)
- elif condition == 13 :
- htmltext = "30718-04.htm"
- elif npcId == 30300: #Pushkin
- if condition >= 14 :
- if st.getQuestItemsCount(MANUAL_OF_MANACLES) == 1 :
- if st.getQuestItemsCount(SILVER_NUGGET) < 10 or st.getQuestItemsCount(STEEL) < 5 or st.getQuestItemsCount(ADAMANTINE_NUGGET) < 2 \
- or st.getQuestItemsCount(COKES) < 10 or st.getQuestItemsCount(BLACKSMITHS_FRAME) < 1 :
- htmltext = "30300-02.htm"
- elif st.getQuestItemsCount(SILVER_NUGGET) >= 10 and st.getQuestItemsCount(STEEL) >= 5 and st.getQuestItemsCount(ADAMANTINE_NUGGET) >= 2 \
- and st.getQuestItemsCount(COKES) >= 10 and st.getQuestItemsCount(BLACKSMITHS_FRAME) >= 1 :
- htmltext = "30300-02.htm"
- st.set("cond","15")
- st.takeItems(MANUAL_OF_MANACLES,1)
- st.takeItems(SILVER_NUGGET,10)
- st.takeItems(ADAMANTINE_NUGGET,2)
- st.takeItems(COKES,10)
- st.takeItems(STEEL,5)
- st.takeItems(BLACKSMITHS_FRAME,1)
- st.giveItems(PENITENTS_MANACLES1,1)
- st.playSound("ItemSound.quest_middle")
- elif st.getQuestItemsCount(PENITENTS_MANACLES1) or st.getQuestItemsCount(PENITENTS_MANACLES) or st.getQuestItemsCount(PENITENTS_MANACLES2) :
- htmltext = "30300-03.htm"
- return htmltext
-
-
- def onKill(self,npc,player,isPet) :
- st = self.getQuestState(player, False)
- if not st : return
- if st.getState() != State.STARTED : return
- condition = st.getInt("cond")
- npcId = npc.getId()
- skulls = st.getQuestItemsCount(SCAVENGER_WERERAT_SKULL)
- tails = st.getQuestItemsCount(TUREK_WARHOUND_TAIL)
- heart = st.getQuestItemsCount(TYRANT_KINGPIN_HEART)
- sacs = st.getQuestItemsCount(TRISALIM_TARANTULAS_VENOM_SAC)
- if npcId == SCAVENGER_WERERAT :
- if condition == 6 :
- if skulls < 10 :
- st.giveItems(SCAVENGER_WERERAT_SKULL,1)
- if st.getQuestItemsCount(SCAVENGER_WERERAT_SKULL) == 10 :
- st.playSound("ItemSound.quest_middle")
- else :
- st.playSound("ItemSound.quest_itemget")
- elif npcId == TUREK_WARHOUND :
- if condition == 7 :
- if tails < 10 :
- st.giveItems(TUREK_WARHOUND_TAIL,1)
- if st.getQuestItemsCount(TUREK_WARHOUND_TAIL) == 10 :
- st.playSound("ItemSound.quest_middle")
- else :
- st.playSound("ItemSound.quest_itemget")
- elif npcId == TYRANT_KINGPIN :
- if condition == 8 :
- if heart < 1 :
- st.giveItems(TYRANT_KINGPIN_HEART,1)
- st.playSound("ItemSound.quest_middle")
- elif npcId == TRISALIM_TARANTULA :
- if condition == 9 :
- if sacs < 3 :
- st.giveItems(TRISALIM_TARANTULAS_VENOM_SAC,1)
- if st.getQuestItemsCount(TRISALIM_TARANTULAS_VENOM_SAC) == 3 :
- st.playSound("ItemSound.quest_middle")
- else :
- st.playSound("ItemSound.quest_itemget")
- return
-
-QUEST = Quest(422,qn,"Repent your Sins")
-
-QUEST.addStartNpc(30981)
-
-QUEST.addTalkId(30981)
-QUEST.addTalkId(30668)
-QUEST.addTalkId(30597)
-QUEST.addTalkId(30612)
-QUEST.addTalkId(30718)
-QUEST.addTalkId(30300)
-
-QUEST.addKillId(SCAVENGER_WERERAT)
-QUEST.addKillId(TUREK_WARHOUND)
-QUEST.addKillId(TYRANT_KINGPIN)
-QUEST.addKillId(TRISALIM_TARANTULA)
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30300-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30300-01.html
similarity index 59%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30300-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30300-01.html
index 47ac808749..e3ae213aca 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30300-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30300-01.html
@@ -1,5 +1,6 @@
<html><body>Blacksmith Pushkin:<br>
-Manacles of a Penitent...? Ah yes. A strange item, but I can make them. Funny thing, too... I've been getting a lot of orders for these lately. They must be getting popular... <br>
+Manacles of a Penitent...? Ah yes. A strange item, but I can make them. Funny thing, too... I've been getting a lot of orders for these lately. They must be getting popular...<BR>
I've memorized the ingredients: I'll need some Steel, an Adamantite Nugget... some silver...<br>
-Here, take this list. Verify that this is what you want to order. These are serious manacles and cannot be handled carelessly!
+Be certain this is what you want.
+These are serious manacles and cannot be handled carelessly!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30300-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30300-02.html
similarity index 71%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30300-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30300-02.html
index 6796459152..72647e2402 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30300-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30300-02.html
@@ -1,4 +1,4 @@
<html><body>Blacksmith Pushkin:<br>
Manacles of a Penitent...? Ah yes. A strange item, but I can make them. Funny thing, too... I've been getting a lot of orders for these lately. They must be getting popular... In fact, so popular that I've run out of the ingredients I need to make them!<br>
-Would you mind going and getting the ingredients listed on this recipe? I will make the manacles for you if you do this.
+Go collect the items on this list, and I'll make the manacles for you.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30300-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30300-03.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30300-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30300-03.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30597-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30597-01.html
new file mode 100644
index 0000000000..d084321ce4
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30597-01.html
@@ -0,0 +1,5 @@
+<html><body>Piotur:<br>
+Are you here to hunt the <font color="LEVEL">Turek war hounds</font>? A while back a black-clad sage appeared and told me that someone like you was coming and I should ask for help with my needs.<br>
+When the war was over I returned to find my farm devastated by the filthy orcs! I hired mercenaries and managed to drive them off my land, but their cursed stray war hounds remain and are rampaging and killing my cattle. Recently they have even been threatening the farmers.<br>
+If you are here to help, please kill the <font color="LEVEL">Turek war hounds</font>. Please kill at least 10 of them! Of course they can be found near the <font color="LEVEL">Orc Barracks</font>!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30597-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30597-02.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30597-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30597-02.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30597-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30597-03.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30597-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30597-03.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30597-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30597-04.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30597-04.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30597-04.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-01.html
similarity index 78%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-01.html
index c7aa859ba2..5a3988e535 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-01.html
@@ -1,4 +1,4 @@
<html><body>Sage Casian:<br>
-Why would you want to help me? Someone up there must like me. Things keep happening that give me the impression that my penance is being watched over. <br>
+Why would you want to help me?Someone up there must like me. Things keep happening that give me the impression that my penance is being watched over.<br>
So, will you do me a favor? I am researching different ways that this polluted Wasteland can be restored to its previous, verdant state. The most promising method is a potion I've been working on. To make this potion I must secure the heart of a <font color="LEVEL">tyrant kingpin</font>. This could very well be above your abilities, but if you bring me the <font color="LEVEL">heart of a tyrant kingpin</font> my research can continue. You will find the beasts in the <font color="LEVEL">western part of the Wasteland</font>.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-02.html
new file mode 100644
index 0000000000..2c09043936
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-02.html
@@ -0,0 +1,4 @@
+<html><body>Sage Casian:<br>
+Why haven't you brought me the heart of a tyrant kingpin yet? I realize that this is not an easy task. My work shall continue for several years, so there is no hurry. Take your time...<br>
+Oh, did I happen to mention that you can find quite a few <font color="LEVEL">tyrant kingpins in the western section of the Wasteland</font>?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-03.html
new file mode 100644
index 0000000000..4b5b0cf4f8
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-03.html
@@ -0,0 +1,3 @@
+<html><body>Sage Casian:<br>
+Ah, the heart of a tyrant kingpin! Thank you! This will advance my research greatly. Now I must confess... In the past I was a terrible criminal. I undertook this project seeking redemption, but now I find that I am required to commit crimes to further my research! The importance of what I am doing, the big picture, is all that keeps me going...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-04.html
similarity index 56%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-04.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-04.html
index 754b596587..5a584b8cf5 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30612-04.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30612-04.html
@@ -1,4 +1,3 @@
<html><body>Sage Casian:<br>
-Thanks to you my research can continue... By the way, what inspired you to help
-a wretch such as I? I suppose we all have our own reasons...
+Thanks to you my research can continue... By the way, what inspired you to help a wretch such as I? I suppose we all have our own reasons...
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-01.html
new file mode 100644
index 0000000000..addb30e17c
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-01.html
@@ -0,0 +1,5 @@
+<html><body>Katari:<br>
+At last! You have come for me! Oh, pardon me... I had a very vivid dream last night, and I've been waiting for someone like you to come for me. Just in case you were the one in my dreams, I wanted you to know. Well... then, I may as well ask you.<br>
+I and some religious Ol Mahums are being threatened by <font color="LEVEL">scavenger wererats</font>. They seem to be unaware of the teachings of the god of light. Everyone knows, even after a conversion, Ol Mahums are not to be trifled with. The same can be said of the Dark Elves. Our god of light is no coward, and I'm ready to teach them a thing or two.<br>
+Please, would you go kill these creatures? Bring back 10 <font color="LEVEL">skulls of scavenger wererats</font>. They can be found in the <font color="LEVEL">Neutral Zone</font>. Put a good scare into them, something to let them know they shouldn't pick on missionaries.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-02.html
new file mode 100644
index 0000000000..e8b6b9f16e
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-02.html
@@ -0,0 +1,3 @@
+<html><body>Katari:<br>
+If I had my way, I would kill every last one of them. But even the most wicked have the chance of redemption. Perhaps one day they will come to the god of light... Anyway, now we must spill some blood. Go to the <font color="LEVEL">Neutral Zone</font> and hunt <font color="LEVEL">scavenger wererats</font>. Bring back 10 of their skulls.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-03.html
new file mode 100644
index 0000000000..b586169dd4
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-03.html
@@ -0,0 +1,4 @@
+<html><body>Katari:<br>
+That should teach them a lesson. I was dreading having to send the Ol Mahums to do the killing, I hate to get them started. And then, from the mist, you appeared. My savior! And you gave them what for, didn't you! Einhasad is truly watching over me.<br>
+Thank you, my friend... I wish you all the best.
+</body></html>
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-04.html
new file mode 100644
index 0000000000..68dc3d49c7
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30668-04.html
@@ -0,0 +1,3 @@
+<html><body>Katari:<br>
+Why are you still here? Would you like to become a missionary? You taught those filthy scavenger wererats some respect for the blade, didn't you? We don't need your help right now, but I do hope you will drop in from time to time. I would like for you to meet some of our Ol Mahum believers.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-01.html
new file mode 100644
index 0000000000..5e106187f6
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-01.html
@@ -0,0 +1,3 @@
+<html><body>Magister Joan:<br>
+Greetings! I look forward to working with you. I am Magister Joan. I am researching the neutralization of the toxic element found in the Sea of Spores. I am sure you are familiar with that poisonous pond... Your task will be to collect three <font color="LEVEL">Trisalim's Venom Sacs</font>. You will find them in the <font color="LEVEL">Sea of Spores.</font> Please bring them to me as soon as possible.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-02.html
similarity index 64%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-02.html
index 423ffb4dc2..1b2c14bc76 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30718-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-02.html
@@ -1,4 +1,4 @@
<html><body>Magister Joan:<br>
-Have you found three <font color="LEVEL">Trisalim Venom Sacs</font> yet? You have gone to the <font color="LEVEL">Sea of Spores.</font>, haven't you?<br>
-This research may seem unimportant to you, but it is of utmost importance to me and the entire Elven race! Although I am the only one who seems to care about it...
+Have you found three <font color="LEVEL">Trisalim Venom Sacs</font> yet? You have gone to the <font color="LEVEL">Sea of Spores</font>, haven't you?<br>
+This research may seem unimportant to you, but it is of utmost importance to me and the entire Elven race! Although I am the only one who seems to care about it...
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-03.html
new file mode 100644
index 0000000000..b89a61c60e
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-03.html
@@ -0,0 +1,3 @@
+<html><body>Magister Joan:<br>
+You brought all three of them! Wonderful! As agreed, your compensation will be paid at the Ivory Tower... Huh? Wait, what is this... What are trying to pull?! According to my records, an adventurer in service to the Ivory Tower has already left for Innadril...! Who are you?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-04.html
new file mode 100644
index 0000000000..f75ff7160b
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30718-04.html
@@ -0,0 +1,6 @@
+<html><body>Magister Joan:<br>
+Ah, it's you again! I'm so dreadfully sorry about the confusion last time. Yes, about your pay... I apologize, I'm waiting for approval and a check from the home office...<br>
+... err, ummm...<br>
+To tell you the truth, I hired you without the approval of the Grand Magisters of the Ivory Tower! You may be waiting a very, very, very long time for your compensation. Please forgive me! I am so ashamed of myself... I'm always getting into trouble. I'm also stubborn! And obsessive-compulsive! Is that a bad thing?<br>
+... By the way, who in the world are you?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-01.htm
similarity index 55%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-01.htm
index 75a92661a2..ab77cc3984 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-01.htm
@@ -1,4 +1,4 @@
<html><body>Black Judge:<br>
-Throughout their lives people commit varying degrees of sin. You, however, have never committed a sin so grievious that you required our assistance... You are on the right path! Your integrity is impressive!<br>
+Throughout their lives people commit varying degrees of sin. You, however, have never committed a sin so grievous that you required our assistance... You are on the right path! Your integrity is impressive!<br>
(This quest can only be undertaken by a character with a PK count of 1 or more.)
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-02.htm
new file mode 100644
index 0000000000..0a9fe8ee80
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-02.htm
@@ -0,0 +1,5 @@
+<html><body>Black Judge:<br>
+Sinning is easy. Atoning for those sins, however, is much more difficult. Are you really prepared for this? We will test your resolve to its utmost on your journey of penitence...<br>
+Are you ready to follow the path away from riches and fame?<br>
+<a action="bypass -h Quest Q00422_RepentYourSins ACCEPT">"I seek redemption."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-03.htm
new file mode 100644
index 0000000000..2844067fb5
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-03.htm
@@ -0,0 +1,4 @@
+<html><body>Black Judge:<br>
+Very well, the test can begin. You must go and see <font color="LEVEL">Katari</font>, a Dark Elf. She teaches the word of Einhasad to godless heathens, such as the Ol Mahums... She needs your help.<br>
+Meet her at the <font color="LEVEL">edge of the Dark Elven Forest north of the Marshland</font> and offer her your help. Come back to see us after you complete this task.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-04.htm
new file mode 100644
index 0000000000..1e2f8b5c91
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-04.htm
@@ -0,0 +1,3 @@
+<html><body>Black Judge:<br>
+Very well, the testing can begin. You will go help a farmer who lost all his possessions during the war between Gracia and Aden. He was left with less than a handful of seed! But this tenacious farmer is bravely trying to cultivate his crops. His name is <font color="LEVEL">Piotur. You will find him near the Orc Barracks in the western part of Gludio</font>. Go there and help him. Come back and see us after you complete the task.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-05.htm
new file mode 100644
index 0000000000..8b1316e03a
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-05.htm
@@ -0,0 +1,4 @@
+<html><body>Black Judge:<br>
+This is the first time that <font color="LEVEL">Elder Casian</font> has ever met with a black judge. He has volunteered to walk the path of endless hardship. Right now he is working on a task in <font color="LEVEL">the southern Wasteland in Gludio</font>. He is in trouble and needs some help... Go there and find him. Come back and see us when you have completed the task.<br>
+(This quest is automatically stopped if any sub-class is added or changed while it is performed.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-06.htm
new file mode 100644
index 0000000000..cade6d5c60
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-06.htm
@@ -0,0 +1,4 @@
+<html><body>Black Judge:<br>
+<font color="LEVEL">Magister Joan of the Ivory Tower</font>, the daughter of a forest fairy, does not realize the importance of the work she is doing. You must go and help her. You must not ask or answer any questions while dealing with her. Come back and see us after completing the task.<br>
+(This quest is automatically stopped if any sub-class is added or changed while it is performed.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-07.html
new file mode 100644
index 0000000000..d47c24f5c1
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-07.html
@@ -0,0 +1,3 @@
+<html><body>Black Judge:<br>
+You have not even taken one step forward on the path of penance. As I said before, this is not the way to fame or fortune. Nobody, including us black judges, can force you to follow this path. If you are having doubts, leave now and never come back.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-08.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-08.html
new file mode 100644
index 0000000000..7e9a488ec8
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-08.html
@@ -0,0 +1,3 @@
+<html><body>Black Judge:<br>
+Don't say a word. I can tell that you have completed your task. Take this to <font color="LEVEL">Blacksmith Pushkin in Giran Castle Town</font>. He will make an item for you. When he finishes it, bring it back to us.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-09.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-09.html
new file mode 100644
index 0000000000..c87d2d981c
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-09.html
@@ -0,0 +1,3 @@
+<html><body>Black Judge:<br>
+There is no hurry. The path of penance will endlessly unfold in front of you. Go to <font color="LEVEL">Blacksmith Pushkin of the Town of Giran</font>. He will make an item for you. Bring this item to us.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-10.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-10.html
new file mode 100644
index 0000000000..a08ca88cce
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-10.html
@@ -0,0 +1,4 @@
+<html><body>Black Judge:<br>
+Have you brought back the <font color="LEVEL">Manacles of Penitence</font>? You must bring them to me. You shall wear them until you have finished your penitence.<br>
+<a action="bypass -h Quest Q00422_RepentYourSins 30981-11.html">Give her the manacles.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-11.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-11.html
similarity index 51%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-11.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-11.html
index 7710bdbd44..068c37cbc8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-11.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-11.html
@@ -1,10 +1,6 @@
<html><body>Black Judge:<br>
-At the other end of this chain is the <font color="LEVEL">Sin Eater</font>.
-He is your brother, and will come if you call his name. Now you must leave.
-When you have completed your penance once, come back and see us. That will be the time
-when you two will part your ways. At that time, you will be released from the manacles.<br>
+At the other end of this chain is the <font color="LEVEL">Sin Eater</font>. He is your brother, and will come if you call his name. Now you must leave. When you have completed your penance once, come back and see us. That will be the time when you two will part your ways. At that time, you will be released from the manacles.<br>
<font color="LEVEL">(When the Sin Eater advances one level you will have completed this quest.)</font><br>
-<font color="LEVEL">All of the Exp that the character who summoned the Sin Eater has acquired will
-be transferred to the Sin Eater.</font><br>
+<font color="LEVEL">All of the Exp that the character who summoned the Sin Eater has acquired will be transferred to the Sin Eater.</font><br>
<font color="LEVEL">When the Sin Eater becomes hungry, you can feed him "Food For Wolves."</font>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-12.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-12.html
new file mode 100644
index 0000000000..70cfaa4829
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-12.html
@@ -0,0 +1,6 @@
+<html><body>Black Judge:<br>
+Your brother's hunger for your sins is not yet sated. Your penance must continue... All the terrible feelings that you are experiencing... the feelings of embarrassment, confusion, loneliness, and boredom etc... they are the manifestation of your sins that are now getting dissolved and exposed...<br>
+<font color="LEVEL">(When the Sin Eater advances one level you will have completed this quest.)</font><br>
+<font color="LEVEL">All of the Exp that the character who summoned the Sin Eater has acquired will be transferred to the Sin Eater.</font><br>
+<font color="LEVEL">When the Sin Eater becomes hungry, you can feed him "Food For Wolves."</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-13.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-13.html
similarity index 56%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-13.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-13.html
index 0f1924a931..1cae11adce 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-13.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-13.html
@@ -1,4 +1,4 @@
<html><body>Black Judge:<br>
Ha! Yes, your brother has grown fat on your sins, hasn't he? Let me see your hands.<br>
-<a action="bypass -h Quest 422_RepentYourSins 2">"Extend your manacled hands.</a>
+<a action="bypass -h Quest Q00422_RepentYourSins 30981-14.html">Extend your manacled hands.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-14.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-14.html
new file mode 100644
index 0000000000..3ce419c4fc
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-14.html
@@ -0,0 +1,4 @@
+<html><body>Black Judge:<br>
+We now release you. <font color="LEVEL">Sin Eater</font> will return to the bottomless Abyss that spawned him. In there your sin will be absolved into the great void.<br>
+<a action="bypass -h Quest Q00422_RepentYourSins 30981-15t.html">Ask what you have left for your sin</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-15.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-15.html
new file mode 100644
index 0000000000..6cf4445e82
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-15.html
@@ -0,0 +1,3 @@
+<html><body>Black Judge:<br>
+Your sins have been washed away. At least the ones we know about... The <font color="LEVEL">Sin Eater</font> can help you no further. You must make your own choices from now on, and become your own Sin Eater.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-16.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-15t.html
similarity index 50%
rename from L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-16.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-15t.html
index 1e7b69c5e0..2dc69eaf7a 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/422_RepentYourSins/30981-16.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-15t.html
@@ -1,6 +1,5 @@
<html><body>Black Judge:<br>
-These chains cannot be broken as long as your brother remains in this world.
-You must now release him to return from whence he came.<br>
+These chains cannot be broken as long as your brother remains in this world. You must now release him to return from whence he came.<br>
Release the <font color="LEVEL">sin eater</font>!<br>
-<a action="bypass -h Quest 422_RepentYourSins 3">Continue</a>
+<a action="bypass -h Quest Q00422_RepentYourSins 30981-15t.html">Continue</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-16.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-16.html
new file mode 100644
index 0000000000..5bd4efbe5b
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-16.html
@@ -0,0 +1,5 @@
+<html><body>Black Judge:<br>
+Ah, yes, there are more sins, aren't there... Are you willing to continue to carry out your task to atone for your sins?<br>
+<a action="bypass -h Quest Q00422_RepentYourSins 30981-17.html">"I wish to atone for my remaining sins."</a><br>
+<a action="bypass -h Quest Q00422_RepentYourSins 30981-18.html">Quit</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-16t.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-16t.html
new file mode 100644
index 0000000000..2530b0167b
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-16t.html
@@ -0,0 +1,5 @@
+<html><body>Black Judge:<br>
+All of your transgressions have not yet been redeemed. You must begin your penitence once again. Would you be in need of a <font color="LEVEL">sin eater</font>?<br>
+<a action="bypass -h Quest Q00422_RepentYourSins 30981-17.html">"I wish to atone for my sins."</a><br>
+<a action="bypass -h Quest Q00422_RepentYourSins 30981-18.html">Quit</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-17.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-17.html
new file mode 100644
index 0000000000..3776e3fe97
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-17.html
@@ -0,0 +1,4 @@
+<html><body>Black Judge:<br>
+Very well. Give me your hands.<br>
+<a action="bypass -h Quest Q00422_RepentYourSins 30981-11.html">Extend your wrists.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-18.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-18.html
new file mode 100644
index 0000000000..d8de324b58
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/30981-18.html
@@ -0,0 +1,3 @@
+<html><body>Black Judge:<br>
+Have you grown weary of the path of penance? Do as you will. No one is forcing you to do this. You are the one who made all the wrong choices... If you have decided to live with them, we respect that. Walk your own path.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
new file mode 100644
index 0000000000..2a9fccf24c
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java
@@ -0,0 +1,509 @@
+/*
+ * Copyright (C) 2004-2015 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.Q00422_RepentYourSins;
+
+import com.l2jserver.gameserver.enums.QuestSound;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Repent Your Sins (422)
+ * @author ivantotov
+ */
+public final class Q00422_RepentYourSins extends Quest
+{
+ // NPCs
+ private static final int BLACKSMITH_PUSHKIN = 30300;
+ private static final int PIOTUR = 30597;
+ private static final int ELDER_CASIAN = 30612;
+ private static final int KATARI = 30668;
+ private static final int MAGISTER_JOAN = 30718;
+ private static final int BLACK_JUDGE = 30981;
+ // Items
+ private static final int RATMAN_SCAVENGERS_SKULL = 4326;
+ private static final int TUREK_WAR_HOUNDS_TAIL = 4327;
+ private static final int TYRANT_KINGPINS_HEART = 4328;
+ private static final int TRISALIM_TARANTULAS_VENOM_SAC = 4329;
+ private static final int PENITENTS_MANACLES1 = 4330;
+ private static final int MANUAL_OF_MANACLES = 4331;
+ private static final int PENITENTS_MANACLES = 4425;
+ // Reward
+ private static final int MANACLES_OF_PENITENT = 4426;
+ // Materials
+ private static final int SILVER_NUGGET = 1873;
+ private static final int ADAMANTITE_NUGGET = 1877;
+ private static final int COKES = 1879;
+ private static final int STEEL = 1880;
+ private static final int BLACKSMITHS_FRAME = 1892;
+ // Monster
+ private static final int SCAVENGER_WERERAT = 20039;
+ private static final int TYRANT_KINGPIN = 20193;
+ private static final int TUREK_WAR_HOUND = 20494;
+ private static final int TRISALIM_TARANTULA = 20561;
+
+ public Q00422_RepentYourSins()
+ {
+ super(422, Q00422_RepentYourSins.class.getSimpleName(), "Repent Your Sins");
+ addStartNpc(BLACK_JUDGE);
+ addTalkId(BLACK_JUDGE, BLACKSMITH_PUSHKIN, PIOTUR, ELDER_CASIAN, KATARI, MAGISTER_JOAN);
+ addKillId(SCAVENGER_WERERAT, TYRANT_KINGPIN, TUREK_WAR_HOUND, TRISALIM_TARANTULA);
+ registerQuestItems(RATMAN_SCAVENGERS_SKULL, TUREK_WAR_HOUNDS_TAIL, TYRANT_KINGPINS_HEART, TRISALIM_TARANTULAS_VENOM_SAC, PENITENTS_MANACLES1, MANUAL_OF_MANACLES, PENITENTS_MANACLES);
+ }
+
+ @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":
+ {
+ qs.startQuest();
+ if ((player.getLevel() > 20) && (player.getLevel() < 31))
+ {
+ playSound(player, QuestSound.ITEMSOUND_QUEST_ACCEPT);
+ qs.setMemoState(2);
+ qs.setCond(3);
+ htmltext = "30981-04.htm";
+ }
+ else if (player.getLevel() < 21)
+ {
+ qs.setMemoState(1);
+ qs.setMemoStateEx(1, 0);
+ qs.setCond(2);
+ htmltext = "30981-03.htm";
+ }
+ else if ((player.getLevel() > 30) && (player.getLevel() < 41))
+ {
+ qs.setMemoState(3);
+ qs.setCond(4);
+ htmltext = "30981-05.htm";
+ }
+ else
+ {
+ qs.setMemoState(4);
+ qs.setCond(5);
+ htmltext = "30981-06.htm";
+ }
+ break;
+ }
+ case "30981-11.html":
+ {
+ if ((qs.getMemoState() >= 9) && (qs.getMemoState() <= 12))
+ {
+ if (hasAtLeastOneQuestItem(player, MANACLES_OF_PENITENT, PENITENTS_MANACLES1))
+ {
+ if (hasQuestItems(player, PENITENTS_MANACLES1))
+ {
+ takeItems(player, PENITENTS_MANACLES1, 1);
+ }
+
+ if (hasQuestItems(player, MANACLES_OF_PENITENT))
+ {
+ takeItems(player, MANACLES_OF_PENITENT, 1);
+ }
+ qs.setMemoStateEx(1, player.getLevel());
+ giveItems(player, PENITENTS_MANACLES, 1);
+ qs.setCond(16);
+ htmltext = event;
+ }
+ }
+ break;
+ }
+ case "30981-14.html":
+ case "30981-17.html":
+ {
+ if ((qs.getMemoState() >= 9) && (qs.getMemoState() <= 12))
+ {
+ htmltext = event;
+ }
+ break;
+ }
+ case "30981-15t.html":
+ {
+ final L2ItemInstance petItem = player.getInventory().getItemByItemId(PENITENTS_MANACLES);
+ final int petLevel = (petItem == null) ? 0 : petItem.getEnchantLevel();
+ if ((qs.getMemoState() >= 9) && (qs.getMemoState() <= 12) && (petLevel > qs.getMemoStateEx(1)))
+ {
+ final L2Summon summon = player.getSummon();
+ if (summon != null)
+ {
+ htmltext = event;
+ }
+ else
+ {
+ int i1 = 0;
+ if (player.getLevel() > qs.getMemoStateEx(1))
+ {
+ i1 = petLevel - qs.getMemoStateEx(1) - (player.getLevel() - qs.getMemoStateEx(1));
+ }
+ else
+ {
+ i1 = petLevel - qs.getMemoStateEx(1);
+ }
+
+ if (i1 < 0)
+ {
+ i1 = 0;
+ }
+
+ int i0 = getRandom(i1) + 1;
+ if (player.getPkKills() <= i0)
+ {
+ giveItems(player, MANACLES_OF_PENITENT, 1);
+ if (petItem != null)
+ {
+ takeItems(player, PENITENTS_MANACLES, -1);
+ }
+ htmltext = "30981-15.html";
+
+ player.setPkKills(0);
+ qs.exitQuest(true, true);
+ }
+ else
+ {
+ giveItems(player, MANACLES_OF_PENITENT, 1);
+ if (petItem != null)
+ {
+ takeItems(player, PENITENTS_MANACLES, -1);
+ }
+ htmltext = "30981-16.html";
+
+ player.setPkKills(player.getPkKills() - i0);
+ qs.setMemoStateEx(1, 0);
+ }
+ }
+ }
+ break;
+ }
+ case "30981-18.html":
+ {
+ if ((qs.getMemoState() >= 9) && (qs.getMemoState() <= 12))
+ {
+ qs.exitQuest(true, 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 SCAVENGER_WERERAT:
+ {
+ if (qs.isMemoState(5) && (getQuestItemsCount(killer, RATMAN_SCAVENGERS_SKULL) < 10))
+ {
+ if (getQuestItemsCount(killer, RATMAN_SCAVENGERS_SKULL) == 9)
+ {
+ giveItems(killer, RATMAN_SCAVENGERS_SKULL, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else
+ {
+ giveItems(killer, RATMAN_SCAVENGERS_SKULL, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ break;
+ }
+ case TYRANT_KINGPIN:
+ {
+ if (qs.isMemoState(7) && !hasQuestItems(killer, TYRANT_KINGPINS_HEART))
+ {
+ giveItems(killer, TYRANT_KINGPINS_HEART, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ break;
+ }
+ case TUREK_WAR_HOUND:
+ {
+ if (qs.isMemoState(6) && (getQuestItemsCount(killer, TUREK_WAR_HOUNDS_TAIL) < 10))
+ {
+ if (getQuestItemsCount(killer, TUREK_WAR_HOUNDS_TAIL) == 9)
+ {
+ giveItems(killer, TUREK_WAR_HOUNDS_TAIL, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else
+ {
+ giveItems(killer, TUREK_WAR_HOUNDS_TAIL, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ break;
+ }
+ case TRISALIM_TARANTULA:
+ {
+ if (qs.isMemoState(8) && (getQuestItemsCount(killer, TRISALIM_TARANTULAS_VENOM_SAC) < 3))
+ {
+ if (getQuestItemsCount(killer, TRISALIM_TARANTULAS_VENOM_SAC) == 2)
+ {
+ giveItems(killer, TRISALIM_TARANTULAS_VENOM_SAC, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
+ }
+ else
+ {
+ giveItems(killer, TRISALIM_TARANTULAS_VENOM_SAC, 1);
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ 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() == BLACK_JUDGE)
+ {
+ if (player.getPkKills() == 0)
+ {
+ htmltext = "30981-01.htm";
+ }
+ else
+ {
+ htmltext = "30981-02.htm";
+ }
+ }
+ }
+ else if (qs.isStarted())
+ {
+ switch (npc.getId())
+ {
+ case BLACK_JUDGE:
+ {
+ if (memoState == 1000)
+ {
+ takeItems(player, PENITENTS_MANACLES, 1);
+ }
+ else if (memoState < 9)
+ {
+ htmltext = "30981-07.html";
+ }
+ else if ((memoState >= 9) && (memoState <= 12))
+ {
+ if (!hasAtLeastOneQuestItem(player, MANUAL_OF_MANACLES, MANACLES_OF_PENITENT, PENITENTS_MANACLES1, PENITENTS_MANACLES))
+ {
+ giveItems(player, MANUAL_OF_MANACLES, 1);
+ qs.setCond(14, true);
+ htmltext = "30981-08.html";
+ }
+ else if (hasQuestItems(player, MANUAL_OF_MANACLES) && !hasAtLeastOneQuestItem(player, MANACLES_OF_PENITENT, PENITENTS_MANACLES1, PENITENTS_MANACLES))
+ {
+ htmltext = "30981-09.html";
+ }
+ else if (hasQuestItems(player, PENITENTS_MANACLES1) && !hasAtLeastOneQuestItem(player, MANUAL_OF_MANACLES, MANACLES_OF_PENITENT, PENITENTS_MANACLES))
+ {
+ htmltext = "30981-10.html";
+ }
+ else if (hasQuestItems(player, PENITENTS_MANACLES))
+ {
+ final L2ItemInstance petItem = player.getInventory().getItemByItemId(PENITENTS_MANACLES);
+ final int petLevel = (petItem == null) ? 0 : petItem.getEnchantLevel();
+ if (petLevel < (qs.getMemoStateEx(1) + 1))
+ {
+ htmltext = "30981-12.html";
+ }
+ else
+ {
+ htmltext = "30981-13.html";
+ }
+ }
+ else if (hasQuestItems(player, MANACLES_OF_PENITENT) && !hasQuestItems(player, PENITENTS_MANACLES))
+ {
+ htmltext = "30981-16t.html";
+ }
+ }
+ break;
+ }
+ case BLACKSMITH_PUSHKIN:
+ {
+ if ((memoState >= 9) && (memoState <= 12))
+ {
+ if (!hasAtLeastOneQuestItem(player, PENITENTS_MANACLES1, PENITENTS_MANACLES, MANACLES_OF_PENITENT) && hasQuestItems(player, MANUAL_OF_MANACLES))
+ {
+ if ((getQuestItemsCount(player, BLACKSMITHS_FRAME) > 0) && (getQuestItemsCount(player, STEEL) >= 5) && (getQuestItemsCount(player, ADAMANTITE_NUGGET) >= 2) && (getQuestItemsCount(player, SILVER_NUGGET) >= 10) && (getQuestItemsCount(player, COKES) >= 10))
+ {
+ takeItems(player, SILVER_NUGGET, 10);
+ takeItems(player, ADAMANTITE_NUGGET, 2);
+ takeItems(player, COKES, 10);
+ takeItems(player, STEEL, 5);
+ takeItems(player, BLACKSMITHS_FRAME, 1);
+ giveItems(player, PENITENTS_MANACLES1, 1);
+ takeItems(player, MANUAL_OF_MANACLES, 1);
+ qs.setCond(15, true);
+ htmltext = "30300-01.html";
+ }
+ else
+ {
+ htmltext = "30300-02.html";
+ }
+ }
+ else if (hasAtLeastOneQuestItem(player, PENITENTS_MANACLES1, PENITENTS_MANACLES, MANACLES_OF_PENITENT))
+ {
+ htmltext = "30300-03.html";
+ }
+ }
+ break;
+
+ }
+ case PIOTUR:
+ {
+ if (memoState == 2)
+ {
+ qs.setMemoState(6);
+ qs.setCond(7, true);
+ htmltext = "30597-01.html";
+ }
+ else if (memoState == 6)
+ {
+ if (getQuestItemsCount(player, TUREK_WAR_HOUNDS_TAIL) < 10)
+ {
+ htmltext = "30597-02.html";
+ }
+ else
+ {
+ takeItems(player, TUREK_WAR_HOUNDS_TAIL, -1);
+ qs.setMemoState(10);
+ qs.setCond(11, true);
+ htmltext = "30597-03.html";
+ }
+ }
+ else if (memoState == 10)
+ {
+ htmltext = "30597-04.html";
+ }
+ break;
+ }
+ case ELDER_CASIAN:
+ {
+ if (memoState == 3)
+ {
+ qs.setMemoState(7);
+ qs.setCond(8, true);
+ htmltext = "30612-01.html";
+ }
+ else if (memoState == 7)
+ {
+ if (!hasQuestItems(player, TYRANT_KINGPINS_HEART))
+ {
+ htmltext = "30612-02.html";
+ }
+ else
+ {
+ takeItems(player, TYRANT_KINGPINS_HEART, -1);
+ qs.setMemoState(11);
+ qs.setCond(12, true);
+ htmltext = "30612-03.html";
+ }
+ }
+ else if (memoState == 11)
+ {
+ htmltext = "30612-04.html";
+ }
+ break;
+ }
+ case KATARI:
+ {
+ if (memoState == 1)
+ {
+ qs.setMemoState(5);
+ qs.setCond(6, true);
+ htmltext = "30668-01.html";
+ }
+ else if (memoState == 5)
+ {
+ if (getQuestItemsCount(player, RATMAN_SCAVENGERS_SKULL) < 10)
+ {
+ htmltext = "30668-02.html";
+ }
+ else
+ {
+ takeItems(player, RATMAN_SCAVENGERS_SKULL, -1);
+ qs.setMemoState(9);
+ qs.setCond(10, true);
+ htmltext = "30668-03.html";
+ }
+ }
+ else if (memoState == 9)
+ {
+ htmltext = "30668-04.html";
+ }
+ break;
+ }
+ case MAGISTER_JOAN:
+ {
+ if (memoState == 4)
+ {
+ qs.setMemoState(8);
+ qs.setCond(9, true);
+ htmltext = "30718-01.html";
+ }
+ else if (memoState == 8)
+ {
+ if (getQuestItemsCount(player, TRISALIM_TARANTULAS_VENOM_SAC) < 3)
+ {
+ htmltext = "30718-02.html";
+ }
+ else
+ {
+ takeItems(player, TRISALIM_TARANTULAS_VENOM_SAC, -1);
+ qs.setMemoState(12);
+ qs.setCond(13, true);
+ htmltext = "30718-03.html";
+ }
+ }
+ else if (memoState == 12)
+ {
+ htmltext = "30718-04.html";
+ }
+ break;
+ }
+ }
+ }
+ return htmltext;
+ }
+}
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
index 63b82117d8..0bbc578929 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -360,6 +360,7 @@ import quests.Q00417_PathOfTheScavenger.Q00417_PathOfTheScavenger;
import quests.Q00418_PathOfTheArtisan.Q00418_PathOfTheArtisan;
import quests.Q00420_LittleWing.Q00420_LittleWing;
import quests.Q00421_LittleWingsBigAdventure.Q00421_LittleWingsBigAdventure;
+import quests.Q00422_RepentYourSins.Q00422_RepentYourSins;
import quests.Q00423_TakeYourBestShot.Q00423_TakeYourBestShot;
import quests.Q00426_QuestForFishingShot.Q00426_QuestForFishingShot;
import quests.Q00431_WeddingMarch.Q00431_WeddingMarch;
@@ -837,6 +838,7 @@ public class QuestMasterHandler
Q00418_PathOfTheArtisan.class,
Q00420_LittleWing.class,
Q00421_LittleWingsBigAdventure.class,
+ Q00422_RepentYourSins.class,
Q00423_TakeYourBestShot.class,
Q00426_QuestForFishingShot.class,
Q00431_WeddingMarch.class,
diff --git a/L2J_DataPack/dist/sql/game/updates/20150622update.sql b/L2J_DataPack/dist/sql/game/updates/20150622update.sql
new file mode 100644
index 0000000000..7bd22ac906
--- /dev/null
+++ b/L2J_DataPack/dist/sql/game/updates/20150622update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='Q00422_RepentYourSins' WHERE name='422_RepentYourSins';
\ No newline at end of file
--
GitLab