From ae830f536db4e65ccbfde74ae490d0052484baf1 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 14 Nov 2019 20:02:24 +0000 Subject: [PATCH] Various start quest adjustments. Thanks to Dmitri. --- .../Q11025_PathOfDestinyProving/34505-11.html | 2 +- .../Q11025_PathOfDestinyProving.java | 3 +- .../34505-06.html | 2 +- .../Q11026_PathOfDestinyConviction.java | 1 + .../Q11032_CurseOfUndying/33178-04.html | 3 ++ .../Q11032_CurseOfUndying.java | 8 ++-- .../Q11033_AntidoteIngredients/34505-06.html | 2 +- .../Q11033_AntidoteIngredients.java | 41 ++++--------------- .../Q11034_ResurrectedOne/33177-05.html | 2 +- .../Q11034_ResurrectedOne.java | 13 +++--- .../Q11035_DeathlyMischief/33509-05.html | 2 +- .../Q11035_DeathlyMischief.java | 17 ++++---- .../Q11036_ChangedSpirits/33963-01.html | 6 +-- .../Q11036_ChangedSpirits/33963-02.html | 8 ++-- .../Q11036_ChangedSpirits/33963-03.html | 6 +++ .../Q11036_ChangedSpirits/34505-01.html | 6 +-- .../Q11036_ChangedSpirits/34505-02.html | 6 +-- .../Q11036_ChangedSpirits/34505-03.html | 6 +-- .../Q11036_ChangedSpirits/34505-04.html | 8 ++-- .../Q11036_ChangedSpirits/34505-06.html | 2 +- .../Q11036_ChangedSpirits.java | 9 ++-- .../Q11037_WhyAreTheRatelHere/33963-01.html | 8 ++-- .../Q11037_WhyAreTheRatelHere/33963-02.html | 8 ++-- .../Q11037_WhyAreTheRatelHere/33963-03.html | 9 ++-- .../Q11037_WhyAreTheRatelHere/33963-04.html | 6 +-- .../Q11037_WhyAreTheRatelHere/33963-05.html | 6 +-- .../Q11037_WhyAreTheRatelHere/33963-06.html | 4 +- .../Q11037_WhyAreTheRatelHere/33963-07.html | 5 +++ .../Q11037_WhyAreTheRatelHere.java | 3 +- .../33963-01.html | 7 ++-- .../33963-02.html | 9 ++-- .../33963-03.html | 9 ++-- .../33963-04.html | 6 +-- .../33963-05.html | 6 +-- .../33963-06.html | 4 +- .../33963-01.html | 6 +-- .../33963-02.html | 9 ++-- .../33963-03.html | 9 ++-- .../33963-04.html | 6 +-- .../33963-05.html | 8 ++-- .../33963-06.html | 4 +- .../33963-01.html | 8 ++-- .../33963-02.html | 8 ++-- .../33963-03.html | 9 ++-- .../33963-04.html | 10 +++-- .../33963-06.html | 4 +- .../34505-01.html | 5 ++- .../34505-02.html | 10 +++-- .../Q11040_AttackOfTheEnragedForest.java | 14 ++++++- .../game/data/stats/items/80600-80699.xml | 1 + 50 files changed, 193 insertions(+), 161 deletions(-) create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/33178-04.html create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-03.html create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-07.html diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/34505-11.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/34505-11.html index 266563b963..badb74e168 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/34505-11.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/34505-11.html @@ -1,3 +1,3 @@ Tarti:
-Artey cannot participate in this quest! The minimum level should be 40.
+The quest can be performed by Ertheias who completed the first liberation, and other races who completed the second profession. Character level must be 40!
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java index a06471da24..25d6e75fc4 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java @@ -54,7 +54,7 @@ public class Q11025_PathOfDestinyProving extends Quest // Location private static final Location TRAINING_GROUNDS_TELEPORT = new Location(-4983, 116607, -3344); // Misc - private static final int MIN_LEVEL = 39; + private static final int MIN_LEVEL = 40; public Q11025_PathOfDestinyProving() { @@ -64,7 +64,6 @@ public class Q11025_PathOfDestinyProving extends Quest addTalkId(TARTI, RAYMOND, TERESIA, MYSTERIOUS_MAGE); addKillId(SKELETON_ARCHER, SKELETON_WARRIOR); registerQuestItems(WIND_SPIRIT); - // addCondNotRace(Race.ERTHEIA, "34505-11.html"); addCondMinLevel(MIN_LEVEL, "34505-11.html"); setQuestNameNpcStringId(NpcStringId.LV_20_PATH_OF_DESTINY_PROVING); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/34505-06.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/34505-06.html index 5c785e213b..541f19bce6 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/34505-06.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/34505-06.html @@ -1,3 +1,3 @@ Tarti:
-The quest can be performed by Ertheias who have completed their second liberation, and other races who have completed their third profession. Character level must be 76! Requires completed quest Path of Destiny - Proving.
+The quest can be performed by arteys who have completed their second liberation, and other races who have completed their third profession. Character level must be 76! Requires completed quest Path of Destiny - Proving.
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java index f5b6427f20..3da7d66088 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java @@ -68,6 +68,7 @@ public class Q11026_PathOfDestinyConviction extends Quest addFirstTalkId(KAIN_VAN_HALTER, MYSTERIOUS_MAGE); addKillId(VAMPIRE_SOLDIER, VON_HELLMANN); registerQuestItems(WIND_SPIRIT); + addCondMinLevel(41, "33963-06.html"); addCondCompletedQuest(Q11025_PathOfDestinyProving.class.getSimpleName(), "33963-06.html"); setQuestNameNpcStringId(NpcStringId.LV_40_PATH_OF_DESTINY_CONVICTION); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/33178-04.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/33178-04.html new file mode 100644 index 0000000000..a6f807401f --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/33178-04.html @@ -0,0 +1,3 @@ +Guard Silvan:
+The quest can be performed by arteys who have completed their first liberation, and other races who have completed their first profession. Character level must be 10!
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java index ac9fbcdb70..ccad264580 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java @@ -62,6 +62,7 @@ public class Q11032_CurseOfUndying extends Quest private static final Location TRAINING_GROUNDS_TELEPORT = new Location(-19204, 138941, -3896); // Misc private static final String KILL_COUNT_VAR = "KillCount"; + private static final int MIN_LEVEL = 10; public Q11032_CurseOfUndying() { @@ -70,7 +71,8 @@ public class Q11032_CurseOfUndying extends Quest addTalkId(SILVAN, TARTI); addKillId(DISGUSTING_ZOMBIES, THE_HIDEOUS_LORD_ZOMBIE); registerQuestItems(SOE_SILVAN.getId()); - addCondCompletedQuest(Q11031_TrainingBeginsNow.class.getSimpleName(), getNoQuestMsg(null)); + addCondMinLevel(MIN_LEVEL, "33178-04.html"); + addCondCompletedQuest(Q11031_TrainingBeginsNow.class.getSimpleName(), "33178-04.html"); setQuestNameNpcStringId(NpcStringId.LV_1_20_CURSE_OF_UNDYING); } @@ -78,7 +80,7 @@ public class Q11032_CurseOfUndying extends Quest public String onAdvEvent(String event, Npc npc, PlayerInstance player) { String htmltext = null; - QuestState qs = getQuestState(player, false); + final QuestState qs = getQuestState(player, false); if (qs == null) { return htmltext; @@ -94,7 +96,7 @@ public class Q11032_CurseOfUndying extends Quest case "33178-02.html": { qs.startQuest(); - player.sendPacket(new ExTutorialShowId(23)); // Adventurers Guide + player.sendPacket(new ExTutorialShowId(5)); // Adventurers Guide htmltext = event; break; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/34505-06.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/34505-06.html index 83711526a2..b7eceb4e8a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/34505-06.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/34505-06.html @@ -1,3 +1,3 @@ Tarti:
-Artey cannot participate in this quest! The minimum level should be 20, and players who have not completed 2nd profession.
+The quest can be performed by Ertheias who completed the first liberation, and other races who completed the second profession. Character level must be 20!
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/Q11033_AntidoteIngredients.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/Q11033_AntidoteIngredients.java index 580c708b99..f9d7c126ee 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/Q11033_AntidoteIngredients.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11033_AntidoteIngredients/Q11033_AntidoteIngredients.java @@ -16,16 +16,11 @@ */ package quests.Q11033_AntidoteIngredients; -import java.util.HashSet; -import java.util.Set; - -import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.holders.ItemHolder; -import org.l2jmobius.gameserver.model.holders.NpcLogListHolder; import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; @@ -38,7 +33,7 @@ import quests.Q11034_ResurrectedOne.Q11034_ResurrectedOne; /** * Antidote Ingredients (11033) * @URL https://l2wiki.com/Antidote_Ingredients - * @author Dmitri + * @author Dmitri, Mobius */ public class Q11033_AntidoteIngredients extends Quest { @@ -48,11 +43,11 @@ public class Q11033_AntidoteIngredients extends Quest private static final int KRAKOS_BAT = 24384; private static final int A_VAMMPIRE = 24385; // Items - private static final ItemHolder SOE_SILVAN = new ItemHolder(80679, 1); + private static final int SECRET_MATERIAL = 80671; + private static final ItemHolder SOE_KALESIN = new ItemHolder(80679, 1); // Location private static final Location TRAINING_GROUNDS_TELEPORT = new Location(-44121, 115926, -3624); // Misc - private static final String KILL_COUNT_VAR = "KillCount"; private static final int MIN_LEVEL = 20; public Q11033_AntidoteIngredients() @@ -61,8 +56,7 @@ public class Q11033_AntidoteIngredients extends Quest addStartNpc(TARTI); addTalkId(TARTI, KALESIN); addKillId(KRAKOS_BAT, A_VAMMPIRE); - registerQuestItems(SOE_SILVAN.getId()); - // addCondNotRace(Race.ERTHEIA, "34505-06.html"); + registerQuestItems(SOE_KALESIN.getId(), SECRET_MATERIAL); addCondMinLevel(MIN_LEVEL, "34505-06.html"); setQuestNameNpcStringId(NpcStringId.LV_20_40_ANTIDOTE_INGREDIENTS); } @@ -181,34 +175,13 @@ public class Q11033_AntidoteIngredients extends Quest final QuestState qs = getQuestState(killer, false); if ((qs != null) && qs.isCond(1)) { - final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; - if (killCount < 15) - { - qs.set(KILL_COUNT_VAR, killCount); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); - sendNpcLogList(killer); - } - else + if (giveItemRandomly(killer, SECRET_MATERIAL, 1, 15, 0.5, true)) { qs.setCond(2, true); - qs.unset(KILL_COUNT_VAR); - giveItems(killer, SOE_SILVAN); - showOnScreenMsg(killer, NpcStringId.USE_SCROLL_OF_ESCAPE_KALLESIN_IN_YOUR_INVENTORY_NTALK_TO_KALLESIN_TO_COMPLETE_THE_QUEST, ExShowScreenMessage.TOP_CENTER, 10000); + giveItems(killer, SOE_KALESIN); + showOnScreenMsg(killer, NpcStringId.USE_SCROLL_OF_ESCAPE_PIO_IN_YOUR_INVENTORY_NTALK_TO_PIO_TO_COMPLETE_THE_QUEST, ExShowScreenMessage.TOP_CENTER, 10000); } } return super.onKill(npc, killer, isSummon); } - - @Override - public Set getNpcLogList(PlayerInstance player) - { - final QuestState qs = getQuestState(player, false); - if ((qs != null) && qs.isCond(1)) - { - final Set holder = new HashSet<>(); - holder.add(new NpcLogListHolder(NpcStringId.RUINS_OF_AGONY_BEND_LV_19.getId(), true, qs.getInt(KILL_COUNT_VAR))); - return holder; - } - return super.getNpcLogList(player); - } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/33177-05.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/33177-05.html index 10b290c068..c22cc1ac71 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/33177-05.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/33177-05.html @@ -1,3 +1,3 @@ Tarti:
-Artey cannot participate in this quest! The minimum level should be 27.
+The quest can be performed by arteys who completed the first liberation, and other races who completed the second profession. Character level must be 27!
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/Q11034_ResurrectedOne.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/Q11034_ResurrectedOne.java index 866764e17e..2473ee48b3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/Q11034_ResurrectedOne.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11034_ResurrectedOne/Q11034_ResurrectedOne.java @@ -44,12 +44,12 @@ public class Q11034_ResurrectedOne extends Quest { // NPCs private static final int KALESIN = 33177; - private static final int JENA = 33509; + private static final int ZENATH = 33509; private static final int SKELETON_SCOUT = 24386; private static final int SKELETON_ARCHER = 24387; private static final int SKELETON_WARRIOR = 24388; // Items - private static final ItemHolder SOE_SILVAN = new ItemHolder(80680, 1); + private static final ItemHolder SOE_ZENATH = new ItemHolder(80680, 1); // Location private static final Location TRAINING_GROUNDS_TELEPORT = new Location(-46169, 110937, -3808); // Misc @@ -60,10 +60,9 @@ public class Q11034_ResurrectedOne extends Quest { super(11034); addStartNpc(KALESIN); - addTalkId(KALESIN, JENA); + addTalkId(KALESIN, ZENATH); addKillId(SKELETON_SCOUT, SKELETON_ARCHER, SKELETON_WARRIOR); - registerQuestItems(SOE_SILVAN.getId()); - // addCondNotRace(Race.ERTHEIA, "33177-05.html"); + registerQuestItems(SOE_ZENATH.getId()); addCondMinLevel(MIN_LEVEL, "33177-05.html"); setQuestNameNpcStringId(NpcStringId.LV_20_40_THE_RESURRECTED_ONE); } @@ -150,7 +149,7 @@ public class Q11034_ResurrectedOne extends Quest } break; } - case JENA: + case ZENATH: { if (qs.isCond(2)) { @@ -187,7 +186,7 @@ public class Q11034_ResurrectedOne extends Quest { qs.setCond(2, true); qs.unset(KILL_COUNT_VAR); - giveItems(killer, SOE_SILVAN); + giveItems(killer, SOE_ZENATH); showOnScreenMsg(killer, NpcStringId.USE_SCROLL_OF_ESCAPE_ZENATH_IN_YOUR_INVENTORY_NTALK_TO_ZENATH_TO_COMPLETE_THE_QUEST, ExShowScreenMessage.TOP_CENTER, 10000); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/33509-05.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/33509-05.html index 62b0d207a6..5a60b1455c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/33509-05.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/33509-05.html @@ -1,3 +1,3 @@ Tarti:
-Artey cannot participate in this quest! The minimum level should be 33.
+The quest can be performed by arteys who completed the first liberation, and other races who completed the second profession. Character level must be 33!
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/Q11035_DeathlyMischief.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/Q11035_DeathlyMischief.java index 0a1e2e64d5..4a2ed17734 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/Q11035_DeathlyMischief.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11035_DeathlyMischief/Q11035_DeathlyMischief.java @@ -38,13 +38,13 @@ import quests.Q11025_PathOfDestinyProving.Q11025_PathOfDestinyProving; public class Q11035_DeathlyMischief extends Quest { // NPCs - private static final int JENA = 33509; + private static final int ZENATH = 33509; private static final int TARTI = 34505; private static final int PHANTOM_SKELETON_SOLDIER = 24389; private static final int SKELETON_BERSERKER = 24390; // Items private static final int BREATH_OF_DEATH = 80672; - private static final ItemHolder SOE_SILVAN = new ItemHolder(80677, 1); + private static final ItemHolder SOE_TARTI = new ItemHolder(80677, 1); // Location private static final Location TRAINING_GROUNDS_TELEPORT = new Location(-51130, 110053, -3664); // Misc @@ -53,11 +53,10 @@ public class Q11035_DeathlyMischief extends Quest public Q11035_DeathlyMischief() { super(11035); - addStartNpc(JENA); - addTalkId(JENA, TARTI); + addStartNpc(ZENATH); + addTalkId(ZENATH, TARTI); addKillId(PHANTOM_SKELETON_SOLDIER, SKELETON_BERSERKER); - registerQuestItems(SOE_SILVAN.getId(), BREATH_OF_DEATH); - // addCondNotRace(Race.ERTHEIA, "33509-05.html"); + registerQuestItems(SOE_TARTI.getId(), BREATH_OF_DEATH); addCondMinLevel(MIN_LEVEL, "33509-05.html"); setQuestNameNpcStringId(NpcStringId.LV_20_40_DEATHLY_MISCHIEF); } @@ -128,7 +127,7 @@ public class Q11035_DeathlyMischief extends Quest { case State.CREATED: { - if (npc.getId() == JENA) + if (npc.getId() == ZENATH) { htmltext = "33509-01.html"; } @@ -138,7 +137,7 @@ public class Q11035_DeathlyMischief extends Quest { switch (npc.getId()) { - case JENA: + case ZENATH: { if (qs.isCond(1)) { @@ -175,7 +174,7 @@ public class Q11035_DeathlyMischief extends Quest if (giveItemRandomly(killer, BREATH_OF_DEATH, 1, 15, 0.5, true)) { qs.setCond(2, true); - giveItems(killer, SOE_SILVAN); + giveItems(killer, SOE_TARTI); showOnScreenMsg(killer, NpcStringId.USE_SCROLL_OF_ESCAPE_TARTI_IN_YOUR_INVENTORY_NTALK_TO_TARTI_TO_COMPLETE_THE_QUEST, ExShowScreenMessage.TOP_CENTER, 10000); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-01.html index a5a7bbcde4..64eaa0491d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-01.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-01.html @@ -1,4 +1,4 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Did you kill all transformed spirits?
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-02.html index a43339cd33..631524f935 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-02.html @@ -1,5 +1,5 @@ -Guard Kallesin:
-So, that's you they've sent from Gludio? I use this material to deal with the curse. Thank you!
-It will be hard to pull this one off, so if you excuse me...
- +Researcher Pio:
+Thank you! Spirits are transforming too fast. I'm afraid we are in danger. Thanks for your help.
+By the way, are you busy now? Could you help me once again?
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-03.html new file mode 100644 index 0000000000..91ab802e26 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/33963-03.html @@ -0,0 +1,6 @@ +Researcher Pio:
+Since Faeron has appeared in the Material Realm, energy of the Wind Spirit Realm is influencing on the Windy Hill markedly.
+We could handle the situation before, but now all is changing too fast.
+We are trying to sort out the situation, but we have not enough time.
+ + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-01.html index 6b0ad6cb92..4520b43a77 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-01.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-01.html @@ -1,5 +1,5 @@ Tarti:
-Do you remember what you've heard about the immortality curse in the Ruins of Despair? I've learned about a... let's say, an antidote that might have something to do with this curse.
-There is a place you can go to investigate it. It's not far from here.
- +Have you ever heard of a place called the Windy Hill?.
+People say that it's changed quite a bit since Faeron appeared...
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-02.html index a81707c410..fd85b0966e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-02.html @@ -1,5 +1,5 @@ Tarti:
-The place is called Ruins of Agony. It's somewhat similar to the Ruins of Despair though there are quite a few differences.
-The immortality curse is pretty common in that region. That's why I think that you should start there if you want to learn about its origins.
-
+You don't know any news, do you? Lately the spirits on the Windy Hill have somehow changed.
+It is possible that the reason lies in Queen Navari's overindulgence in the Wind Spirit Realm's power. There is nothing we can do about it but we can check if my hunch is right.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-03.html index e265cbfaee..9a201f7af3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-03.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-03.html @@ -1,5 +1,5 @@ Tarti:
-To be honest, I'm not quite sure mysself what you need to look for. What I am sure is that this adventure will benefit you greatly. Consider it training.
-On you go! Oh!.. You know about skill training, right?
- +Hm... Yes, you should take a good look at the Windy Hill spirits.
+There are some researchers who examine the influence of the Wind Spirit Realm. According to their findings, the spirits there are quite dangerous.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-04.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-04.html index 660e34ee85..677072f027 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-04.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-04.html @@ -1,7 +1,7 @@ Tarti:
-In the Ruins of Agony you will find Carcass Bats and Vampires.
-I think Vampires might have something to do with the curse. I've heard that you can gain a Secret Material if you defeat Carcass Bats and Vampires.
-Find the Secret Material and give it to Guard Kallesin.
-I don't want you to get lost on your way to the ruins so I'll send you right there.
+The Windy Hill has been the domain of spirits called the Sobbing Wind, the Whispering Wind and the Giggling Wind. They, however, have changed quite drastically lately.
+If instead of them you find creatures called Sobbing Windra, Whispering Windra and Giggling Windra destroy them without second thought.
+After you're done report to Researcher Pio.
+I Will teleport you right to the Windy Hill.

\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-06.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-06.html index 83711526a2..732bc0b3ae 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-06.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/34505-06.html @@ -1,3 +1,3 @@ Tarti:
-Artey cannot participate in this quest! The minimum level should be 20, and players who have not completed 2nd profession.
+The quest can be performed by arteys who have completed their second liberation, and other races who have completed their third profession. Character level must be 40!
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/Q11036_ChangedSpirits.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/Q11036_ChangedSpirits.java index 817b565ac0..f76f69ee72 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/Q11036_ChangedSpirits.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11036_ChangedSpirits/Q11036_ChangedSpirits.java @@ -49,7 +49,7 @@ public class Q11036_ChangedSpirits extends Quest private static final int WHISPERING_BREEZE = 24392; private static final int LAUGHING_BREEZE = 24393; // Items - private static final ItemHolder SOE_SILVAN = new ItemHolder(80681, 1); + private static final ItemHolder SOE_PIO = new ItemHolder(80681, 1); // Location private static final Location TRAINING_GROUNDS_TELEPORT = new Location(-74631, 94630, -3736); // Misc @@ -62,7 +62,7 @@ public class Q11036_ChangedSpirits extends Quest addStartNpc(TARTI); addTalkId(TARTI, PIO); addKillId(SOBBING_BREEZE, WHISPERING_BREEZE, LAUGHING_BREEZE); - registerQuestItems(SOE_SILVAN.getId()); + registerQuestItems(SOE_PIO.getId()); addCondMinLevel(MIN_LEVEL, "34505-06.html"); addCondCompletedQuest(Q11025_PathOfDestinyProving.class.getSimpleName(), "34505-06.html"); setQuestNameNpcStringId(NpcStringId.LV_40_76_CHANGED_SPIRITS); @@ -82,6 +82,7 @@ public class Q11036_ChangedSpirits extends Quest { case "34505-02.html": case "34505-04.html": + case "33963-02.html": { htmltext = event; break; @@ -100,7 +101,7 @@ public class Q11036_ChangedSpirits extends Quest } break; } - case "33963-02.html": + case "33963-03.html": { if (qs.isCond(2)) { @@ -186,7 +187,7 @@ public class Q11036_ChangedSpirits extends Quest { qs.setCond(2, true); qs.unset(KILL_COUNT_VAR); - giveItems(killer, SOE_SILVAN); + giveItems(killer, SOE_PIO); showOnScreenMsg(killer, NpcStringId.USE_SCROLL_OF_ESCAPE_PIO_IN_YOUR_INVENTORY_NTALK_TO_PIO_TO_COMPLETE_THE_QUEST, ExShowScreenMessage.TOP_CENTER, 10000); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-01.html index 9ec49b9f9b..91ab802e26 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-01.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-01.html @@ -1,4 +1,6 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Since Faeron has appeared in the Material Realm, energy of the Wind Spirit Realm is influencing on the Windy Hill markedly.
+We could handle the situation before, but now all is changing too fast.
+We are trying to sort out the situation, but we have not enough time.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-02.html index d3aa9ba666..5e86c0e182 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-02.html @@ -1,5 +1,5 @@ -Guard Kallesin:
-So, that's you they've sent from Gludio? I use this material to deal with the curse. Thank you!
-It will be hard to pull this one off, so if you excuse me...
- +Researcher Pio:
+The creatures don't belong to the Material Realm, they are living in the Wind Spirit Realm. When Faeron had appeared, several Ratel were transfered to the Material Realm. Now they are wandering everywhere, and not long ago have started to attack people.
+We've planned so many researches, so it's hard for me to manage everything. Also since Ratel have become dangerously aggressive, researchers can't get near to them.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-03.html index 18b49c31d3..059e86d1da 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-03.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-03.html @@ -1,4 +1,7 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+This isn't going to end in anything good, if there are too many Ratel.
+To prevent the grim future you have to kill Fear Ratel and Fear Ratel Robust.
+I suppose you don't know where to find the creatures, so I'll teleport you to them.
+When your mission is done, come back to me.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-04.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-04.html index 0fcbced5ec..dc86047a41 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-04.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-04.html @@ -1,4 +1,4 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Have you dealt with Ratel?
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-05.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-05.html index 6390067280..226cfd6864 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-05.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-05.html @@ -1,4 +1,4 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Thank you. But I'm afraid Ratel are not the biggest problem.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-06.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-06.html index 83711526a2..6bb7690765 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-06.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-06.html @@ -1,3 +1,3 @@ -Tarti:
-Artey cannot participate in this quest! The minimum level should be 20, and players who have not completed 2nd profession.
+Researcher Pio:
+The quest can be performed by arteys who have completed their second liberation, and other races who have completed their third profession. Character level must be 45!
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-07.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-07.html new file mode 100644 index 0000000000..791e28ced3 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/33963-07.html @@ -0,0 +1,5 @@ +Researcher Pio:
+Growlers! There are too many of them.
+If we do nothing, Ratel would seem a child's play in comparison with growlers. We have to hurry up while we can deal with them.
+ + \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/Q11037_WhyAreTheRatelHere.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/Q11037_WhyAreTheRatelHere.java index 065fb726a0..cf7adc3500 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/Q11037_WhyAreTheRatelHere.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11037_WhyAreTheRatelHere/Q11037_WhyAreTheRatelHere.java @@ -79,6 +79,7 @@ public class Q11037_WhyAreTheRatelHere extends Quest switch (event) { case "33963-03.html": + case "33963-05.html": { htmltext = event; break; @@ -97,7 +98,7 @@ public class Q11037_WhyAreTheRatelHere extends Quest } break; } - case "33963-05.html": + case "33963-07.html": { if (qs.isCond(2)) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-01.html index 6390067280..791e28ced3 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-01.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-01.html @@ -1,4 +1,5 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Growlers! There are too many of them.
+If we do nothing, Ratel would seem a child's play in comparison with growlers. We have to hurry up while we can deal with them.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-02.html index d376b6d337..9af3706457 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-02.html @@ -1,5 +1,6 @@ -Guard Kallesin:
-So, that's you they've sent from Gludio? I use this material to deal with the curse. Thank you!
-It will be hard to pull this one off, so if you excuse me...
- +Researcher Pio:
+I think growlers have become more aggressive for some reason.
+No doubt. We have to find out why they have become so furious...
+Will you help me?
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-03.html index 24c64adec4..13a0a97cd8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-03.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-03.html @@ -1,4 +1,7 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+I assume Corrupted Energy is influencing on growlers.
+I've kept watch over them and almost sure I'm right.
+We need to study Corrupted Energy. That's why you have to kill Fear Growler, Fear Growler Evolved and Fear Growler Robust, gather the energy and bring it to me.
+I suppose you don't know where to find the creatures, so I'll teleport you to them.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-04.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-04.html index 4fbd3d69d7..0c8b30831c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-04.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-04.html @@ -1,4 +1,4 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Do you have the Corrupted Energy??
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-05.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-05.html index e2f7f2dbb7..af28e72969 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-05.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-05.html @@ -1,4 +1,4 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Thank you! But there is one more trouble.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-06.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-06.html index 83711526a2..b251429adb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-06.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11038_GrowlersTurnedViolent/33963-06.html @@ -1,3 +1,3 @@ -Tarti:
-Artey cannot participate in this quest! The minimum level should be 20, and players who have not completed 2nd profession.
+Researcher Pio:
+The quest can be performed by arteys who have completed their second liberation, and other races who have completed their third profession.
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-01.html index e2f7f2dbb7..af28e72969 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-01.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-01.html @@ -1,4 +1,4 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Thank you! But there is one more trouble.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-02.html index 167404d2dc..9e069c36bb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-02.html @@ -1,5 +1,6 @@ -Guard Kallesin:
-So, that's you they've sent from Gludio? I use this material to deal with the curse. Thank you!
-It will be hard to pull this one off, so if you excuse me...
- +Researcher Pio:
+Spirits always have been very different from us. But now they are too rampageous.
+Before now we could talk to each other!
+But not long ago they stopped speaking with us.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-03.html index 078b39afb8..176d53bf41 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-03.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-03.html @@ -1,4 +1,7 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Hurt? Well... Maybe you are right. But make hurt all of them at the same time?
+I've got an idea!
+Someone wants to make spirits suffer. So we have to find out what is hurting them.
+I will teleport you right to the spirits. Defeat Fussy Leaf and Fussy Arbor and find something to prove our theory.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-04.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-04.html index 2d1032755b..9423ca4c21 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-04.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-04.html @@ -1,4 +1,4 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Any good news?
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-05.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-05.html index 2fa3cbf898..c8e92242fc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-05.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-05.html @@ -1,4 +1,6 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Oh my... Did you find it in spirits' bodies?
+Thank you! I think spirits will be thankful too.
+We should consider what we can do.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-06.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-06.html index 83711526a2..b251429adb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-06.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11039_CommunicationBreakdown/33963-06.html @@ -1,3 +1,3 @@ -Tarti:
-Artey cannot participate in this quest! The minimum level should be 20, and players who have not completed 2nd profession.
+Researcher Pio:
+The quest can be performed by arteys who have completed their second liberation, and other races who have completed their third profession.
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-01.html index 2fa3cbf898..c8e92242fc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-01.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-01.html @@ -1,4 +1,6 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Oh my... Did you find it in spirits' bodies?
+Thank you! I think spirits will be thankful too.
+We should consider what we can do.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-02.html index 3acb7c5486..50cd387b30 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-02.html @@ -1,5 +1,5 @@ -Guard Kallesin:
-So, that's you they've sent from Gludio? I use this material to deal with the curse. Thank you!
-It will be hard to pull this one off, so if you excuse me...
- +Researcher Pio:
+Because of spirits' transformation the forest itself has become furious.
+I've never seen the forest in such state.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-03.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-03.html index b25f1ef956..55b77f17c0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-03.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-03.html @@ -1,4 +1,7 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Have you seen Tiny Windima and Giant Windima?
+They are forest spirits born by anger of the forest.
+I never saw so many Windima.
+I have to stay here to complete my researches, But I don't know how we can deal with Windima
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-04.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-04.html index e1b638b716..c5d49035e0 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-04.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-04.html @@ -1,4 +1,8 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Researcher Pio:
+Really? I can feel anger of the forest even here.
+We've done everything to calm the forest but all for nothing.
+If we don't make a move, its anger can damage the town. We can't let it be.
+We have to defeat mad and vicious Tiny Windima and Giant Windima.
+I will teleport you right to them.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-06.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-06.html index 83711526a2..b251429adb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-06.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/33963-06.html @@ -1,3 +1,3 @@ -Tarti:
-Artey cannot participate in this quest! The minimum level should be 20, and players who have not completed 2nd profession.
+Researcher Pio:
+The quest can be performed by arteys who have completed their second liberation, and other races who have completed their third profession.
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/34505-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/34505-01.html index 7ccf278b26..56eb6b0b3b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/34505-01.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/34505-01.html @@ -1,4 +1,5 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
+Tarti:
+It's terrible that we can't quell the anger of the forest.
+Have you defeated the Tiny Windima and Giant Windima?
\ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/34505-02.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/34505-02.html index 7ccf278b26..d68325a1bc 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/34505-02.html +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/34505-02.html @@ -1,4 +1,8 @@ -Guard Kallesin:
-So, what brings you to me? Ah, is it about the Secret Material?
- +Tarti:
+We must calm the enraged forest as soon as possible and restore peace.
+So... It's time for the third class change.
+I never doubted that you would grow stronger each day, but this is truly impressive...
+Everything's happening so fast that I haven't even finished my research on the Wind Spirit Realm's Relic.
+I met with Navari in Faeron, talked to High Priest Gereth, discussed some things with Karly and have only recently returned.
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/Q11040_AttackOfTheEnragedForest.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/Q11040_AttackOfTheEnragedForest.java index 66ef3b26ea..771168ce46 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/Q11040_AttackOfTheEnragedForest.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q11040_AttackOfTheEnragedForest/Q11040_AttackOfTheEnragedForest.java @@ -20,6 +20,7 @@ import java.util.HashSet; import java.util.Set; import org.l2jmobius.gameserver.enums.QuestSound; +import org.l2jmobius.gameserver.instancemanager.QuestManager; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -31,12 +32,13 @@ import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q11026_PathOfDestinyConviction.Q11026_PathOfDestinyConviction; import quests.Q11039_CommunicationBreakdown.Q11039_CommunicationBreakdown; /** * Attack of the Enraged Forest (11040) * @URL https://l2wiki.com/Attack_of_the_Enraged_Forest - * @author Dmitri + * @author Dmitri, Mobius */ public class Q11040_AttackOfTheEnragedForest extends Quest { @@ -51,6 +53,7 @@ public class Q11040_AttackOfTheEnragedForest extends Quest private static final Location TRAINING_GROUNDS_TELEPORT = new Location(-91374, 92270, -3360); // Misc private static final String KILL_COUNT_VAR = "KillCount"; + private static final int MIN_LEVEL = 66; public Q11040_AttackOfTheEnragedForest() { @@ -59,6 +62,7 @@ public class Q11040_AttackOfTheEnragedForest extends Quest addTalkId(PIO, TARTI); addKillId(TINY_WHIRLWIND, GIANT_WHIRLWIND); registerQuestItems(SOE_TARTI.getId()); + addCondMinLevel(MIN_LEVEL, "33963-06.html"); addCondCompletedQuest(Q11039_CommunicationBreakdown.class.getSimpleName(), "33963-06"); setQuestNameNpcStringId(NpcStringId.LV_40_76_ATTACK_OF_THE_ENRAGED_FOREST); } @@ -76,6 +80,7 @@ public class Q11040_AttackOfTheEnragedForest extends Quest switch (event) { case "33963-03.html": + case "33963-04.html": case "33963-05.html": { htmltext = event; @@ -103,6 +108,13 @@ public class Q11040_AttackOfTheEnragedForest extends Quest giveAdena(player, 240000, true); qs.exitQuest(false, true); htmltext = event; + + // Initialize next quest. + final Quest nextQuest = QuestManager.getInstance().getQuest(Q11026_PathOfDestinyConviction.class.getSimpleName()); + if (nextQuest != null) + { + nextQuest.newQuestState(player); + } } break; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/80600-80699.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/80600-80699.xml index 0d5f943ac9..1369d6766b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/80600-80699.xml +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/80600-80699.xml @@ -711,6 +711,7 @@ +