From e5c1a7fdf3fd88a97b849544bdc4b73841514e7d Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 11 Apr 2019 12:48:04 +0000 Subject: [PATCH] Addition of quest related teleporter dialogs. Contributed by NightBR. --- .../data/html/teleporter/30006-Q561-1.htm | 9 +++++++ .../data/html/teleporter/30006-Q561-2.htm | 10 ++++++++ .../game/data/html/teleporter/30006-Q561.htm | 9 +++++++ .../data/html/teleporter/30134-Q562-1.htm | 9 +++++++ .../data/html/teleporter/30134-Q562-2.htm | 8 ++++++ .../game/data/html/teleporter/30134-Q562.htm | 8 ++++++ .../data/html/teleporter/30256-Q562-1.htm | 9 +++++++ .../data/html/teleporter/30256-Q562-2.htm | 12 +++++++++ .../game/data/html/teleporter/30256-Q562.htm | 9 +++++++ .../html/teleporter/30848-Q561-Q562-1.htm | 9 +++++++ .../html/teleporter/30848-Q561-Q562-2.htm | 11 ++++++++ .../data/html/teleporter/30848-Q561-Q562.htm | 9 +++++++ .../scripts/handlers/bypasshandlers/Link.java | 25 ++++++++++++++++++- .../actor/instance/TeleporterInstance.java | 19 +++++++++----- .../data/html/teleporter/30006-Q561-1.htm | 9 +++++++ .../data/html/teleporter/30006-Q561-2.htm | 10 ++++++++ .../game/data/html/teleporter/30006-Q561.htm | 9 +++++++ .../data/html/teleporter/30134-Q562-1.htm | 9 +++++++ .../data/html/teleporter/30134-Q562-2.htm | 8 ++++++ .../game/data/html/teleporter/30134-Q562.htm | 8 ++++++ .../data/html/teleporter/30256-Q562-1.htm | 9 +++++++ .../data/html/teleporter/30256-Q562-2.htm | 12 +++++++++ .../game/data/html/teleporter/30256-Q562.htm | 9 +++++++ .../html/teleporter/30848-Q561-Q562-1.htm | 9 +++++++ .../html/teleporter/30848-Q561-Q562-2.htm | 11 ++++++++ .../data/html/teleporter/30848-Q561-Q562.htm | 9 +++++++ .../scripts/handlers/bypasshandlers/Link.java | 25 ++++++++++++++++++- .../actor/instance/TeleporterInstance.java | 19 +++++++++----- .../data/html/teleporter/30006-Q561-1.htm | 9 +++++++ .../data/html/teleporter/30006-Q561-2.htm | 10 ++++++++ .../game/data/html/teleporter/30006-Q561.htm | 9 +++++++ .../data/html/teleporter/30134-Q562-1.htm | 9 +++++++ .../data/html/teleporter/30134-Q562-2.htm | 8 ++++++ .../game/data/html/teleporter/30134-Q562.htm | 8 ++++++ .../data/html/teleporter/30256-Q562-1.htm | 9 +++++++ .../data/html/teleporter/30256-Q562-2.htm | 12 +++++++++ .../game/data/html/teleporter/30256-Q562.htm | 9 +++++++ .../html/teleporter/30848-Q561-Q562-1.htm | 9 +++++++ .../html/teleporter/30848-Q561-Q562-2.htm | 11 ++++++++ .../data/html/teleporter/30848-Q561-Q562.htm | 9 +++++++ .../scripts/handlers/bypasshandlers/Link.java | 25 ++++++++++++++++++- .../actor/instance/TeleporterInstance.java | 19 +++++++++----- 42 files changed, 447 insertions(+), 21 deletions(-) create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561-1.htm create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561-2.htm create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561.htm create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562-1.htm create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562-2.htm create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562.htm create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562-1.htm create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562-2.htm create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562.htm create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561-1.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561-2.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562-1.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562-2.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562-1.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562-2.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561-1.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561-2.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562-1.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562-2.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562-1.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562-2.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562.htm diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561-1.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561-1.htm new file mode 100644 index 0000000000..92a5474891 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561-1.htm @@ -0,0 +1,9 @@ +Gatekeeper Milia:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+Even so, I need to confirm you really wish to go somewhere else. Can you check again, please?
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins quest, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561-2.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561-2.htm new file mode 100644 index 0000000000..746b3c8c2d --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561-2.htm @@ -0,0 +1,10 @@ +Gatekeeper Milia:
+I'm sorry for not being able to explain the other things I could do for you. Your mission from the Adventure Guild comes first.
+You can check the full menu after completing this mission.
+ + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561.htm new file mode 100644 index 0000000000..d92753a099 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30006-Q561.htm @@ -0,0 +1,9 @@ +Gatekeeper Milia:
+Welcome. I'm Gatekeeper Milia from Ivory Tower.
+Are you here on a mission from the Adeventure Guild? Then please start by clicking the [Quest] button. I'll explain the mission and send you to your desired location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins quest, click the [Quest] button)
+ diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562-1.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562-1.htm new file mode 100644 index 0000000000..01068ea3b8 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562-1.htm @@ -0,0 +1,9 @@ +Teleport Device:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+If you still want to teleport to another place, I'll send you.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562-2.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562-2.htm new file mode 100644 index 0000000000..693a817e4f --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562-2.htm @@ -0,0 +1,8 @@ +Teleport Device:
+The Dark Elf Village is currently under quarantine due to an epidemic. Survivors from the village who are not carrying the disease have been relocated to the Talking Island. We recommend that visitors avoid the Dark Elf village until further notice.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + + + \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562.htm new file mode 100644 index 0000000000..a6613bbf6e --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30134-Q562.htm @@ -0,0 +1,8 @@ +Teleport Device:
+If you to carry out a mission from the Adeventure Guild, click the [Quest] button to start the mission and press the Teleport Menu button to go your selected location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562-1.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562-1.htm new file mode 100644 index 0000000000..611a8bb228 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562-1.htm @@ -0,0 +1,9 @@ +Gatekeeper Bella:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+If you still want to teleport to another place, I'll send you.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562-2.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562-2.htm new file mode 100644 index 0000000000..717b4ea4b3 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562-2.htm @@ -0,0 +1,12 @@ +Gatekeeper Bella:
+I'm sorry for not being able to explain the other things I could do for you. Your mission from the Adventure Guild comes first.
+You can check the full menu after completing this mission.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562.htm new file mode 100644 index 0000000000..6f0332fc7e --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30256-Q562.htm @@ -0,0 +1,9 @@ +Gatekeeper Bella:
+Welcome! Beautiful weather, isn't it? Perfect for teleporting!
+Oh my, are you here on a mission from the Adeventure Guild? Then can you click the [Quest] button to proceed with the mission? I will give you a short explanation and send you to your desired location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm new file mode 100644 index 0000000000..44eb31e73b --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm @@ -0,0 +1,9 @@ +Gatekeeper Elisa:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+If you still want to teleport to another place, I'll send you.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins or Basic Mission: Altar of Evil quest, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm new file mode 100644 index 0000000000..0b3541e9ef --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm @@ -0,0 +1,11 @@ +Gatekeeper Elisa:
+I'm sorry for not being able to explain the other things I could do for you. Your mission from the Adventure Guild comes first.
+You can check the full menu after completing this mission.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562.htm new file mode 100644 index 0000000000..6eca753472 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/html/teleporter/30848-Q561-Q562.htm @@ -0,0 +1,9 @@ +Gatekeeper Elisa:
+I'm Gatekeeper Elisa, one of the many sent from the Ivory Tower to watch over the Gates of Time and Space
+Are you here on a mission from the Adeventure Guild? Then please start by clicking the [Quest] button. I'll explain the mission and send you to your desired location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins or Basic Mission: Altar of Evil quest, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 47a82701b5..e388860644 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.cache.HtmCache; import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import com.l2jmobius.gameserver.model.actor.instance.TeleporterInstance; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class Link implements IBypassHandler @@ -73,6 +74,23 @@ public class Link implements IBypassHandler "teleporter/separatedsoul.htm", "warehouse/clanwh.htm", "warehouse/privatewh.htm", + // Quests + "teleporter/30006.htm", + "teleporter/30006-Q561.htm", + "teleporter/30006-Q561-1.htm", + "teleporter/30006-Q561-2.htm", + "teleporter/30134.htm", + "teleporter/30134-Q562.htm", + "teleporter/30134-Q562-1.htm", + "teleporter/30134-Q562-2.htm", + "teleporter/30256.htm", + "teleporter/30256-Q562.htm", + "teleporter/30256-Q562-1.htm", + "teleporter/30256-Q562-2.htm", + "teleporter/30848.htm", + "teleporter/30848-Q561-Q562.htm", + "teleporter/30848-Q561-Q562-1.htm", + "teleporter/30848-Q561-Q562-2.htm", }; @Override @@ -91,7 +109,12 @@ public class Link implements IBypassHandler return false; } - final String content = CommonUtil.contains(VALID_BYPASSES, htmlPath) ? HtmCache.getInstance().getHtm(player, "data/html/" + htmlPath) : null; + String content = CommonUtil.contains(VALID_BYPASSES, htmlPath) ? HtmCache.getInstance().getHtm(player, "data/html/" + htmlPath) : null; + // Precaution. + if (htmlPath.startsWith("teleporter/") && !(player.getTarget() instanceof TeleporterInstance)) + { + content = null; + } final NpcHtmlMessage html = new NpcHtmlMessage(target != null ? target.getObjectId() : 0); if (content != null) { diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index c8426ab1ac..cf8793d767 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -16,6 +16,7 @@ */ package com.l2jmobius.gameserver.model.actor.instance; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -51,12 +52,18 @@ public final class TeleporterInstance extends Npc }; private static final Map> QUEST_RECOMENDATIONS = new HashMap<>(); - // static - // { - // QUEST_RECOMENDATIONS.put(30848, new ArrayList<>()); - // QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00561_BasicMissionHarnakUndergroundRuins", -1, "30848-Q561-Q562")); - // QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00562_BasicMissionAltarOfEvil", -1, "30848-561-562")); - // } + static + { + QUEST_RECOMENDATIONS.put(30006, new ArrayList<>()); // Gatekeeper Milia + QUEST_RECOMENDATIONS.get(30006).add(new TeleporterQuestRecommendationHolder(30006, "Q00561_BasicMissionHarnakUndergroundRuins", -1, "30006-Q561")); + QUEST_RECOMENDATIONS.put(30134, new ArrayList<>()); // Dark Elf Village Teleport Device + QUEST_RECOMENDATIONS.get(30134).add(new TeleporterQuestRecommendationHolder(30134, "Q00562_BasicMissionAltarOfEvil", -1, "30134-Q562")); + QUEST_RECOMENDATIONS.put(30256, new ArrayList<>()); // Gatekeeper Bella + QUEST_RECOMENDATIONS.get(30256).add(new TeleporterQuestRecommendationHolder(30256, "Q00562_BasicMissionAltarOfEvil", -1, "30256-Q562")); + QUEST_RECOMENDATIONS.put(30848, new ArrayList<>()); // Gatekeeper Elisa + QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00561_BasicMissionHarnakUndergroundRuins", -1, "30848-Q561-Q562")); + QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00562_BasicMissionAltarOfEvil", -1, "30848-Q561-Q562")); + } public TeleporterInstance(NpcTemplate template) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561-1.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561-1.htm new file mode 100644 index 0000000000..92a5474891 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561-1.htm @@ -0,0 +1,9 @@ +Gatekeeper Milia:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+Even so, I need to confirm you really wish to go somewhere else. Can you check again, please?
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins quest, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561-2.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561-2.htm new file mode 100644 index 0000000000..746b3c8c2d --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561-2.htm @@ -0,0 +1,10 @@ +Gatekeeper Milia:
+I'm sorry for not being able to explain the other things I could do for you. Your mission from the Adventure Guild comes first.
+You can check the full menu after completing this mission.
+ + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561.htm new file mode 100644 index 0000000000..d92753a099 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30006-Q561.htm @@ -0,0 +1,9 @@ +Gatekeeper Milia:
+Welcome. I'm Gatekeeper Milia from Ivory Tower.
+Are you here on a mission from the Adeventure Guild? Then please start by clicking the [Quest] button. I'll explain the mission and send you to your desired location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins quest, click the [Quest] button)
+ diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562-1.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562-1.htm new file mode 100644 index 0000000000..01068ea3b8 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562-1.htm @@ -0,0 +1,9 @@ +Teleport Device:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+If you still want to teleport to another place, I'll send you.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562-2.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562-2.htm new file mode 100644 index 0000000000..693a817e4f --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562-2.htm @@ -0,0 +1,8 @@ +Teleport Device:
+The Dark Elf Village is currently under quarantine due to an epidemic. Survivors from the village who are not carrying the disease have been relocated to the Talking Island. We recommend that visitors avoid the Dark Elf village until further notice.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + + + \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562.htm new file mode 100644 index 0000000000..a6613bbf6e --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30134-Q562.htm @@ -0,0 +1,8 @@ +Teleport Device:
+If you to carry out a mission from the Adeventure Guild, click the [Quest] button to start the mission and press the Teleport Menu button to go your selected location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562-1.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562-1.htm new file mode 100644 index 0000000000..611a8bb228 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562-1.htm @@ -0,0 +1,9 @@ +Gatekeeper Bella:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+If you still want to teleport to another place, I'll send you.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562-2.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562-2.htm new file mode 100644 index 0000000000..717b4ea4b3 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562-2.htm @@ -0,0 +1,12 @@ +Gatekeeper Bella:
+I'm sorry for not being able to explain the other things I could do for you. Your mission from the Adventure Guild comes first.
+You can check the full menu after completing this mission.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562.htm new file mode 100644 index 0000000000..6f0332fc7e --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30256-Q562.htm @@ -0,0 +1,9 @@ +Gatekeeper Bella:
+Welcome! Beautiful weather, isn't it? Perfect for teleporting!
+Oh my, are you here on a mission from the Adeventure Guild? Then can you click the [Quest] button to proceed with the mission? I will give you a short explanation and send you to your desired location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm new file mode 100644 index 0000000000..44eb31e73b --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm @@ -0,0 +1,9 @@ +Gatekeeper Elisa:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+If you still want to teleport to another place, I'll send you.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins or Basic Mission: Altar of Evil quest, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm new file mode 100644 index 0000000000..0b3541e9ef --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm @@ -0,0 +1,11 @@ +Gatekeeper Elisa:
+I'm sorry for not being able to explain the other things I could do for you. Your mission from the Adventure Guild comes first.
+You can check the full menu after completing this mission.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562.htm new file mode 100644 index 0000000000..6eca753472 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/teleporter/30848-Q561-Q562.htm @@ -0,0 +1,9 @@ +Gatekeeper Elisa:
+I'm Gatekeeper Elisa, one of the many sent from the Ivory Tower to watch over the Gates of Time and Space
+Are you here on a mission from the Adeventure Guild? Then please start by clicking the [Quest] button. I'll explain the mission and send you to your desired location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins or Basic Mission: Altar of Evil quest, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 47a82701b5..e388860644 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.cache.HtmCache; import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import com.l2jmobius.gameserver.model.actor.instance.TeleporterInstance; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class Link implements IBypassHandler @@ -73,6 +74,23 @@ public class Link implements IBypassHandler "teleporter/separatedsoul.htm", "warehouse/clanwh.htm", "warehouse/privatewh.htm", + // Quests + "teleporter/30006.htm", + "teleporter/30006-Q561.htm", + "teleporter/30006-Q561-1.htm", + "teleporter/30006-Q561-2.htm", + "teleporter/30134.htm", + "teleporter/30134-Q562.htm", + "teleporter/30134-Q562-1.htm", + "teleporter/30134-Q562-2.htm", + "teleporter/30256.htm", + "teleporter/30256-Q562.htm", + "teleporter/30256-Q562-1.htm", + "teleporter/30256-Q562-2.htm", + "teleporter/30848.htm", + "teleporter/30848-Q561-Q562.htm", + "teleporter/30848-Q561-Q562-1.htm", + "teleporter/30848-Q561-Q562-2.htm", }; @Override @@ -91,7 +109,12 @@ public class Link implements IBypassHandler return false; } - final String content = CommonUtil.contains(VALID_BYPASSES, htmlPath) ? HtmCache.getInstance().getHtm(player, "data/html/" + htmlPath) : null; + String content = CommonUtil.contains(VALID_BYPASSES, htmlPath) ? HtmCache.getInstance().getHtm(player, "data/html/" + htmlPath) : null; + // Precaution. + if (htmlPath.startsWith("teleporter/") && !(player.getTarget() instanceof TeleporterInstance)) + { + content = null; + } final NpcHtmlMessage html = new NpcHtmlMessage(target != null ? target.getObjectId() : 0); if (content != null) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index c8426ab1ac..cf8793d767 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -16,6 +16,7 @@ */ package com.l2jmobius.gameserver.model.actor.instance; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -51,12 +52,18 @@ public final class TeleporterInstance extends Npc }; private static final Map> QUEST_RECOMENDATIONS = new HashMap<>(); - // static - // { - // QUEST_RECOMENDATIONS.put(30848, new ArrayList<>()); - // QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00561_BasicMissionHarnakUndergroundRuins", -1, "30848-Q561-Q562")); - // QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00562_BasicMissionAltarOfEvil", -1, "30848-561-562")); - // } + static + { + QUEST_RECOMENDATIONS.put(30006, new ArrayList<>()); // Gatekeeper Milia + QUEST_RECOMENDATIONS.get(30006).add(new TeleporterQuestRecommendationHolder(30006, "Q00561_BasicMissionHarnakUndergroundRuins", -1, "30006-Q561")); + QUEST_RECOMENDATIONS.put(30134, new ArrayList<>()); // Dark Elf Village Teleport Device + QUEST_RECOMENDATIONS.get(30134).add(new TeleporterQuestRecommendationHolder(30134, "Q00562_BasicMissionAltarOfEvil", -1, "30134-Q562")); + QUEST_RECOMENDATIONS.put(30256, new ArrayList<>()); // Gatekeeper Bella + QUEST_RECOMENDATIONS.get(30256).add(new TeleporterQuestRecommendationHolder(30256, "Q00562_BasicMissionAltarOfEvil", -1, "30256-Q562")); + QUEST_RECOMENDATIONS.put(30848, new ArrayList<>()); // Gatekeeper Elisa + QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00561_BasicMissionHarnakUndergroundRuins", -1, "30848-Q561-Q562")); + QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00562_BasicMissionAltarOfEvil", -1, "30848-Q561-Q562")); + } public TeleporterInstance(NpcTemplate template) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561-1.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561-1.htm new file mode 100644 index 0000000000..92a5474891 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561-1.htm @@ -0,0 +1,9 @@ +Gatekeeper Milia:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+Even so, I need to confirm you really wish to go somewhere else. Can you check again, please?
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins quest, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561-2.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561-2.htm new file mode 100644 index 0000000000..746b3c8c2d --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561-2.htm @@ -0,0 +1,10 @@ +Gatekeeper Milia:
+I'm sorry for not being able to explain the other things I could do for you. Your mission from the Adventure Guild comes first.
+You can check the full menu after completing this mission.
+ + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561.htm new file mode 100644 index 0000000000..d92753a099 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30006-Q561.htm @@ -0,0 +1,9 @@ +Gatekeeper Milia:
+Welcome. I'm Gatekeeper Milia from Ivory Tower.
+Are you here on a mission from the Adeventure Guild? Then please start by clicking the [Quest] button. I'll explain the mission and send you to your desired location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins quest, click the [Quest] button)
+ diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562-1.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562-1.htm new file mode 100644 index 0000000000..01068ea3b8 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562-1.htm @@ -0,0 +1,9 @@ +Teleport Device:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+If you still want to teleport to another place, I'll send you.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562-2.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562-2.htm new file mode 100644 index 0000000000..693a817e4f --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562-2.htm @@ -0,0 +1,8 @@ +Teleport Device:
+The Dark Elf Village is currently under quarantine due to an epidemic. Survivors from the village who are not carrying the disease have been relocated to the Talking Island. We recommend that visitors avoid the Dark Elf village until further notice.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + + + \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562.htm new file mode 100644 index 0000000000..a6613bbf6e --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30134-Q562.htm @@ -0,0 +1,8 @@ +Teleport Device:
+If you to carry out a mission from the Adeventure Guild, click the [Quest] button to start the mission and press the Teleport Menu button to go your selected location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562-1.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562-1.htm new file mode 100644 index 0000000000..611a8bb228 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562-1.htm @@ -0,0 +1,9 @@ +Gatekeeper Bella:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+If you still want to teleport to another place, I'll send you.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562-2.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562-2.htm new file mode 100644 index 0000000000..717b4ea4b3 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562-2.htm @@ -0,0 +1,12 @@ +Gatekeeper Bella:
+I'm sorry for not being able to explain the other things I could do for you. Your mission from the Adventure Guild comes first.
+You can check the full menu after completing this mission.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562.htm new file mode 100644 index 0000000000..6f0332fc7e --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30256-Q562.htm @@ -0,0 +1,9 @@ +Gatekeeper Bella:
+Welcome! Beautiful weather, isn't it? Perfect for teleporting!
+Oh my, are you here on a mission from the Adeventure Guild? Then can you click the [Quest] button to proceed with the mission? I will give you a short explanation and send you to your desired location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with a Basic Mission or Altar of Evil mission, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm new file mode 100644 index 0000000000..44eb31e73b --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562-1.htm @@ -0,0 +1,9 @@ +Gatekeeper Elisa:
+You have not started a quest yet. If you teleport to another place, you can't preceed with a mission properly.
+If you still want to teleport to another place, I'll send you.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins or Basic Mission: Altar of Evil quest, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm new file mode 100644 index 0000000000..0b3541e9ef --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562-2.htm @@ -0,0 +1,11 @@ +Gatekeeper Elisa:
+I'm sorry for not being able to explain the other things I could do for you. Your mission from the Adventure Guild comes first.
+You can check the full menu after completing this mission.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562.htm new file mode 100644 index 0000000000..6eca753472 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/html/teleporter/30848-Q561-Q562.htm @@ -0,0 +1,9 @@ +Gatekeeper Elisa:
+I'm Gatekeeper Elisa, one of the many sent from the Ivory Tower to watch over the Gates of Time and Space
+Are you here on a mission from the Adeventure Guild? Then please start by clicking the [Quest] button. I'll explain the mission and send you to your desired location.
+(If your Main Class is Lv. 99 or below, you can teleport for free.)
+ + + +(If you want to preceed with the Basic Mission: Harnak Underground Ruins or Basic Mission: Altar of Evil quest, click the [Quest] button)
+ \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Link.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Link.java index 47a82701b5..e388860644 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Link.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/bypasshandlers/Link.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.cache.HtmCache; import com.l2jmobius.gameserver.handler.IBypassHandler; import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import com.l2jmobius.gameserver.model.actor.instance.TeleporterInstance; import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; public class Link implements IBypassHandler @@ -73,6 +74,23 @@ public class Link implements IBypassHandler "teleporter/separatedsoul.htm", "warehouse/clanwh.htm", "warehouse/privatewh.htm", + // Quests + "teleporter/30006.htm", + "teleporter/30006-Q561.htm", + "teleporter/30006-Q561-1.htm", + "teleporter/30006-Q561-2.htm", + "teleporter/30134.htm", + "teleporter/30134-Q562.htm", + "teleporter/30134-Q562-1.htm", + "teleporter/30134-Q562-2.htm", + "teleporter/30256.htm", + "teleporter/30256-Q562.htm", + "teleporter/30256-Q562-1.htm", + "teleporter/30256-Q562-2.htm", + "teleporter/30848.htm", + "teleporter/30848-Q561-Q562.htm", + "teleporter/30848-Q561-Q562-1.htm", + "teleporter/30848-Q561-Q562-2.htm", }; @Override @@ -91,7 +109,12 @@ public class Link implements IBypassHandler return false; } - final String content = CommonUtil.contains(VALID_BYPASSES, htmlPath) ? HtmCache.getInstance().getHtm(player, "data/html/" + htmlPath) : null; + String content = CommonUtil.contains(VALID_BYPASSES, htmlPath) ? HtmCache.getInstance().getHtm(player, "data/html/" + htmlPath) : null; + // Precaution. + if (htmlPath.startsWith("teleporter/") && !(player.getTarget() instanceof TeleporterInstance)) + { + content = null; + } final NpcHtmlMessage html = new NpcHtmlMessage(target != null ? target.getObjectId() : 0); if (content != null) { diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java index c8426ab1ac..cf8793d767 100644 --- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/actor/instance/TeleporterInstance.java @@ -16,6 +16,7 @@ */ package com.l2jmobius.gameserver.model.actor.instance; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -51,12 +52,18 @@ public final class TeleporterInstance extends Npc }; private static final Map> QUEST_RECOMENDATIONS = new HashMap<>(); - // static - // { - // QUEST_RECOMENDATIONS.put(30848, new ArrayList<>()); - // QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00561_BasicMissionHarnakUndergroundRuins", -1, "30848-Q561-Q562")); - // QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00562_BasicMissionAltarOfEvil", -1, "30848-561-562")); - // } + static + { + QUEST_RECOMENDATIONS.put(30006, new ArrayList<>()); // Gatekeeper Milia + QUEST_RECOMENDATIONS.get(30006).add(new TeleporterQuestRecommendationHolder(30006, "Q00561_BasicMissionHarnakUndergroundRuins", -1, "30006-Q561")); + QUEST_RECOMENDATIONS.put(30134, new ArrayList<>()); // Dark Elf Village Teleport Device + QUEST_RECOMENDATIONS.get(30134).add(new TeleporterQuestRecommendationHolder(30134, "Q00562_BasicMissionAltarOfEvil", -1, "30134-Q562")); + QUEST_RECOMENDATIONS.put(30256, new ArrayList<>()); // Gatekeeper Bella + QUEST_RECOMENDATIONS.get(30256).add(new TeleporterQuestRecommendationHolder(30256, "Q00562_BasicMissionAltarOfEvil", -1, "30256-Q562")); + QUEST_RECOMENDATIONS.put(30848, new ArrayList<>()); // Gatekeeper Elisa + QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00561_BasicMissionHarnakUndergroundRuins", -1, "30848-Q561-Q562")); + QUEST_RECOMENDATIONS.get(30848).add(new TeleporterQuestRecommendationHolder(30848, "Q00562_BasicMissionAltarOfEvil", -1, "30848-Q561-Q562")); + } public TeleporterInstance(NpcTemplate template) {