diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
index 0c46eeae321772c2d0786b23f00366337e491dde..d50e6b888e5345bfefba738594e4e44a95d17b3e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
@@ -39,6 +39,14 @@ public class Q00131_BirdInACage extends Quest
// Misc
private static final int MIN_LEVEL = 78;
+ public Q00131_BirdInACage(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+ addStartNpc(KANIS);
+ addTalkId(KANIS, PARME);
+ registerQuestItems(ECHO_CRYSTAL_OF_FREE_THOUGHT, PARMES_LETTER);
+ }
+
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
@@ -226,14 +234,6 @@ public class Q00131_BirdInACage extends Quest
return htmltext;
}
- public Q00131_BirdInACage(int questId, String name, String descr)
- {
- super(questId, name, descr);
- addStartNpc(KANIS);
- addTalkId(KANIS, PARME);
- registerQuestItems(ECHO_CRYSTAL_OF_FREE_THOUGHT, PARMES_LETTER);
- }
-
public static void main(String[] args)
{
new Q00131_BirdInACage(131, Q00131_BirdInACage.class.getSimpleName(), "Bird in a Cage");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
index 499fcc682c649294a4495e3d33afb8ef2ea34382..a2551f52db6d04bba4382ff2cfc42541297e4155 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
@@ -37,6 +37,14 @@ public class Q00133_ThatsBloodyHot extends Quest
// Misc
private static final int MIN_LEVEL = 78;
+ public Q00133_ThatsBloodyHot(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+ addStartNpc(KANIS);
+ addTalkId(KANIS, GALATE);
+ registerQuestItems(REFINED_CRYSTAL_SAMPLE);
+ }
+
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
@@ -204,14 +212,6 @@ public class Q00133_ThatsBloodyHot extends Quest
return htmltext;
}
- public Q00133_ThatsBloodyHot(int questId, String name, String descr)
- {
- super(questId, name, descr);
- addStartNpc(KANIS);
- addTalkId(KANIS, GALATE);
- registerQuestItems(REFINED_CRYSTAL_SAMPLE);
- }
-
public static void main(String[] args)
{
new Q00133_ThatsBloodyHot(133, Q00133_ThatsBloodyHot.class.getSimpleName(), "That's Bloody Hot!");
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-00.htm
index e0f1c8f4de052f48ca169c2d39071f0f8baa1eac..6219a629f7f3401e594688c583806a3759334e1c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-00.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-00.htm
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
You will understand what I mean someday, adventurer.<br>
When that time comes, we can combine our skills. You with your sword, and me with my brain.<br>
(Only characters with levels 82 and above can play this quest.)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-01.htm
index 690c9b7ae4e486c1f9e9a9fec796ec9a15965334..ef141557f413d7c9ec70a10efdeb879a7350ece5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-01.htm
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
By the looks of you, I can tell you aren't one of the locals... given the fact you can still stand up straight and don't look like you are about to pass out.<br>
I'm a talent scout and I'm looking for the best of the best in Aden. Apparently, I made a mistake coming here first.<br>
You look like you know your way around a weapon. Want to test your skills?<br>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-02.html
index 613b8a2c03d680a0749c2bd1b676b95ff01d00c0..5b23de8bf6d27d9d2d96cb0b0247fbbb11e83fb5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-02.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-02.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Yes... someone who searches for someone who has talent. Not too bright are you. My boss, who wishes to remain nameless, has asked me to find adventurers who can demonstrate excellent combat skills. Those who are great are rewarded with greatness. Those who are horrible are rewarded with shame.<br>
<a action="bypass -h Quest Q00458_PerfectForm 32768-03.html">"What type of skills are you looking for?"</a><br>
<a action="bypass -h Quest Q00458_PerfectForm 32768-04.html">"Look no further. Greatness has arrived."</a>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-03.html
index fcf549724d3a1ab82994d293c8feafe22feb69e3..ee63ca8dd1f2c20f117d95d69d144e1cdcc17e34 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-03.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-03.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Oh nothing much. We take a look at the area to see what can be done and then ask would-be-adventure-seekers such as you to do it.<br>
For instance, the Beast Farm. There are a lot of animals that can be temperamental if raised incorrectly. So, we use that as inspiration when creating a challenge. But it can't be as easy as "kill X of Y". That is just so boring. No, you have to add in a little flare to it.<br>
<a action="bypass -h Quest Q00458_PerfectForm 32768-04.html">"I think I see where this is going."</a>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-04.html
index 5fc36cb9a82f20c5ae64467a063b33f899594498..108743071c8d95fbe16747cce2bb3af219b37cc4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-04.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-04.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Right. Down to business.<br>
As you can see, there are <font color="LEVEL">Alpine Buffalo, Grendel, Cougar, and Kookaburra</font> all over the place. Cute in their infant state, but vicious if they are raised incorrectly.<br>
There are 3 parts to the challenge. Part 1: Raise an Alpine animal to their adult state. Part 2: Slaughter the beast. Part 3...<br>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-05.html
index 44d1216c0ab11f5aee4b1af50f26504c69c1335a..11ec0a7e594530d0aa9f8ab48c0c61460bc07c88 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-05.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-05.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
No, you do NOT get it you amateur. Part 3 is the most important part of the challenge. It separates the no talent wannabes from the pros.<br>
You must score <font color="LEVEL">Over-hits on fully grown Alpine animals</font>. A kill is a kill and that is all fine and dandy, but we are looking for perfection here. Bonus points are scored for performing <font color="LEVEL">Critical Over-hits</font>.<br>
Do you understand the challenge?<br>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-06.htm
index b7c24ffdf342548729ab367000d720790357ade7..279784ae4a912623cf1ca76689702a760d1eec6f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-06.htm
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Really... you really want me to go over this again? It is simple. Find an <font color="LEVEL">Alpine Kookaburra, Alpine Cougar, Alpine Buffalo, or Alpine Grendel</font> and feed it on spice until it grows into an adult. Speak to my associate over here to purchase spice.<br>
Once it is an adult, kill it trying to score as many <font color="LEVEL">Over-hits and Critical Over-hits</font> as possible.<br>
The limit is <font color="LEVEL">10 of each</font> type of animal. That's a total of 40 if you can't add. If you can't score an Over-hit before killing an animal, you'll have to wait until tomorrow to try again.<br>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-07.htm
index 20ff31a39059e5aa223c4b8f6156added207112d..d7b99e772c23b3038c3f6c0b167189c281a674b0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-07.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-07.htm
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Am I wasting my time here or what? Do you want to see if you got what it takes, or am I going to have to go speak to some other adventurer who can stop annoying me?<br>
<a action="bypass -h Quest Q00458_PerfectForm 32768-10.htm">Accept the challenge.</a><br>
<a action="bypass -h Quest Q00458_PerfectForm 32768-08.htm">Keep annoying her.</a>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-08.htm
index 84543a58992b03086585bfafeb64ea1467a8c4df..c48fcb07351b42ad2a4eed2a918cc75d483c6c5b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-08.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-08.htm
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
No, no, no, I will not be drawn into this ridiculous game.<br>
Either accept the challenge or walk away.<br>
<a action="bypass -h Quest Q00458_PerfectForm 32768-10.htm">Accept the challenge.</a><br>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-09.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-09.htm
index 0f9b929a85bc305c9af7a8f1cf8348fddd43ecdc..f541117bffa09031cead3dcb1e72735da79ceaed 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-09.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-09.htm
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Ah, seriously, there isn't anything further if you keep annoying me. Go ahead and accept the challenge.<br>
<a action="bypass -h Quest Q00458_PerfectForm 32768-10.htm">Accept the challenge.</a><br>
<a action="bypass -h Quest Q00458_PerfectForm 32768-08.htm">KEEP ANNOYING HER.</a>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-10.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-10.htm
index 26e1809897fc3c6b8ec53857852616cd1e0cbbee..64de614f951611b5446e698ad9051db1af258a4c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-10.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-10.htm
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
We have set up spotters all around the area to watch you so you can't cheat.<br>
We will keep track and let you know how well you have done.<br>
Break a leg!
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-11.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-11.html
index 8532b3d46b1aac459bad4c9392d13c105e807f28..4561592862b40ae889e01308b62a619a2b275059 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-11.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-11.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Remember, we will be judging you based on skill, technique, and consistency. We are looking for total perfection.<br>
Fully grown <font color="LEVEL">Alpine Kookaburra, Alpine Cougar, Alpine Buffalo, Alpine Grendel</font> and <font color="LEVEL">Over-hits</font> count. Anything else is worthless.
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-12.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-12.html
index 617316132b54c30ab81c2223958cb846d3c4de97..1bed26427bc16feffd8a8ccc7c95b847f9ed020b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-12.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-12.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Our spotters have reported you aren't quite finished yet.<br>
Get back in the field and show us what you got.
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-13.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-13.html
index 9cc1a9c7ca11249cdbbc1a028ab604a385c96fa5..a3242a61997909c83bda0cc35308e08f1179a7d9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-13.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-13.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
And done... you look a little winded. Are you sure that wasn't too much for you?<br>
Are you ready to hear your results?<br>
<a action="bypass -h Quest Q00458_PerfectForm results1">Listen to Results.</a>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14a.html
index fb2b2becb9a92d5c2b5227362fc26a48f9a5d258..b14c6bb10cb794b89834fa0454b08b92a3d5ceb6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14a.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14a.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
First, I'd like to discuss your skill level. Out of the 40 kills, you had <font color="LEVEL"><?number?> Over-hits</font>. Wow, a perfect number! I almost never see that!<br>
<a action="bypass -h Quest Q00458_PerfectForm results2">"Yeah, I'm kind of a perfectionist."</a>
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14b.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14b.html
index 59fb2bdb3433de23d82e0567bffb02a769c7bc0e..36dec1e8c102a8e2dd5cbe9a81e131c85bf55668 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14b.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14b.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
First, I'd like to discuss your skill level. Out of the 40 kills, you had <font color="LEVEL"><?number?> Over-hits</font>. It's okay... but not great. We have seen better.<br>
<a action="bypass -h Quest Q00458_PerfectForm results2">"I'm sure I had more than that."</a>
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14c.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14c.html
index 82e255ed07b00df822eadf9a3b6ff297d3fc02ae..665c4a66c69bdf1a4766537be2bcb6552d6ed50a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14c.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-14c.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
First, I'd like to discuss your skill level. Out of the 40 kills, you had <font color="LEVEL"><?number?> Over-hits</font>. Hmm... seems like you didn't quite understand the challenge. Or is it that you just don't have what it takes to be a pro.<br>
<a action="bypass -h Quest Q00458_PerfectForm results2">"Yeah, yeah. Next."</a>
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15a.html
index 6ff3ba62f788962bd100c051f2ae692909d9039d..3bc05549b0e3f27c019b12e692ee37a288ec17d7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15a.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15a.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Second, I'd like to discuss your technique. It also appears that you like to use a lot of flash in your moves. Of the 40 kills, you managed to get <font color="LEVEL"><?number?> Critical Over-hits</font>. That is impressive. I don't think we have ever encountered someone who has managed that.<br>
<a action="bypass -h Quest Q00458_PerfectForm results3">"Yep, I am awesome."</a>
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15b.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15b.html
index 6ec9f0b9c307b1afec2282840de1cf822de8921e..3cdeaba55527300405a93f7699cd61b2a8364384 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15b.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15b.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Second, I'd like to discuss your technique. Not a lot of zest in your moves. Of the 40 kills, you managed to get <font color="LEVEL"><?number?> Critical Over-hits</font>. Not that exciting to watch. With someone of your talents, I would have expected more.<br>
<a action="bypass -h Quest Q00458_PerfectForm results3">"Well, I wasn't really trying."</a>
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15c.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15c.html
index bd66726f8892198a8581b87bf26a47ddb2f12974..944231edcfa9be117d64bfc730bb1328165fb2ae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15c.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-15c.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Second, I'd like to discuss your technique. Wow. You managed to have <font color="LEVEL"><?number?> Critical Over-hits</font>. Well, I've seen worse... no not really. You are really that bad.<br>
<a action="bypass -h Quest Q00458_PerfectForm results3">Continue listening to the abuse.</a>
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16a.html
index 4c491d22fd7b2234f39ce2bd216310dcd5f87e14..a337460b18d00fddf3744288a092fff301685638 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16a.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16a.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Lastly, I want to discuss your consistency. You managed <font color="LEVEL"><?number?> consecutive Over-hit(s)</font>. You've demonstrated all the traits of a perfect killing machine.<br>
I don't have anything else to go over. Here is your reward.<br>
<a action="bypass -h Quest Q00458_PerfectForm 32768-17.html">Graciously accept the award.</a>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16b.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16b.html
index 2faff0844ad444d7a7ae0a9b819d6440e59c75ec..b26e8ee3437a389f5ba5f148f6fa38ae261f82d9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16b.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16b.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Lastly, I want to discuss your consistency. You managed <font color="LEVEL"><?number?> consecutive Over-hit(s)</font>. It's about average. You could do better.<br>
I don't have anything else to go over. Here is your reward.<br>
<a action="bypass -h Quest Q00458_PerfectForm 32768-17.html">Embarrassed... accept the reward.</a>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16c.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16c.html
index 76e6856c7be0bbc954f57c67333b4c7773cb90c2..43da062689ab6ec8aea96915bdc0b2de994d86d4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16c.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-16c.html
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Lastly I want to discuss your consistency. Of the 40 kills, you managed <font color="LEVEL"><?number?> consecutive Over-hit(s)</font>. Yes, you consistently demonstrated how bad at this you really are.<br>
Now that I have finished crushing your spirit, here is your reward for your work.<br>
<a action="bypass -h Quest Q00458_PerfectForm 32768-17.html">Humiliated... accept the reward.</a>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-17.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-17.html
index db1f8e9896d028e545280e8b833c746f69e6a279..f0ddf26bdd440ea47d54c5fa01ca547c64b143f5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-17.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-17.html
@@ -1,4 +1,3 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
If you want to give it a shot again, let me know.
</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-18.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-18.htm
index eb08c2c356d4bf11b71cf42ba6b9affabb75eed8..93eb4a02b283e641a4c02eed7c93ab13e25838b6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-18.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/32768-18.htm
@@ -1,5 +1,4 @@
-<html><body>
-Kelleyia:<br>
+<html><body>Kelleyia:<br>
Sorry. But it's time to go back home...<br>
Please tell me all about it tomorrow.<br>
(This is a quest that can be played only once a day. This quest resets everyday at 6:30 am.)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
index d9570421a159a9c50ccb64a4c7886c0edbf8e7aa..664114731bfc4e98af36fcc0f132de0c4fb31cbf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
@@ -24,14 +24,15 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.util.Util;
/**
- * Perfect Form (458).<br>
+ * Perfect Form (458)
* @author jurchiks
*/
public class Q00458_PerfectForm extends Quest
{
+ // NPCs
private static final int KELLEYIA = 32768;
-
- // level 4 (full grown) feedable beasts
+ // Monsters
+ // Level 4 (full grown) feedable beasts
private static final int[] KOOKABURRAS =
{
18878,
@@ -60,7 +61,8 @@ public class Q00458_PerfectForm extends Quest
BUFFALOS,
GRENDELS
};
- // 60% icarus weapon recipes (except kamael weapons)
+ // Rewards
+ // 60% Icarus weapon recipes (except kamael weapons)
// @formatter:off
private static final int[] ICARUS_WEAPON_RECIPES =
{
@@ -73,6 +75,17 @@ public class Q00458_PerfectForm extends Quest
};
// @formatter:on
+ private Q00458_PerfectForm()
+ {
+ super(458, Q00458_PerfectForm.class.getSimpleName(), "Perfect Form");
+ addStartNpc(KELLEYIA);
+ addTalkId(KELLEYIA);
+ addKillId(KOOKABURRAS);
+ addKillId(COUGARS);
+ addKillId(BUFFALOS);
+ addKillId(GRENDELS);
+ }
+
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
@@ -249,7 +262,7 @@ public class Q00458_PerfectForm extends Quest
if (overHitHtml)
{
htmltext = getHtm(player.getHtmlPrefix(), htmltext);
- htmltext = htmltext.replace("<?number?>", "" + overHits);
+ htmltext = htmltext.replace("<?number?>", String.valueOf(overHits));
}
return htmltext;
}
@@ -316,17 +329,6 @@ public class Q00458_PerfectForm extends Quest
return super.onKill(npc, player, isPet);
}
- public Q00458_PerfectForm()
- {
- super(458, Q00458_PerfectForm.class.getSimpleName(), "Perfect Form");
- addStartNpc(KELLEYIA);
- addTalkId(KELLEYIA);
- addKillId(KOOKABURRAS);
- addKillId(COUGARS);
- addKillId(BUFFALOS);
- addKillId(GRENDELS);
- }
-
public static void main(String[] args)
{
new Q00458_PerfectForm();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 60f6bdfbd686966b42835f7fc2e87ccada1c0484..48d6be714a25ee881db6879cd91edf0c7fd168d0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -31,13 +31,13 @@ public class Q10290_LandDragonConqueror extends Quest
// NPC
private static final int THEODRIC = 30755;
- // @formatter:off
- private static final int[] ANTHARAS =
- {
- // Old, Weak, Normal, Strong
- 29019, 29066, 29067, 29068
- };
- //@formatter:on
+ private static final int[] ANTHARAS =
+ {
+ 29019, // Old
+ 29066, // Weak
+ 29067, // Normal
+ 29068 //Strong
+ };
// Items
private static final int PORTAL_STONE = 3865;