diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java index 66e0e4e4c4..95721f08dc 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java @@ -125,7 +125,7 @@ public class Q00262_TradeWithTheIvoryTower extends Quest if (getQuestItemsCount(player, SPORE_SAC) >= REQUIRED_ITEM_COUNT) { htmltext = "30137-05.html"; - giveAdena(player, 1000, true); + giveAdena(player, 300, true); qs.exitQuest(true, true); } break; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java index 26bbe0c26a..b3a3806366 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java @@ -44,8 +44,8 @@ public class Q00374_WhisperOfDreamsPart1 extends Quest private static final int ENCHANT_ARMOR_B = 948; private static final int IMPROVED_ENCHANT_ARMOR_B = 29743; // Misc - private static final int MIN_LEVEL = 56; - private static final int MAX_LEVEL = 66; + private static final int MIN_LEVEL = 64; + private static final int MAX_LEVEL = 74; public Q00374_WhisperOfDreamsPart1() { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java index 370ba1f6b8..e0b18fa2f5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java @@ -43,8 +43,8 @@ public class Q00375_WhisperOfDreamsPart2 extends Quest private static final int ENCHANT_WEAPON_B = 947; private static final int IMPROVED_ENCHANT_WEAPON_B = 33808; // Misc - private static final int MIN_LEVEL = 60; - private static final int MAX_LEVEL = 74; + private static final int MIN_LEVEL = 68; + private static final int MAX_LEVEL = 82; public Q00375_WhisperOfDreamsPart2() { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java index 73be798601..1f140e4e80 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java @@ -149,7 +149,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest } case "30417-13.html": { - if (hasQuestItems(player, SQUIRES_MARK) && ((CoinCount) == 3)) + if (hasQuestItems(player, SQUIRES_MARK) && ((CoinCount) == 2)) { giveItems(player, SWORD_OF_RITUAL, 1); takeItems(player, COIN_OF_LORDS1, 1); @@ -192,7 +192,7 @@ public class Q00402_PathOfTheHumanKnight extends Quest } case "30417-14.html": { - if (hasQuestItems(player, SQUIRES_MARK) && ((CoinCount) > 3) && ((CoinCount) < 6)) + if (hasQuestItems(player, SQUIRES_MARK) && ((CoinCount) > 2) && ((CoinCount) < 6)) { giveItems(player, SWORD_OF_RITUAL, 1); takeItems(player, COIN_OF_LORDS1, 1); @@ -416,15 +416,15 @@ public class Q00402_PathOfTheHumanKnight extends Quest final long CoinCount = getQuestItemsCount(player, COIN_OF_LORDS1, COIN_OF_LORDS2, COIN_OF_LORDS3, COIN_OF_LORDS4, COIN_OF_LORDS5, COIN_OF_LORDS6); if (hasQuestItems(player, SQUIRES_MARK)) { - if ((CoinCount) < 3) + if ((CoinCount) < 2) { htmltext = "30417-09.html"; } - else if ((CoinCount) == 3) + else if ((CoinCount) == 2) { htmltext = "30417-10.html"; } - else if (((CoinCount) > 3) && ((CoinCount) < 6)) + else if (((CoinCount) > 2) && ((CoinCount) < 6)) { htmltext = "30417-11.html"; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java index b76c4327b3..250e3a8995 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10993_FutureDwarves/Q10993_FutureDwarves.java @@ -39,7 +39,7 @@ public class Q10993_FutureDwarves extends Quest private static final int SILVERA = 30527; // Items - private static final int FIRST_CLASS_BUFF_SCROLL = 29654; + private static final int SCROLL_OF_BLOOD_MELODY = 49772; private static final int IMPROVED_SOE = 49087; // Misc @@ -94,7 +94,7 @@ public class Q10993_FutureDwarves extends Quest { if (qs.getCond() > 1) { - giveItems(player, FIRST_CLASS_BUFF_SCROLL, 5); + giveItems(player, SCROLL_OF_BLOOD_MELODY, 2); giveItems(player, IMPROVED_SOE, 1); qs.exitQuest(false, true); htmltext = event; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java index b2397d915a..238e0fa458 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10994_FutureOrcs/Q10994_FutureOrcs.java @@ -39,7 +39,7 @@ public class Q10994_FutureOrcs extends Quest private static final int GANTAKAI = 30587; private static final int HESTUI = 30585; // Items - private static final int FIRST_CLASS_BUFF_SCROLL = 29654; + private static final int SCROLL_OF_BLOOD_MELODY = 49772; private static final int IMPROVED_SOE = 49087; // Misc private static final int MIN_LEVEL = 19; @@ -103,7 +103,7 @@ public class Q10994_FutureOrcs extends Quest { if (qs.getCond() > 1) { - giveItems(player, FIRST_CLASS_BUFF_SCROLL, 5); + giveItems(player, SCROLL_OF_BLOOD_MELODY, 2); giveItems(player, IMPROVED_SOE, 1); qs.exitQuest(false, true); htmltext = event; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java index 16ce909551..26f7bd0b77 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java @@ -26,6 +26,8 @@ import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q10995_MutualBenefit.Q10995_MutualBenefit; + /** * Temples Decorations (10996) * @author Stayway @@ -66,6 +68,7 @@ public class Q10996_TemplesDecorations extends Quest addKillId(BARBED_BATS, CRYSTAL_PUMA, GOBLIN_LORD, GOBLIN_BRIGAND_LEADER, WINSTONE_GOLEM, OBSIDIAN_GOLEM); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no-level.html"); // Custom addCondRace(Race.DWARF, "no-race.html"); // Custom + addCondCompletedQuest(Q10995_MutualBenefit.class.getSimpleName(), "no-quest.html"); registerQuestItems(TEMPLE_RECONSTRUCTION_REQUEST, BARBED_BAT_WING_SAC, PUMA_FUR, GOBLIN_JEWEL, GOLEM_ORE); setQuestNameNpcStringId(NpcStringId.LV_11_20_TEMPLE_S_DECORATIONS); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/no-quest.html b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/no-quest.html new file mode 100644 index 0000000000..b8be7c4a1a --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10996_TemplesDecorations/no-quest.html @@ -0,0 +1,4 @@ +Weapon Merchant Reep:
+You seem like you have unfinished business, but you can come back later.
+(This quest is available to characters who have already completed the "Mutual Benefit" quest.)
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java index 2ed08fc50c..686ade6c04 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10997_LoserPriest1/Q10997_LoserPriest1.java @@ -26,6 +26,8 @@ import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q10996_TemplesDecorations.Q10996_TemplesDecorations; + /** * Loser Priest (1/3) (10997) * @author Stayway @@ -60,6 +62,7 @@ public class Q10997_LoserPriest1 extends Quest addKillId(PLUNDER_TARANTULA, HUNTER_TARANTULA); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no-level.html"); // Custom addCondRace(Race.DWARF, "no-race.html"); // Custom + addCondCompletedQuest(Q10996_TemplesDecorations.class.getSimpleName(), "no-quest.html"); registerQuestItems(MAINTENANCE_REQUEST, HUNTER_TARANTULA_VENOM, PLUNDER_TARANTULA_KIDNEY); setQuestNameNpcStringId(NpcStringId.LV_15_20_LOSER_PRIEST_1_3); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10997_LoserPriest1/no-quest.html b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10997_LoserPriest1/no-quest.html new file mode 100644 index 0000000000..612ac45a28 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10997_LoserPriest1/no-quest.html @@ -0,0 +1,4 @@ +Priest of the Earth Zimenf:
+You seem like you have unfinished business, but you can come back later.
+(This quest is available to characters who have already completed the "Temple's Decorations" quest.)
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java index 8721acf2af..b96385a241 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java @@ -26,6 +26,8 @@ import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q11001_TombsOfAncestors.Q11001_TombsOfAncestors; + /** * Help with Temple Restoration (11002) * @author Stayway @@ -65,6 +67,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest addKillId(ORC_CAPTAIN, ORC_LIEUTENANT, WEREWOLF_HUMTER, WEREWOLF_CHIEFTAIN, STONE_GOLEM, CRASHER); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no-level.html"); // Custom addCondRace(Race.HUMAN, "no-race.html"); // Custom + addCondCompletedQuest(Q11001_TombsOfAncestors.class.getSimpleName(), "30035-01a.html"); registerQuestItems(INVENTORY_BOOK, WOODEN_POLE, WOODEN_DOOR_PANEL, STONE_POWDER); setQuestNameNpcStringId(NpcStringId.LV_11_20_HELP_WITH_TEMPLE_RESTORATION); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java index 129deca6dc..19bad0e3f6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java @@ -26,6 +26,8 @@ import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q11002_HelpWithTempleRestoration.Q11002_HelpWithTempleRestoration; + /** * Perfect Leather Armor (1/3) (11003) * @author Stayway @@ -64,6 +66,7 @@ public class Q11003_PerfectLeatherArmor1 extends Quest addKillId(GIANT_SPIDER, GIANT_FANG_SPIDER, GIANT_BLADE_SPIDER, UNDINE, UNDINE_ELDER, UNDINE_NOBLE); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no-level.html"); // Custom addCondRace(Race.HUMAN, "no-race.html"); // Custom + addCondCompletedQuest(Q11002_HelpWithTempleRestoration.class.getSimpleName(), "no-quest.html"); registerQuestItems(LECTORS_NOTES, COBWEB, ESSENCE_OF_WATER); setQuestNameNpcStringId(NpcStringId.LV_15_20_PERFECT_LEATHER_ARMOR_1_3); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/no-quest.html b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/no-quest.html new file mode 100644 index 0000000000..1d287cafc5 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/no-quest.html @@ -0,0 +1,4 @@ +Magister Harrys:
+You seem like you have unfinished business, but you can come back later.
+(This quest is available to characters who have already completed the "Help with Temple Restoration" quest.)
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java index 4c017c9982..926f1dd745 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11006_FuturePeople/Q11006_FuturePeople.java @@ -43,7 +43,7 @@ public class Q11006_FuturePeople extends Quest private static final int BEZIQUE = 30379; // Items - private static final int FIRST_CLASS_BUFF_SCROLL = 29654; + private static final int SCROLL_OF_BLOOD_MELODY = 49772; private static final int IMPROVED_SOE = 49087; // Misc @@ -126,7 +126,7 @@ public class Q11006_FuturePeople extends Quest { if (qs.getCond() > 1) { - giveItems(player, FIRST_CLASS_BUFF_SCROLL, 5); + giveItems(player, SCROLL_OF_BLOOD_MELODY, 2); giveItems(player, IMPROVED_SOE, 1); qs.exitQuest(false, true); htmltext = event; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java index 6234d1f496..ebba66e998 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java @@ -26,6 +26,8 @@ import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q11007_NoiseInWoods.Q11007_NoiseInWoods; + /** * Preparation for Dungeon (11008) * @author Stayway @@ -67,6 +69,7 @@ public class Q11008_PreparationForDungeon extends Quest addKillId(KABOO_ORC_WARRIOR, KABOO_ORC_WARRIOR_CAPTAIN, KABOO_ORC_WARRIOR_LIEUTENANT, DRYAD, DRYAD_ELDER, HOOK_SPIDER, CRIMSON_SPIDER, PINCER_SPIDER); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no-level.html"); // Custom addCondRace(Race.ELF, "no-race.html"); // Custom + addCondCompletedQuest(Q11007_NoiseInWoods.class.getSimpleName(), "no-quest.html"); registerQuestItems(NOTE_ABOUT_REQUIRED_INGREDIENTS, ORCS_BANDAGE, DRYADS_CRIMSON_HERB, SPIDER_VENOM); setQuestNameNpcStringId(NpcStringId.LV_11_20_PREPARATION_FOR_DUNGEON); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/no-quest.html b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/no-quest.html new file mode 100644 index 0000000000..64b8af4727 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/no-quest.html @@ -0,0 +1,4 @@ +Weapon Merchant Reep:
+You seem like you have unfinished business, but you can come back later.
+(This quest is available to characters who have already completed the "Noise in Woods" quest.)
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java index ab957c6430..10c21ab330 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11012_FutureElves/Q11012_FutureElves.java @@ -40,7 +40,7 @@ public class Q11012_FutureElves extends Quest private static final int ROSELLA = 30414; private static final int MANUEL = 30293; // Items - private static final int FIRST_CLASS_BUFF_SCROLL = 29654; + private static final int SCROLL_OF_BLOOD_MELODY = 49772; private static final int IMPROVED_SOE = 49087; // Misc private static final int MIN_LEVEL = 19; @@ -113,7 +113,7 @@ public class Q11012_FutureElves extends Quest { if (qs.getCond() > 1) { - giveItems(player, FIRST_CLASS_BUFF_SCROLL, 5); + giveItems(player, SCROLL_OF_BLOOD_MELODY, 2); giveItems(player, IMPROVED_SOE, 1); qs.exitQuest(false, true); htmltext = event; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java index 1f376d04a6..8b5bad8107 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java @@ -26,6 +26,8 @@ import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q11013_ShilensHunt.Q11013_ShilensHunt; + /** * Surprise Gift (11014) * @author Stayway @@ -67,6 +69,7 @@ public class Q11014_SurpriseGift extends Quest addKillId(ZOMBIE_FOREST_ELF, ZOMBIE_FOREST_ELF_RESEARCHER, FESTERING_BAT, RED_EYE_BAT, GIANT_STONE_GUARDIAN, GIANT_STONE_SOLDIER, DARK_HORROR); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no-level.html"); // Custom addCondRace(Race.DARK_ELF, "no-race.html"); // Custom + addCondCompletedQuest(Q11013_ShilensHunt.class.getSimpleName(), "no-quest.html"); registerQuestItems(ARMOR_DESIGN, ZOMBIE_FOREST_ELF_TOOTH, BAT_SKIN, STONE_GIANTS_SHINY_ROCK, OLD_BONE_FRAGMENT); setQuestNameNpcStringId(NpcStringId.LV_11_20_SURPRISE_GIFT); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/no-quest.html b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/no-quest.html new file mode 100644 index 0000000000..29b5dbab6f --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11014_SurpriseGift/no-quest.html @@ -0,0 +1,4 @@ +Tetrarch Talos:
+You seem like you have unfinished business, but you can come back later.
+(This quest is available to characters who have already completed the "Shilen's Hunt" quest.)
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java index 8ea5b69558..d94a21b683 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java @@ -26,6 +26,8 @@ import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q11014_SurpriseGift.Q11014_SurpriseGift; + /** * Prepare for Trade (1/3) (11015) * @author Stayway @@ -64,6 +66,7 @@ public class Q11015_PrepareForTrade1 extends Quest addKillId(STONE_GIANT_GUARDIANS, CRYSTALLINE_BEAST, PROWLER, GIANT_VENOMOUS_SPIDER, ARACHNID_TRACKER); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no-level.html"); // Custom addCondRace(Race.DARK_ELF, "no-race.html"); // Custom + addCondCompletedQuest(Q11014_SurpriseGift.class.getSimpleName(), "no-quest.html"); registerQuestItems(SUPPLIES_CERTIFICATE, STONE_GIANTS_GUARDIANS_CORE, CRYSTALLINE_BEASTS_SHINEDUST, GIANT_SPIDER_SKIN_FRAGMENT); setQuestNameNpcStringId(NpcStringId.LV_15_20_PREPARE_FOR_TRADE_1_3); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/no-quest.html b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/no-quest.html new file mode 100644 index 0000000000..53a401469b --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/no-quest.html @@ -0,0 +1,4 @@ +Trader Payne:
+You seem like you have unfinished business, but you can come back later.
+(This quest is available to characters who have already completed the "Surprise Gift" quest.)
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java index d6c98287af..bbe6a3fac5 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11018_FutureDarkElves/Q11018_FutureDarkElves.java @@ -41,7 +41,7 @@ public class Q11018_FutureDarkElves extends Quest private static final int SIDRA = 30330; // Items - private static final int FIRST_CLASS_BUFF_SCROLL = 29654; + private static final int SCROLL_OF_BLOOD_MELODY = 49772; private static final int IMPROVED_SOE = 49087; // Misc @@ -115,7 +115,7 @@ public class Q11018_FutureDarkElves extends Quest { if (qs.getCond() > 1) { - giveItems(player, FIRST_CLASS_BUFF_SCROLL, 5); + giveItems(player, SCROLL_OF_BLOOD_MELODY, 2); giveItems(player, IMPROVED_SOE, 1); qs.exitQuest(false, true); htmltext = event; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java index 8209d11d8d..7ee3670bb9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java @@ -26,6 +26,8 @@ import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q11019_TribalBenefit.Q11019_TribalBenefit; + /** * Blacksmith's Request (11020) * @author Stayway @@ -64,6 +66,7 @@ public class Q11020_BlacksmithsRequest extends Quest addKillId(BLACKWING_BAT, TOMB_RAIDER_LEADER, GREYSTONE_GOLEM, EVIL_EYE_PATROL); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no-level.html"); // Custom addCondRace(Race.ORC, "no-race.html"); // Custom + addCondCompletedQuest(Q11019_TribalBenefit.class.getSimpleName(), "no-quest.html"); registerQuestItems(REQUIRED_MATERIALS, BLACKWING_BAT_WING, GRAVE_ROBBERS_BELT, GOLEM_ORE, EVIL_EYE_PATROL_HIDE); setQuestNameNpcStringId(NpcStringId.LV_11_20_BLACKSMITH_S_REQUEST); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/no-quest.html b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/no-quest.html new file mode 100644 index 0000000000..8dce305992 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/no-quest.html @@ -0,0 +1,4 @@ +Centurion Tiku:
+You seem like you have unfinished business, but you can come back later.
+(This quest is available to characters who have already completed the "Tribal Benefit" quest.)
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java index 200ca15bb5..0aac259082 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java @@ -26,6 +26,8 @@ import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q11020_BlacksmithsRequest.Q11020_BlacksmithsRequest; + /** * Red Gem Necklace (1/3) (11021) * @author Stayway @@ -62,6 +64,7 @@ public class Q11021_RedGemNecklace1 extends Quest addKillId(KASHA_BEAR, KASHA_SPIDER, KASHA_FANG_SPIDER, KASHA_BLADE_SPIDER); addCondLevel(MIN_LEVEL, MAX_LEVEL, "no-level.html"); // Custom addCondRace(Race.ORC, "no-race.html"); // Custom + addCondCompletedQuest(Q11020_BlacksmithsRequest.class.getSimpleName(), "no-quest.html"); registerQuestItems(LIST_OF_MATERIALS, BEARS_SHIN_BONE, SHARP_SPIDER_LEG); setQuestNameNpcStringId(NpcStringId.LV_15_20_RED_GEM_NECKLACE_1_3); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/no-quest.html b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/no-quest.html new file mode 100644 index 0000000000..c5cefc1fd2 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/no-quest.html @@ -0,0 +1,4 @@ +Blacksmith Sumari:
+You seem like you have unfinished business, but you can come back later.
+(This quest is available to characters who have already completed the "Blacksmith's Request" quest.)
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/not_done/Q10871_DeathToThePirateKing.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/not_done/Q10871_DeathToThePirateKing.java index 51dc258112..c235c0735b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/not_done/Q10871_DeathToThePirateKing.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/not_done/Q10871_DeathToThePirateKing.java @@ -32,5 +32,6 @@ public class Q10871_DeathToThePirateKing extends Quest addStartNpc(START_NPC); addTalkId(START_NPC); addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL /* 70 */, getNoQuestMsg(null)); + addCondCompletedQuest(Q10870_UnfinishedDevice.class.getSimpleName(), getNoQuestMsg(null)); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/not_done/Q10871_DeathToThePirateKing.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/not_done/Q10871_DeathToThePirateKing.java index 51dc258112..c235c0735b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/not_done/Q10871_DeathToThePirateKing.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/not_done/Q10871_DeathToThePirateKing.java @@ -32,5 +32,6 @@ public class Q10871_DeathToThePirateKing extends Quest addStartNpc(START_NPC); addTalkId(START_NPC); addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL /* 70 */, getNoQuestMsg(null)); + addCondCompletedQuest(Q10870_UnfinishedDevice.class.getSimpleName(), getNoQuestMsg(null)); } }