diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 1353dce515b6ab94990abe105dc2640f190a8568..836756e95ad376b446c480c29607dfb7326f9bbb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -49,6 +49,7 @@ ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
ai/npc/Teleports/ToIVortex/ToIVortex.java
ai/npc/Teleports/Warpgate/Warpgate.java
ai/npc/TerritoryManagers/TerritoryManagers.java
+ai/npc/Tunatun/Tunatun.java
ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
ai/npc/WeaverOlf/WeaverOlf.java
ai/npc/ZealotOfShilen/ZealotOfShilen.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-22.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-22.html
rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-23.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-23.html
rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-21.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-03.html
similarity index 61%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-21.html
rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-03.html
index 76b93f33a35404b127204af314c085ae492e45e0..808f10b5dfaae4c416827e0a5fc54459fe59ad35 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-21.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-03.html
@@ -1,4 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
If you're interested in handling the beasts, I can give you this Bull Whip. If you've forgotten how to use it, I can tell you again.<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-24.html">Listen to the explanation about how to handle.</a>
+<a action="bypass -h Quest Tunatun 31537-04.html">Listen to the explanation about how to handle.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-24.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-04.html
similarity index 73%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-24.html
rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-04.html
index 0114b4551d46d18f707eaebcdfbc70bc715324ae..6f56e5b9d831f22dd3dac4f5fdca17b267d3ee64 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-24.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-04.html
@@ -1,4 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
In order to give orders to the beasts, you need this Bull Whip. On the old Beast Farm, you used to be able to command only one beast, but with this improved whip, you can now give orders to many tamed beasts at the same time.<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-25.html">Continue to listen to the story</a>
+<a action="bypass -h Quest Tunatun 31537-05.html">Continue to listen to the story</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-25.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-05.html
similarity index 74%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-25.html
rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-05.html
index 628423214bf05402ccce6874f0c3dbcf5ddf83d8..b0eff12ea59c3600cffa169748ade5e6f171d4fa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-25.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-05.html
@@ -1,4 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
Being able to give orders to many cubs you train can be incredibly helpful. Each type of cub can cast supplemental magic to help buff your skills in combat, and the more cubs you tame, the more types of buffs you can have cast on yourself.<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-26.html">Continue to listen to the story</a>
+<a action="bypass -h Quest Tunatun 31537-06.html">Continue to listen to the story</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-26.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-06.html
similarity index 63%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-26.html
rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-06.html
index c192499aea7ed4350ae4c67e8392162e6d03b0e4..042658932f8e6f8a579f29a5e62dbbc43421868c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-26.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537-06.html
@@ -1,4 +1,3 @@
-<html><body>Beaster Herder Tunatun:<br>
-Look for Feed Sellers in this area like the one standing next to me. The feed you buy from them can be given to <font color="LEVEL">Alpine Buffalo, Alpine Grendel, Alpine Kookaburra, and Alpine Buffalo</font>. The more feed you give each beast, the more they'll grow.<br>
-Remember though, tamed beasts will run away if you run out of feed to give them. So be careful.
+<html><body>Beast Herder Tunatun:<br>
+Look for Feed Sellers in this area like the one standing next to me. The feed you buy from them can be given to <font color="LEVEL">Alpine Buffalo, Alpine Grendel, Alpine Kookaburra, and Alpine Buffalo</font>. The more feed you give each beast, the more they'll grow.<br>Remember though, tamed beasts will run away if you run out of feed to give them. So be careful.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537.html
new file mode 100644
index 0000000000000000000000000000000000000000..5b279e6ad86a83c5ce211bfe1eb116449cc303ac
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/31537.html
@@ -0,0 +1,5 @@
+<html><body>Beast Herder Tunatun:<br>
+Hi! Welcome to the Beast Farm. My name is Tunatun and I'm the one in charge here. I got this job because I thought I'd be able to commune with the beasts. After all, my pet kitty back home absolutely loved me. On this farm though, it's not so easy.<br>As a matter of fact, I'm having a lot of trouble with these beasts. They tend to fight back if you try to feed or tame them, so I've hired a Feed Seller and various adventurers to help me manage and protect the farm. At this point, there's not much else I can do.<br>
+<a action="bypass -h Quest Tunatun Whip">Take the Beast Handler's Whip.</a><br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java
new file mode 100644
index 0000000000000000000000000000000000000000..9b0b8a39dfc99aba2140df8d6f813fa7becd9e88
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2004-2013 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 ai.npc.Tunatun;
+
+import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.QuestState;
+
+/**
+ * Beast Herder Tunatun AI.
+ * @author Adry_85
+ */
+public class Tunatun extends AbstractNpcAI
+{
+ // NPC
+ private static final int TUNATUN = 31537;
+ // Item
+ private static final int BEAST_HANDLERS_WHIP = 15473;
+ // Misc
+ private static final int MIN_LEVEL = 82;
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ if ("Whip".equals(event))
+ {
+ if (hasQuestItems(player, BEAST_HANDLERS_WHIP))
+ {
+ return "31537-01.html";
+ }
+
+ QuestState st = player.getQuestState(Q00020_BringUpWithLove.class.getSimpleName());
+ if ((st == null) && (player.getLevel() < MIN_LEVEL))
+ {
+ return "31537-02.html";
+ }
+ else if ((st != null) || (player.getLevel() >= MIN_LEVEL))
+ {
+ giveItems(player, BEAST_HANDLERS_WHIP, 1);
+ return "31537-03.html";
+ }
+ }
+ return event;
+ }
+
+ public Tunatun(String name, String descr)
+ {
+ super(name, descr);
+ addStartNpc(TUNATUN);
+ addFirstTalkId(TUNATUN);
+ addTalkId(TUNATUN);
+ }
+
+ public static void main(String[] args)
+ {
+ new Tunatun(Tunatun.class.getSimpleName(), "ai/npc");
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-00.htm
deleted file mode 100644
index b6c3fcfd9d2a7184ad6398d1b4227387ebd1b955..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-00.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Beast Herder Tunatun:<br>
-Ahh... I love the farm, but I wonder what they will become when they mature.<br>
-It's not always easy to farm beasts, you know. Even as manager of this place, I can only do so much to command those beasts... Do you know anyone skilled with such beasts...?<br>
-Feral beasts are too dangerous for pretenders and beginners....<br>
-(Only characters of level 82 and above are permitted to take on this quest.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-01.htm
index 34763ae8431d22801d04bb2069e943504e7f764f..be3ef0bf376c0e7b91af9830429c27c581982c5a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-01.htm
@@ -1,5 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
-Ahh... I love the farm, but I wonder what they will become when they mature.<br>
-It's not always easy to farm beasts, you know. Even as manager of this place, I can only do so much to command those beasts... Do you know anyone skilled with such beasts...?<br>
+Ahh... I love the farm, but I wonder what they will become when they mature.<br>It's not always easy to farm beasts, you know. Even as manager of this place, I can only do so much to command those beasts... Do you know anyone skilled with such beasts...?<br>
<a action="bypass -h Quest Q00020_BringUpWithLove 31537-02.htm">Say that you will help</a>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-02.htm
index e2ce437afbedd35d34a7566765a6f3a0d441c6a0..fce631a4346529972537028deb55cff46dc34fda 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-02.htm
@@ -1,4 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
You...? I agree you look the part, but know that these beasts won't care how you look. You must stay in control. The young are docile, it's the adults to watch out for. Are you sure you are ready?<br>
<a action="bypass -h Quest Q00020_BringUpWithLove 31537-03.htm">Say that you are ready</a>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-03.htm
index f5108065456cb8e43b7f5aacd7f008ea8dfdb092..112ea5a046584a9bc499c6eb4a95a369a03301a2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-03.htm
@@ -1,6 +1,5 @@
<html><body>Beast Herder Tunatun:<br>
-If you say so...<br>
-First, take this <font color="LEVEL">Beast Handler's Whip</font>. Do I need to show you how this works?<br>
+If you say so...<br>First, take this <font color="LEVEL">Beast Handler's Whip</font>. Do I need to show you how this works?<br>
<a action="bypass -h Quest Q00020_BringUpWithLove 31537-04.htm">Say that you know</a><br>
<a action="bypass -h Quest Q00020_BringUpWithLove 31537-05.htm">Say that you don't know</a>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-03a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-03a.htm
deleted file mode 100644
index 1926d33cf7244100f045798b3e4a1a2f85e19bba..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-03a.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Beast Herder Tunatun:<br>
-If you say so...<br>
-As i see you already have <font color="LEVEL">Beast Handler's Whip</font>. Do I need to show you how this works?<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-04.htm">Say that you know</a><br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-05.htm">Say that you don't know</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-04.htm
index 671a44c3ed9ff352d825eb89f6e4d6856db04a02..4c557a3a92f3762d29d82a981d40a54cfbb38a5d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-04.htm
@@ -1,5 +1,5 @@
<html><body>Beast Herder Tunatun:<br>
-The next step is simple. The cubs need proper positive attention. They only recognize you as their master if you raise them right.<br>
-But, if you ignore them and leave them to their own mischief... Well let's just say you won't be bringing one home for the kids!<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-07.htm">"And then?"</a>
-</body></html>
\ No newline at end of file
+Well, the lesson is almost over.<br> If you feel ready, there's only one way to know for sure.<br>
+<a action="bypass -h Quest Q00020_BringUpWithLove 31537-08.htm">Say that you know</a><br>
+<a action="bypass -h Quest Q00020_BringUpWithLove 31537-12.htm">Say that you don't know</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-05.htm
index 6f78fe43a233085228d527b5febbd4f0b1068764..1ae0d2d5a3b6e7bffac7557f1795279e8167e4ee 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-05.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-05.htm
@@ -1,5 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
-The Beast Handler's Whip is a necessity on this farm.<br>
-One beast used to be our limit, but thanks to the Beast Handler's Whip it isn't a problem controlling more.<br>
+The Beast Handler's Whip is a necessity on this farm.<br>One beast used to be our limit, but thanks to the Beast Handler's Whip it isn't a problem controlling more.<br>
<a action="bypass -h Quest Q00020_BringUpWithLove 31537-06.htm">Continue to listen to the story</a>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-06.htm
index f23951d57a716495f234633ef164b4f90e42c07f..7d2cb16674744a91fab0ac9f1cbbe7f7bd7ad107 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-06.htm
@@ -1,5 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
-That's not the only reason. When you use this Beast Handler's Whip, you can use a variety supplemental magic on the cubs you train.<br>
-The more kinds of beasts you train, the greater the magic you can use!<br>
+That's not the only reason. When you use this Beast Handler's Whip, you can use a variety supplemental magic on the cubs you train.<br>The more kinds of beasts you train, the greater the magic you can use!<br>
<a action="bypass -h Quest Q00020_BringUpWithLove 31537-07.htm">Continue to listen to the story</a>
-</body></html>
\ No newline at end of file
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-07.htm
index 38a92e49f9dca9b62943a3082784267fe09c3c5d..6161b02a9535391ae79e0209b71e27bfea969736 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-07.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-07.htm
@@ -1,6 +1,5 @@
<html><body>Beast Herder Tunatun:<br>
-Well, the lesson is almost over.<br>
-If you feel ready, there's only one way to know for sure.<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-09.htm">Say that you know</a><br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-08.htm">Say that you don't know</a>
-</body></html>
\ No newline at end of file
+If somehow you lose the Beast Handler's Whip, let me know. I'll give you another one.<br>Before we begin.. Do you need a few tips?<br>
+<a action="bypass -h Quest Q00020_BringUpWithLove 31537-08.htm">Say that you know</a><br>
+<a action="bypass -h Quest Q00020_BringUpWithLove 31537-12.htm">Say that you don't know</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-08.htm
index 192895a2fd5a0f6e0c20475be57cdabad9995bd1..85b9246a58e2af76ad0fc7b10720c8e6d2558b13 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-08.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-08.htm
@@ -1,5 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
-Pay attention. You see those Feed Sellers?<br>
-Purchase the Feed from them, and let <font color="LEVEL">Alpine Buffalo, Alpine Grendel, Alpine Kookaburra, Alpine Cougar</font> eat the Feed to make them grow.<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-09.htm">Listen to the next story</a>
-</body></html>
\ No newline at end of file
+The next step is simple. The cubs need proper positive attention. They only recognize you as their master if you raise them right.<br>But, if you ignore them and leave them to their own mischief... Well let's just say you won't be bringing one home for the kids!<br>
+<a action="bypass -h Quest Q00020_BringUpWithLove 31537-09.htm">"And then?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-09.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-09.htm
index ced949755d08e80a75db42bb2fa850cceb94f1d3..1cee19e8d9d0406144f34bbab895f46fc0466cb3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-09.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-09.htm
@@ -1,5 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
-The next step is simple. The cubs need proper positive attention. They only recognize you as their master if you raise them right.<br>
-But, if you ignore them and leave them to their own mischief... Well let's just say you won't be bringing one home for the kids!<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-10.htm">"And then?"</a>
-</body></html>
\ No newline at end of file
+Now sometimes, and I do mean rarely, a cub remains purely innocent and good, without any trace of evil. Again, this is rare. But when it does happen, that cub will produce a white jewel.<br>We call this jewel a <font color="LEVEL">Jewel of Innocence</font>. It's a product of the cub's pure love for its master.<br>
+<a action="bypass -h Quest Q00020_BringUpWithLove 31537-10.htm">"So, what you really want to say is...?"</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-10.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-10.htm
index 8ebda1e9fd7350df181d548bf872cb6013f14859..bc9c4b28fc967a4932b25a083e7c996e0975028e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-10.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-10.htm
@@ -1,5 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
-Now sometimes, and I do mean rarely, a cub remains purely innocent and good, without any trace of evil. Again, this is rare. But when it does happen, that cub will produce a white jewel.<br>
-We call this jewel a <font color="LEVEL">Jewel of Innocence</font>. It's a product of the cub's pure love for its master.<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-11.htm">"So, what you really want to say is...?"</a>
-</body></html>
\ No newline at end of file
+You've guessed it, I want that Jewel of Innocence! Beasts crave them, but only the person who raised the cub can retrieve the Jewel of Innocence.<br>Also, and I don't know why, but you only get one chance to acquire that jewel. I've only seen it once, truly unforgettable to say the least... <br>Get this jewel for me and the reward will be great. What do you say?<br>
+<a action="bypass -h Quest Q00020_BringUpWithLove 31537-11.html">Say that you will</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-11.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-11.htm
deleted file mode 100644
index 352a49d0c9e8f810b71ae890bc4f6efa3e22f73b..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-11.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Beast Herder Tunatun:<br>
-You've guessed it, I want that Jewel of Innocence! Beasts crave them, but only the person who raised the cub can retrieve the Jewel of Innocence.<br>
-Also, and I don't know why, but you only get one chance to acquire that jewel. I've only seen it once, truly unforgettable to say the least... <br>
-Get this jewel for me and the reward will be great. What do you say?<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-12.htm">Say that you will</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-11.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-11.html
new file mode 100644
index 0000000000000000000000000000000000000000..d7b14c025bce63ee14752fe87ed75f9e975cd1ee
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-11.html
@@ -0,0 +1,3 @@
+<html><body>Beast Herder Tunatun:<br>
+I hope you aren't all talk! Feed them, diligently, with Feed from the Feed Sellers, and fortune may shine on you... with a jewel!<br>However, a beast with any evil in it can be dangerous. So be careful! I'll be waiting for that jewel.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-12.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-12.htm
index b337a79d1c5844e46bf21819413de0b0e6f66395..c40be658b319bbe440b5a04857876a92cad1830c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-12.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-12.htm
@@ -1,4 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
-I hope you aren't all talk! Feed them, diligently, with Feed from the Feed Sellers, and fortune may shine on you... with a jewel!<br>
-However, a beast with any evil in it can be dangerous. So be careful! I'll be waiting for that jewel.
-</body></html>
\ No newline at end of file
+Pay attention. You see those Feed Sellers?<br>Purchase the Feed from them, and let <font color="LEVEL">Alpine Buffalo, Alpine Grendel, Alpine Kookaburra, Alpine Cougar</font> eat the Feed to make them grow.<br>
+<a action="bypass -h Quest Q00020_BringUpWithLove 31537-08.htm">Listen to the next story</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-13.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-13.htm
deleted file mode 100644
index adb2074f616cc758120c847831d30111967ee054..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-13.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Beast Herder Tunatun:<br>
-Buy food from the Feed Sellers. Without food the beasts turn feral. If that happens you've wasted everyone's time. So do us both a favor, have enough food ready.<br>
-The cubs you can raise are <font color="LEVEL">Alpine Buffalo, Alpine Grendel, Alpine Kookaburra, and Alpine Cougar</font>. So raise em' right. And when you do... bring me a Jewel of Innocence!
-</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-13.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-13.html
new file mode 100644
index 0000000000000000000000000000000000000000..fed8c4661594cad5493f641f0a94373365312563
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-13.html
@@ -0,0 +1,3 @@
+<html><body>Beast Herder Tunatun:<br>
+Ahh... I love the farm, but I wonder what they will become when they mature.<br>It's not always easy to farm beasts, you know. Even as manager of this place, I can only do so much to command those beasts... Do you know anyone skilled with such beasts...?<br>Feral beasts are too dangerous for pretenders and beginners....<br>(Only characters of level 82 and above are permitted to take on this quest.)
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-14.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-14.html
new file mode 100644
index 0000000000000000000000000000000000000000..6ed233b59f78215981896625215d9418823206b8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-14.html
@@ -0,0 +1,3 @@
+<html><body>Beast Herder Tunatun:<br>
+Buy food from the Feed Sellers. Without food the beasts turn feral. If that happens you've wasted everyone's time. So do us both a favor, have enough food ready.<br>The cubs you can raise are <font color="LEVEL">Alpine Buffalo, Alpine Grendel, Alpine Kookaburra, and Alpine Cougar</font>. So raise em' right. And when you do... bring me a Jewel of Innocence!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-15.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-15.htm
deleted file mode 100644
index a690a5f6ee1ea06bf3e57900fde01687273b2072..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-15.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>Beast Herder Tunatun:<br>
-Ahh, it has been too long...! The way light catches it, the color, the texture, the...<br>
-Oh... I, I'm crying. Don't mind me...<br>
-This Jewel... when I hold it I remember the innocence of my youth. I remember a dream... <br>
-I dreamed about making the world a better place. Yes, I was young. But I realize now I still dream this.<br>
-I have to do something, I have to act.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-14.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-15.html
similarity index 55%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-14.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-15.html
index 042776d6f0d0e2a95bbe0b2aecd22c348edb53ad..9dc95edab4f31b7b0ca8876aa990b5473fc79efb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-14.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-15.html
@@ -1,4 +1,4 @@
<html><body>Beast Herder Tunatun:<br>
The Jewel of Innocence! You aren't thinking of keeping it, are you? I'll pay you now..<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-15.htm">Give it to him</a>
-</body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00020_BringUpWithLove 31537-16.html">Give it to him</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-16.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-16.html
new file mode 100644
index 0000000000000000000000000000000000000000..af3714497ae30e16002d9097d712978f9ce61a9b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-16.html
@@ -0,0 +1,3 @@
+<html><body>Beast Herder Tunatun:<br>
+Ahh, it has been too long...! The way light catches it, the color, the texture, the...<br>Oh... I, I'm crying. Don't mind me...<br>This Jewel... when I hold it I remember the innocence of my youth. I remember a dream... <br>I dreamed about making the world a better place. Yes, I was young. But I realize now I still dream this.<br>I have to do something, I have to act.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-20.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-20.html
deleted file mode 100644
index 00bdfd1be5af5799e7723a6f26360201a07e90fb..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/31537-20.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Beast Herder Tunatun:<br>
-Hi! Welcome to the Beast Farm. My name is Tunatun and I'm the one in charge here. I got this job because I thought I'd be able to commune with the beasts. After all, my pet kitty back home absolutely loved me. On this farm though, it's not so easy.<br>
-As a matter of fact, I'm having a lot of trouble with these beasts. They tend to fight back if you try to feed or tame them, so I've hired a Feed Seller and various adventurers to help me manage and protect the farm. At this point, there's not much else I can do.<br>
-<a action="bypass -h Quest Q00020_BringUpWithLove 31537-21.html">Take the Beast Handler's Whip.</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index 32036b0440e59d3fb4828a56bbb2d698ac64c581..cdb07069a8720b94411dfcd25e34a1e2cc287804 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -26,16 +26,17 @@ import com.l2jserver.gameserver.model.quest.State;
/**
* Bring Up With Love (20)
- * @author Gnacik, jurchiks
+ * @author Adry_85
*/
public class Q00020_BringUpWithLove extends Quest
{
// NPC
private static final int TUNATUN = 31537;
// Items
- private static final int BEAST_HANDLERS_WHIP = 15473;
private static final int WATER_CRYSTAL = 9553;
- private static final int JEWEL_OF_INNOCENCE = 7185;
+ private static final int INNOCENCE_JEWEL = 15533;
+ // Misc
+ private static final int MIN_LEVEL = 82;
public Q00020_BringUpWithLove(int questId, String name, String descr)
{
@@ -51,60 +52,52 @@ public class Q00020_BringUpWithLove extends Quest
final QuestState st = player.getQuestState(getName());
if (st == null)
{
- return getNoQuestMsg(player);
+ return null;
}
- String htmltext = event;
-
+ String htmltext = null;
switch (event)
{
- case "31537-12.htm":
- st.startQuest();
- break;
+ case "31537-02.htm":
case "31537-03.htm":
- if (hasQuestItems(player, BEAST_HANDLERS_WHIP))
- {
- return "31537-03a.htm";
- }
- giveItems(player, BEAST_HANDLERS_WHIP, 1);
+ case "31537-04.htm":
+ case "31537-05.htm":
+ case "31537-06.htm":
+ case "31537-07.htm":
+ case "31537-08.htm":
+ case "31537-09.htm":
+ case "31537-10.htm":
+ case "31537-12.htm":
+ {
+ htmltext = event;
break;
-
- case "31537-15.htm":
- takeItems(player, JEWEL_OF_INNOCENCE, -1);
- giveItems(player, WATER_CRYSTAL, 1);
- st.exitQuest(false, true);
+ }
+ case "31537-11.html":
+ {
+ st.startQuest();
+ htmltext = event;
break;
- case "31537-21.html":
- if (player.getLevel() < 82)
+ }
+ case "31537-16.html":
+ {
+ if (st.isCond(2) && st.hasQuestItems(INNOCENCE_JEWEL))
{
- return "31537-23.html";
+ st.giveItems(WATER_CRYSTAL, 1);
+ st.takeItems(INNOCENCE_JEWEL, -1);
+ st.exitQuest(false, true);
+ htmltext = event;
}
- if (hasQuestItems(player, BEAST_HANDLERS_WHIP))
- {
- return "31537-22.html";
- }
- giveItems(player, BEAST_HANDLERS_WHIP, 1);
break;
+ }
}
return htmltext;
}
- @Override
- public String onFirstTalk(L2Npc npc, L2PcInstance player)
- {
- QuestState st = player.getQuestState(getName());
- if (st == null)
- {
- newQuestState(player);
- }
- return "31537-20.html";
- }
-
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- String htmltext = getNoQuestMsg(player);
QuestState st = player.getQuestState(getName());
+ String htmltext = getNoQuestMsg(player);
if (st == null)
{
return htmltext;
@@ -112,18 +105,27 @@ public class Q00020_BringUpWithLove extends Quest
switch (st.getState())
{
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ }
case State.CREATED:
- htmltext = ((player.getLevel() < 82) ? "31537-00.htm" : "31537-01.htm");
+ htmltext = player.getLevel() >= MIN_LEVEL ? "31537-01.htm" : "31537-13.html";
break;
case State.STARTED:
switch (st.getCond())
{
case 1:
- htmltext = "31537-13.htm";
+ {
+ htmltext = "31537-14.html";
break;
+ }
case 2:
- htmltext = "31537-14.htm";
+ {
+ htmltext = (!st.hasQuestItems(INNOCENCE_JEWEL)) ? "31537-14.html" : "31537-15.html";
break;
+ }
}
break;
}
@@ -133,9 +135,9 @@ public class Q00020_BringUpWithLove extends Quest
public static void checkJewelOfInnocence(L2PcInstance player)
{
final QuestState st = player.getQuestState(Q00020_BringUpWithLove.class.getSimpleName());
- if ((st != null) && st.isCond(1) && !st.hasQuestItems(JEWEL_OF_INNOCENCE) && (getRandom(20) == 0))
+ if ((st != null) && st.isCond(1) && !st.hasQuestItems(INNOCENCE_JEWEL) && (getRandom(100) < 5))
{
- st.giveItems(JEWEL_OF_INNOCENCE, 1);
+ st.giveItems(INNOCENCE_JEWEL, 1);
st.setCond(2, true);
}
}