diff --git a/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-01.html b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-01.html
new file mode 100644
index 0000000000..b44c11c1c9
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-01.html
@@ -0,0 +1,5 @@
+High Priest Maximilian:
+What's going on? Oh, an Ertheia.
+Did you come here at Queen Navari's request?
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-02.html b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-02.html
new file mode 100644
index 0000000000..5b1c4be6ae
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-02.html
@@ -0,0 +1,6 @@
+High Priest Maximilian:
+Nice to meet you. I know that Queen Navari and the Ertheia are helping us, and will not forget this fact.
+We asked for help because of the Dimensional Rift in Dragon Valley.
+So far we learned that it's different from the the Dimensional Rift the Ertheia came though, but it would still need investigating. Could you help?
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-03.html b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-03.html
new file mode 100644
index 0000000000..5513f3d6dc
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-03.html
@@ -0,0 +1,4 @@
+High Priest Maximilian:
+Thank you for your kind gesture. Dragon Valley is a dangerous place. You need to be extra careful.
+First go to Namo in Dragon Valley and talk about the details.
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-04.html b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-04.html
new file mode 100644
index 0000000000..c7b91887ca
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/30120-04.html
@@ -0,0 +1,3 @@
+High Priest Maximilian:
+First go to Namo in Dragon Valley and talk about the details.
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/33973-01.html b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/33973-01.html
new file mode 100644
index 0000000000..86f6516741
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/33973-01.html
@@ -0,0 +1,4 @@
+Namo:
+What brings you here?
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/33973-02.html b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/33973-02.html
new file mode 100644
index 0000000000..0968d6bf4b
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/33973-02.html
@@ -0,0 +1,5 @@
+Namo:
+Right now, Dragon Valley is a very dangerous place. As the 6th Seal was broken, the Dimensional Rift caused the Undead to appear whenever night fell.
+You're really not going to change your mind about investigating such a dangerous place?
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/33973-03.html b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/33973-03.html
new file mode 100644
index 0000000000..af892960fd
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/33973-03.html
@@ -0,0 +1,4 @@
+Namo:
+Good. Here's your mission.
+(You have completed all "Letters from the Queen". You can start "The Minstrel's Song" after reaching Lv. 85.)
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/Announce.html b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/Announce.html
new file mode 100644
index 0000000000..d3a08c0375
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/Announce.html
@@ -0,0 +1,7 @@
+The Queen's Letter:
+I got an emergency request from the Town of Giran. Near the Town of Giran at Dragon Valley, a Dimensional Rift was spotted.
+It's different from the one we came in, but it's worth looking into. Go see High Priest Maximilian.
+(A Scroll of Escape is enclosed. If you want to go now, use it to travel immediately.)
+
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/Q10798_LettersFromTheQueen_DragonValley.java b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/Q10798_LettersFromTheQueen_DragonValley.java
new file mode 100644
index 0000000000..590ced483f
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/Q10798_LettersFromTheQueen_DragonValley.java
@@ -0,0 +1,270 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * 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 .
+ */
+package quests.Q10798_LettersFromTheQueen_DragonValley;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.gameserver.ai.CtrlIntention;
+import com.l2jmobius.gameserver.cache.HtmCache;
+import com.l2jmobius.gameserver.enums.QuestSound;
+import com.l2jmobius.gameserver.enums.Race;
+import com.l2jmobius.gameserver.handler.BypassHandler;
+import com.l2jmobius.gameserver.handler.IBypassHandler;
+import com.l2jmobius.gameserver.model.Location;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.L2Npc;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.events.EventType;
+import com.l2jmobius.gameserver.model.events.ListenerRegisterType;
+import com.l2jmobius.gameserver.model.events.annotations.RegisterEvent;
+import com.l2jmobius.gameserver.model.events.annotations.RegisterType;
+import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLevelChanged;
+import com.l2jmobius.gameserver.model.holders.ItemHolder;
+import com.l2jmobius.gameserver.model.quest.Quest;
+import com.l2jmobius.gameserver.model.quest.QuestState;
+import com.l2jmobius.gameserver.model.quest.State;
+import com.l2jmobius.gameserver.network.NpcStringId;
+import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
+import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+
+/**
+ * Letters from the Queen: Dragon Valley (10798)
+ * @URL https://l2wiki.com/Letters_from_the_Queen:_Dragon_Valley
+ * @author Gigi
+ */
+public class Q10798_LettersFromTheQueen_DragonValley extends Quest implements IBypassHandler
+{
+ // NPCs
+ private static final int MAXIMILIAN = 30120;
+ private static final int NAMO = 33973;
+ // Items
+ private static final ItemHolder SCROLL_OF_ESCAPE_DRAGON_VALLEY = new ItemHolder(39587, 1);
+ private static final ItemHolder SCROLL_OF_ESCAPE_TOWN_OF_GIRAN = new ItemHolder(39586, 1);
+ private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 182);
+ private static final ItemHolder EWS = new ItemHolder(959, 1);
+ // Reward
+ private static final int EXP_REWARD = 1277640;
+ private static final int SP_REWARD = 306;
+ // Misc
+ private static final int MIN_LEVEL = 76;
+ private static final int MAX_LEVEL = 84;
+ // Teleport
+ private static final Location TP_LOC = new Location(86674, 148630, -3401);
+ private static final String[] TP_COMMANDS =
+ {
+ "Q10798_Teleport"
+ };
+
+ public Q10798_LettersFromTheQueen_DragonValley()
+ {
+ super(10798, Q10798_LettersFromTheQueen_DragonValley.class.getSimpleName(), "Letters from the Queen: Dragon Valley");
+ addStartNpc(MAXIMILIAN);
+ addTalkId(MAXIMILIAN, NAMO);
+ registerQuestItems(SCROLL_OF_ESCAPE_DRAGON_VALLEY.getId(), SCROLL_OF_ESCAPE_TOWN_OF_GIRAN.getId());
+ addCondRace(Race.ERTHEIA, "noErtheia.html");
+ addCondLevel(MIN_LEVEL, MAX_LEVEL, "no_level.html");
+ BypassHandler.getInstance().registerHandler(this);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+ String htmltext = null;
+ switch (event)
+ {
+ case "30120-02.html":
+ case "33973-02.html":
+ {
+ htmltext = event;
+ break;
+ }
+ case "close":
+ {
+ return null;
+ }
+ case "30120-03.html":
+ {
+ qs.startQuest();
+ if (getQuestItemsCount(player, SCROLL_OF_ESCAPE_DRAGON_VALLEY.getId()) < 1)
+ {
+ giveItems(player, SCROLL_OF_ESCAPE_DRAGON_VALLEY);
+ player.sendPacket(new ExShowScreenMessage("Try using the teleport scroll Innocentin gave you to go to Dragon Valley.", 10000));
+ qs.setCond(2, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "33973-03.html":
+ {
+ if (qs.isCond(2))
+ {
+ showOnScreenMsg(player, NpcStringId.YOU_HAVE_FINISHED_ALL_OF_QUEEN_NAVARI_S_LETTERS_GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_LETTERS_FROM_A_MINSTREL_AT_LV_85, ExShowScreenMessage.TOP_CENTER, 8000);
+ giveItems(player, STEEL_DOOR_GUILD);
+ giveItems(player, EWS);
+ addExpAndSp(player, EXP_REWARD, SP_REWARD);
+ playSound(player, QuestSound.ITEMSOUND_QUEST_FINISH);
+ qs.exitQuest(false, true);
+ htmltext = event;
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, true);
+ String htmltext = null;
+ if (qs == null)
+ {
+ return htmltext;
+ }
+
+ if (player.getRace() != Race.ERTHEIA)
+ {
+ return "noErtheia.html";
+ }
+
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ switch (npc.getId())
+ {
+ case MAXIMILIAN:
+ {
+ htmltext = "30120-01.html";
+ break;
+ }
+
+ case NAMO:
+ {
+ if ((player.getRace() != Race.ERTHEIA) || (qs.isCreated()))
+ {
+ htmltext = getNoQuestMsg(player);
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (npc.getId())
+ {
+ case MAXIMILIAN:
+ {
+ if (qs.isCond(2))
+ {
+ htmltext = "30120-04.html";
+ }
+ break;
+ }
+ case NAMO:
+ {
+ if (qs.isCond(2))
+ {
+ htmltext = "33973-01.html";
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED)
+ @RegisterType(ListenerRegisterType.GLOBAL)
+ public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
+ {
+ if (Config.DISABLE_TUTORIAL)
+ {
+ return;
+ }
+ final L2PcInstance player = event.getActiveChar();
+ final QuestState qs = getQuestState(player, false);
+ if ((qs == null) && (player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL) && (player.getRace() == Race.ERTHEIA))
+ {
+ final NpcHtmlMessage html = new NpcHtmlMessage(0, 0);
+ html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10798_LettersFromTheQueen_DragonValley/Announce.html"));
+ player.sendPacket(html);
+ if (getQuestItemsCount(player, SCROLL_OF_ESCAPE_TOWN_OF_GIRAN.getId()) < 1)
+ {
+ giveItems(player, SCROLL_OF_ESCAPE_TOWN_OF_GIRAN);
+ }
+ }
+ }
+
+ @Override
+ public boolean useBypass(String command, L2PcInstance player, L2Character bypassOrigin)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if ((qs != null) || (player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL) || (player.getRace() != Race.ERTHEIA))
+ {
+ return false;
+ }
+ if (player.isInParty())
+ {
+ player.sendPacket(new ExShowScreenMessage("You cannot teleport when you are in party.", 5000));
+ }
+ else if (player.isInCombat())
+ {
+ player.sendPacket(new ExShowScreenMessage("You cannot teleport when you in combat status.", 5000));
+ }
+ else if (player.isInDuel())
+ {
+ player.sendPacket(new ExShowScreenMessage("You cannot teleport when you are in a duel.", 5000));
+ }
+ else if (player.isInOlympiadMode())
+ {
+ player.sendPacket(new ExShowScreenMessage("You cannot teleport when you are in Olympiad.", 5000));
+ }
+ else if (player.isInVehicle())
+ {
+ player.sendPacket(new ExShowScreenMessage("You cannot teleport when you are in any vehicle or mount.", 5000));
+ }
+ else
+ {
+ player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
+ player.teleToLocation(TP_LOC);
+ if (getQuestItemsCount(player, SCROLL_OF_ESCAPE_TOWN_OF_GIRAN.getId()) > 0)
+ {
+ takeItem(player, SCROLL_OF_ESCAPE_TOWN_OF_GIRAN);
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public String[] getBypassList()
+ {
+ return TP_COMMANDS;
+ }
+}
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/noErtheia.html b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/noErtheia.html
new file mode 100644
index 0000000000..ea67e16f1c
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/noErtheia.html
@@ -0,0 +1,3 @@
+High Priest Orven:
+You are not Ertheia, this quest is not for you.
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/no_level.htm b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/no_level.htm
new file mode 100644
index 0000000000..c5719d0999
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10798_LettersFromTheQueen_DragonValley/no_level.htm
@@ -0,0 +1,3 @@
+You don't meet level requirements
+(Quest available from level 76 - 84)
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/QuestMasterHandler.java b/trunk/dist/game/data/scripts/quests/QuestMasterHandler.java
index 873598f655..56c7de1e25 100644
--- a/trunk/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/trunk/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -297,6 +297,7 @@ import quests.Q10790_AMercenaryHelper.Q10790_AMercenaryHelper;
import quests.Q10791_TheManOfMystery.Q10791_TheManOfMystery;
import quests.Q10792_LettersFromTheQueen_ForestOfTheDead.Q10792_LettersFromTheQueen_ForestOfTheDead;
import quests.Q10795_LettersFromTheQueen_WallOfAgros.Q10795_LettersFromTheQueen_WallOfAgros;
+import quests.Q10798_LettersFromTheQueen_DragonValley.Q10798_LettersFromTheQueen_DragonValley;
/**
* @author NosBit
@@ -584,7 +585,8 @@ final class QuestMasterHandler
Q10790_AMercenaryHelper.class,
Q10791_TheManOfMystery.class,
Q10792_LettersFromTheQueen_ForestOfTheDead.class,
- Q10795_LettersFromTheQueen_WallOfAgros.class
+ Q10795_LettersFromTheQueen_WallOfAgros.class,
+ Q10798_LettersFromTheQueen_DragonValley.class
};
public static void main(String[] args)
diff --git a/trunk/dist/game/data/scripts/quests/QuestsToDo.xlsx b/trunk/dist/game/data/scripts/quests/QuestsToDo.xlsx
index da5fa5fe6f..36cd1dce42 100644
Binary files a/trunk/dist/game/data/scripts/quests/QuestsToDo.xlsx and b/trunk/dist/game/data/scripts/quests/QuestsToDo.xlsx differ
diff --git a/trunk/dist/game/data/stats/items/39500-39599.xml b/trunk/dist/game/data/stats/items/39500-39599.xml
index 1f51b63ab3..f24afe4db3 100644
--- a/trunk/dist/game/data/stats/items/39500-39599.xml
+++ b/trunk/dist/game/data/stats/items/39500-39599.xml
@@ -1146,28 +1146,38 @@
+
-
+
+
+
+
+
+
-
+
+
+
+
+
diff --git a/trunk/dist/game/data/stats/skills/17900-17999.xml b/trunk/dist/game/data/stats/skills/17900-17999.xml
index 59d2555c2f..dcce1fc809 100644
--- a/trunk/dist/game/data/stats/skills/17900-17999.xml
+++ b/trunk/dist/game/data/stats/skills/17900-17999.xml
@@ -811,20 +811,40 @@
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
@@ -1028,11 +1048,22 @@
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
@@ -1075,7 +1106,7 @@
-
+