diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/html/default/34523.htm b/L2J_Mobius_8.0_Homunculus/dist/game/data/html/default/34523.htm new file mode 100644 index 0000000000..8c07f08fc9 --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/html/default/34523.htm @@ -0,0 +1,4 @@ +Evan Graham:
+I'm sure that somebody is going to talk to me... Very soon, i can feel it... Well, here you are!
+ + \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-02.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-02.html index 3dd50d0759..83e0fd30d9 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-02.html +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-02.html @@ -1,4 +1,5 @@ Harp Zu Hestui:
-You'll be able to grow in the Blazing Swamp. Please defeat the monsters there.
- +Kill monsters and grow stronger. That's your task.
+Tell me, are you ready?
+ \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-03.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-03.html index 7270ffafe0..40ec10cd9d 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-03.html +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-03.html @@ -1,5 +1,6 @@ Harp Zu Hestui:
-You mission is to defeat the monsters in the Blazing Swamp. Defeat the Magma Allith, Lava Wyrm, Lava Drake, Lava Wendigo, Lava Stone Golem, Lava Leviah, Magma Salamander, Magma Dre Vanul, Flame Preta, Flame Crow, Flame Rael, Flame Salamander, Flame Drake, Flame Votis. And collect 1000 Hot Energy..
-And you must also reach level 100.
-Once you complete the mission, you can return to Dual Class Master Joachim! +Listen closely then. Go to the Blazing Swamp, kill local monsters and collect 1000 pieces of Hot Energy from their corpses. +Or you can do the same at the War-Torn Plains, if you want.
+You will also need to reach Lv. 100.
+When you're done, go to Dual Class Master Joachim. Use the Teleportation cubic to return to him. \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04.htm b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04.htm index 5ce4b15dd1..bd7d8471ee 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04.htm +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04.htm @@ -1,6 +1,7 @@ Dual Class Master Joachim:
-Please carry out the following mission to prove that you are qualified to become a noble one.
-Go to Blazing Swamp to train and hunt, and complete the mission from Harp Zu Hestul.
-I'll send you there once you are ready.
- +Oh, you are back. Let me give you the buff first.
+Choose a place where you are going to take missions and i will send you there. If you change you mind, use the Teleportation cubic to return to me.
+So, choose the place.
+ + \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04b.htm b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04b.htm new file mode 100644 index 0000000000..98b3e9ee26 --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04b.htm @@ -0,0 +1,7 @@ +Dual Class Master Joachim:
+Oh, you are back. Let me give you the buff first.
+Choose a place where you are going to take missions and i will send you there. If you change you mind, use the Teleportation cubic to return to me.
+So, choose the place.
+ + + \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-01.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-01.html new file mode 100644 index 0000000000..7da48d730d --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-01.html @@ -0,0 +1,5 @@ +Evan Graham:
+I was waiting for you. I think you are the one who can help me.
+Am i right?
+ + \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-02.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-02.html new file mode 100644 index 0000000000..64bd7b9277 --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-02.html @@ -0,0 +1,5 @@ +Evan Graham:
+I knew it. I've asked to send me brave warriors who are ready to defeat monsters that suddenly appeared in the place not far away. Only high experienced and skilled warriors are able to deal with them. I look at you and see a really strong hero who surely can help me.
+You are going to defeat the monsters in no time.
+ + \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-03.html b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-03.html new file mode 100644 index 0000000000..ffc39db0fe --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-03.html @@ -0,0 +1,7 @@ +Evan Graham:
+Simple. You have to kill monsters on the War-Torn Plains. They drop Hot Energy, so +bring me 1000 of them as proof of your victory. You can also get the items from monsters of the Blasing Swamp.
+During this quest you have to reach Lv. 100.
+When you're done, go to Dual Class Master Joachim.
+Use the Teleportation cubic to return to him. + \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java index 56ccc2077b..287680e912 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java @@ -1,22 +1,25 @@ /* * This file is part of the L2J Mobius project. - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ package quests.Q10591_NobleMaterial; import org.l2jmobius.Config; +import org.l2jmobius.gameserver.data.xml.CategoryData; +import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -33,14 +36,14 @@ import quests.Q10590_ReawakenedFate.Q10590_ReawakenedFate; /** * Noble Material (10591) - * @URL https://www.youtube.com/watch?v=HCd784Gnguw - * @author NightBR, Mobius + * @author NightBR, Mobius, NasSeKa */ public class Q10591_NobleMaterial extends Quest { // NPCs private static final int JOACHIM = 34513; private static final int HARP_ZU_HESTUI = 34014; + private static final int EVAN_GRAHAM = 34523; private static final int HERPA = 34362; private static final int LIONEL_HUNTER = 33907; private static final int[] MONSTERS = @@ -59,6 +62,8 @@ public class Q10591_NobleMaterial extends Quest 23502, // Flame Salamander 23503, // Flame Drake 23504, // Flame Votis + 24585, // Vanor Silenos Mercenary + 24586, // Vanor Silenos Guardian }; // Item private static final int FLAME_ENERGY = 80856; // Flame Energy - monster drop @@ -74,13 +79,14 @@ public class Q10591_NobleMaterial extends Quest private static final int MIN_LEVEL = 100; // Location private static final Location BURNING_MARSH = new Location(152754, -15142, -4400); + private static final Location WAR_PLAINS = new Location(159620, 21075, -3688); private static final Location HEIN = new Location(111257, 221071, -3550); public Q10591_NobleMaterial() { super(10591); addStartNpc(JOACHIM); - addTalkId(JOACHIM, HARP_ZU_HESTUI, HERPA, LIONEL_HUNTER); + addTalkId(JOACHIM, HARP_ZU_HESTUI, EVAN_GRAHAM, HERPA, LIONEL_HUNTER); addKillId(MONSTERS); registerQuestItems(FLAME_ENERGY); addCondMinLevel(99, "34513-16.html"); @@ -103,6 +109,7 @@ public class Q10591_NobleMaterial extends Quest case "34513-07.html": case "34513-04.htm": case "34014-03.html": + case "34523-03.html": case "34362-03.html": case "33907-03.html": { @@ -115,7 +122,15 @@ public class Q10591_NobleMaterial extends Quest htmltext = event; break; } - case "teleport": + case "teleportWP": + { + if (qs.isCond(1)) + { + player.teleToLocation(WAR_PLAINS); + } + break; + } + case "teleportBS": { if (qs.isCond(1)) { @@ -129,6 +144,12 @@ public class Q10591_NobleMaterial extends Quest htmltext = event; break; } + case "34523-02.html": + { + qs.setCond(2, true); + htmltext = event; + break; + } case "34513-06.html": { qs.setCond(4, true); @@ -213,6 +234,7 @@ public class Q10591_NobleMaterial extends Quest @Override public String onTalk(Npc npc, PlayerInstance player) { + final ClassId classId = player.getBaseTemplate().getClassId(); final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); switch (qs.getState()) @@ -238,7 +260,14 @@ public class Q10591_NobleMaterial extends Quest if (qs.isCond(1)) { - htmltext = "34513-04.htm"; + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, classId.getId()) || CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, classId.getId()) || CategoryData.getInstance().isInCategory(CategoryType.SIXTH_WYNN_GROUP, classId.getId())) + { + htmltext = "34513-04b.htm"; + } + else + { + htmltext = "34513-04.htm"; + } } else if (qs.isCond(2)) { @@ -266,6 +295,18 @@ public class Q10591_NobleMaterial extends Quest } break; } + case EVAN_GRAHAM: + { + if (qs.isCond(1)) + { + htmltext = "34523-01.html"; + } + else if (qs.isCond(2)) + { + htmltext = "34523-03.html"; + } + break; + } case HERPA: { if (qs.isCond(4)) diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Aden/WarTornPlains.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Aden/WarTornPlains.xml new file mode 100644 index 0000000000..86f1f1b024 --- /dev/null +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Aden/WarTornPlains.xml @@ -0,0 +1,389 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/old/24_18.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/old/24_18.xml deleted file mode 100644 index 16c090eaf2..0000000000 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/old/24_18.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80800-80899.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80800-80899.xml index 5d5d998113..a65155c069 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80800-80899.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80800-80899.xml @@ -734,6 +734,7 @@ + diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/npcs/24500-24599.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/npcs/24500-24599.xml index 4c56372022..4a785afcb5 100644 --- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/npcs/24500-24599.xml +++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/npcs/24500-24599.xml @@ -3675,119 +3675,74 @@ - - - ETC + + HUMANOID FEMALE + - + + + + + + + - - + + - - - + + + + + + + + + + + + - - - ETC + + HUMANOID FEMALE + - + + + + + + + - - + + - - - - - - - - - - - - BEAST - MALE - - - - - - - - - - - - - - - - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - @@ -3891,6 +3846,7 @@ HUMANOID MALE + diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/html/default/34523.htm b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/html/default/34523.htm new file mode 100644 index 0000000000..8c07f08fc9 --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/html/default/34523.htm @@ -0,0 +1,4 @@ +Evan Graham:
+I'm sure that somebody is going to talk to me... Very soon, i can feel it... Well, here you are!
+ + \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-02.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-02.html index 3dd50d0759..83e0fd30d9 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-02.html +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-02.html @@ -1,4 +1,5 @@ Harp Zu Hestui:
-You'll be able to grow in the Blazing Swamp. Please defeat the monsters there.
- +Kill monsters and grow stronger. That's your task.
+Tell me, are you ready?
+ \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-03.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-03.html index 7270ffafe0..40ec10cd9d 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-03.html +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34014-03.html @@ -1,5 +1,6 @@ Harp Zu Hestui:
-You mission is to defeat the monsters in the Blazing Swamp. Defeat the Magma Allith, Lava Wyrm, Lava Drake, Lava Wendigo, Lava Stone Golem, Lava Leviah, Magma Salamander, Magma Dre Vanul, Flame Preta, Flame Crow, Flame Rael, Flame Salamander, Flame Drake, Flame Votis. And collect 1000 Hot Energy..
-And you must also reach level 100.
-Once you complete the mission, you can return to Dual Class Master Joachim! +Listen closely then. Go to the Blazing Swamp, kill local monsters and collect 1000 pieces of Hot Energy from their corpses. +Or you can do the same at the War-Torn Plains, if you want.
+You will also need to reach Lv. 100.
+When you're done, go to Dual Class Master Joachim. Use the Teleportation cubic to return to him. \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04.htm b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04.htm index 5ce4b15dd1..bd7d8471ee 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04.htm +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04.htm @@ -1,6 +1,7 @@ Dual Class Master Joachim:
-Please carry out the following mission to prove that you are qualified to become a noble one.
-Go to Blazing Swamp to train and hunt, and complete the mission from Harp Zu Hestul.
-I'll send you there once you are ready.
- +Oh, you are back. Let me give you the buff first.
+Choose a place where you are going to take missions and i will send you there. If you change you mind, use the Teleportation cubic to return to me.
+So, choose the place.
+ + \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04b.htm b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04b.htm new file mode 100644 index 0000000000..98b3e9ee26 --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34513-04b.htm @@ -0,0 +1,7 @@ +Dual Class Master Joachim:
+Oh, you are back. Let me give you the buff first.
+Choose a place where you are going to take missions and i will send you there. If you change you mind, use the Teleportation cubic to return to me.
+So, choose the place.
+ + + \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-01.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-01.html new file mode 100644 index 0000000000..7da48d730d --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-01.html @@ -0,0 +1,5 @@ +Evan Graham:
+I was waiting for you. I think you are the one who can help me.
+Am i right?
+ + \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-02.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-02.html new file mode 100644 index 0000000000..64bd7b9277 --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-02.html @@ -0,0 +1,5 @@ +Evan Graham:
+I knew it. I've asked to send me brave warriors who are ready to defeat monsters that suddenly appeared in the place not far away. Only high experienced and skilled warriors are able to deal with them. I look at you and see a really strong hero who surely can help me.
+You are going to defeat the monsters in no time.
+ + \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-03.html b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-03.html new file mode 100644 index 0000000000..ffc39db0fe --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/34523-03.html @@ -0,0 +1,7 @@ +Evan Graham:
+Simple. You have to kill monsters on the War-Torn Plains. They drop Hot Energy, so +bring me 1000 of them as proof of your victory. You can also get the items from monsters of the Blasing Swamp.
+During this quest you have to reach Lv. 100.
+When you're done, go to Dual Class Master Joachim.
+Use the Teleportation cubic to return to him. + \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java index 56ccc2077b..287680e912 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10591_NobleMaterial/Q10591_NobleMaterial.java @@ -1,22 +1,25 @@ /* * This file is part of the L2J Mobius project. - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ package quests.Q10591_NobleMaterial; import org.l2jmobius.Config; +import org.l2jmobius.gameserver.data.xml.CategoryData; +import org.l2jmobius.gameserver.enums.CategoryType; +import org.l2jmobius.gameserver.enums.ClassId; import org.l2jmobius.gameserver.enums.QuestSound; import org.l2jmobius.gameserver.model.Location; import org.l2jmobius.gameserver.model.actor.Npc; @@ -33,14 +36,14 @@ import quests.Q10590_ReawakenedFate.Q10590_ReawakenedFate; /** * Noble Material (10591) - * @URL https://www.youtube.com/watch?v=HCd784Gnguw - * @author NightBR, Mobius + * @author NightBR, Mobius, NasSeKa */ public class Q10591_NobleMaterial extends Quest { // NPCs private static final int JOACHIM = 34513; private static final int HARP_ZU_HESTUI = 34014; + private static final int EVAN_GRAHAM = 34523; private static final int HERPA = 34362; private static final int LIONEL_HUNTER = 33907; private static final int[] MONSTERS = @@ -59,6 +62,8 @@ public class Q10591_NobleMaterial extends Quest 23502, // Flame Salamander 23503, // Flame Drake 23504, // Flame Votis + 24585, // Vanor Silenos Mercenary + 24586, // Vanor Silenos Guardian }; // Item private static final int FLAME_ENERGY = 80856; // Flame Energy - monster drop @@ -74,13 +79,14 @@ public class Q10591_NobleMaterial extends Quest private static final int MIN_LEVEL = 100; // Location private static final Location BURNING_MARSH = new Location(152754, -15142, -4400); + private static final Location WAR_PLAINS = new Location(159620, 21075, -3688); private static final Location HEIN = new Location(111257, 221071, -3550); public Q10591_NobleMaterial() { super(10591); addStartNpc(JOACHIM); - addTalkId(JOACHIM, HARP_ZU_HESTUI, HERPA, LIONEL_HUNTER); + addTalkId(JOACHIM, HARP_ZU_HESTUI, EVAN_GRAHAM, HERPA, LIONEL_HUNTER); addKillId(MONSTERS); registerQuestItems(FLAME_ENERGY); addCondMinLevel(99, "34513-16.html"); @@ -103,6 +109,7 @@ public class Q10591_NobleMaterial extends Quest case "34513-07.html": case "34513-04.htm": case "34014-03.html": + case "34523-03.html": case "34362-03.html": case "33907-03.html": { @@ -115,7 +122,15 @@ public class Q10591_NobleMaterial extends Quest htmltext = event; break; } - case "teleport": + case "teleportWP": + { + if (qs.isCond(1)) + { + player.teleToLocation(WAR_PLAINS); + } + break; + } + case "teleportBS": { if (qs.isCond(1)) { @@ -129,6 +144,12 @@ public class Q10591_NobleMaterial extends Quest htmltext = event; break; } + case "34523-02.html": + { + qs.setCond(2, true); + htmltext = event; + break; + } case "34513-06.html": { qs.setCond(4, true); @@ -213,6 +234,7 @@ public class Q10591_NobleMaterial extends Quest @Override public String onTalk(Npc npc, PlayerInstance player) { + final ClassId classId = player.getBaseTemplate().getClassId(); final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); switch (qs.getState()) @@ -238,7 +260,14 @@ public class Q10591_NobleMaterial extends Quest if (qs.isCond(1)) { - htmltext = "34513-04.htm"; + if (CategoryData.getInstance().isInCategory(CategoryType.SIXTH_FEOH_GROUP, classId.getId()) || CategoryData.getInstance().isInCategory(CategoryType.SIXTH_YR_GROUP, classId.getId()) || CategoryData.getInstance().isInCategory(CategoryType.SIXTH_WYNN_GROUP, classId.getId())) + { + htmltext = "34513-04b.htm"; + } + else + { + htmltext = "34513-04.htm"; + } } else if (qs.isCond(2)) { @@ -266,6 +295,18 @@ public class Q10591_NobleMaterial extends Quest } break; } + case EVAN_GRAHAM: + { + if (qs.isCond(1)) + { + htmltext = "34523-01.html"; + } + else if (qs.isCond(2)) + { + htmltext = "34523-03.html"; + } + break; + } case HERPA: { if (qs.isCond(4)) diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Aden/WarTornPlains.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Aden/WarTornPlains.xml new file mode 100644 index 0000000000..86f1f1b024 --- /dev/null +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Aden/WarTornPlains.xml @@ -0,0 +1,389 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/old/24_18.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/old/24_18.xml deleted file mode 100644 index 16c090eaf2..0000000000 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/old/24_18.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/items/80800-80899.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/items/80800-80899.xml index 5d5d998113..a65155c069 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/items/80800-80899.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/items/80800-80899.xml @@ -734,6 +734,7 @@ +
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24500-24599.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24500-24599.xml index 0e0abcfeab..4a785afcb5 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24500-24599.xml +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/stats/npcs/24500-24599.xml @@ -3675,120 +3675,74 @@ - - - ETC + + HUMANOID FEMALE + - + + + + + + + - - + + - - - + + + + + + + + + + + + - - - ETC + + HUMANOID FEMALE + - + + + + + + + - - + + - - - - - - - - - - - - BEAST - MALE - - - - - - - - - - - - - - - - - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - -