From e31b86dd67f51af6a4fb09340ec5917b8cf8aeb6 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 26 Aug 2017 00:35:24 +0000 Subject: [PATCH] Some quest fixes from l2jserver. --- .../instances/ElcadiasTent/ElcadiasTent.java | 2 +- .../{32593-01.htm => 32593-01.html} | 0 .../instances/HideoutOfTheDawn/32617-01.html | 5 + .../{32617-01.htm => 32617-02.html} | 2 +- .../HideoutOfTheDawn/32617-02a.html} | 2 +- .../instances/HideoutOfTheDawn/32617.html | 4 + .../HideoutOfTheDawn/HideoutOfTheDawn.java | 41 ++- .../Q00198_SevenSignsEmbryo/32593-02.html | 2 +- .../Q00198_SevenSignsEmbryo/32593-04.html | 2 +- .../Q00198_SevenSignsEmbryo/32617-01.html | 5 - .../Q00198_SevenSignsEmbryo.java | 10 +- .../Q00269_InventionAmbition.java | 109 +++--- .../30832-04.html | 3 - .../Q10292_SevenSignsGirlOfDoubt/32593-01.htm | 2 +- .../Q10292_SevenSignsGirlOfDoubt/32593-02.htm | 5 +- .../Q10292_SevenSignsGirlOfDoubt/32593-03.htm | 4 +- .../Q10292_SevenSignsGirlOfDoubt/32593-04.htm | 4 +- .../Q10292_SevenSignsGirlOfDoubt/32593-05.htm | 4 - .../32593-05.html | 4 + .../Q10292_SevenSignsGirlOfDoubt/32593-06.htm | 3 +- .../32593-07.html | 2 +- .../32597-02.html | 4 +- .../32597-03.html | 2 +- .../32597-04.html | 2 +- .../32597-05.html | 3 +- .../32597-06.html | 2 +- .../32597-07.html | 3 - .../32784-01.html | 2 +- .../32784-02.html | 2 +- .../32784-03.html | 2 +- .../32784-04.html | 4 +- .../32784-05.html | 4 +- .../32784-06.html | 4 +- .../32784-07.html | 3 +- .../32784-08.html | 4 +- .../32784-09.html | 6 +- .../32784-10.html | 5 +- .../32784-11.html | 4 +- .../32784-12.html | 4 +- .../32784-13.html | 3 +- .../32784-14.html | 2 +- .../32784-15.html | 3 +- .../32784-17.html | 3 - .../32784-18.html | 3 - .../Q10292_SevenSignsGirlOfDoubt.java | 345 +++++++++--------- .../32593-03.html | 2 +- 46 files changed, 323 insertions(+), 313 deletions(-) rename L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/{32593-01.htm => 32593-01.html} (100%) create mode 100644 L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.html rename L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/{32617-01.htm => 32617-02.html} (60%) rename L2J_Mobius_HighFive/dist/game/data/scripts/{quests/Q00198_SevenSignsEmbryo/32617-02.html => instances/HideoutOfTheDawn/32617-02a.html} (64%) create mode 100644 L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617.html delete mode 100644 L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-01.html delete mode 100644 L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/30832-04.html delete mode 100644 L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.htm create mode 100644 L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.html delete mode 100644 L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-07.html delete mode 100644 L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-17.html delete mode 100644 L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-18.html diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java index febfdb810e..5f591918ac 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java @@ -66,7 +66,7 @@ public final class ElcadiasTent extends AbstractInstance final QuestState Q10293 = talker.getQuestState(Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.class.getSimpleName()); final QuestState Q10294 = talker.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName()); final QuestState Q10296 = talker.getQuestState(Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.class.getSimpleName()); - if (((Q10292 != null) && Q10292.isStarted()) // + if (((Q10292 != null) && (Q10292.getMemoState() > 1) && (Q10292.getMemoState() < 9)) // || ((Q10292 != null) && Q10292.isCompleted() && (Q10293 == null)) // || ((Q10293 != null) && Q10293.isStarted()) // || ((Q10293 != null) && Q10293.isCompleted() && (Q10294 == null)) // diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32593-01.htm b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32593-01.html similarity index 100% rename from L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32593-01.htm rename to L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32593-01.html diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.html b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.html new file mode 100644 index 0000000000..3afae31183 --- /dev/null +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.html @@ -0,0 +1,5 @@ +Priestess Jaina:
+Are you sure you wish to leave the safety of our hall?
+"Yes, I am sure."
+"No, I want to stay in the clan hall." + \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.htm b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02.html similarity index 60% rename from L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.htm rename to L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02.html index ca2b782f0d..ec3203f2cf 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-01.htm +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02.html @@ -1,3 +1,3 @@ -Priestess Jeina:
+Priestess Jaina:
May Einhasad's blessing go with you.... \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-02.html b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02a.html similarity index 64% rename from L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-02.html rename to L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02a.html index 5121eb917c..d135553637 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-02.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617-02a.html @@ -1,3 +1,3 @@ -Priestess Jeina:
+Priestess Jaina:
Please speak with Priest Franz for more details. \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617.html b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617.html new file mode 100644 index 0000000000..9eb607e48b --- /dev/null +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/32617.html @@ -0,0 +1,4 @@ +Priestess Jaina:
+Are you sure you wish to leave the safety of our hall?
+"I want to get out of the clan hall." + \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java index ebd9040116..ce80410915 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java @@ -16,7 +16,6 @@ */ package instances.HideoutOfTheDawn; -import com.l2jmobius.gameserver.instancemanager.InstanceManager; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -30,42 +29,54 @@ import instances.AbstractInstance; */ public final class HideoutOfTheDawn extends AbstractInstance { + protected class HotDWorld extends InstanceWorld + { + + } + // NPCs private static final int WOOD = 32593; private static final int JAINA = 32617; // Location - private static final Location WOOD_LOC = new Location(-23758, -8959, -5384, 0, 0); - private static final Location JAINA_LOC = new Location(147072, 23743, -1984, 0); + private static final Location WOOD_LOC = new Location(-23758, -8959, -5384); + private static final Location JAINA_LOC = new Location(147072, 23743, -1984); // Misc private static final int TEMPLATE_ID = 113; public HideoutOfTheDawn() { super(HideoutOfTheDawn.class.getSimpleName()); + addFirstTalkId(JAINA); addStartNpc(WOOD); addTalkId(WOOD, JAINA); } @Override - public String onTalk(L2Npc npc, L2PcInstance talker) + public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - switch (npc.getId()) + String htmltext = null; + switch (event) { - case WOOD: + case "32617-01.html": + case "32617-02a.html": { - enterInstance(talker, "HideoutOfTheDawn.xml", TEMPLATE_ID); - return "32593-01.htm"; + htmltext = event; + break; } - case JAINA: + case "32617-02.html": { - final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(talker); - world.removeAllowed(talker.getObjectId()); - talker.setInstanceId(0); - talker.teleToLocation(JAINA_LOC); - return "32617-01.htm"; + player.setInstanceId(0); + player.teleToLocation(JAINA_LOC, true); + htmltext = event; + break; + } + case "32593-01.html": + { + enterInstance(player, new HotDWorld(), "HideoutOfTheDawn.xml", TEMPLATE_ID); + htmltext = event; } } - return super.onTalk(npc, talker); + return htmltext; } @Override diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-02.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-02.html index d45d8eff0a..a205df70f0 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-02.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-02.html @@ -1,4 +1,4 @@ Priest Wood:
You know Franz doesn't just meet anyone. In fact I believe you'll be the first new acquaintance of his for quite some time.
-"I feel privileged." +"I feel privileged." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-04.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-04.html index 6fdbe58c26..2065915298 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-04.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32593-04.html @@ -1,4 +1,4 @@ Priest Wood:
Good! Now... it's time for you to meet the great man yourself.
-"I'm ready." +"I'm ready." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-01.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-01.html deleted file mode 100644 index f88e4e0e70..0000000000 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/32617-01.html +++ /dev/null @@ -1,5 +0,0 @@ -Priestess Jeina:
-Are you sure you wish to leave the safety of our hall?
-Leave the clan hall.
-Remain in the clan hall. - \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java index 5b7d10802a..18501a1120 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java @@ -41,7 +41,6 @@ public final class Q00198_SevenSignsEmbryo extends Quest private static final int SHILENS_EVIL_THOUGHTS = 27346; private static final int WOOD = 32593; private static final int FRANZ = 32597; - private static final int JAINA = 32617; // Items private static final int SCULPTURE_OF_DOUBT = 14355; private static final int DAWNS_BRACELET = 15312; @@ -49,12 +48,11 @@ public final class Q00198_SevenSignsEmbryo extends Quest private static final int MIN_LEVEL = 79; private boolean isBusy = false; // Skill - private static SkillHolder NPC_HEAL = new SkillHolder(4065, 8); + private static final SkillHolder NPC_HEAL = new SkillHolder(4065, 8); public Q00198_SevenSignsEmbryo() { super(198, Q00198_SevenSignsEmbryo.class.getSimpleName(), "Seven Signs, Embryo"); - addFirstTalkId(JAINA); addStartNpc(WOOD); addTalkId(WOOD, FRANZ); addKillId(SHILENS_EVIL_THOUGHTS); @@ -163,12 +161,6 @@ public final class Q00198_SevenSignsEmbryo extends Quest return htmltext; } - @Override - public String onFirstTalk(L2Npc npc, L2PcInstance player) - { - return "32617-01.html"; - } - @Override public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon) { diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java index 32fea0e1eb..aa36d6009c 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q00269_InventionAmbition/Q00269_InventionAmbition.java @@ -19,12 +19,10 @@ package quests.Q00269_InventionAmbition; import java.util.HashMap; import java.util.Map; -import com.l2jmobius.gameserver.enums.QuestSound; 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; /** * Invention Ambition (269) @@ -37,17 +35,17 @@ public final class Q00269_InventionAmbition extends Quest // Items private static final int ENERGY_ORE = 10866; // Monsters - private static final Map MONSTERS = new HashMap<>(); + private static final Map MONSTERS = new HashMap<>(); static { - MONSTERS.put(21124, 46); // Red Eye Barbed Bat - MONSTERS.put(21125, 48); // Northern Trimden - MONSTERS.put(21126, 50); // Kerope Werewolf - MONSTERS.put(21127, 64); // Northern Goblin - MONSTERS.put(21128, 66); // Spine Golem - MONSTERS.put(21129, 68); // Kerope Werewolf Chief - MONSTERS.put(21130, 76); // Northern Goblin Leader - MONSTERS.put(21131, 78); // Enchanted Spine Golem + MONSTERS.put(21124, 0.46); // Red Eye Barbed Bat + MONSTERS.put(21125, 0.48); // Northern Trimden + MONSTERS.put(21126, 0.5); // Kerope Werewolf + MONSTERS.put(21127, 0.64); // Northern Goblin + MONSTERS.put(21128, 0.66); // Spine Golem + MONSTERS.put(21129, 0.68); // Kerope Werewolf Chief + MONSTERS.put(21130, 0.76); // Northern Goblin Leader + MONSTERS.put(21131, 0.78); // Enchanted Spine Golem } // Misc private static final int MIN_LVL = 18; @@ -65,33 +63,41 @@ public final class Q00269_InventionAmbition extends Quest public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, false); - String htmltext = null; - if (st != null) + if (st == null) { - switch (event) + return null; + } + + String htmltext = null; + switch (event) + { + case "32486-03.htm": { - case "32486-03.htm": + if (player.getLevel() >= MIN_LVL) { - htmltext = (player.getLevel() >= MIN_LVL) ? event : null; - break; + htmltext = event; } - case "32486-04.htm": + break; + } + case "32486-04.htm": + { + if (player.getLevel() >= MIN_LVL) { st.startQuest(); htmltext = event; - break; - } - case "32486-07.html": - { - st.exitQuest(true, true); - htmltext = event; - break; - } - case "32486-08.html": - { - htmltext = event; - break; } + break; + } + case "32486-07.html": + { + st.exitQuest(true, true); + htmltext = event; + break; + } + case "32486-08.html": + { + htmltext = event; + break; } } return htmltext; @@ -100,11 +106,10 @@ public final class Q00269_InventionAmbition extends Quest @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - final QuestState st = getQuestState(killer, false); - if ((st != null) && (getRandom(100) < MONSTERS.get(npc.getId()))) + final QuestState st = getRandomPartyMemberState(killer, -1, 3, npc); + if (st != null) { - giveItems(killer, ENERGY_ORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + giveItemRandomly(st.getPlayer(), npc, ENERGY_ORE, 1, 0, MONSTERS.get(npc.getId()), true); } return super.onKill(npc, killer, isSummon); } @@ -114,30 +119,22 @@ public final class Q00269_InventionAmbition extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + if (st.isCreated()) { - switch (st.getState()) + htmltext = (player.getLevel() >= MIN_LVL) ? "32486-01.htm" : "32486-02.html"; + } + else if (st.isStarted()) + { + if (hasQuestItems(player, ENERGY_ORE)) { - case State.CREATED: - { - htmltext = (player.getLevel() >= MIN_LVL) ? "32486-01.htm" : "32486-02.html"; - break; - } - case State.STARTED: - { - if (hasQuestItems(player, ENERGY_ORE)) - { - final long count = getQuestItemsCount(player, ENERGY_ORE); - giveAdena(player, (count * 50) + (count >= 10 ? 2044 : null), true); - takeItems(player, ENERGY_ORE, -1); - htmltext = "32486-06.html"; - } - else - { - htmltext = "32486-05.html"; - } - break; - } + final long count = getQuestItemsCount(player, ENERGY_ORE); + giveAdena(player, (count * 50) + (count >= 10 ? 2044 : 0), true); + takeItems(player, ENERGY_ORE, -1); + htmltext = "32486-06.html"; + } + else + { + htmltext = "32486-05.html"; } } return htmltext; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/30832-04.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/30832-04.html deleted file mode 100644 index 1b48036eb9..0000000000 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/30832-04.html +++ /dev/null @@ -1,3 +0,0 @@ -Hardin:
-Library of Sages holds so many ancient books. I believe you might be able to find whatever you seek there, friend. Please tell Elcadia she should head there first. - \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-01.htm b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-01.htm index e8eab50fb2..584725b84a 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-01.htm +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-01.htm @@ -1,4 +1,4 @@ Priest Wood:
You are a difficult person to find. Lord Franz wishes something of you. Can you go and speak with Lord Franz?
-Accept request. +"Leave it to me." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-02.htm b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-02.htm index 1f4c27e1c8..21f3b14e34 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-02.htm +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-02.htm @@ -1,4 +1,5 @@ Priest Wood:
-Thanks to you, we've moved another step forward.
-(This is an already completed quest.) +Lord Franz requests you, I'm afraid this is an urgent matter. Can you see Lord Franz right away?
+"Yes, right now."
+"Maybe later." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-03.htm b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-03.htm index e56a7e8a6b..590dc8a2bd 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-03.htm +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-03.htm @@ -1,4 +1,4 @@ Priest Wood:
-There is more you must do first. Return when you can help me.
-(Only characters with level 81 or above can take on this quest.) +Very well. If you must, go ahead and meet Lord Franz.
+"I can't wait to see him." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-04.htm b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-04.htm index 85c725e921..bdd79a55a4 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-04.htm +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-04.htm @@ -1,5 +1,3 @@ Priest Wood:
-Lord Franz requests you, I'm afraid this is an urgent matter. Can you see Lord Franz right away?
-I will go right now.
-I will go later. +Are you busy right now? Alright, but tell me as soon as you are ready. \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.htm b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.htm deleted file mode 100644 index c7baa9d5f9..0000000000 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.htm +++ /dev/null @@ -1,4 +0,0 @@ -Priest Wood:
-Very well. If you must, go ahead and meet Lord Franz.
-Enter. - \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.html new file mode 100644 index 0000000000..042da12a3f --- /dev/null +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-05.html @@ -0,0 +1,4 @@ +Priest Wood:
+Thanks to you, we've moved another step forward.
+(You have already completed this quest.) + \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-06.htm b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-06.htm index bdd79a55a4..e56a7e8a6b 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-06.htm +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-06.htm @@ -1,3 +1,4 @@ Priest Wood:
-Are you busy right now? Alright, but tell me as soon as you are ready. +There is more you must do first. Return when you can help me.
+(Only characters with level 81 or above can take on this quest.) \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-07.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-07.html index be619fa959..dbba163531 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-07.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32593-07.html @@ -1,4 +1,4 @@ Priest Wood:
Alright. Go ahead, you may meet Lord Franz.
-Enter. +"I can't wait to see him." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-02.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-02.html index a3a0157809..97f1427719 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-02.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-02.html @@ -1,5 +1,5 @@ Priest Franz:
I had a good deal of results ever since the research on the Seven Signs was completed. Also, I received information suggesting that the Revolutionaries of Dusk had uncovered more information too. We're going to send someone to uncover their findings, and I want you to accompany him and find out what they know.
-"Sure."
-"Not interested." +"Sure."
+"Not interested." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-03.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-03.html index 5a983df19d..e703130181 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-03.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-03.html @@ -1,3 +1,3 @@ Priest Franz:
-How did the job I requested go? +It is said that he has been looking for a companion. According to our intelligence, he is staying at a place in the Beast Farm. I want you to go find out what's going on. \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-04.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-04.html index 16e607cb7c..3cdff52935 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-04.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-04.html @@ -1,3 +1,3 @@ Priest Franz:
-Is the job I requested going well? +Is that so? That's too bad. But, there is nobody other than you who is qualified, so I hope that you think about it again. \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-05.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-05.html index 7149355c9a..5a983df19d 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-05.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-05.html @@ -1,4 +1,3 @@ Priest Franz:
-We don't have accurate information regarding the figure dispatched from the Dusk. But, the only thing is, that person is looking for an adventurer who has skills to accompany him. I thought that you would be qualified to work with him because you have skill, no? It was said that he's taken on the job very secretively, so approach him cautiously.
-"Okay." +How did the job I requested go? \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-06.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-06.html index 3cdff52935..16e607cb7c 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-06.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-06.html @@ -1,3 +1,3 @@ Priest Franz:
-Is that so? That's too bad. But, there is nobody other than you who is qualified, so I hope that you think about it again. +Is the job I requested going well? \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-07.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-07.html deleted file mode 100644 index e703130181..0000000000 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32597-07.html +++ /dev/null @@ -1,3 +0,0 @@ -Priest Franz:
-It is said that he has been looking for a companion. According to our intelligence, he is staying at a place in the Beast Farm. I want you to go find out what's going on. - \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-01.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-01.html index cdfc46aaff..aede7f9a4a 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-01.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-01.html @@ -1,4 +1,4 @@ Abyssal Saintess Elcadia:
Are you here to help me? Hm... you have an air of confidence about you, perhaps you will do. But you will have to earn my trust, and I cannot promise your safety. Are you sure you want to become involved?
-I will help you. +"I will help you." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-02.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-02.html index f4edd57f2a..10e646bb82 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-02.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-02.html @@ -1,4 +1,4 @@ Abyssal Saintess Elcadia:
Alright. If you think you have what it takes, I'll just require a small demonstration. But know this, those who have come before you quickly discovered it takes more than confidence to pass this test. We shall see soon enough if you have what it takes, do you accept?
-Accept the test. +"Yes." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-03.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-03.html index f97fce193b..3fd80d55f2 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-03.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-03.html @@ -1,4 +1,4 @@ Abyssal Saintess Elcadia:
-Really? In a place called Pavel Ruins, northeast from here, are Golems. I've placed tokens on them using a bit of magic. Defeat them and collect the tokens. Your test is to earn 10 tokens.
+Alright. Then how about proving yourself by slaying the monsters around here, without venturing too far? The Farm Bandits and Beast Devourers lurking around the Beast Farm have been marked using my magic. Slay them, and they will give up these marks. Your test is to collect 10 of these marks.
Don't look so glum. Maybe it's harder than you think, but either way I have to know who I'm dealing with. \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-04.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-04.html index c594132337..196f1c2ca1 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-04.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-04.html @@ -1,4 +1,4 @@ Abyssal Saintess Elcadia:
-You've heard of a place called Pavel Ruins, just northeast from here? There are Golems there, with magically placed tokens hung by yours truly. Your test is to defeat the Golems until you've collected 10 tokens.
-You almost look disappointed. I'll take that as a good sign, if your abilities match your confidence. +Hm.. You are better than I thought. But that was just a small test.
+"Did I pass the test?" \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-05.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-05.html index ae4fdb60d2..084106282b 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-05.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-05.html @@ -1,4 +1,4 @@ Abyssal Saintess Elcadia:
-Hm.. You are better than I thought. But that was just a small test.
-Did I pass the test? +Not yet... This is just a basic test. Let's call it research for a client. Can you demonstrate your abilities so I can see for myself?
+"No problem." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-06.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-06.html index f753c970c4..cb8aadb56a 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-06.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-06.html @@ -1,4 +1,4 @@ Abyssal Saintess Elcadia:
-Not yet... This is just a basic test. Let's call it research for a client. Can you demonstrate your abilities so I can see for myself?
-Continue with the testing. +Yes, you certainly sound confident in battle... But can you prove it, here and now? What do you think? Are you ready?
+"Absolutely!" \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-07.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-07.html index 26b349295c..673e945174 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-07.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-07.html @@ -1,4 +1,3 @@ Abyssal Saintess Elcadia:
-I love your confidence, especially if you can back it up. Why not show me firsthand what you can do? Are you ready?
-Puh-leez, I'm always ready. +Hey, pay attention to detail. See all these monsters around here? I said defeat them. \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-08.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-08.html index a502248717..f634f220d3 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-08.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-08.html @@ -1,4 +1,4 @@ Abyssal Saintess Elcadia:
-Yes, you certainly sound confident in battle... But can you prove it, here and now? What do you think? Are you ready?
-Am I ready? I was BORN ready! Prepare to be impressed. +I love your confidence, especially if you can back it up. Why not show me firsthand what you can do? Are you ready?
+"Always!" \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-09.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-09.html index 23257fa687..10166d9385 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-09.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-09.html @@ -1,4 +1,4 @@ -Abyssal Saintess Elcadia:
-I'm suprised, and not in a good way. What happened to you? Are you better now? Ready to show me your true skills?
-I'm always ready. I had something in my eye last time. +Abyssal Saintess Elcadia:
+I'm surprised, and not in a good way. What happened to you? Are you better now? Ready to show me your true skills?
+"Absolutely!" \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-10.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-10.html index 012f42b933..04b0db1dc4 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-10.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-10.html @@ -1,3 +1,4 @@ -Abyssal Saintess Elcadia:
-Alright. Time to see what you are made of, adventurer. Defeat the monsters I have prepared for you, and I'll know there's more to you than just a pretty face. +Abyssal Saintess Elcadia:
+You are very skilled, and I am not easily impressed... Alright. Consider this a formal request. I'm in need of someone who I can count on in a number of ways, especially someone who can keep a secret. What do you say, are you willing to help me?
+"Leave it to me." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-11.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-11.html index 710e9d5093..4faafc5298 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-11.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-11.html @@ -1,4 +1,4 @@ Abyssal Saintess Elcadia:
-You are very skilled, and I am not easily impressed... Alright. Consider this a formal request. I'm in need of someone who I can count on in a number of ways, especially someone who can keep a secret. What do you say, are you willing to help me?
-Accept the request. +My request is simple, just accompany me until I get the information I need. Right now I need information on a place called Embryo. I don't even know if its a place or a person, but whatever it is I need to know.
+"Hmm... What do you want me to do?" \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-12.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-12.html index aa6d4b8f09..ff9171fdb2 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-12.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-12.html @@ -1,4 +1,4 @@ Abyssal Saintess Elcadia:
-My request is simple, just accompany me until I get the information I need. Right now I need information on a place called Embryo. I don't even know if its a place or a person, but whatever it is I need to know.
-Ask what I should do. +Have you heard of the great wizard Hardin? He used to reside in Ivory Tower, and now he is studying dark magic at Hardin's Academy. He knows more than most will forget in their lifetime, he will know the information we need. I want you to find Hardin.
+"Okay. I will go find him now." \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-13.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-13.html index bd1c26d60f..f30c1e1916 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-13.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-13.html @@ -1,4 +1,3 @@ Abyssal Saintess Elcadia:
-Have you heard of the great wizard Hardin? He used to reside in Ivory Tower, and now he is studying dark magic at Hardin's Academy. He knows more than most will forget in their lifetime, he will know the information we need. I want you to find Hardin.
-Come back after meeting with Hardin. +If you meet Hardin, remember to ask him about Embryo. If he asks who sent you, give him my name. He knows who I am. \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-14.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-14.html index f30c1e1916..37c2ccd803 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-14.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-14.html @@ -1,3 +1,3 @@ Abyssal Saintess Elcadia:
-If you meet Hardin, remember to ask him about Embryo. If he asks who sent you, give him my name. He knows who I am. +If you meet Hardin, ask him about the word Embryo. When he asks who sent you, give him my name. We're not close, but he knows who I am. \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-15.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-15.html index 37c2ccd803..105872b622 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-15.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-15.html @@ -1,3 +1,4 @@ Abyssal Saintess Elcadia:
-If you meet Hardin, ask him about the word Embryo. When he asks who sent you, give him my name. We're not close, but he knows who I am. +Oh? You seem different than when I met you. If you changed your class or if you're in a different state than before, you would have to return to your original state. Said again, I have no intention of talking with you if you're in a subclass condition.
+(You cannot complete the quest while in a subclass condition) \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-17.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-17.html deleted file mode 100644 index 673e945174..0000000000 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-17.html +++ /dev/null @@ -1,3 +0,0 @@ -Abyssal Saintess Elcadia:
-Hey, pay attention to detail. See all these monsters around here? I said defeat them. - \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-18.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-18.html deleted file mode 100644 index 0adfd980d2..0000000000 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/32784-18.html +++ /dev/null @@ -1,3 +0,0 @@ -Abyssal Saintess Elcadia:
-Oh? You're different than when I first met you. If you changed your class or if you're in a different state, you would have to come back to your original state. (You cannot complete the quest when you're in a sub job condition.) - \ No newline at end of file diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 393a18102e..f599dae21c 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -16,8 +16,6 @@ */ package quests.Q10292_SevenSignsGirlOfDoubt; -import com.l2jmobius.gameserver.ThreadPoolManager; -import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.holders.ItemHolder; @@ -30,6 +28,7 @@ import quests.Q00198_SevenSignsEmbryo.Q00198_SevenSignsEmbryo; /** * Seven Signs, Girl of Doubt (10292) * @author Adry_85 + * @since 2.6.0.0 */ public final class Q10292_SevenSignsGirlOfDoubt extends Quest { @@ -37,13 +36,14 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest private static final int HARDIN = 30832; private static final int WOOD = 32593; private static final int FRANZ = 32597; - private static final int JAINA = 32617; private static final int ELCADIA = 32784; // Item private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); // Misc private static final int MIN_LEVEL = 81; - private boolean isBusy = false; + // Variables + private static int killCount = 0; + private static final String I_QUEST1 = "I_QUEST1"; // Monster private static final int CREATURE_OF_THE_DUSK1 = 27422; private static final int CREATURE_OF_THE_DUSK2 = 27424; @@ -61,7 +61,8 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest { super(10292, Q10292_SevenSignsGirlOfDoubt.class.getSimpleName(), "Seven Signs, Girl of Doubt"); addStartNpc(WOOD); - addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); + addSpawnId(ELCADIA); + addTalkId(WOOD, FRANZ, ELCADIA, HARDIN); addKillId(MOBS); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); registerQuestItems(ELCADIAS_MARK.getId()); @@ -70,8 +71,8 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - final QuestState qs = getQuestState(player, false); - if (qs == null) + final QuestState st = getQuestState(player, false); + if (st == null) { return null; } @@ -79,33 +80,31 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest String htmltext = null; switch (event) { + case "32593-02.htm": case "32593-04.htm": - case "32593-06.htm": - { - htmltext = event; - break; - } - case "32593-05.htm": - { - qs.startQuest(); - htmltext = event; - break; - } case "32597-02.html": - case "32597-06.html": + case "32597-04.html": { htmltext = event; break; } - case "32597-07.html": + case "32593-03.htm": { - qs.setCond(2, true); + st.startQuest(); + st.setMemoState(1); + htmltext = event; + break; + } + case "32597-03.html": + { + st.setMemoState(2); + st.setCond(2, true); htmltext = event; break; } case "32784-02.html": { - if (qs.isCond(2)) + if (st.isMemoState(2)) { htmltext = event; } @@ -113,81 +112,78 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest } case "32784-03.html": { - if (qs.isCond(2)) + if (st.isMemoState(2)) + { + st.setMemoState(3); + st.setCond(3, true); + htmltext = event; + } + break; + } + case "32784-05.html": + { + if (st.isMemoState(4)) { - qs.setCond(3, true); htmltext = event; } break; } case "32784-06.html": { - if (qs.isCond(4) && hasItem(player, ELCADIAS_MARK)) + if (st.isMemoState(4)) { - playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - htmltext = event; - } - break; - } - case "32784-08.html": - { - if (qs.isCond(4) && hasItem(player, ELCADIAS_MARK)) - { - takeItem(player, ELCADIAS_MARK); - qs.setCond(5, true); - htmltext = event; - } - break; - } - case "32784-12.html": - case "32784-13.html": - { - if (qs.isCond(6)) - { - htmltext = event; - } - break; - } - case "32784-14.html": - { - if (qs.isCond(6)) - { - qs.setCond(7, true); + st.setMemoState(5); + st.setCond(5, true); htmltext = event; } break; } case "SPAWN": { - if (qs.isCond(5)) + if (!npc.getVariables().getBoolean(I_QUEST1, false)) { - isBusy = true; - final L2Npc creature1 = addSpawn(CREATURE_OF_THE_DUSK1, 89440, -238016, -9632, 335, false, 0, false, player.getInstanceId()); - creature1.setIsNoRndWalk(true); - final L2Npc creature2 = addSpawn(CREATURE_OF_THE_DUSK2, 89524, -238131, -9632, 56, false, 0, false, player.getInstanceId()); - creature2.setIsNoRndWalk(true); - ThreadPoolManager.schedule(() -> - { - creature1.deleteMe(); - creature2.deleteMe(); - qs.unset("ex"); - isBusy = false; - }, 60000); + npc.getVariables().set(I_QUEST1, true); + addSpawn(CREATURE_OF_THE_DUSK1, 89440, -238016, -9632, getRandom(360), false, 0, false, player.getInstanceId()); + addSpawn(CREATURE_OF_THE_DUSK2, 89524, -238131, -9632, getRandom(360), false, 0, false, player.getInstanceId()); + } + else + { + htmltext = "32784-07.html"; + } + break; + } + case "32784-11.html": + case "32784-12.html": + { + if (st.isMemoState(6)) + { + htmltext = event; + } + break; + } + case "32784-13.html": + { + if (st.isMemoState(6)) + { + st.setMemoState(7); + st.setCond(7, true); + htmltext = event; } break; } case "30832-02.html": { - if (qs.isCond(7)) + if (st.isMemoState(7)) { - qs.setCond(8, true); + st.setMemoState(8); + st.setCond(8, true); htmltext = event; } break; } case "30832-03.html": { - if (qs.isCond(8)) + if (st.isMemoState(8)) { htmltext = event; } @@ -200,132 +196,155 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest @Override public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon) { - if (Util.contains(MOBS, npc.getId())) + final QuestState st = getRandomPartyMemberState(player, -1, 3, npc); + if (st != null) { - final QuestState qs = getRandomPartyMemberState(player, 3, 3, npc); - if ((qs != null) && giveItemRandomly(qs.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 1.0, true)) + if (Util.contains(MOBS, npc.getId())) { - qs.setCond(4, true); - } - } - else - { - final QuestState qs = getQuestState(player, false); - if ((qs != null) && qs.isCond(5)) - { - final int value = qs.getInt("ex") + 1; - qs.set("ex", value); - if (value == 2) + if (giveItemRandomly(st.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 0.7, true) && st.isMemoState(3)) { - qs.setCond(6, true); + st.setCond(4, true); + } + } + else + { + killCount++; + if (killCount == 2) + { + st.setMemoState(6); + st.setCond(6); } } } return super.onKill(npc, player, isSummon); } + @Override + public String onSpawn(L2Npc npc) + { + npc.getVariables().set(I_QUEST1, false); + return super.onSpawn(npc); + } + @Override public String onTalk(L2Npc npc, L2PcInstance player) { - QuestState qs = getQuestState(player, true); + final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - switch (npc.getId()) + if (st.isCompleted()) { - case WOOD: + if (npc.getId() == WOOD) { - if (qs.isCompleted()) - { - htmltext = "32593-02.html"; - } - else if (qs.isCreated()) - { - qs = player.getQuestState(Q00198_SevenSignsEmbryo.class.getSimpleName()); - htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32593-01.htm" : "32593-03.htm"; - } - else if (qs.isStarted()) - { - htmltext = "32593-07.html"; - } - break; + htmltext = "32593-05.html"; } - case FRANZ: + } + else if (st.isCreated()) + { + final QuestState st1 = player.getQuestState(Q00198_SevenSignsEmbryo.class.getSimpleName()); + htmltext = ((player.getLevel() >= MIN_LEVEL) && (st1 != null) && (st1.isCompleted())) ? "32593-01.htm" : "32593-06.htm"; + } + else if (st.isStarted()) + { + switch (npc.getId()) { - if (qs.isCond(1)) + case WOOD: { - htmltext = "32597-01.html"; - } - else if (qs.isCond(2)) - { - htmltext = "32597-03.html"; - } - break; - } - case ELCADIA: - { - switch (qs.getCond()) - { - case 2: + if ((st.getMemoState() > 0) && (st.getMemoState() < 9)) { - htmltext = "32784-01.html"; - break; + htmltext = "32593-07.html"; } - case 3: + break; + } + case FRANZ: + { + final int memoState = st.getMemoState(); + if (memoState == 1) { - htmltext = "32784-04.html"; - break; + htmltext = "32597-01.html"; } - case 4: + else if ((memoState >= 2) && (memoState < 7)) { - if (hasItem(player, ELCADIAS_MARK)) + htmltext = "32597-05.html"; + } + else if (memoState == 7) + { + htmltext = "32597-06.html"; + } + break; + } + case ELCADIA: + { + switch (st.getMemoState()) + { + case 2: { - playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - htmltext = "32784-05.html"; + htmltext = "32784-01.html"; + break; } - break; - } - case 5: - { - htmltext = isBusy ? "32784-17.html" : "32784-07.html"; - break; - } - case 6: - { - htmltext = "32784-11.html"; - break; - } - case 7: - { - htmltext = "32784-15.html"; - break; - } - case 8: - { - if (player.isSubClassActive()) + case 3: { - htmltext = "32784-18.html"; + if (!hasItem(player, ELCADIAS_MARK)) + { + htmltext = "32784-03.html"; + } + else + { + takeItem(player, ELCADIAS_MARK); + st.setMemoState(4); + st.setCond(4, true); + htmltext = "32784-04.html"; + } + break; } - else + case 4: { - addExpAndSp(player, 10000000, 1000000); - qs.exitQuest(false, true); - htmltext = "32784-16.html"; + htmltext = "32784-08.html"; + break; + } + case 5: + { + htmltext = "32784-09.html"; + break; + } + case 6: + { + htmltext = "32784-10.html"; + break; + } + case 7: + { + htmltext = "32784-14.html"; + break; + } + case 8: + { + if (player.isSubClassActive()) + { + htmltext = "32784-15.html"; + } + else + { + addExpAndSp(player, 10000000, 1000000); + st.exitQuest(false, true); + htmltext = "32784-16.html"; + } + break; } - break; } + break; } - break; - } - case HARDIN: - { - if (qs.isCond(7)) + case HARDIN: { - htmltext = "30832-01.html"; + if (st.isMemoState(7)) + { + htmltext = "30832-01.html"; + } + else if (st.isMemoState(8)) + { + htmltext = "30832-03.html"; + } + break; } - else if (qs.isCond(8)) - { - htmltext = "30832-04.html"; - } - break; } } return htmltext; diff --git a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/32593-03.html b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/32593-03.html index 027bf4e257..a631156c8f 100644 --- a/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/32593-03.html +++ b/L2J_Mobius_HighFive/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/32593-03.html @@ -1,4 +1,4 @@ Priest Wood:
OK, then go and greet Lord Franz. And remember your courtesies.
-Enter. +Enter. \ No newline at end of file