diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-00.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-00.html new file mode 100644 index 0000000000..3a4a0bf932 --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-00.html @@ -0,0 +1,15 @@ +Atelia Refinery Teleport Device:
+A device for teleporting to Atelia Refinery settled by the Blackbird Clan.
+Choose your destination.

+
Places:
+Inward of Atelia Refinery,
+Atelia Outlet,
+the area controlled by Death Pondus,
+the area controlled by Devil Varos,
+the area controlled by Demonic Weiss.
+ + + + + + \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html index 360c8e2323..f7b8b98134 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html @@ -7,7 +7,6 @@ the area controlled by Death Pondus,
the area controlled by Devil Varos,
the area controlled by Demonic Weiss.
- diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java index 5384589855..9dc62d0546 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java @@ -19,8 +19,10 @@ package ai.areas.AteliaRefinery; 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.quest.QuestState; import ai.AbstractNpcAI; +import quests.Q10890_SaviorsPathHallOfEtina.Q10890_SaviorsPathHallOfEtina; /** * @author NviX @@ -32,6 +34,7 @@ public class AteliaRefinery extends AbstractNpcAI // Teleport Locations private static final Location[] TELE_LOCATIONS = { + new Location(-251728, 178576, -8928), // Atelia Outlet new Location(-59493, 52620, -8610), // Entrance new Location(-56096, 49688, -8729), // First Area new Location(-56160, 45406, -8847), // Second Area @@ -76,30 +79,36 @@ public class AteliaRefinery extends AbstractNpcAI String htmltext = null; switch (event) { - case "entrance": + case "outlet": { player.teleToLocation(TELE_LOCATIONS[0]); htmltext = "34441-01.html"; break; } - case "first_area": + case "entrance": { player.teleToLocation(TELE_LOCATIONS[1]); htmltext = "34441-01.html"; break; } - case "second_area": + case "first_area": { player.teleToLocation(TELE_LOCATIONS[2]); htmltext = "34441-01.html"; break; } - case "third_area": + case "second_area": { player.teleToLocation(TELE_LOCATIONS[3]); htmltext = "34441-01.html"; break; } + case "third_area": + { + player.teleToLocation(TELE_LOCATIONS[4]); + htmltext = "34441-01.html"; + break; + } } return htmltext; } @@ -123,6 +132,22 @@ public class AteliaRefinery extends AbstractNpcAI return super.onKill(npc, killer, isSummon); } + @Override + public String onFirstTalk(Npc npc, PlayerInstance player) + { + String htmltext = null; + final QuestState qs = player.getQuestState(Q10890_SaviorsPathHallOfEtina.class.getSimpleName()); + if (((qs != null) && qs.isCompleted())) + { + htmltext = "34441-00.html"; + } + else + { + htmltext = "34441.html"; + } + return htmltext; + } + public static void main(String[] args) { new AteliaRefinery(); diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-0.html similarity index 74% rename from L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504.html rename to L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-0.html index 19bc2465f4..8ae787eb91 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504.html +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-0.html @@ -1,7 +1,7 @@ -Blackbird Clan Lord Leona Blackbird:
-Thank you. Without your help, we couldn't have won easily.
- - - - +Blackbird Clan Lord Leona Blackbird:
+Thank you. Without your help, we couldn't have won easily.
+ + + + \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-1.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-1.html similarity index 98% rename from L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-1.html rename to L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-1.html index be33093d6f..1b411660ba 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-1.html +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-1.html @@ -1,4 +1,4 @@ -Blackbird Clan Lord Leona Blackbird:
-On the Etis van Etina there is an attack!
-At this time it's impossible to enter the temple. +Blackbird Clan Lord Leona Blackbird:
+On the Etis van Etina there is an attack!
+At this time it's impossible to enter the temple. \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-2.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-2.html similarity index 98% rename from L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-2.html rename to L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-2.html index 897a7bfbd9..50aafd1249 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-2.html +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-2.html @@ -1,4 +1,4 @@ -Blackbird Clan Lord Leona Blackbird:
-Etis van Etina? You're too late, friend.
-A group of warriors drove him off not long ago. +Blackbird Clan Lord Leona Blackbird:
+Etis van Etina? You're too late, friend.
+A group of warriors drove him off not long ago. \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-3.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-3.html similarity index 98% rename from L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-3.html rename to L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-3.html index 88f0abe7cf..f70c4fa3e1 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-3.html +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-3.html @@ -1,4 +1,4 @@ -Blackbird Clan Lord Leona Blackbird:
-You are overcome by a voice, a voice so powerful you are helpless as it speaks:
-(The players who belong to an association can only enter through the Association Leader.) +Blackbird Clan Lord Leona Blackbird:
+You are overcome by a voice, a voice so powerful you are helpless as it speaks:
+(The players who belong to an association can only enter through the Association Leader.) \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-4.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-4.html similarity index 99% rename from L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-4.html rename to L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-4.html index 1d0fbcd926..f6d106da8f 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-4.html +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-4.html @@ -1,3 +1,3 @@ -Blackbird Clan Lord Leona Blackbird:
-(A command channel needs at least minimum: %min% and maximum: %max% members to challenge Etis van Etina.) +Blackbird Clan Lord Leona Blackbird:
+(A command channel needs at least minimum: %min% and maximum: %max% members to challenge Etis van Etina.) \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-5.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-5.html similarity index 99% rename from L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-5.html rename to L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-5.html index 7a884956bb..2771665072 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-5.html +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-5.html @@ -1,3 +1,3 @@ -Blackbird Clan Lord Leona Blackbird:
-(A command channel members level must be minimum: %minLevel% Lvl or higher to challenge Etis van Etina.) +Blackbird Clan Lord Leona Blackbird:
+(A command channel members level must be minimum: %minLevel% Lvl or higher to challenge Etis van Etina.) \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426.html new file mode 100644 index 0000000000..858d7f33f1 --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426.html @@ -0,0 +1,5 @@ +Blackbird Clan Lord Leona Blackbird:
+Thank you. Without your help, we couldn't have won easily.
+ + + \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-6.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-6.html deleted file mode 100644 index 5808299f40..0000000000 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-6.html +++ /dev/null @@ -1,3 +0,0 @@ -Blackbird Clan Lord Leona Blackbird:
-(You can't go on Etina's Instance solo right now.) - \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java index 591fee6fdf..342dc193bd 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java @@ -24,9 +24,11 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import ai.AbstractNpcAI; +import quests.Q10890_SaviorsPathHallOfEtina.Q10890_SaviorsPathHallOfEtina; /** * @author Liamxroy @@ -34,7 +36,7 @@ import ai.AbstractNpcAI; public class Leona extends AbstractNpcAI { // NPCs - private static final int LEONA = 34504; + private static final int LEONA = 34426; private static final int ETINA_RAID = 29318; // Location private static final Location ENTER_LOC = new Location(-245778, 181088, 2860); @@ -61,15 +63,15 @@ public class Leona extends AbstractNpcAI { if (status == 1) { - return "34504-1.html"; + return "34426-1.html"; } if (status == 2) { - return "34504-2.html"; + return "34426-2.html"; } if (!player.isInParty()) { - return "34504-3.html"; + return "34426-3.html"; } final Party party = player.getParty(); final boolean isInCC = party.isInCommandChannel(); @@ -77,12 +79,12 @@ public class Leona extends AbstractNpcAI final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player); if (!isPartyLeader) { - return "34504-3.html"; + return "34426-3.html"; } if ((members.size() < Config.ETINA_MIN_PLAYERS) || (members.size() > Config.ETINA_MAX_PLAYERS)) { final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId()); - packet.setHtml(getHtm(player, "34504-4.html")); + packet.setHtml(getHtm(player, "34426-4.html")); packet.replace("%min%", Integer.toString(Config.ETINA_MIN_PLAYERS)); packet.replace("%max%", Integer.toString(Config.ETINA_MAX_PLAYERS)); player.sendPacket(packet); @@ -93,7 +95,7 @@ public class Leona extends AbstractNpcAI if (member.getLevel() < Config.ETINA_MIN_PLAYER_LEVEL) { final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId()); - packet.setHtml(getHtm(player, "34504-5.html")); + packet.setHtml(getHtm(player, "34426-5.html")); packet.replace("%minlvl%", Integer.toString(Config.ETINA_MIN_PLAYER_LEVEL)); player.sendPacket(packet); return null; @@ -119,7 +121,17 @@ public class Leona extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, PlayerInstance player) { - return "34504.html"; + final QuestState qs = player.getQuestState(Q10890_SaviorsPathHallOfEtina.class.getSimpleName()); + String htmltext = null; + if (((qs != null) && qs.isCompleted())) + { + htmltext = "34426-0.html"; + } + else + { + htmltext = "34426.html"; + } + return htmltext; } public static void main(String[] args) diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/DarkElf/AteliaRefinery.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/DarkElf/AteliaRefinery.xml index 698ad6acff..35e83cb2fa 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/DarkElf/AteliaRefinery.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/DarkElf/AteliaRefinery.xml @@ -3,7 +3,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-00.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-00.html new file mode 100644 index 0000000000..3a4a0bf932 --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/34441-00.html @@ -0,0 +1,15 @@ +Atelia Refinery Teleport Device:
+A device for teleporting to Atelia Refinery settled by the Blackbird Clan.
+Choose your destination.

+
Places:
+Inward of Atelia Refinery,
+Atelia Outlet,
+the area controlled by Death Pondus,
+the area controlled by Devil Varos,
+the area controlled by Demonic Weiss.
+ + + + + + \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html index 360c8e2323..f7b8b98134 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/34441.html @@ -7,7 +7,6 @@ the area controlled by Death Pondus,
the area controlled by Devil Varos,
the area controlled by Demonic Weiss.
- diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java index 5384589855..9dc62d0546 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/AteliaRefinery.java @@ -19,8 +19,10 @@ package ai.areas.AteliaRefinery; 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.quest.QuestState; import ai.AbstractNpcAI; +import quests.Q10890_SaviorsPathHallOfEtina.Q10890_SaviorsPathHallOfEtina; /** * @author NviX @@ -32,6 +34,7 @@ public class AteliaRefinery extends AbstractNpcAI // Teleport Locations private static final Location[] TELE_LOCATIONS = { + new Location(-251728, 178576, -8928), // Atelia Outlet new Location(-59493, 52620, -8610), // Entrance new Location(-56096, 49688, -8729), // First Area new Location(-56160, 45406, -8847), // Second Area @@ -76,30 +79,36 @@ public class AteliaRefinery extends AbstractNpcAI String htmltext = null; switch (event) { - case "entrance": + case "outlet": { player.teleToLocation(TELE_LOCATIONS[0]); htmltext = "34441-01.html"; break; } - case "first_area": + case "entrance": { player.teleToLocation(TELE_LOCATIONS[1]); htmltext = "34441-01.html"; break; } - case "second_area": + case "first_area": { player.teleToLocation(TELE_LOCATIONS[2]); htmltext = "34441-01.html"; break; } - case "third_area": + case "second_area": { player.teleToLocation(TELE_LOCATIONS[3]); htmltext = "34441-01.html"; break; } + case "third_area": + { + player.teleToLocation(TELE_LOCATIONS[4]); + htmltext = "34441-01.html"; + break; + } } return htmltext; } @@ -123,6 +132,22 @@ public class AteliaRefinery extends AbstractNpcAI return super.onKill(npc, killer, isSummon); } + @Override + public String onFirstTalk(Npc npc, PlayerInstance player) + { + String htmltext = null; + final QuestState qs = player.getQuestState(Q10890_SaviorsPathHallOfEtina.class.getSimpleName()); + if (((qs != null) && qs.isCompleted())) + { + htmltext = "34441-00.html"; + } + else + { + htmltext = "34441.html"; + } + return htmltext; + } + public static void main(String[] args) { new AteliaRefinery(); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-0.html similarity index 74% rename from L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504.html rename to L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-0.html index 19bc2465f4..8ae787eb91 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504.html +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-0.html @@ -1,7 +1,7 @@ -Blackbird Clan Lord Leona Blackbird:
-Thank you. Without your help, we couldn't have won easily.
- - - - +Blackbird Clan Lord Leona Blackbird:
+Thank you. Without your help, we couldn't have won easily.
+ + + + \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-1.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-1.html similarity index 98% rename from L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-1.html rename to L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-1.html index be33093d6f..1b411660ba 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-1.html +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-1.html @@ -1,4 +1,4 @@ -Blackbird Clan Lord Leona Blackbird:
-On the Etis van Etina there is an attack!
-At this time it's impossible to enter the temple. +Blackbird Clan Lord Leona Blackbird:
+On the Etis van Etina there is an attack!
+At this time it's impossible to enter the temple. \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-2.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-2.html similarity index 98% rename from L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-2.html rename to L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-2.html index 897a7bfbd9..50aafd1249 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-2.html +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-2.html @@ -1,4 +1,4 @@ -Blackbird Clan Lord Leona Blackbird:
-Etis van Etina? You're too late, friend.
-A group of warriors drove him off not long ago. +Blackbird Clan Lord Leona Blackbird:
+Etis van Etina? You're too late, friend.
+A group of warriors drove him off not long ago. \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-3.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-3.html similarity index 98% rename from L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-3.html rename to L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-3.html index 88f0abe7cf..f70c4fa3e1 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-3.html +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-3.html @@ -1,4 +1,4 @@ -Blackbird Clan Lord Leona Blackbird:
-You are overcome by a voice, a voice so powerful you are helpless as it speaks:
-(The players who belong to an association can only enter through the Association Leader.) +Blackbird Clan Lord Leona Blackbird:
+You are overcome by a voice, a voice so powerful you are helpless as it speaks:
+(The players who belong to an association can only enter through the Association Leader.) \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-4.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-4.html similarity index 99% rename from L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-4.html rename to L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-4.html index 1d0fbcd926..f6d106da8f 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-4.html +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-4.html @@ -1,3 +1,3 @@ -Blackbird Clan Lord Leona Blackbird:
-(A command channel needs at least minimum: %min% and maximum: %max% members to challenge Etis van Etina.) +Blackbird Clan Lord Leona Blackbird:
+(A command channel needs at least minimum: %min% and maximum: %max% members to challenge Etis van Etina.) \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-5.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-5.html similarity index 99% rename from L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-5.html rename to L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-5.html index 7a884956bb..2771665072 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-5.html +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426-5.html @@ -1,3 +1,3 @@ -Blackbird Clan Lord Leona Blackbird:
-(A command channel members level must be minimum: %minLevel% Lvl or higher to challenge Etis van Etina.) +Blackbird Clan Lord Leona Blackbird:
+(A command channel members level must be minimum: %minLevel% Lvl or higher to challenge Etis van Etina.) \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426.html new file mode 100644 index 0000000000..858d7f33f1 --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34426.html @@ -0,0 +1,5 @@ +Blackbird Clan Lord Leona Blackbird:
+Thank you. Without your help, we couldn't have won easily.
+ + + \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-6.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-6.html deleted file mode 100644 index 5808299f40..0000000000 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/34504-6.html +++ /dev/null @@ -1,3 +0,0 @@ -Blackbird Clan Lord Leona Blackbird:
-(You can't go on Etina's Instance solo right now.) - \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java index 591fee6fdf..342dc193bd 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/ai/areas/AteliaRefinery/Leona/Leona.java @@ -24,9 +24,11 @@ import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.Party; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage; import ai.AbstractNpcAI; +import quests.Q10890_SaviorsPathHallOfEtina.Q10890_SaviorsPathHallOfEtina; /** * @author Liamxroy @@ -34,7 +36,7 @@ import ai.AbstractNpcAI; public class Leona extends AbstractNpcAI { // NPCs - private static final int LEONA = 34504; + private static final int LEONA = 34426; private static final int ETINA_RAID = 29318; // Location private static final Location ENTER_LOC = new Location(-245778, 181088, 2860); @@ -61,15 +63,15 @@ public class Leona extends AbstractNpcAI { if (status == 1) { - return "34504-1.html"; + return "34426-1.html"; } if (status == 2) { - return "34504-2.html"; + return "34426-2.html"; } if (!player.isInParty()) { - return "34504-3.html"; + return "34426-3.html"; } final Party party = player.getParty(); final boolean isInCC = party.isInCommandChannel(); @@ -77,12 +79,12 @@ public class Leona extends AbstractNpcAI final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player); if (!isPartyLeader) { - return "34504-3.html"; + return "34426-3.html"; } if ((members.size() < Config.ETINA_MIN_PLAYERS) || (members.size() > Config.ETINA_MAX_PLAYERS)) { final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId()); - packet.setHtml(getHtm(player, "34504-4.html")); + packet.setHtml(getHtm(player, "34426-4.html")); packet.replace("%min%", Integer.toString(Config.ETINA_MIN_PLAYERS)); packet.replace("%max%", Integer.toString(Config.ETINA_MAX_PLAYERS)); player.sendPacket(packet); @@ -93,7 +95,7 @@ public class Leona extends AbstractNpcAI if (member.getLevel() < Config.ETINA_MIN_PLAYER_LEVEL) { final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId()); - packet.setHtml(getHtm(player, "34504-5.html")); + packet.setHtml(getHtm(player, "34426-5.html")); packet.replace("%minlvl%", Integer.toString(Config.ETINA_MIN_PLAYER_LEVEL)); player.sendPacket(packet); return null; @@ -119,7 +121,17 @@ public class Leona extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, PlayerInstance player) { - return "34504.html"; + final QuestState qs = player.getQuestState(Q10890_SaviorsPathHallOfEtina.class.getSimpleName()); + String htmltext = null; + if (((qs != null) && qs.isCompleted())) + { + htmltext = "34426-0.html"; + } + else + { + htmltext = "34426.html"; + } + return htmltext; } public static void main(String[] args) diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/DarkElf/AteliaRefinery.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/DarkElf/AteliaRefinery.xml index 698ad6acff..35e83cb2fa 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/DarkElf/AteliaRefinery.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/DarkElf/AteliaRefinery.xml @@ -3,7 +3,7 @@ - + @@ -11,7 +11,7 @@ - +