From 29533ee7354187aafb32f333db74ac3b03c95014 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 9 Jun 2017 17:59:10 +0000 Subject: [PATCH] Talking Island rework #2. Contributed by Stayway. --- .../gameserver/network/NpcStringId.java | 3 + .../YeSegiraTeleportDevice.java | 10 +- .../32610-04.html | 3 - .../Q10330_ToTheRuinsOfYeSagira/32146-01.htm | 6 +- .../Q10330_ToTheRuinsOfYeSagira/32146-02.htm | 7 +- .../Q10330_ToTheRuinsOfYeSagira/32146-03.htm | 5 +- .../Q10330_ToTheRuinsOfYeSagira/32146-04.htm | 5 +- .../Q10330_ToTheRuinsOfYeSagira/32146-05.html | 3 + .../Q10330_ToTheRuinsOfYeSagira/32147-01.htm | 6 +- .../Q10330_ToTheRuinsOfYeSagira/32147-02.htm | 6 +- .../Q10330_ToTheRuinsOfYeSagira/32147-03.htm | 7 +- .../Q10330_ToTheRuinsOfYeSagira/32147-04.htm | 5 +- .../Q10330_ToTheRuinsOfYeSagira/32147-05.html | 4 + .../Q10330_ToTheRuinsOfYeSagira/32150-01.htm | 6 +- .../Q10330_ToTheRuinsOfYeSagira/32150-02.htm | 6 +- .../Q10330_ToTheRuinsOfYeSagira/32150-03.htm | 5 +- .../Q10330_ToTheRuinsOfYeSagira/32150-04.htm | 5 +- .../Q10330_ToTheRuinsOfYeSagira/32150-05.html | 4 + .../Q10330_ToTheRuinsOfYeSagira/32153-02.htm | 7 +- .../Q10330_ToTheRuinsOfYeSagira/32153-05.html | 4 + .../Q10330_ToTheRuinsOfYeSagira/32157-01.htm | 6 +- .../Q10330_ToTheRuinsOfYeSagira/32157-02.htm | 5 +- .../Q10330_ToTheRuinsOfYeSagira/32157-03.htm | 5 +- .../Q10330_ToTheRuinsOfYeSagira/32157-04.htm | 5 +- .../Q10330_ToTheRuinsOfYeSagira/32157-05.html | 3 + .../Q10330_ToTheRuinsOfYeSagira/32160-01.htm | 6 +- .../Q10330_ToTheRuinsOfYeSagira/32160-03.htm | 5 +- .../Q10330_ToTheRuinsOfYeSagira/32160-04.htm | 5 +- .../Q10330_ToTheRuinsOfYeSagira/32160-05.html | 4 + .../Q10330_ToTheRuinsOfYeSagira/32169-04.html | 5 + .../Q10330_ToTheRuinsOfYeSagira/32169-05.html | 6 + .../Q10330_ToTheRuinsOfYeSagira/32169-06.html | 3 + .../Q10330_ToTheRuinsOfYeSagira.java | 59 +++- .../33451-05.html | 3 +- .../33451-06.html | 4 + .../Q10364_ObligationsOfTheSeeker.java | 7 +- .../32978-01.html | 2 +- .../32978-02.html | 0 .../33453-01.htm | 10 +- .../33453-02.htm | 2 +- .../33453-03.htm} | 10 +- .../33453-04.htm} | 0 .../Q10365_ForTheSearchdogKing/33453-05.html | 5 + .../Q10365_ForTheSearchdogKing/33453-06.html | 4 + .../Q10365_ForTheSearchdogKing.java | 167 ++++++++++ .../quests/Q10365_SeekerEscort/32978-03.html | 4 - .../quests/Q10365_SeekerEscort/33453-04.html | 4 - .../quests/Q10365_SeekerEscort/33453-05.html | 3 - .../quests/Q10365_SeekerEscort/33453-06.html | 4 - .../quests/Q10365_SeekerEscort/33453-07.html | 4 - .../Q10365_SeekerEscort.java | 312 ------------------ ...Q10366_ReportOnTheSituationAtTheRuins.java | 9 +- .../Q10541_TrainLikeTheRealThing.java | 5 +- .../Q10542_SearchingForNewPower.java | 6 +- .../scripts/quests/QuestMasterHandler.java | 4 +- .../gameserver/network/NpcStringId.java | 3 + 56 files changed, 360 insertions(+), 436 deletions(-) delete mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32610-04.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-05.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-05.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-05.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32153-05.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-05.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-05.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-04.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-05.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-06.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-06.html rename L2J_Mobius_Helios/dist/game/data/scripts/quests/{Q10365_SeekerEscort => Q10365_ForTheSearchdogKing}/32978-01.html (88%) rename L2J_Mobius_Helios/dist/game/data/scripts/quests/{Q10365_SeekerEscort => Q10365_ForTheSearchdogKing}/32978-02.html (100%) rename L2J_Mobius_Helios/dist/game/data/scripts/quests/{Q10365_SeekerEscort => Q10365_ForTheSearchdogKing}/33453-01.htm (87%) rename L2J_Mobius_Helios/dist/game/data/scripts/quests/{Q10365_SeekerEscort => Q10365_ForTheSearchdogKing}/33453-02.htm (86%) rename L2J_Mobius_Helios/dist/game/data/scripts/quests/{Q10365_SeekerEscort/33453-02a.htm => Q10365_ForTheSearchdogKing/33453-03.htm} (87%) rename L2J_Mobius_Helios/dist/game/data/scripts/quests/{Q10365_SeekerEscort/33453-03.html => Q10365_ForTheSearchdogKing/33453-04.htm} (100%) create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-05.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-06.html create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java delete mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-03.html delete mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-04.html delete mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-05.html delete mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-06.html delete mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-07.html delete mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/NpcStringId.java index c2d74b9c75..762087bd41 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/network/NpcStringId.java @@ -12081,6 +12081,9 @@ public final class NpcStringId @ClientString(id = 536504, message = "Seeker Escort (Lv. 16-25)") public static NpcStringId SEEKER_ESCORT_LV_16_252; + @ClientString(id = 536505, message = "Use the Ye Sagira Teleport Device shining with a red shimmer to go to Exploration Area 5") + public static NpcStringId USE_THE_YE_SAGIRA_TELEPORT_DEVICE_SHINING_WITH_A_RED_SHIMMER_TO_GO_TO_EXPLORATION_AREA_5; + @ClientString(id = 536601, message = "Ruins Status Update (Lv. 16-25)") public static NpcStringId RUINS_STATUS_UPDATE_LV_16_25; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java index 1184aa1436..7d9b6c2a5a 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java @@ -19,6 +19,9 @@ package ai.areas.TalkingIsland.YeSegiraTeleportDevice; import java.util.HashMap; import java.util.Map; +import quests.Q10365_ForTheSearchdogKing.Q10365_ForTheSearchdogKing; +import ai.AbstractNpcAI; + import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.instancemanager.QuestManager; @@ -33,9 +36,6 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerCreat import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; -import ai.AbstractNpcAI; -import quests.Q10365_SeekerEscort.Q10365_SeekerEscort; - /** * Ye Segira Teleport Device AI. * @author St3eT @@ -101,10 +101,10 @@ public final class YeSegiraTeleportDevice extends AbstractNpcAI } else if (event.equals("5_exploration_zone")) { - final QuestState st = player.getQuestState(Q10365_SeekerEscort.class.getSimpleName()); + final QuestState st = player.getQuestState(Q10365_ForTheSearchdogKing.class.getSimpleName()); if ((st != null) && st.isStarted() && st.isCond(1)) { - final Quest quest_10365 = QuestManager.getInstance().getQuest(Q10365_SeekerEscort.class.getSimpleName()); + final Quest quest_10365 = QuestManager.getInstance().getQuest(Q10365_ForTheSearchdogKing.class.getSimpleName()); if (quest_10365 != null) { quest_10365.notifyEvent("TELEPORT_TO_NEXT_STAGE", null, player); diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32610-04.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32610-04.html deleted file mode 100644 index a1a9178644..0000000000 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/32610-04.html +++ /dev/null @@ -1,3 +0,0 @@ -Weaver Olf Kanore:
-Listen carefully to my instructions and then go and tinker with some different options. Come back and talk to me when you succeed. - \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-01.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-01.htm index 1815ce3918..9fd793eca9 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-01.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-01.htm @@ -1,6 +1,4 @@ Grand Master Valfar:
-Thank you for stepping up and helping out.
-I have heard you have applied to join the seekers. I've been told you only just signed up, but you seem to be a seasoned seeker veteran in more ways than one.
-That's why I want to ask you to do something.
- +There is something that you might do in order to overcome the limitations of your class. Are you interested?
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-02.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-02.htm index 5992e33f7b..88d0b80c19 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-02.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-02.htm @@ -1,5 +1,6 @@ Grand Master Valfar:
-Your help is required in the Ruins of Ye Sagira. I can promise you something when you have completed this mission.
-It will not be easy, though. What do you think? Will you take it on?
- +Curiosity is what helps young Kamael grow. If you are interested, I will tell you.
+If we improve our powers through training, we gain the ability to overcome our limitations. I can set you on the right path.
+What you need is to train, and I know just the place. Would you head on over there?
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-03.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-03.htm index 3a6f93a926..de03e6cbe9 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-03.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-03.htm @@ -1,4 +1,5 @@ Grand Master Valfar:
-That's right. According to what I've seen and heard so far, your skills and rate of growth are such that you would fit right into the very front lines of the seekers right away. Could you head to the Ruins of Ye Sagira and help the seekers there with their assignment?
- +Until now, you've said wanted to be a seeker. Then it would be good if you could find something to do along that path.
+The seekers are engaged in a search mission in the Ruins of Ye Sagira, and they need your help there. I expect your many abilities to be of help in resolving the many problems going on there.
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-04.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-04.htm index a3424c7cbd..ec3890c58f 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-04.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-04.htm @@ -1,5 +1,4 @@ Grand Master Valfar:
-Thank you for being so eager to accept.
-Please head immediately to the Ruins of Ye Sagira, and help the seekers with their operation. At the entrance to the Ruins of Ye Sagira should be the former scholar and current Seeker Lakcis. I believe your help will be required: I ask you to please go and provide your help.
-There is no time to lose. So please teleport through Gatekeeper Milia. +To the Ruins of Ye Sagira now, then.
+To get the Ruins of Ye Sagira, I suggest you teleport through Gatekeeper Milia. No point in traveling the hard way when you have an easier option. Once you're there, find Lakcis. Your help will be needed...
\ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-05.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-05.html new file mode 100644 index 0000000000..3b28c383c1 --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32146-05.html @@ -0,0 +1,3 @@ +Grand Master Valfar:
+To get the Ruins of Ye Sagira, I suggest you teleport through Gatekeeper Milia. No point in traveling the hard way when you have an easier option. Once you're there, find Lakcis. Your help will be needed... + \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-01.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-01.htm index 5d17b0980d..7e8f68bd27 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-01.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-01.htm @@ -1,6 +1,4 @@ Grand Master Revian:
-Thank you for stepping up and helping out.
-I have heard you have applied to join the seekers. I've been told you only just signed up, but you seem to be a seasoned seeker veteran in more ways than one.
-That's why I want to ask you to do something.
- +You must have had a hard time collecting the supplies. Could I ask you to do one more thing
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-02.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-02.htm index abb52708ae..6788ec1fe7 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-02.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-02.htm @@ -1,5 +1,5 @@ Grand Master Revian:
-Your help is required in the Ruins of Ye Sagira. I can promise you something when you have completed this mission.
-It will not be easy, though. What do you think? Will you take it on?
- +The commandos sre asking for backup. You're the only one I can ask for help and trust at the same time.
+I heard that you took good care of the goings on at the museum last time. I trust that your skills should be more than enough. Could you help out?
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-03.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-03.htm index a77dc505c7..55b980e918 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-03.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-03.htm @@ -1,4 +1,7 @@ Grand Master Revian:
-That's right. According to what I've seen and heard so far, your skills and rate of growth are such that you would fit right into the very front lines of the seekers right away. Could you head to the Ruins of Ye Sagira and help the seekers there with their assignment?
- +Is that a yes? Oh, what a relief.
+The commandos carrying out the search in the Ruins of Ye Sagira will tell you the details.
+Since there are so many ongoing cases there, all of them change constantly, close attention is required.
+Would you go to the Ruins of Ye Sagira, then?
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-04.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-04.htm index 8c0001a2f5..a5fc8116b9 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-04.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-04.htm @@ -1,5 +1,4 @@ Grand Master Revian:
-Thank you for being so eager to accept.
-Please head immediately to the Ruins of Ye Sagira, and help the seekers with their operation. At the entrance to the Ruins of Ye Sagira should be the former scholar and current Seeker Lakcis. I believe your help will be required: I ask you to please go and provide your help.
-There is no time to lose. So please teleport through Gatekeeper Milia. +You must hurry, so go to the Gatekeeper Milia, and ask you be teleported to the Ruins of Ye Sagira.
+Lakcis will be waiting for you at the entrance to the Ruins of Ye Sagira. Please get the details from Lakcis.
\ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-05.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-05.html new file mode 100644 index 0000000000..9c6463309e --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32147-05.html @@ -0,0 +1,4 @@ +Grand Master Revian:
+Go to the Gatekeeper Milia
, and ask you be teleported to the Ruins of Ye Sagira.
+Lakcis will be waiting for you at the entrance to the Ruins of Ye Sagira. Please get the details from Lakcis.
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-01.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-01.htm index 733f5a105f..cb812d8149 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-01.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-01.htm @@ -1,6 +1,4 @@ High Prefect Took:
-Thank you for stepping up and helping out.
-I have heard you have applied to join the seekers. I've been told you only just signed up, but you seem to be a seasoned seeker veteran in more ways than one.
-That's why I want to ask you to do something.
- +Now thye time is here for you to prove yourself. Are you ready to put your life on the line and prove yourself?
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-02.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-02.htm index 2e898d98fd..b927869306 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-02.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-02.htm @@ -1,5 +1,5 @@ High Prefect Took:
-Your help is required in the Ruins of Ye Sagira. I can promise you something when you have completed this mission.
-It will not be easy, though. What do you think? Will you take it on?
- +Good! You are more than ready to prove yourself.
+I will set you on the right path, then. You are one of the commandos at the moment. Wouldn't you like to find a place where there a more like you around, a place where there is even greater danger, but where you can really prove yourself as commando? + \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-03.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-03.htm index 93c31d2bd3..a4e38dbc20 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-03.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-03.htm @@ -1,4 +1,5 @@ High Prefect Took:
-That's right. According to what I've seen and heard so far, your skills and rate of growth are such that you would fit right into the very front lines of the seekers right away. Could you head to the Ruins of Ye Sagira and help the seekers there with their assignment?
- +Head to Ye Sagira! There will be much for you to do there!
+Also, many will be looking for your help. Will you go to Ye Sagira?
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-04.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-04.htm index 6be6351f49..bb0535cb2a 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-04.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-04.htm @@ -1,5 +1,4 @@ High Prefect Took:
-Thank you for being so eager to accept.
-Please head immediately to the Ruins of Ye Sagira, and help the seekers with their operation. At the entrance to the Ruins of Ye Sagira should be the former scholar and current Seeker Lakcis. I believe your help will be required: I ask you to please go and provide your help.
-There is no time to lose. So please teleport through Gatekeeper Milia. +Good. Go to the Ruins of Ye Sagira, and search for the Commando Lakcis. He is not one who is as valiant as we are, and will require much help!
+The faster you go there, the better. Find Gatekeeper Milia and ask to be teleported to the Ruins of Ye Sagira.
\ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-05.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-05.html new file mode 100644 index 0000000000..aa81d6f041 --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32150-05.html @@ -0,0 +1,4 @@ +High Prefect Took:
+Go to the Ruins of Ye Sagira, and search for the Commando Lakcis. He is not one who is as valiant as we are, and will require much help!
+The faster you go there, the better. Find Gatekeeper Milia and ask to be teleported to the Ruins of Ye Sagira.
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32153-02.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32153-02.htm index 8a001a5dc1..9f32acb16c 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32153-02.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32153-02.htm @@ -1,5 +1,6 @@ High Priest Franco:
-Your help is required in the Ruins of Ye Sagira. I can promise you something when you have completed this mission.
-It will not be easy, though. What do you think? Will you take it on?
- +Many Seekers are engaged in searching the Ruins of Ye Sagira. Many are hard at work there, but for many reasons, they're still very short on manpower.
+It has been reported that one thought to be connected with the one who intruded into the museum in search of the book appeared there. That's why I'm even more worried.
+We would like skilled persons like you to go to the Ruins of Ye Sagira and help out with the search there.
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32153-05.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32153-05.html new file mode 100644 index 0000000000..79774d5e0e --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32153-05.html @@ -0,0 +1,4 @@ +High Priest Franco:
+Please head immediately to the Ruins of Ye Sagira, and help the seekers with their operation. At the entrance to the Ruins of Ye Sagira should be the former scholar and current Seeker Lakcis. I believe your help will be required: I ask you to please go and provide your help.
+There is no time to lose. So please teleport through Gatekeeper Milia. + \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-01.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-01.htm index 6e67bd53f0..6c68b9b26b 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-01.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-01.htm @@ -1,6 +1,4 @@ Head Blacksmith Moka:
-Thank you for stepping up and helping out.
-I have heard you have applied to join the seekers. I've been told you only just signed up, but you seem to be a seasoned seeker veteran in more ways than one.
-That's why I want to ask you to do something.
- +If you don't have anything you need to do right now, please lend me hand with my work.
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-02.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-02.htm index 3c79b0879b..6cb97cc9eb 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-02.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-02.htm @@ -1,5 +1,4 @@ Head Blacksmith Moka:
-Your help is required in the Ruins of Ye Sagira. I can promise you something when you have completed this mission.
-It will not be easy, though. What do you think? Will you take it on?
- +I'm busy out of my mind as it is, and they're pestering me to send help to the Ruins of Ye Sagira! Wouldn't it be nice if you could go and lend them a hand
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-03.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-03.htm index 2b709606f7..b81ae0e126 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-03.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-03.htm @@ -1,4 +1,5 @@ Head Blacksmith Moka:
-That's right. According to what I've seen and heard so far, your skills and rate of growth are such that you would fit right into the very front lines of the seekers right away. Could you head to the Ruins of Ye Sagira and help the seekers there with their assignment?
- +I like how you're quick with your answer.
+Go then to Ruins of Ye Sagira and help out with things there. If you return after completing the assignment successfully, I may be able to help you with your transfer.
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-04.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-04.htm index e415af3d13..0e67694ac8 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-04.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-04.htm @@ -1,5 +1,4 @@ Head Blacksmith Moka:
-Thank you for being so eager to accept.
-Please head immediately to the Ruins of Ye Sagira, and help the seekers with their operation. At the entrance to the Ruins of Ye Sagira should be the former scholar and current Seeker Lakcis. I believe your help will be required: I ask you to please go and provide your help.
-There is no time to lose. So please teleport through Gatekeeper Milia. +I don't believe. I need to tell you such things...
+There is no time. Go to Gatekeeper Milia and ask to be teleported to the Ruins of Ye Sagira. When you arrive there, look for Lakcis.
\ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-05.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-05.html new file mode 100644 index 0000000000..46235c6906 --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32157-05.html @@ -0,0 +1,3 @@ +Head Blacksmith Moka:
+Go to Gatekeeper Milia and ask to be teleported to the Ruins of Ye Sagira. When you arrive there, look for Lakcis.
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-01.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-01.htm index 91c850be4f..da1e7806b0 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-01.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-01.htm @@ -1,6 +1,4 @@ Grand Magister Devon:
-Thank you for stepping up and helping out.
-I have heard you have applied to join the seekers. I've been told you only just signed up, but you seem to be a seasoned seeker veteran in more ways than one.
-That's why I want to ask you to do something.
- +You must be quite surprised that the supplies have been cut off. I'm about to tell you what you need to do next. Do you have a mind to listen?
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-03.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-03.htm index 822a4110b6..cc9986ac09 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-03.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-03.htm @@ -1,4 +1,5 @@ Grand Magister Devon:
-That's right. According to what I've seen and heard so far, your skills and rate of growth are such that you would fit right into the very front lines of the seekers right away. Could you head to the Ruins of Ye Sagira and help the seekers there with their assignment?
- +You needn't be impatient. You will reach the end one step at a time. For now, go to Ruins of Ye Sagira and build up your strength while you help them there.
+What do you think?
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-04.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-04.htm index 6be6351f49..d7fc84f5ab 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-04.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-04.htm @@ -1,5 +1,4 @@ High Prefect Took:
-Thank you for being so eager to accept.
-Please head immediately to the Ruins of Ye Sagira, and help the seekers with their operation. At the entrance to the Ruins of Ye Sagira should be the former scholar and current Seeker Lakcis. I believe your help will be required: I ask you to please go and provide your help.
-There is no time to lose. So please teleport through Gatekeeper Milia. +You will find Lakcis waiting for you at the Ruins of Ye Sagira. Your help will be needed.
+You needn't waste more time than is necessary in getting there. I recommend you go to Gatekeeper Milia and ask you to be teleported to the Ruins of Ye Sagira. Go and do your thing.
\ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-05.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-05.html new file mode 100644 index 0000000000..aff6d0ae19 --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32160-05.html @@ -0,0 +1,4 @@ +High Prefect Took:
+You will find Lakcis waiting for you at the Ruins of Ye Sagira. Your help will be needed.
+You needn't waste more time than is necessary in getting there. I recommend you go to Gatekeeper Milia and ask you to be teleported to the Ruins of Ye Sagira.
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-04.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-04.html new file mode 100644 index 0000000000..d2e00263db --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-04.html @@ -0,0 +1,5 @@ +Gatekeeper Milia:
+Going to help Lakcis, you say? What a relief. I was shocked when Lakcis that bookworm said he was headed out on expedition to the ruins.
+Please, hurry, go and help Lakcis. I'll tell you how you can get there faster. Are you ready to teleport?
+ + \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-05.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-05.html new file mode 100644 index 0000000000..46b54db61c --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-05.html @@ -0,0 +1,6 @@ +Gatekeeper Milia:
+Gatekeepers like me help to make your travels more comfortable.
+Use the Teleport menu. Care to give it a try?
+Please, hurry, go and help Lakcis. I'll tell you how you can get there faster. Are you ready to teleport?
+ + \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-06.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-06.html new file mode 100644 index 0000000000..238d3e3bea --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/32169-06.html @@ -0,0 +1,3 @@ +Gatekeeper Milia:
+When you're ready to teleport, talk to me. Then use Teleport to teleport to the Ruins of Ye Sagira.
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java index b68eedfb65..fca9cf6cf3 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java @@ -16,6 +16,8 @@ */ package quests.Q10330_ToTheRuinsOfYeSagira; +import quests.Q10544_SeekerSupplies.Q10544_SeekerSupplies; + import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -23,8 +25,6 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; -import quests.Q10544_SeekerSupplies.Q10544_SeekerSupplies; - /** * To the Ruins of Ye Sagira (10330) * @author Gladicek @@ -82,6 +82,8 @@ public final class Q10330_ToTheRuinsOfYeSagira extends Quest case "32157-03.htm": case "32146-02.htm": case "32146-03.htm": + case "32169-05.htm": + case "32169-06.htm": { htmltext = event; break; @@ -168,25 +170,64 @@ public final class Q10330_ToTheRuinsOfYeSagira extends Quest { switch (npc.getId()) { - case FRANCO: - case RIVIAN: - case TOOK: - case DEVON: - case MOKA: case VALFAR: { if (qs.isCond(1)) { - htmltext = "return.html"; + htmltext = "32146-05.html"; + } + break; + } + case MOKA: + { + if (qs.isCond(1)) + { + htmltext = "32157-05.html"; + } + break; + } + case DEVON: + { + if (qs.isCond(1)) + { + htmltext = "32160-05.html"; + } + break; + } + case TOOK: + { + if (qs.isCond(1)) + { + htmltext = "32150-05.html"; + } + break; + } + case FRANCO: + { + if (qs.isCond(1)) + { + htmltext = "32153-05.html"; + } + break; + } + case RIVIAN: + { + if (qs.isCond(1)) + { + htmltext = "32147-05.html"; } break; } case MILA: { - if (qs.isCond(1) || qs.isCond(2)) + if (qs.isCond(1)) { htmltext = "32169-01.html"; } + else if (qs.isCond(2)) + { + htmltext = "32169-04.html"; + } break; } case LAKCIS: diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-05.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-05.html index be50149582..7a6d4f3e7c 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-05.html +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-05.html @@ -1,4 +1,3 @@ Celin:
-Good to see you friend! Things are much better here.
-(You have already completed this quest.) +Have you talked to Walker? diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-06.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-06.html new file mode 100644 index 0000000000..be50149582 --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/33451-06.html @@ -0,0 +1,4 @@ +Celin:
+Good to see you friend! Things are much better here.
+(You have already completed this quest.) + diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java index dacde64873..ea67fabfb6 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java @@ -16,6 +16,8 @@ */ package quests.Q10364_ObligationsOfTheSeeker; +import quests.Q10363_RequestOfTheSeeker.Q10363_RequestOfTheSeeker; + import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.quest.Quest; @@ -24,8 +26,6 @@ import com.l2jmobius.gameserver.model.quest.State; import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; -import quests.Q10363_RequestOfTheSeeker.Q10363_RequestOfTheSeeker; - /** * Obligations of the Seeker (10364) * @URL https://l2wiki.com/Obligations_of_the_Seeker @@ -153,7 +153,8 @@ public final class Q10364_ObligationsOfTheSeeker extends Quest { if (qs.isCond(1)) { - htmltext = "33451-03.html"; + showOnScreenMsg(player, NpcStringId.USE_THE_YE_SAGIRA_TELEPORT_DEVICE_TO_GO_TO_EXPLORATION_AREA_3, ExShowScreenMessage.TOP_CENTER, 10000); + htmltext = "33451-06.html"; break; } break; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-01.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/32978-01.html similarity index 88% rename from L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-01.html rename to L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/32978-01.html index 1f0931bc3c..d1136d71cf 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-01.html +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/32978-01.html @@ -2,5 +2,5 @@ Good, you've collected the King's Tonics! I just brought the King back here.
It wasn't easy since I'd injured my leg, but I still had my magic at my disposal. It wasn't too difficult to bring the King back here. I think I should be able to take care of the King before we return to the village.
Since you've collected the tonics, the King is sure to recover soon. When the King recovers his health, he will be very grateful.
- + \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-02.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/32978-02.html similarity index 100% rename from L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-02.html rename to L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/32978-02.html diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-01.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-01.htm similarity index 87% rename from L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-01.htm rename to L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-01.htm index 1a2d0ac6bd..a2ef4c49d3 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-01.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-01.htm @@ -1,6 +1,6 @@ -Dep:
-Oh, no. This is a big problem... this is the only one we had left...
-What's wrong, you ask? It's the Bloodhounds. When are first arrived, there were 10, but they all are eaten by monsters. Their king is the one that has survived, but he is weak...
-I have no idea what I can do for them. King, come on, recover your strength...
- +Dep:
+Oh, no. This is a big problem... this is the only one we had left...
+What's wrong, you ask? It's the Bloodhounds. When are first arrived, there were 10, but they all are eaten by monsters. Their king is the one that has survived, but he is weak...
+I have no idea what I can do for them. King, come on, recover your strength...
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-02.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-02.htm similarity index 86% rename from L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-02.htm rename to L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-02.htm index bfa0af0d82..538bc181ac 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-02.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-02.htm @@ -2,5 +2,5 @@ Actually, I was going to ask someone to take the king to Sebion. However, give the king's state, I doubt he'll be able to make it there...
I did send a message to Sebion, but even if Sebion devises a way to retrieve the king, with him so weak already, I'm worried that we'll be causing more danger.
If I had the tonic on me, it would have been some help...
- + \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-02a.htm b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-03.htm similarity index 87% rename from L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-02a.htm rename to L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-03.htm index 76c61e39da..5fb015d243 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-02a.htm +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-03.htm @@ -1,6 +1,6 @@ -Dep:
-If I had the tonic, the king wouldn't have gotten so week.
-He has the habit of burying his things here and there, and he's buried the tonic he needs to take here and there as well.
-I've sometimes seen the monsters here find the tonic and take it with them, but me, I can't find it no matter how I try. Do you think the monsters have cleared the land of tonics? I'd be so much less worried if only I could get my hands on that tonic...
- +Dep:
+If I had the tonic, the king wouldn't have gotten so week.
+He has the habit of burying his things here and there, and he's buried the tonic he needs to take here and there as well.
+I've sometimes seen the monsters here find the tonic and take it with them, but me, I can't find it no matter how I try. Do you think the monsters have cleared the land of tonics? I'd be so much less worried if only I could get my hands on that tonic...
+ \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-03.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-04.htm similarity index 100% rename from L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-03.html rename to L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-04.htm diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-05.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-05.html new file mode 100644 index 0000000000..4cc5ab018d --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-05.html @@ -0,0 +1,5 @@ +Dep:
+Defeat Hush Eyesaroch, Husk Critter, and Husk Rider and bring me King's Tonics.
+I'll have to feed the king with some porridge until Sebion takes him.
+Once you bring 20 Tonics, go find Sebion in Zone 5. Sebion said he will come find the king soon, so the king will be safe by then. + \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-06.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-06.html new file mode 100644 index 0000000000..85739de418 --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/33453-06.html @@ -0,0 +1,4 @@ +Dep:
+I can't just give King to anybody!
+(Only those who have completed the "Obligations of the Seeker" quest, and are between levels 16-25, may start this quest.) + \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java new file mode 100644 index 0000000000..f968dd6de7 --- /dev/null +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java @@ -0,0 +1,167 @@ +/* + * 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.Q10365_ForTheSearchdogKing; + +import quests.Q10364_ObligationsOfTheSeeker.Q10364_ObligationsOfTheSeeker; + +import com.l2jmobius.gameserver.model.actor.L2Npc; +import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; +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; + +/** + * For the Searchdog King (10365) + * @author Stayway + */ +public final class Q10365_ForTheSearchdogKing extends Quest +{ + // NPCs + private static final int DEP = 33453; + private static final int SEBION = 32978; + // MOBs + private static final int EYESAROCH = 23122; + private static final int CRITTER = 22993; + private static final int RIDER = 22995; + // Items + private static final int KINGS_TONIC = 47607; + // Misc + private static final int MIN_LEVEL = 16; + private static final int MAX_LEVEL = 25; + + public Q10365_ForTheSearchdogKing() + { + super(10365); + addStartNpc(DEP); + addTalkId(DEP, SEBION); + registerQuestItems(KINGS_TONIC); + addKillId(EYESAROCH, CRITTER, RIDER); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "33453-06.html"); + addCondCompletedQuest(Q10364_ObligationsOfTheSeeker.class.getSimpleName(), "33453-06.html"); + } + + @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 "33453-02.htm": + case "33453-03.htm": + { + htmltext = event; + break; + } + case "33453-04.htm": + { + qs.startQuest(); + htmltext = event; + break; + } + case "32978-02.html": + { + if (qs.isCond(2)) + { + addExpAndSp(player, 172000, 15); + qs.exitQuest(false, true); + htmltext = event; + break; + } + break; + } + } + return htmltext; + } + + @Override + public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) + { + final QuestState qs = getQuestState(killer, false); + + if ((qs != null) && qs.isCond(1)) + { + if (giveItemRandomly(killer, npc, KINGS_TONIC, 1, 20, 0.5, true)) + { + qs.setCond(0); + qs.setCond(2); + showOnScreenMsg(killer, NpcStringId.USE_THE_YE_SAGIRA_TELEPORT_DEVICE_SHINING_WITH_A_RED_SHIMMER_TO_GO_TO_EXPLORATION_AREA_5, ExShowScreenMessage.TOP_CENTER, 4500); + } + } + return super.onKill(npc, killer, isSummon); + } + + @Override + public String onTalk(L2Npc npc, L2PcInstance player) + { + final QuestState qs = getQuestState(player, true); + String htmltext = null; + + switch (qs.getState()) + { + case State.CREATED: + { + if (npc.getId() == DEP) + { + htmltext = "33453-01.htm"; + break; + } + break; + } + case State.STARTED: + { + switch (npc.getId()) + { + case DEP: + { + if (qs.isCond(1)) + { + showOnScreenMsg(player, NpcStringId.USE_THE_YE_SAGIRA_TELEPORT_DEVICE_TO_GO_TO_EXPLORATION_AREA_3, ExShowScreenMessage.TOP_CENTER, 10000); + htmltext = "33453-05.html"; + break; + } + } + case SEBION: + { + if (qs.isCond(2)) + { + + { + htmltext = "32978-01.html"; + break; + } + } + break; + } + } + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; + } + } + return htmltext; + } +} \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-03.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-03.html deleted file mode 100644 index 1f7850cdd1..0000000000 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/32978-03.html +++ /dev/null @@ -1,4 +0,0 @@ -Sebion:
-I'm planning to take King back to town. He's fine, don't worry.
-(Quest already completed.) - \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-04.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-04.html deleted file mode 100644 index 7092183855..0000000000 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-04.html +++ /dev/null @@ -1,4 +0,0 @@ -Dep:
-Don't take your eyes off King! If he loses you, he'll just come back to me! It's not safe here!
- - \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-05.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-05.html deleted file mode 100644 index 4004d6b339..0000000000 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-05.html +++ /dev/null @@ -1,3 +0,0 @@ -Dep:
-Sebion is in Exploration Zone 5. Just follow King and you'll bump into Sebion. - \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-06.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-06.html deleted file mode 100644 index 21972bfbc0..0000000000 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-06.html +++ /dev/null @@ -1,4 +0,0 @@ -Dep:
-I can't just give King to anybody!
-(Only characters between level 16 and 25 can take this quest.) - \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-07.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-07.html deleted file mode 100644 index 3c76776cd9..0000000000 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/33453-07.html +++ /dev/null @@ -1,4 +0,0 @@ -Dep:
-How is King doing? I miss his little face...
-(This quest has already been completed.) - \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java deleted file mode 100644 index 4b3cd7f638..0000000000 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java +++ /dev/null @@ -1,312 +0,0 @@ -/* - * 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.Q10365_SeekerEscort; - -import com.l2jmobius.gameserver.enums.ChatType; -import com.l2jmobius.gameserver.model.Location; -import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -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.ExRotation; -import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; -import com.l2jmobius.gameserver.util.Util; - -import quests.Q10364_ObligationsOfTheSeeker.Q10364_ObligationsOfTheSeeker; - -/** - * Seeker Escort (10365) - * @author Gladicek - */ -public final class Q10365_SeekerEscort extends Quest -{ - // NPCs - private static final int DEP = 33453; - private static final int BLOODHOUND = 32988; - private static final int SEBION = 32978; - // Misc - private static final int MIN_LEVEL = 15; - private static final int MAX_LEVEL = 25; - // Locations - private static final Location BLOODHOUND_SPAWN_1 = new Location(-110624, 238369, -2920); - private static final Location BLOODHOUND_SPAWN_2 = new Location(-112660, 233942, -3072); - private static final Location[] BLOODHOUND_LOC_1 = - { - new Location(-110574, 238972, -2920), - new Location(-110723, 239275, -2920), - new Location(-110981, 239500, -2920), - new Location(-111077, 239726, -2920), - new Location(-111000, 239978, -2920), - new Location(-111766, 240211, -2920), - new Location(-111774, 240549, -2920), - new Location(-111018, 240584, -2920), - new Location(-111281, 240378, -2920), - new Location(-111630, 239878, -2920), - new Location(-111921, 239728, -2920), - new Location(-112279, 239804, -2920), - new Location(-112623, 239904, -2920), - new Location(-112711, 240227, -2920), - new Location(-112470, 240536, -2920), - new Location(-112119, 240511, -2920), - new Location(-112042, 240290, -2920), - new Location(-112199, 240141, -2920), - new Location(-112291, 240201, -2920), - }; - private static final Location[] BLOODHOUND_LOC_2 = - { - new Location(-112403, 233676, -3096), - new Location(-112174, 233487, -3120), - new Location(-112135, 233107, -3120), - new Location(-112424, 233910, -3096), - new Location(-112739, 232540, -3072), - new Location(-112558, 232070, -3080), - new Location(-112236, 232098, -3120), - new Location(-112054, 232356, -3136), - new Location(-111729, 232600, -3158), - new Location(-111194, 232727, -3224), - new Location(-110776, 232459, -3256), - new Location(-111194, 231841, -3224), - new Location(-111487, 232013, -3200), - new Location(-111681, 231967, -3168), - new Location(-111707, 231828, -3168), - }; - - public Q10365_SeekerEscort() - { - super(10365); - addStartNpc(DEP); - addTalkId(DEP, SEBION); - addSpawnId(BLOODHOUND); - addMoveFinishedId(BLOODHOUND); - addCondLevel(MIN_LEVEL, MAX_LEVEL, "33453-06.html"); - addCondCompletedQuest(Q10364_ObligationsOfTheSeeker.class.getSimpleName(), "33453-06.html"); - } - - @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 "33453-02.htm": - case "33453-02a.htm": - { - htmltext = event; - break; - } - case "33453-03.html": - { - qs.startQuest(); - qs.setMemoState(1); - final L2Npc bloodhound = addSpawn(BLOODHOUND, BLOODHOUND_SPAWN_1, false, 300000); - bloodhound.setSummoner(player); - bloodhound.setTitle(player.getName()); - startQuestTimer("MOVE_DELAY", 500, bloodhound, player); - htmltext = event; - break; - } - case "32978-02.html": - { - if (qs.isCond(2)) - { - addExpAndSp(player, 172000, 15); - qs.exitQuest(false, true); - htmltext = event; - } - break; - } - case "CHECK_PLAYER": - { - final L2PcInstance owner = npc.getSummoner().getActingPlayer(); - if (owner != null) - { - if (npc.calculateDistance(owner, false, false) < 180) - { - npc.getVariables().set("FAIL_COUNT", 0); - final int loc_index = npc.getVariables().getInt("MOVE_INDEX", -1) + 1; - if (loc_index > 0) - { - if (qs.isMemoState(1)) - { - if (loc_index == 19) - { - showOnScreenMsg(player, NpcStringId.YOU_MUST_MOVE_TO_EXPLORATION_AREA_5_IN_ORDER_TO_CONTINUE, ExShowScreenMessage.TOP_CENTER, 4500); - startQuestTimer("DELETE_NPC", 8000, npc, owner); - break; - } - npc.getVariables().set("MOVE_INDEX", loc_index); - addMoveToDesire(npc, BLOODHOUND_LOC_1[loc_index], 0); - } - else if (qs.isMemoState(2)) - { - if (loc_index == 15) - { - qs.setCond(2); - startQuestTimer("DELETE_NPC", 2000, npc, owner); - break; - } - npc.getVariables().set("MOVE_INDEX", loc_index); - addMoveToDesire(npc, BLOODHOUND_LOC_2[loc_index], 0); - } - } - } - else - { - final int failCount = npc.getVariables().getInt("FAIL_COUNT", 0) + 1; - npc.getVariables().set("FAIL_COUNT", failCount); - - if (failCount >= 50) - { - // Use maybe something else than memostate to check if npc is spawned?! - qs.setMemoState(0); - showOnScreenMsg(player, NpcStringId.KING_HAS_RETURNED_TO_DEF_RETURN_TO_DEF_AND_START_AGAIN, ExShowScreenMessage.TOP_CENTER, 4500); - npc.deleteMe(); - break; - } - startQuestTimer("CHECK_PLAYER", 1000, npc, owner); - - if (getRandom(100) < 10) - { - npc.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.RUFF_RUFF_RRRRRR); - } - } - } - else - { - npc.deleteMe(); - } - break; - } - case "MOVE_DELAY": - { - if (qs.isMemoState(1)) - { - npc.setIsRunning(true); - npc.broadcastInfo(); - addMoveToDesire(npc, BLOODHOUND_LOC_1[0], 0); - npc.getVariables().set("MOVE_INDEX", 0); - break; - } - else if (qs.isMemoState(2)) - { - npc.setIsRunning(true); - npc.broadcastInfo(); - addMoveToDesire(npc, BLOODHOUND_LOC_2[0], 0); - npc.getVariables().set("MOVE_INDEX", 0); - break; - } - break; - } - case "DELETE_NPC": - { - npc.deleteMe(); - break; - } - case "TELEPORT_TO_NEXT_STAGE": - { - qs.setMemoState(2); - player.teleToLocation(BLOODHOUND_SPAWN_2); - final L2Npc bloodhound = addSpawn(BLOODHOUND, BLOODHOUND_SPAWN_2, false, 300000); - bloodhound.setTitle(player.getName()); - bloodhound.setSummoner(player); - bloodhound.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.RUFF_RUFF_RRRRRR); - startQuestTimer("MOVE_DELAY", 500, bloodhound, player); - break; - } - case "SPAWN_KING": - { - qs.setMemoState(1); - final L2Npc bloodhound = addSpawn(BLOODHOUND, BLOODHOUND_SPAWN_1, false, 300000); - bloodhound.setTitle(player.getName()); - bloodhound.setSummoner(player); - startQuestTimer("MOVE_DELAY", 500, bloodhound, player); - break; - } - } - return htmltext; - } - - @Override - public void onMoveFinished(L2Npc npc) - { - final L2PcInstance owner = npc.getSummoner().getActingPlayer(); - - if (owner != null) - { - showOnScreenMsg(owner, NpcStringId.CATCH_UP_TO_KING_HE_S_WAITING, ExShowScreenMessage.TOP_CENTER, 4500); - npc.setHeading(Util.calculateHeadingFrom(npc, owner)); - npc.broadcastPacket(new ExRotation(npc.getObjectId(), npc.getHeading())); - startQuestTimer("CHECK_PLAYER", 1000, npc, owner); - } - } - - @Override - public String onTalk(L2Npc npc, L2PcInstance player) - { - final QuestState qs = getQuestState(player, true); - String htmltext = null; - - switch (qs.getState()) - { - case State.CREATED: - { - if (npc.getId() == DEP) - { - htmltext = "33453-01.htm"; - break; - } - break; - } - case State.STARTED: - { - if (npc.getId() == DEP) - { - if (qs.isCond(1)) - { - // Use maybe something else than memostate to check if npc is spawned?! - htmltext = qs.isMemoState(0) ? "33453-04.html" : "33453-05.html"; - break; - } - break; - } - else if (npc.getId() == SEBION) - { - if (qs.isCond(2)) - { - htmltext = "32978-01.html"; - } - break; - } - break; - } - case State.COMPLETED: - { - htmltext = npc.getId() == DEP ? "33453-04.html" : "32978-03.html"; - break; - } - } - return htmltext; - } -} \ No newline at end of file diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java index 6394dbafe9..03d459d4b9 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java @@ -19,6 +19,8 @@ package quests.Q10366_ReportOnTheSituationAtTheRuins; import java.util.HashSet; import java.util.Set; +import quests.Q10365_ForTheSearchdogKing.Q10365_ForTheSearchdogKing; + import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -28,8 +30,6 @@ import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; import com.l2jmobius.gameserver.network.NpcStringId; -import quests.Q10365_SeekerEscort.Q10365_SeekerEscort; - /** * Report on the situation at the ruins (10366) * @URL https://l2wiki.com/Report_on_the_situation_at_the_ruins @@ -44,7 +44,8 @@ public final class Q10366_ReportOnTheSituationAtTheRuins extends Quest 22993, // Critter 22994, // Avian 22995, // Rider - 23122 // Eyesaroch + 23122 + // Eyesaroch }; // Misc private static final int MIN_LEVEL = 16; @@ -58,7 +59,7 @@ public final class Q10366_ReportOnTheSituationAtTheRuins extends Quest addTalkId(SEBION); addKillId(MONSTERS); addCondLevel(MIN_LEVEL, MAX_LEVEL, "32978-08.html"); - addCondCompletedQuest(Q10365_SeekerEscort.class.getSimpleName(), "32978-08.html"); + addCondCompletedQuest(Q10365_ForTheSearchdogKing.class.getSimpleName(), "32978-08.html"); } @Override diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java index 3586bf9469..95a3d274b4 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java @@ -19,6 +19,8 @@ package quests.Q10541_TrainLikeTheRealThing; import java.util.HashSet; import java.util.Set; +import quests.Q10321_QualificationsOfTheSeeker.Q10321_QualificationsOfTheSeeker; + import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; @@ -34,8 +36,6 @@ import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList; import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import com.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; -import quests.Q10321_QualificationsOfTheSeeker.Q10321_QualificationsOfTheSeeker; - /** * Train Like the Real Thing (10541) * @URL https://l2wiki.com/Train_Like_the_Real_Thing @@ -179,6 +179,7 @@ public final class Q10541_TrainLikeTheRealThing extends Quest case 3: { htmltext = "32974-07.html"; + showOnScreenMsg(player, NpcStringId.SPEAK_WITH_THE_ADVENTURERS_GUIDE_FOR_TRAINING, ExShowScreenMessage.TOP_CENTER, 5000); break; } case 5: diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java index 82f9ddbc5e..d6de553296 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java @@ -19,6 +19,8 @@ package quests.Q10542_SearchingForNewPower; import java.util.HashSet; import java.util.Set; +import quests.Q10541_TrainLikeTheRealThing.Q10541_TrainLikeTheRealThing; + import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; @@ -31,8 +33,6 @@ import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import com.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; -import quests.Q10541_TrainLikeTheRealThing.Q10541_TrainLikeTheRealThing; - /** * Searching for New Power (10542) * @URL https://l2wiki.com/Searching_for_New_Power @@ -111,7 +111,7 @@ public final class Q10542_SearchingForNewPower extends Quest if (qs.isCond(5)) { giveItems(player, (player.isInCategory(CategoryType.MAGE_GROUP) ? SPIRITSHOTS : SOULSHOTS), 100); - addExpAndSp(player, 2550, 7); + addExpAndSp(player, 3200, 8); qs.exitQuest(false, true); htmltext = "32974-08.html"; } diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java index 224f68cf4c..5285df14fd 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java @@ -251,7 +251,7 @@ import quests.Q10360_CertificationOfFate.Q10360_CertificationOfFate; import quests.Q10362_CertificationOfTheSeeker.Q10362_CertificationOfTheSeeker; import quests.Q10363_RequestOfTheSeeker.Q10363_RequestOfTheSeeker; import quests.Q10364_ObligationsOfTheSeeker.Q10364_ObligationsOfTheSeeker; -import quests.Q10365_SeekerEscort.Q10365_SeekerEscort; +import quests.Q10365_ForTheSearchdogKing.Q10365_ForTheSearchdogKing; import quests.Q10366_ReportOnTheSituationAtTheRuins.Q10366_ReportOnTheSituationAtTheRuins; import quests.Q10369_NoblesseSoulTesting.Q10369_NoblesseSoulTesting; import quests.Q10370_MenacingTimes.Q10370_MenacingTimes; @@ -670,7 +670,7 @@ public class QuestMasterHandler Q10362_CertificationOfTheSeeker.class, Q10363_RequestOfTheSeeker.class, Q10364_ObligationsOfTheSeeker.class, - Q10365_SeekerEscort.class, + Q10365_ForTheSearchdogKing.class, Q10366_ReportOnTheSituationAtTheRuins.class, Q10369_NoblesseSoulTesting.class, Q10370_MenacingTimes.class, diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/NpcStringId.java index c2d74b9c75..762087bd41 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/network/NpcStringId.java @@ -12081,6 +12081,9 @@ public final class NpcStringId @ClientString(id = 536504, message = "Seeker Escort (Lv. 16-25)") public static NpcStringId SEEKER_ESCORT_LV_16_252; + @ClientString(id = 536505, message = "Use the Ye Sagira Teleport Device shining with a red shimmer to go to Exploration Area 5") + public static NpcStringId USE_THE_YE_SAGIRA_TELEPORT_DEVICE_SHINING_WITH_A_RED_SHIMMER_TO_GO_TO_EXPLORATION_AREA_5; + @ClientString(id = 536601, message = "Ruins Status Update (Lv. 16-25)") public static NpcStringId RUINS_STATUS_UPDATE_LV_16_25;