diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 595fab3565697488b5315cf049304b4bf22af245..c2c7b4f0f3beeb253b1b5640cd8cc5595369fe87 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -678,9 +678,9 @@ quests/647_InfluxOfMachines/__init__.py
quests/648_AnIceMerchantsDream/__init__.py
quests/649_ALooterAndARailroadMan/__init__.py
quests/650_ABrokenDream/__init__.py
-quests/651_RunawayYouth/__init__.py
+quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
-quests/653_WildMaiden/__init__.py
+quests/Q00653_WildMaiden/Q00653_WildMaiden.java
quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
quests/659_IdRatherBeCollectingFairyBreath/__init__.py
quests/660_AidingtheFloranVillage/__init__.py
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-01.htm
deleted file mode 100644
index 2fe1dcf9fc12cd7754340b06cb758eacb4ef7e11..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Ivan:<br>
-Oh, you're an adventurer, aren't you? Phew... I'm Ivan. I'm a fisherman like my father! But to tell you the truth, I hate the smell of fish! So I left home... I've been wandering around this dangerous place, and now I'm thinking that maybe my father was right after all! I wish I could go back home... Maybe one day you'll be able to help me.<br>
-(Quest for characters level 26 and above)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-03.htm
deleted file mode 100644
index 314614188931d3a5b827d43480823bcaa72fcc19..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-03.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Ivan:<br>
-Thank you so much! Now I can get home safely. Again, thank you.<br>
-My father is<font color="LEVEL"> Batidae, a Fishing Guild Member of the Town of Schuttgart</font>.<br>
-If you go there, please look for my father. He'll reward you. I'm leaving now... Good luck!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-04.htm
deleted file mode 100644
index 1999bf82f38d5f11834b20052a460c59d8594dc5..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-04.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Ivan:<br>
-All who see me make fun of me. Insults pour from their mouths. They shake their heads and say, let him commit himself unto the lord! let Him rescue him; let Him deliver him, seeing He delighteth in him.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-04a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-04a.htm
deleted file mode 100644
index f4b8fe1e02b45cb4308e0ff76c8cc4f0edc65f89..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-04a.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Ivan:<br>
-You don't have a Scroll of Escape!<br>
-Talk to me when you get one.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/__init__.py
deleted file mode 100644
index 38c15223a53dfb8575010bdcf3113caca3d798e8..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/__init__.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# Made by Polo & DrLecter
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-
-qn = "651_RunawayYouth"
-#Npc
-IVAN = 32014
-BATIDAE = 31989
-
-#Items
-SOE = 736
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-
- def onAdvEvent (self,event,npc,player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- if event == "32014-04.htm" :
- if st.getQuestItemsCount(SOE):
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- st.takeItems(SOE,1)
- htmltext = "32014-03.htm"
- npc.deleteMe()
- elif event == "32014-04a.htm" :
- st.exitQuest(1)
- st.playSound("ItemSound.quest_giveup")
- return htmltext
-
- def onTalk (self,npc,player):
- st = player.getQuestState(qn)
- htmltext = Quest.getNoQuestMsg(player)
- if not st : return htmltext
- npcId = npc.getNpcId()
- id = st.getState()
- cond=st.getInt("cond")
- if npcId == IVAN and id == State.CREATED:
- if player.getLevel()>=26 :
- htmltext = "32014-02.htm"
- else:
- htmltext = "32014-01.htm"
- st.exitQuest(1)
- elif npcId == BATIDAE and st.getInt("cond") :
- htmltext = "31989-01.htm"
- st.giveItems(57,2883)
- st.playSound("ItemSound.quest_finish")
- st.exitQuest(1)
- return htmltext
-
-QUEST = Quest(651,qn,"Runaway Youth")
-
-QUEST.addStartNpc(IVAN)
-
-QUEST.addTalkId(IVAN)
-QUEST.addTalkId(BATIDAE)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/30181-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/30181-01.htm
deleted file mode 100644
index 51ecb9c878beb0f40b69965a8b983ff410952285..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/30181-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Galibredo:<br>
-Thank you so much! Thanks to you, my daughter made it home safely. I certainly gave her a good talking-to! I swear, I don't know what I'mg going to do with that girl! I'm afraid something terrible will happen to her someday... Humph! By the way, Take this! It's not much, but think of it as a small token of my appreciation. Thank you again.<br>
-What's a father to do...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-02.htm
deleted file mode 100644
index 6ae530e270922b41006a658794cc0bf4035d00c4..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Suki:<br>
-Good heavens! Oh, my ... ... You're an adventurer, aren't you? You certainly surprised me. Who am I? My name's suki! What am I doing here? Honestly, I fell in love with a wonderful Warrior who came to our town not too long ago. A dark face with a melancholy shadow... Sinewy hands held his sword tight.. He admired my pure heart and then he... he kissed my... Oh my! Some things are better left unsaid... Anyway, when he left, he wouldn't let me go with him, saying that it was too dangerous for me... Although I knew the danger well, I secretly followed him! I got lost and wound up here... The days have been hard here. My skin has grown rough and I haven't eaten in days! I would give anything just to get back home!<br>
-<a action="bypass -h Quest 653_WildMaiden 32013-04.htm">"Go on Home. This will take you there."</a><br>
-<a action="bypass -h Quest 653_WildMaiden 32013-04a.htm">"What? Are you crazy? Go and find your man!"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-03.htm
deleted file mode 100644
index a26b3eae3c13b2d8879eff086ce4ecea2ed46526..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Suki:<br>
-Oh, thank you so much! I can now go home safely! By the way... You have such smooth skin and great body tone... Not to mention that fine looking face! if you're ever in<font color="LEVEL"> the Town of Oren</font>, speak with<font color="LEVEL"> Galibredo</font>. He's my father, and he'll reward your kindness. Well, I should be going... Goodbye and Good luck!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-04a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-04a.htm
deleted file mode 100644
index ce4a01b5c49e96bfa0cf5ec2cd9c55c7af50dca2..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-04a.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Suki:<br>
-Humph! Oh yeah? If I die out here, it'll be all your fault!<br>
-Humph!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/__init__.py
deleted file mode 100644
index 2e0c244365c4f93e26dbf514e39a84244ace9004..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/__init__.py
+++ /dev/null
@@ -1,61 +0,0 @@
-# Made by DrLecter, based on a Polo script and a DoomIta contribution
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-
-qn = "653_WildMaiden"
-#Npc
-SUKI = 32013
-GALIBREDO = 30181
-
-#Items
-SOE = 736
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-
- def onAdvEvent (self,event,npc,player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- if event == "32013-04.htm" :
- if st.getQuestItemsCount(SOE):
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- st.takeItems(SOE,1)
- htmltext = "32013-03.htm"
- npc.deleteMe()
- elif event == "32013-04a.htm" :
- st.exitQuest(1)
- st.playSound("ItemSound.quest_giveup")
- return htmltext
-
- def onTalk (self,npc,player):
- st = player.getQuestState(qn)
- htmltext = Quest.getNoQuestMsg(player)
- if not st : return htmltext
- npcId = npc.getNpcId()
- id = st.getState()
- cond=st.getInt("cond")
- if npcId == SUKI and id == State.CREATED:
- if player.getLevel() >= 36 :
- htmltext = "32013-02.htm"
- else:
- htmltext = "32013-01.htm"
- st.exitQuest(1)
- elif npcId == GALIBREDO and st.getInt("cond"):
- htmltext = "30181-01.htm"
- st.giveItems(57,2883)
- st.playSound("ItemSound.quest_finish")
- st.exitQuest(1)
- return htmltext
-
-QUEST = Quest(653,qn,"Wild Maiden")
-
-QUEST.addStartNpc(SUKI)
-
-QUEST.addTalkId(SUKI)
-QUEST.addTalkId(GALIBREDO)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/31989-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/31989-01.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/31989-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/31989-01.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-01.htm
similarity index 63%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-01.htm
index 30353acc83d17ade9677249f2451709c247cf42a..e39c6fa19d1df06adbb6d90c9465b51f8bfe0dae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/651_RunawayYouth/32014-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-01.htm
@@ -1,5 +1,5 @@
<html><body>Ivan:<br>
Oh, you're an adventurer, aren't you? Phew... I'm Ivan. I'm a fisherman like my father! But to tell you the truth, I hate the smell of fish! So I left home... I've been wandering around this dangerous place, and now I'm thinking that maybe my father was right after all! I wish I could go back home... Please help me!!<br>
-<a action="bypass -h Quest 651_RunawayYouth 32014-04.htm">"Here's a Scroll of Escape."</a><br>
-<a action="bypass -h Quest 651_RunawayYouth 32014-04a.htm">"Get lost! I've got my own problems"</a>
+<a action="bypass -h Quest Q00651_RunawayYouth 32014-04.htm">"Here's a Scroll of Escape."</a><br>
+<a action="bypass -h Quest Q00651_RunawayYouth 32014-03.html">"Get lost! I've got my own problems."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-01a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-01a.htm
new file mode 100644
index 0000000000000000000000000000000000000000..32acb5ad5067520c7ed9dc35f03df021e963cb3e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-01a.htm
@@ -0,0 +1,5 @@
+<html><body>Ivan:<br>
+The boy appears not to trust you.<br>
+He doesn't want to talk to you.<br>
+(Only characters level 26 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/Q00651_RunawayYouth/32014-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..2b3ee4b6ad8fb8c45f7b8d671cdcf57ec2d29d22
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-02.html
@@ -0,0 +1,6 @@
+<html><body>Ivan:<br>
+Thanks to you, I can get home safely. Thank you again!<br>
+My father is <font color = "LEVEL">Batidae, a Fishing Guild Member of the Town of Schuttgart</font>.<br>
+If you go there, please look for my father. He'll reward you.<br>
+I'm leaving now... Good luck!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..8a714010916c1b7c10dd5f60b0685d3fa07e6f60
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-03.html
@@ -0,0 +1,3 @@
+<html><body>Ivan:<br>
+You're such a cold person... I never should've left home.... If I die out here, I will curse you and haunt you forever!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-04.htm
new file mode 100644
index 0000000000000000000000000000000000000000..d875a4299e10fa89b012b85076294ac0b51f7232
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-04.htm
@@ -0,0 +1,5 @@
+<html><body>Ivan:<br>
+Thank you so much! Now I can now get home safely. Again, thank you.<br>
+My father is <font color="LEVEL">Batidae, a Fishing Guild Member of the Town of Schuttgart</font>.<br>
+If you go there, please look for my father. He'll reward you.<br>I'm leaving now... Good luck!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-05.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c980cc234e4fbeedce9a418b1adb414ec159f07e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/32014-05.htm
@@ -0,0 +1,3 @@
+<html><body>Ivan:<br>
+You don't have the Scroll of Escape... If you ever meet someone who has one, please ask them to help me! By all that is Holy, I beg you!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
new file mode 100644
index 0000000000000000000000000000000000000000..2ac2ec9cc7829bf9b5da2cb3e0bd99d9def0b6ca
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
@@ -0,0 +1,113 @@
+/*
+ * This program 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.
+ *
+ * This program 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.Q00651_RunawayYouth;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Runaway Youth (651)
+ * @author malyelfik
+ */
+public class Q00651_RunawayYouth extends Quest
+{
+ // NPC
+ private static final int BATIDAE = 31989;
+ private static final int IVAN = 32014;
+
+ // Item
+ private static final int SOE = 736;
+
+ // Misc
+ private static final int MIN_LEVEL = 26;
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = player.getQuestState(getName());
+ if (st == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ if (event.equals("32014-03.html"))
+ {
+ htmltext = event;
+ }
+ else if (event.equals("32014-04.htm"))
+ {
+ if (!st.hasQuestItems(SOE))
+ {
+ return "32014-05.htm";
+ }
+ st.startQuest();
+ st.takeItems(SOE, 1);
+ npc.deleteMe();
+ htmltext = event;
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = getNoQuestMsg(player);
+ final QuestState st = player.getQuestState(getName());
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ switch (npc.getNpcId())
+ {
+ case IVAN:
+ switch (st.getState())
+ {
+ case State.CREATED:
+ htmltext = (player.getLevel() >= MIN_LEVEL) ? "32014-01.htm" : "32014-01a.htm";
+ break;
+ case State.STARTED:
+ htmltext = "32014-02.html";
+ break;
+ }
+ break;
+ case BATIDAE:
+ if (st.isStarted())
+ {
+ st.giveAdena(2883, true);
+ st.exitQuest(true, true);
+ htmltext = "31989-01.html";
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ public Q00651_RunawayYouth(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+ addStartNpc(IVAN);
+ addTalkId(BATIDAE, IVAN);
+ }
+
+ public static void main(String[] args)
+ {
+ new Q00651_RunawayYouth(651, Q00651_RunawayYouth.class.getSimpleName(), "Runaway Youth");
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/30181-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/30181-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..378958c1af435bd9a39b30ebd3f3d970f43597d9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/30181-01.html
@@ -0,0 +1,4 @@
+<html><body>Galibredo:<br>
+Thank you so much! Thanks to you, my daughter made it home safely. I certainly gave her a good talking-to! I swear, I don't know what I'm going to do with that girl! I'm afraid something terrible will happen to her someday... Humph! By the way, Take this! It's not much, but think of it as a small token of my appreciation. Thank you again.<br>
+What's a father to do...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ef7cfce16df32f818defc56bf689046daa4ed927
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-01.htm
@@ -0,0 +1,5 @@
+<html><body>Suki:<br>
+Good heavens! Oh, my ... ... You're an adventurer, aren't you? You certainly surprised me. Who am I? My name's Suki! What am I doing here? Honestly, I fell in love with a wonderful Warrior who came to our town not too long ago. A dark face with a melancholy shadow... Sinewy hands held his sword tight... He admired my pure heart and then he... he kissed my... Oh my! Some things are better left unsaid... Anyway, when he left, he wouldn't let me go with him, saying that it was too dangerous for me... Although I knew the danger well, I secretly followed him! I got lost and wound up here... The days have been hard here. My skin has grown rough and I haven't eaten in days! I would give anything just to get back home!<br>
+<a action="bypass -h Quest Q00653_WildMaiden 32013-04.htm">"Go on home. This will take you there."</a><br>
+<a action="bypass -h Quest Q00653_WildMaiden 32013-03.html">"What? Are you crazy? Go and find your man!</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-01a.htm
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-01a.htm
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-02.htm
new file mode 100644
index 0000000000000000000000000000000000000000..e1df6560799a26e7c7c34b2dddfe9a99d380cc7e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-02.htm
@@ -0,0 +1,3 @@
+<html><body>Suki:<br>
+You're the adventurer who helped me! Thank you so much! Now I can return home safely. If you're ever in <font color="LEVEL">the Town of Oren</font>, speak with <font color="LEVEL">Galibredo</font>. He's my father, and he'll reward you for your kindness.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-03.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/653_WildMaiden/32013-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-03.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-04.htm
new file mode 100644
index 0000000000000000000000000000000000000000..007c47cf9995374929c7d0248939309a2344cce1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-04.htm
@@ -0,0 +1,3 @@
+<html><body>Suki:<br>
+Oh, thank you so much! Thanks to you, I can now go back home safely. Thank you. By the way... Are you seeing anybody? .... Oh, never mind...Hehehe.. If you're ever in <font color = "LEVEL">the Town of Oren</font>, speak with <font color = "LEVEL">Galibredo</font>. He's my father, and he'll reward your kindness. I have to go now. So long, handsome! Good luck!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-04a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-04a.htm
new file mode 100644
index 0000000000000000000000000000000000000000..fa2cdec1c24e133f812a30697e423aabedc1fb22
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-04a.htm
@@ -0,0 +1,3 @@
+<html><body>Suki:<br>
+Oh, thank you so much! I can now go home safely! By the way... You have such smooth skin and great body tone... Not to mention that fine looking face! What's your secret? Oh, never mind... If you're ever in <font color = "LEVEL">the Town of Oren</font>, speak with <font color = "LEVEL">Galibredo</font>. He's my father, and he'll reward your kindness. Well, I should be going... Goodbye and Good luck!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-05.htm
new file mode 100644
index 0000000000000000000000000000000000000000..118db8ef8255150486a540f12706ab22512030af
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/32013-05.htm
@@ -0,0 +1,3 @@
+<html<body>Suki:<br>
+Ah, you don't have the Scroll of Escape, huh? Well, if you meet someone who has one, please tell them that about this innocent, fragile and pitiful girl in trouble that desperately needs their help...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
new file mode 100644
index 0000000000000000000000000000000000000000..be7d37632edea5438b56b7471678e1bec041390b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
@@ -0,0 +1,116 @@
+/*
+ * This program 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.
+ *
+ * This program 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.Q00653_WildMaiden;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Wild Maiden (653)
+ * @author malyelfik
+ */
+public class Q00653_WildMaiden extends Quest
+{
+ // NPC
+ private static final int GALIBREDO = 30181;
+ private static final int SUKI = 32013;
+
+ // Item
+ private static final int SOE = 736;
+
+ // Misc
+ private static final int MIN_LEVEL = 36;
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = player.getQuestState(getName());
+ if (st == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ if (event.equals("32013-03.html"))
+ {
+ htmltext = event;
+ }
+ else if (event.equals("32013-04.htm"))
+ {
+ if (!st.hasQuestItems(SOE))
+ {
+ return "32013-05.htm";
+ }
+ st.startQuest();
+ st.takeItems(SOE, 1);
+ npc.deleteMe();
+ if (getRandom(2) == 0)
+ htmltext = event;
+ else
+ htmltext = "32013-04a.htm";
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = getNoQuestMsg(player);
+ final QuestState st = player.getQuestState(getName());
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ switch (npc.getNpcId())
+ {
+ case SUKI:
+ switch (st.getState())
+ {
+ case State.CREATED:
+ htmltext = (player.getLevel() >= MIN_LEVEL) ? "32013-01.htm" : "32013-01a.htm";
+ break;
+ case State.STARTED:
+ htmltext = "32013-02.htm";
+ break;
+ }
+ break;
+ case GALIBREDO:
+ if (st.isStarted())
+ {
+ st.giveAdena(2553, true);
+ st.exitQuest(true, true);
+ htmltext = "30181-01.html";
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ public Q00653_WildMaiden(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+ addStartNpc(SUKI);
+ addTalkId(GALIBREDO, SUKI);
+ }
+
+ public static void main(String[] args)
+ {
+ new Q00653_WildMaiden(653, Q00653_WildMaiden.class.getSimpleName(), "Wild Maiden");
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/random_spawn.sql b/L2J_DataPack_BETA/dist/sql/game/random_spawn.sql
index 6580c480448b1bfd00ddaf9e7984394d7d59730f..56f99a904214710da9862faaf1d0727f5185e909 100644
--- a/L2J_DataPack_BETA/dist/sql/game/random_spawn.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/random_spawn.sql
@@ -12,13 +12,6 @@ CREATE TABLE `random_spawn` (
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
INSERT INTO `random_spawn` VALUES
--- (2,31092,1,-1,60,0,'false','false'), -- Black Marketeer of Mammon
--- (3,31092,1,-1,60,0,'false','false'), -- Black Marketeer of Mammon
--- (4,31092,1,-1,60,0,'false','false'), -- Black Marketeer of Mammon
--- (5,31092,1,-1,60,0,'false','false'), -- Black Marketeer of Mammon
--- (6,31092,1,-1,60,0,'false','false'), -- Black Marketeer of Mammon
--- (7,31092,1,-1,60,0,'false','false'), -- Black Marketeer of Mammon
--- (8,31092,1,-1,60,0,'false','false'), -- Black Marketeer of Mammon
(11,31113,1,-1,-1,-1,'true','true'), -- Merchant of Mammon
(12,31126,1,-1,-1,-1,'true','true'), -- Blacksmith of Mammon
(13,31094,1,-1,60,0,'false','false'), -- Orator of Revelations
@@ -120,7 +113,6 @@ INSERT INTO `random_spawn` VALUES
(109,31171,1,-1,60,0,'false','false'), -- Crest of Dawn
(110,25283,1,-1,86400,0,'false','false'), -- Lilith (80)
(111,25286,1,-1,86400,0,'false','false'), -- Anakim (80)
-(112,27316,1,1800000,14400000,1800000,'false','false'), -- Fallen Chieftain Vegus
(113,31094,1,-1,60,0,'false','false'), -- Orator of Revelations
(114,31093,1,-1,60,0,'false','false'), -- Preacher of Doom
(115,31094,1,-1,60,0,'false','false'), -- Orator of Revelations
@@ -141,8 +133,8 @@ INSERT INTO `random_spawn` VALUES
(130,31094,1,-1,60,0,'false','false'), -- Orator of Revelations
(131,31093,1,-1,60,0,'false','false'), -- Preacher of Doom
(132,31094,1,-1,60,0,'false','false'), -- Orator of Revelations
-(133,32014,1,-1,1800000,1800000,'false','true'), -- Ivan (Runaway Youth quest)
-(134,32013,1,-1,1800000,1800000,'false','true'), -- Suki (Wild Maiden quest)
+(133,32014,1,-1,3600000,0,'false','true'), -- Ivan (Runaway Youth quest)
+(134,32013,1,-1,3600000,0,'false','true'), -- Suki (Wild Maiden quest)
(136,32012,1,-1,3600000,0,'false','true'), -- Tantan (Aged ExAdventurer quest)
(137,32335,1,-1,120000,120000,'false','true'), -- Marksman (Guards on kamael island)
(138,32335,1,-1,120000,120000,'false','true'), -- Marksman (Guards on kamael island)
diff --git a/L2J_DataPack_BETA/dist/sql/game/random_spawn_loc.sql b/L2J_DataPack_BETA/dist/sql/game/random_spawn_loc.sql
index 5377adf9980360d1c7af0cd7c10d56342813ce14..b5f1063ef32c2a8311f118edfc3a94b5528e8a7a 100644
--- a/L2J_DataPack_BETA/dist/sql/game/random_spawn_loc.sql
+++ b/L2J_DataPack_BETA/dist/sql/game/random_spawn_loc.sql
@@ -9,15 +9,6 @@ CREATE TABLE `random_spawn_loc` (
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
INSERT INTO `random_spawn_loc` VALUES
--- Black Marketeer of Mammon
-(2,-12345,121695,-2984,0),
-(3,81360,150016,-3528,16000),
-(4,120493,76520,-2136,35500),
-(5,-84745,151732,-3128,50000),
-(6,113481,218450,-3624,33000),
-(7,80129,56947,-1552,32500),
-(8,146986,29566,-2271,32500),
-
-- Merchant of Mammon
(11,-52172,78884,-4741,-1), -- Necropolis of Devotion
(11,-41350,209876,-5087,-1), -- Necropolis of Sacrifice
@@ -145,9 +136,6 @@ INSERT INTO `random_spawn_loc` VALUES
-- Anakim (80)
(111,185000,-13000,-5488,-1),
--- Fallen Chieftain Vegus
-(112,171708,43964,-4972,-1),
-
-- Orator of Revelations / Preacher of Doom
(113,147943,-56176,-2781,-1),
(114,148064,-56288,-2781,-1),
@@ -171,14 +159,21 @@ INSERT INTO `random_spawn_loc` VALUES
(132,38695,-48308,896,-1),
-- Runaway Youth quest
-(133,118600,-161235,-1119,-1),
-(133,108380,-150268,-2376,-1),
-(133,123254,-148126,-3425,-1),
+(133,104000,-156496,-1968,-1),
+(133,108912,-150000,-2416,-1),
+(133,107888,-144688,-3660,-1),
+(133,123248,-147680,-3520,-1),
+(133,118176,-161008,-1072,-1),
+(133,120880,-156720,-1673,-1),
+(133,117024,-150304,-2320,-1),
-- Wild Maiden quest
-(134,66578,72351,-3731,-1),
-(134,67994,79605,-3685,-1),
-(134,72414,89582,-3068,-1),
+(134,69152,88816,-3408,-1),
+(134,75392,87600,-3344,-1),
+(134,67920,77888,-3616,-1),
+(134,76544,73616,-3709,-1),
+(134,66768,72016,-3677,-1),
+(134,71520,67936,-3564,-1),
-- Aged ExAdventurer quest
(136,89856,-7248,-3034,0),
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20130101update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20130101update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..7427c436a90909f431720e4486fd8ff8f0fa6ea7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20130101update.sql
@@ -0,0 +1,2 @@
+UPDATE character_quests SET name='Q00651_RunawayYouth' WHERE name='651_RunawayYouth';
+UPDATE character_quests SET name='Q00653_WildMaiden' WHERE name='653_WildMaiden';
\ No newline at end of file