diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java index 688986453a..0935fda0fa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java @@ -126,12 +126,16 @@ public class Q10995_MutualBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, BALCK_WOLF_TOOTH) < 10))) { giveItems(killer, BALCK_WOLF_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BALCK_WOLF_TOOTH) >= 10) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACK_WOLVES_AND_GOBLIN_SNOOPERS_NGO_HUNTING_AND_KILL_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -140,12 +144,16 @@ public class Q10995_MutualBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) < 10))) { giveItems(killer, GOBLINS_NAVIGATION_DEVICE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BALCK_WOLF_TOOTH) >= 10) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACK_WOLVES_AND_GOBLIN_SNOOPERS_NGO_HUNTING_AND_KILL_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -155,12 +163,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, UTUKU_ORC_AMULET) < 10)) { giveItems(killer, UTUKU_ORC_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, UTUKU_ORC_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS_NGO_HUNTING_AND_KILL_GOBLIN_BRIGANDS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -169,12 +181,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOBLIN_BRIGANDS_OLD_SWORD) < 10)) { giveItems(killer, GOBLIN_BRIGANDS_OLD_SWORD, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_BRIGANDS_OLD_SWORD) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_BRIGANDS_N_GO_HUNTING_AND_KILL_GARUM_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -183,12 +199,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, GARUM_WEREWOLF_TAIL) < 10)) { giveItems(killer, GARUM_WEREWOLF_TAIL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GARUM_WEREWOLF_TAIL) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GARUM_WEREWOLVES_N_GO_HUNTING_AND_KILL_GOBLIN_BRIGAND_LIEUTENANTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +217,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(6) && (getQuestItemsCount(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE) < 10)) { giveItems(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_BRIGAND_LIEUTENANTS_NRETURN_TO_WEAPON_MERCHANT_REEP, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -274,4 +298,4 @@ public class Q10995_MutualBenefit extends Quest } return htmltext; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java index bbfde541ae..f4c81bcfd6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java @@ -46,7 +46,7 @@ public class Q10996_TemplesDecorations extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int BARBED_BATS = 20370; private static final int CRYSTAL_PUMA = 20510; @@ -99,7 +99,7 @@ public class Q10996_TemplesDecorations extends Quest takeItems(player, GOLEM_ORE, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30538-03.html"; @@ -117,7 +117,7 @@ public class Q10996_TemplesDecorations extends Quest takeItems(player, GOLEM_ORE, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30538-04.html"; @@ -201,12 +201,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BARBED_BAT_WING_SAC) < 20) && (getRandom(100) < 90)) { giveItems(killer, BARBED_BAT_WING_SAC, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BARBED_BAT_WING_SAC) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BARBED_BATS_N_GO_HUNTING_AND_KILL_CRYSTAL_PUMAS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -215,12 +219,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, PUMA_FUR) < 20) && (getRandom(100) < 90)) { giveItems(killer, PUMA_FUR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, PUMA_FUR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTAL_PUMAS_N_GO_HUNTING_AND_KILL_GOBLIN_LORDS_AND_GOBLIN_BRIGAND_LEADERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -230,12 +238,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOBLIN_JEWEL) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOBLIN_JEWEL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOBLIN_JEWEL) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_LORDS_AND_GOBLIN_BRIGAND_LEADERS_N_GO_HUNTING_AND_KILL_WHINSTONE_GOLEM_AND_OBSIDIAN_GOLEMS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -245,12 +257,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, GOLEM_ORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOLEM_ORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOLEM_ORE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WHINSTONE_GOLEM_AND_OBSIDIAN_GOLEMS_NRETURN_TO_PRIEST_OF_THE_EARTH_ZIMENF, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -258,4 +274,4 @@ public class Q10996_TemplesDecorations extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java index 08cff41099..b61181f06c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java @@ -178,12 +178,16 @@ public class Q10998_LoserPriest2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, HUNTER_TARANTULA_VENOM) < 20) && (getRandom(100) < 94)) { giveItems(killer, HUNTER_TARANTULA_VENOM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, HUNTER_TARANTULA_VENOM) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_HUNTER_TARANTULAS_N_GO_HUNTING_AND_KILL_PLUNDER_TARANTULAS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -192,12 +196,16 @@ public class Q10998_LoserPriest2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, PLUNDER_TARANTULA_KIDNEY) < 20) && (getRandom(100) < 94)) { giveItems(killer, PLUNDER_TARANTULA_KIDNEY, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, PLUNDER_TARANTULA_KIDNEY) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PLUNDER_TARANTULAS_NRETURN_TO_PRIEST_OF_THE_EARTH_GERALD, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -205,4 +213,4 @@ public class Q10998_LoserPriest2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java index c3d757ec35..952c639c4f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java @@ -182,12 +182,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BAT_BRISTLE) < 20) && (getRandom(100) < 90)) { giveItems(killer, BAT_BRISTLE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BAT_BRISTLE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_RED_EYE_BARBED_BATS_NGO_HUNTING_AND_KILL_NORTHERN_TRIMDENS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -196,12 +200,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, TRIMDEN_WEB) < 20) && (getRandom(100) < 90)) { giveItems(killer, TRIMDEN_WEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, TRIMDEN_WEB) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_NORTHERN_TRIMDENS_N_GO_HUNTING_AND_KILL_KEROPE_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -211,12 +219,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, KEROPE_WEREWOLF_TWIG_CHARM) < 20) && (getRandom(100) < 90)) { giveItems(killer, KEROPE_WEREWOLF_TWIG_CHARM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KEROPE_WEREWOLF_TWIG_CHARM) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KEROPE_WEREWOLVES_NRETURN_TO_PRIEST_OF_THE_EARTH_GERALD, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -224,4 +236,4 @@ public class Q10999_LoserPriest3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java index feaa6e4313..456313a0fd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java @@ -200,12 +200,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, WOLF_PELT) < 10) && (getRandom(100) < 93)) { giveItems(killer, WOLF_PELT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOLF_PELT) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WOLVES_N_GO_HUNTING_AND_KILL_ORCS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -216,12 +220,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ORC_AMULET) < 10) && (getRandom(100) < 93)) { giveItems(killer, ORC_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ORC_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORCS_NGO_HUNTING_AND_KILL_ORC_WARRIORS_AND_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -230,12 +238,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, BROKEN_SWORD) < 10) && (getRandom(100) < 89)) { giveItems(killer, BROKEN_SWORD, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BROKEN_SWORD) >= 10) && (getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -244,12 +256,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, WEREWOLFS_FANG) < 10) && (getRandom(100) < 100)) { giveItems(killer, WEREWOLFS_FANG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10) && (getQuestItemsCount(killer, BROKEN_SWORD) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -257,4 +273,4 @@ public class Q11001_TombsOfAncestors extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java index 16db8db562..cee0c0662c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java @@ -45,7 +45,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int ORC_LIEUTENANT = 20096; private static final int ORC_CAPTAIN = 20098; @@ -97,7 +97,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest takeItems(player, STONE_POWDER, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30035-03.html"; @@ -114,7 +114,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest takeItems(player, STONE_POWDER, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30035-04.html"; @@ -199,12 +199,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, WOODEN_POLE) < 20) && (getRandom(100) < 84)) { giveItems(killer, WOODEN_POLE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOODEN_POLE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORC_LIEUTENANTS_AND_ORC_CAPTAINS_N_GO_HUNTING_AND_KILL_WEREWOLF_HUNTERS_AND_WEREWOLF_CHIEFTAINS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -214,12 +218,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, WOODEN_DOOR_PANEL) < 25) && (getRandom(100) < 87)) { giveItems(killer, WOODEN_DOOR_PANEL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOODEN_DOOR_PANEL) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WEREWOLF_HUNTERS_AND_WEREWOLF_CHIEFTAINS_N_GO_HUNTING_AND_KILL_STONE_GOLEMS_AND_CRASHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -229,12 +237,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, STONE_POWDER) < 20) && (getRandom(100) < 84)) { giveItems(killer, STONE_POWDER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, STONE_POWDER) >= 20) && (getQuestItemsCount(killer, STONE_POWDER) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_HARRYS_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -242,4 +254,4 @@ public class Q11002_HelpWithTempleRestoration extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java index 578428fb11..3b95786637 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java @@ -198,12 +198,16 @@ public class Q11003_PerfectLeatherArmor1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -214,12 +218,16 @@ public class Q11003_PerfectLeatherArmor1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -227,4 +235,4 @@ public class Q11003_PerfectLeatherArmor1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java index 661328aa50..5a5560f006 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java @@ -183,12 +183,16 @@ public class Q11004_PerfectLeatherArmor2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -199,12 +203,16 @@ public class Q11004_PerfectLeatherArmor2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -212,4 +220,4 @@ public class Q11004_PerfectLeatherArmor2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java index d5d32b68ef..5b2286e9a0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java @@ -183,12 +183,16 @@ public class Q11005_PerfectLeatherArmor3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -199,12 +203,16 @@ public class Q11005_PerfectLeatherArmor3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -212,4 +220,4 @@ public class Q11005_PerfectLeatherArmor3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java index 8ce8278e7e..5f047e5677 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java @@ -141,12 +141,16 @@ public class Q11007_NoiseInWoods extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, TAIL_OF_A_GRAY_WOLF) < 10))) { giveItems(killer, TAIL_OF_A_GRAY_WOLF, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, TAIL_OF_A_GRAY_WOLF) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GRAY_WOLVES_N_GO_HUNTING_AND_KILL_GOBLIN_RAIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -155,12 +159,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, GOBLINS_PACK_OF_KNICKKNACKS) < 10)) { giveItems(killer, GOBLINS_PACK_OF_KNICKKNACKS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLINS_PACK_OF_KNICKKNACKS) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_RAIDERS_N_GO_HUNTING_AND_KILL_KABOO_ORCS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -171,12 +179,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, KABBO_ORC_STURDY_AMULET) < 10)) { giveItems(killer, KABBO_ORC_STURDY_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KABBO_ORC_STURDY_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KABOO_ORCS_N_GO_HUNTING_AND_KILL_SPORE_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -185,12 +197,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, MUSHROOM_SPORE_POWDER) < 20)) { giveItems(killer, MUSHROOM_SPORE_POWDER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MUSHROOM_SPORE_POWDER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SPORE_FUNGUS_N_RETURN_TO_SENTINEL_KENDELL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -262,4 +278,4 @@ public class Q11007_NoiseInWoods extends Quest } return htmltext; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java index 28ff350aa0..5ead32e1f5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java @@ -45,7 +45,7 @@ public class Q11008_PreparationForDungeon extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int KABOO_ORC_WARRIOR_CAPTAIN = 20472; private static final int KABOO_ORC_WARRIOR_LIEUTENANT = 20473; @@ -99,7 +99,7 @@ public class Q11008_PreparationForDungeon extends Quest takeItems(player, SPIDER_VENOM, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30220-03.html"; @@ -116,7 +116,7 @@ public class Q11008_PreparationForDungeon extends Quest takeItems(player, SPIDER_VENOM, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30220-04.html"; // Custom @@ -202,12 +202,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ORCS_BANDAGE) < 20) && (getRandom(100) < 90)) { giveItems(killer, ORCS_BANDAGE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ORCS_BANDAGE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KABOO_ORC_WARRIOR_LIEUTENANTS_AND_KABOO_ORC_WARRIOR_CAPTAINS_N_GO_HUNTING_AND_KILL_DRYADS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -217,12 +221,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, DRYADS_CRIMSON_HERB) < 20) && (getRandom(100) < 90)) { giveItems(killer, DRYADS_CRIMSON_HERB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, DRYADS_CRIMSON_HERB) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_DRYADS_N_GO_HUNTING_AND_KILL_CRIMSON_SPIDERS_HOOK_SPIDERS_AND_PINCER_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -233,12 +241,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, SPIDER_VENOM) < 20) && (getRandom(100) < 90)) { giveItems(killer, SPIDER_VENOM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, SPIDER_VENOM) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_SENTINEL_STARDEN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -246,4 +258,4 @@ public class Q11008_PreparationForDungeon extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java index 8dbfacb187..59a0e9fbef 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java @@ -195,12 +195,16 @@ public class Q11009_NewPotionDevelopment1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, SPIDER_ICHOR) < 20) && (getRandom(100) < 92)) { giveItems(killer, SPIDER_ICHOR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SPIDER_ICHOR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SCAVENGER_SPIDERS_AND_RED_SCAVENGER_SPIDERS_N_GO_HUNTING_AND_KILL_MOONSTONE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -209,12 +213,16 @@ public class Q11009_NewPotionDevelopment1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) < 20) && (getRandom(100) < 92)) { giveItems(killer, MOONSTONE_BEAST_SCALES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -222,4 +230,4 @@ public class Q11009_NewPotionDevelopment1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java index b7aeb07793..57ba0557fa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java @@ -179,12 +179,16 @@ public class Q11010_NewPotionDevelopment2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, SPIDER_ICHOR) < 20) && (getRandom(100) < 92)) { giveItems(killer, SPIDER_ICHOR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SPIDER_ICHOR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SCAVENGER_SPIDERS_AND_RED_SCAVENGER_SPIDERS_N_GO_HUNTING_AND_KILL_MOONSTONE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -193,12 +197,16 @@ public class Q11010_NewPotionDevelopment2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) < 20) && (getRandom(100) < 92)) { giveItems(killer, MOONSTONE_BEAST_SCALES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -206,4 +214,4 @@ public class Q11010_NewPotionDevelopment2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java index 78abcfdec6..74ca100b7c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java @@ -177,12 +177,16 @@ public class Q11011_NewPotionDevelopment3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ANTIDOTE) < 20) && (getRandom(100) < 95)) { giveItems(killer, ANTIDOTE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ANTIDOTE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_RATMAN_SCAVENGERS_N_GO_HUNTING_AND_KILL_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -191,12 +195,16 @@ public class Q11011_NewPotionDevelopment3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ARACHNID_TRACKER_THORN) < 20) && (getRandom(100) < 90)) { giveItems(killer, ARACHNID_TRACKER_THORN, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ARACHNID_TRACKER_THORN) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL_3, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -204,4 +212,4 @@ public class Q11011_NewPotionDevelopment3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java index 239058d00b..a408980e02 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java @@ -205,12 +205,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(2)) { giveItems(killer, WOLF_TAIL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOLF_TAIL) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ASHEN_WOLVES_N_GO_HUNTING_AND_KILL_GOBLINS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -219,12 +223,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(3)) { giveItems(killer, GOBLIN_POISONOUS_DART, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_POISONOUS_DART) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLINS_N_GO_HUNTING_AND_KILL_IMPS_AND_IMP_ELDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -234,12 +242,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(4)) { giveItems(killer, IMP_WING, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, IMP_WING) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_IMPS_AND_IMP_ELDERS_N_GO_HUNTING_AND_KILL_GREEN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -248,12 +260,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(5)) { giveItems(killer, FUNGUS_JUICE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, FUNGUS_JUICE) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GREEN_FUNGUS_N_GO_HUNTING_AND_KILL_BALOR_ORC_WARRIORS_BALOR_ORC_WARRIOR_CAPTAINS_AND_BALOR_ORC_WARRIOR_LIEUTENANTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -264,12 +280,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(6)) { giveItems(killer, BALOR_ORC_FANG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BALOR_ORC_FANG) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BALOR_ORC_WARRIORS_BALOR_ORC_WARRIOR_CAPTAINS_AND_BALOR_ORC_WARRIOR_LIEUTENANTS_NRETURN_TO_HIERARCH_TALOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -277,4 +297,4 @@ public class Q11013_ShilensHunt extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java index 6f1743398f..eac7abcfda 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java @@ -46,7 +46,7 @@ public class Q11014_SurpriseGift extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int ZOMBIE_FOREST_ELF = 20015; private static final int ZOMBIE_FOREST_ELF_RESEARCHER = 20020; @@ -100,7 +100,7 @@ public class Q11014_SurpriseGift extends Quest takeItems(player, OLD_BONE_FRAGMENT, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30136-03.html"; @@ -118,7 +118,7 @@ public class Q11014_SurpriseGift extends Quest takeItems(player, OLD_BONE_FRAGMENT, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30136-04.html"; @@ -203,12 +203,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ZOMBIE_FOREST_ELF_TOOTH) < 10) && (getRandom(100) < 85)) { giveItems(killer, ZOMBIE_FOREST_ELF_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ZOMBIE_FOREST_ELF_TOOTH) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ZOMBIE_FOREST_ELVES_AND_ZOMBIE_FOREST_ELF_RESEARCHERS_N_GO_HUNTING_AND_KILL_FESTERING_BATS_AND_RED_EYE_BATS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -218,12 +222,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, BAT_SKIN) < 10) && (getRandom(100) < 85)) { giveItems(killer, BAT_SKIN, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BAT_SKIN) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_FESTERING_BATS_AND_RED_EYE_BATS_N_GO_HUNTING_AND_KILL_STONE_GIANT_SOLDIERS_AND_STONE_GIANT_GUARDIANS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -233,12 +241,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, STONE_GIANTS_SHINY_ROCK) < 10) && (getRandom(100) < 85)) { giveItems(killer, STONE_GIANTS_SHINY_ROCK, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, STONE_GIANTS_SHINY_ROCK) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_SOLDIERS_AND_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_DARK_HORRORS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -247,12 +259,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, OLD_BONE_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, OLD_BONE_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, OLD_BONE_FRAGMENT) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_DARK_HORRORS_NRETURN_TO_ARMOR_MERCHANT_PAYNE, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -260,4 +276,4 @@ public class Q11014_SurpriseGift extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java index 691442fce7..61a9ece70e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java @@ -199,12 +199,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +217,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 87)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -229,12 +237,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -242,4 +254,4 @@ public class Q11015_PrepareForTrade1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java index 932cacf9a5..4c84e21a52 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java @@ -183,12 +183,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +201,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 87)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +221,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -226,4 +238,4 @@ public class Q11016_PrepareForTrade2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java index 3768253ada..b40e5299ea 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java @@ -183,12 +183,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +201,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 85)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +221,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -226,4 +238,4 @@ public class Q11017_PrepareForTrade3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java index c3761f1eb3..86916c941d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java @@ -126,12 +126,16 @@ public class Q11019_TribalBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, KASHA_WOLF_FUR) < 10))) { giveItems(killer, KASHA_WOLF_FUR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KASHA_WOLF_FUR) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_WOLVES_AND_KASHA_BEARS_N_GO_HUNTING_AND_KILL_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -140,12 +144,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ASHES_OF_ANCESTORS) < 10)) { giveItems(killer, ASHES_OF_ANCESTORS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, ASHES_OF_ANCESTORS) >= 10) && (getQuestItemsCount(killer, IMP_NECKLACE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS_N_GO_HUNTING_AND_KILL_MOUNTAIN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -154,12 +162,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, IMP_NECKLACE) < 10)) { giveItems(killer, IMP_NECKLACE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, ASHES_OF_ANCESTORS) >= 10) && (getQuestItemsCount(killer, IMP_NECKLACE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS_N_GO_HUNTING_AND_KILL_MOUNTAIN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -168,12 +180,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, MOUNTAIN_FUNGUS_SPORES) < 10)) { giveItems(killer, MOUNTAIN_FUNGUS_SPORES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOUNTAIN_FUNGUS_SPORES) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_MOUNTAIN_FUNGUS_N_GO_HUNTING_AND_KILL_MARAKU_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -182,12 +198,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, MARAKU_WEREWOLF_CLAW) < 10)) { giveItems(killer, MARAKU_WEREWOLF_CLAW, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MARAKU_WEREWOLF_CLAW) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_MARAKU_WEREWOLVES_N_GO_HUNTING_AND_KILL_EYES_OF_SEER, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -196,12 +216,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(6) && (getQuestItemsCount(killer, EYE_OF_SEER_TEARS) < 10)) { giveItems(killer, EYE_OF_SEER_TEARS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, EYE_OF_SEER_TEARS) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EYES_OF_SEER_NRETURN_TO_CENTURION_TIKU, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -269,4 +293,4 @@ public class Q11019_TribalBenefit extends Quest } return htmltext; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java index 8e3a1e7c8f..ecee5b9ec1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java @@ -46,7 +46,7 @@ public class Q11020_BlacksmithsRequest extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int EARRING_NOVICE = 49040; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int BLACKWING_BAT = 20316; private static final int TOMB_RAIDER_LEADER = 20320; @@ -199,12 +199,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BLACKWING_BAT_WING) < 20) && (getRandom(100) < 90)) { giveItems(killer, BLACKWING_BAT_WING, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BLACKWING_BAT_WING) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACKWING_BATS_N_GO_HUNTING_AND_KILL_GOBLIN_TOMB_RAIDER_LEADERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +217,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, GRAVE_ROBBERS_BELT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GRAVE_ROBBERS_BELT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GRAVE_ROBBERS_BELT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDER_LEADERS_N_GO_HUNTING_AND_KILL_GREYSTONE_GOLEMS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -227,12 +235,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOLEM_ORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOLEM_ORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOLEM_ORE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GREYSTONE_GOLEMS_N_GO_HUNTING_AND_KILL_EVIL_EYE_PATROLS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -241,12 +253,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, EVIL_EYE_PATROL_HIDE) < 20) && (getRandom(100) < 90)) { giveItems(killer, EVIL_EYE_PATROL_HIDE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, EVIL_EYE_PATROL_HIDE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EVIL_EYE_PATROLS_NRETURN_TO_BLACKSMITH_SUMARI, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -254,4 +270,4 @@ public class Q11020_BlacksmithsRequest extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java index 996895c049..4152e0523d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java @@ -195,12 +195,16 @@ public class Q11021_RedGemNecklace1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BEARS_SHIN_BONE) < 20) && (getRandom(100) < 92)) { giveItems(killer, BEARS_SHIN_BONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BEARS_SHIN_BONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_BEARS_N_GO_HUNTING_AND_KILL_KASHA_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -211,12 +215,16 @@ public class Q11021_RedGemNecklace1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, SHARP_SPIDER_LEG) < 30) && (getRandom(100) < 89)) { giveItems(killer, SHARP_SPIDER_LEG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SHARP_SPIDER_LEG) >= 30) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_SPIDERS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -224,4 +232,4 @@ public class Q11021_RedGemNecklace1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java index 2d13284f7a..2fec10cced 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java @@ -179,12 +179,16 @@ public class Q11022_RedGemNecklace2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BEARS_SHIN_BONE) < 20) && (getRandom(100) < 92)) { giveItems(killer, BEARS_SHIN_BONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BEARS_SHIN_BONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_BEARS_N_GO_HUNTING_AND_KILL_KASHA_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -195,12 +199,16 @@ public class Q11022_RedGemNecklace2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, SHARP_SPIDER_LEG) < 30) && (getRandom(100) < 89)) { giveItems(killer, SHARP_SPIDER_LEG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SHARP_SPIDER_LEG) >= 30) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_SPIDERS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -208,4 +216,4 @@ public class Q11022_RedGemNecklace2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java index f433bbeaa6..c46e010f00 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java @@ -177,12 +177,16 @@ public class Q11023_RedGemNecklace3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, HARD_LENS) < 20) && (getRandom(100) < 92)) { giveItems(killer, HARD_LENS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, HARD_LENS) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EVIL_EYE_SEERS_N_GO_HUNTING_AND_KILL_KASHA_IMPS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -191,12 +195,16 @@ public class Q11023_RedGemNecklace3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, RED_STONE) < 20) && (getRandom(100) < 91)) { giveItems(killer, RED_STONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, RED_STONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_IMPS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -204,4 +212,4 @@ public class Q11023_RedGemNecklace3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java index 688986453a..0935fda0fa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java @@ -126,12 +126,16 @@ public class Q10995_MutualBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, BALCK_WOLF_TOOTH) < 10))) { giveItems(killer, BALCK_WOLF_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BALCK_WOLF_TOOTH) >= 10) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACK_WOLVES_AND_GOBLIN_SNOOPERS_NGO_HUNTING_AND_KILL_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -140,12 +144,16 @@ public class Q10995_MutualBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) < 10))) { giveItems(killer, GOBLINS_NAVIGATION_DEVICE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BALCK_WOLF_TOOTH) >= 10) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACK_WOLVES_AND_GOBLIN_SNOOPERS_NGO_HUNTING_AND_KILL_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -155,12 +163,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, UTUKU_ORC_AMULET) < 10)) { giveItems(killer, UTUKU_ORC_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, UTUKU_ORC_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS_NGO_HUNTING_AND_KILL_GOBLIN_BRIGANDS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -169,12 +181,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOBLIN_BRIGANDS_OLD_SWORD) < 10)) { giveItems(killer, GOBLIN_BRIGANDS_OLD_SWORD, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_BRIGANDS_OLD_SWORD) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_BRIGANDS_N_GO_HUNTING_AND_KILL_GARUM_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -183,12 +199,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, GARUM_WEREWOLF_TAIL) < 10)) { giveItems(killer, GARUM_WEREWOLF_TAIL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GARUM_WEREWOLF_TAIL) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GARUM_WEREWOLVES_N_GO_HUNTING_AND_KILL_GOBLIN_BRIGAND_LIEUTENANTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +217,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(6) && (getQuestItemsCount(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE) < 10)) { giveItems(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_BRIGAND_LIEUTENANTS_NRETURN_TO_WEAPON_MERCHANT_REEP, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -274,4 +298,4 @@ public class Q10995_MutualBenefit extends Quest } return htmltext; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java index bbfde541ae..f4c81bcfd6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java @@ -46,7 +46,7 @@ public class Q10996_TemplesDecorations extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int BARBED_BATS = 20370; private static final int CRYSTAL_PUMA = 20510; @@ -99,7 +99,7 @@ public class Q10996_TemplesDecorations extends Quest takeItems(player, GOLEM_ORE, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30538-03.html"; @@ -117,7 +117,7 @@ public class Q10996_TemplesDecorations extends Quest takeItems(player, GOLEM_ORE, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30538-04.html"; @@ -201,12 +201,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BARBED_BAT_WING_SAC) < 20) && (getRandom(100) < 90)) { giveItems(killer, BARBED_BAT_WING_SAC, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BARBED_BAT_WING_SAC) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BARBED_BATS_N_GO_HUNTING_AND_KILL_CRYSTAL_PUMAS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -215,12 +219,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, PUMA_FUR) < 20) && (getRandom(100) < 90)) { giveItems(killer, PUMA_FUR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, PUMA_FUR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTAL_PUMAS_N_GO_HUNTING_AND_KILL_GOBLIN_LORDS_AND_GOBLIN_BRIGAND_LEADERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -230,12 +238,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOBLIN_JEWEL) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOBLIN_JEWEL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOBLIN_JEWEL) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_LORDS_AND_GOBLIN_BRIGAND_LEADERS_N_GO_HUNTING_AND_KILL_WHINSTONE_GOLEM_AND_OBSIDIAN_GOLEMS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -245,12 +257,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, GOLEM_ORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOLEM_ORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOLEM_ORE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WHINSTONE_GOLEM_AND_OBSIDIAN_GOLEMS_NRETURN_TO_PRIEST_OF_THE_EARTH_ZIMENF, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -258,4 +274,4 @@ public class Q10996_TemplesDecorations extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java index 08cff41099..b61181f06c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java @@ -178,12 +178,16 @@ public class Q10998_LoserPriest2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, HUNTER_TARANTULA_VENOM) < 20) && (getRandom(100) < 94)) { giveItems(killer, HUNTER_TARANTULA_VENOM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, HUNTER_TARANTULA_VENOM) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_HUNTER_TARANTULAS_N_GO_HUNTING_AND_KILL_PLUNDER_TARANTULAS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -192,12 +196,16 @@ public class Q10998_LoserPriest2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, PLUNDER_TARANTULA_KIDNEY) < 20) && (getRandom(100) < 94)) { giveItems(killer, PLUNDER_TARANTULA_KIDNEY, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, PLUNDER_TARANTULA_KIDNEY) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PLUNDER_TARANTULAS_NRETURN_TO_PRIEST_OF_THE_EARTH_GERALD, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -205,4 +213,4 @@ public class Q10998_LoserPriest2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java index c3d757ec35..952c639c4f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java @@ -182,12 +182,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BAT_BRISTLE) < 20) && (getRandom(100) < 90)) { giveItems(killer, BAT_BRISTLE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BAT_BRISTLE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_RED_EYE_BARBED_BATS_NGO_HUNTING_AND_KILL_NORTHERN_TRIMDENS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -196,12 +200,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, TRIMDEN_WEB) < 20) && (getRandom(100) < 90)) { giveItems(killer, TRIMDEN_WEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, TRIMDEN_WEB) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_NORTHERN_TRIMDENS_N_GO_HUNTING_AND_KILL_KEROPE_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -211,12 +219,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, KEROPE_WEREWOLF_TWIG_CHARM) < 20) && (getRandom(100) < 90)) { giveItems(killer, KEROPE_WEREWOLF_TWIG_CHARM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KEROPE_WEREWOLF_TWIG_CHARM) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KEROPE_WEREWOLVES_NRETURN_TO_PRIEST_OF_THE_EARTH_GERALD, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -224,4 +236,4 @@ public class Q10999_LoserPriest3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java index feaa6e4313..456313a0fd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java @@ -200,12 +200,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, WOLF_PELT) < 10) && (getRandom(100) < 93)) { giveItems(killer, WOLF_PELT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOLF_PELT) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WOLVES_N_GO_HUNTING_AND_KILL_ORCS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -216,12 +220,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ORC_AMULET) < 10) && (getRandom(100) < 93)) { giveItems(killer, ORC_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ORC_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORCS_NGO_HUNTING_AND_KILL_ORC_WARRIORS_AND_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -230,12 +238,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, BROKEN_SWORD) < 10) && (getRandom(100) < 89)) { giveItems(killer, BROKEN_SWORD, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BROKEN_SWORD) >= 10) && (getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -244,12 +256,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, WEREWOLFS_FANG) < 10) && (getRandom(100) < 100)) { giveItems(killer, WEREWOLFS_FANG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10) && (getQuestItemsCount(killer, BROKEN_SWORD) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -257,4 +273,4 @@ public class Q11001_TombsOfAncestors extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java index 16db8db562..cee0c0662c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java @@ -45,7 +45,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int ORC_LIEUTENANT = 20096; private static final int ORC_CAPTAIN = 20098; @@ -97,7 +97,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest takeItems(player, STONE_POWDER, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30035-03.html"; @@ -114,7 +114,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest takeItems(player, STONE_POWDER, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30035-04.html"; @@ -199,12 +199,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, WOODEN_POLE) < 20) && (getRandom(100) < 84)) { giveItems(killer, WOODEN_POLE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOODEN_POLE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORC_LIEUTENANTS_AND_ORC_CAPTAINS_N_GO_HUNTING_AND_KILL_WEREWOLF_HUNTERS_AND_WEREWOLF_CHIEFTAINS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -214,12 +218,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, WOODEN_DOOR_PANEL) < 25) && (getRandom(100) < 87)) { giveItems(killer, WOODEN_DOOR_PANEL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOODEN_DOOR_PANEL) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WEREWOLF_HUNTERS_AND_WEREWOLF_CHIEFTAINS_N_GO_HUNTING_AND_KILL_STONE_GOLEMS_AND_CRASHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -229,12 +237,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, STONE_POWDER) < 20) && (getRandom(100) < 84)) { giveItems(killer, STONE_POWDER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, STONE_POWDER) >= 20) && (getQuestItemsCount(killer, STONE_POWDER) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_HARRYS_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -242,4 +254,4 @@ public class Q11002_HelpWithTempleRestoration extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java index 578428fb11..3b95786637 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java @@ -198,12 +198,16 @@ public class Q11003_PerfectLeatherArmor1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -214,12 +218,16 @@ public class Q11003_PerfectLeatherArmor1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -227,4 +235,4 @@ public class Q11003_PerfectLeatherArmor1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java index 661328aa50..5a5560f006 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java @@ -183,12 +183,16 @@ public class Q11004_PerfectLeatherArmor2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -199,12 +203,16 @@ public class Q11004_PerfectLeatherArmor2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -212,4 +220,4 @@ public class Q11004_PerfectLeatherArmor2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java index d5d32b68ef..5b2286e9a0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java @@ -183,12 +183,16 @@ public class Q11005_PerfectLeatherArmor3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -199,12 +203,16 @@ public class Q11005_PerfectLeatherArmor3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -212,4 +220,4 @@ public class Q11005_PerfectLeatherArmor3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java index 8ce8278e7e..5f047e5677 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java @@ -141,12 +141,16 @@ public class Q11007_NoiseInWoods extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, TAIL_OF_A_GRAY_WOLF) < 10))) { giveItems(killer, TAIL_OF_A_GRAY_WOLF, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, TAIL_OF_A_GRAY_WOLF) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GRAY_WOLVES_N_GO_HUNTING_AND_KILL_GOBLIN_RAIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -155,12 +159,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, GOBLINS_PACK_OF_KNICKKNACKS) < 10)) { giveItems(killer, GOBLINS_PACK_OF_KNICKKNACKS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLINS_PACK_OF_KNICKKNACKS) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_RAIDERS_N_GO_HUNTING_AND_KILL_KABOO_ORCS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -171,12 +179,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, KABBO_ORC_STURDY_AMULET) < 10)) { giveItems(killer, KABBO_ORC_STURDY_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KABBO_ORC_STURDY_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KABOO_ORCS_N_GO_HUNTING_AND_KILL_SPORE_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -185,12 +197,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, MUSHROOM_SPORE_POWDER) < 20)) { giveItems(killer, MUSHROOM_SPORE_POWDER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MUSHROOM_SPORE_POWDER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SPORE_FUNGUS_N_RETURN_TO_SENTINEL_KENDELL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -262,4 +278,4 @@ public class Q11007_NoiseInWoods extends Quest } return htmltext; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java index 28ff350aa0..5ead32e1f5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java @@ -45,7 +45,7 @@ public class Q11008_PreparationForDungeon extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int KABOO_ORC_WARRIOR_CAPTAIN = 20472; private static final int KABOO_ORC_WARRIOR_LIEUTENANT = 20473; @@ -99,7 +99,7 @@ public class Q11008_PreparationForDungeon extends Quest takeItems(player, SPIDER_VENOM, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30220-03.html"; @@ -116,7 +116,7 @@ public class Q11008_PreparationForDungeon extends Quest takeItems(player, SPIDER_VENOM, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30220-04.html"; // Custom @@ -202,12 +202,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ORCS_BANDAGE) < 20) && (getRandom(100) < 90)) { giveItems(killer, ORCS_BANDAGE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ORCS_BANDAGE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KABOO_ORC_WARRIOR_LIEUTENANTS_AND_KABOO_ORC_WARRIOR_CAPTAINS_N_GO_HUNTING_AND_KILL_DRYADS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -217,12 +221,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, DRYADS_CRIMSON_HERB) < 20) && (getRandom(100) < 90)) { giveItems(killer, DRYADS_CRIMSON_HERB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, DRYADS_CRIMSON_HERB) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_DRYADS_N_GO_HUNTING_AND_KILL_CRIMSON_SPIDERS_HOOK_SPIDERS_AND_PINCER_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -233,12 +241,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, SPIDER_VENOM) < 20) && (getRandom(100) < 90)) { giveItems(killer, SPIDER_VENOM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, SPIDER_VENOM) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_SENTINEL_STARDEN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -246,4 +258,4 @@ public class Q11008_PreparationForDungeon extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java index 8dbfacb187..59a0e9fbef 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java @@ -195,12 +195,16 @@ public class Q11009_NewPotionDevelopment1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, SPIDER_ICHOR) < 20) && (getRandom(100) < 92)) { giveItems(killer, SPIDER_ICHOR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SPIDER_ICHOR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SCAVENGER_SPIDERS_AND_RED_SCAVENGER_SPIDERS_N_GO_HUNTING_AND_KILL_MOONSTONE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -209,12 +213,16 @@ public class Q11009_NewPotionDevelopment1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) < 20) && (getRandom(100) < 92)) { giveItems(killer, MOONSTONE_BEAST_SCALES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -222,4 +230,4 @@ public class Q11009_NewPotionDevelopment1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java index b7aeb07793..57ba0557fa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java @@ -179,12 +179,16 @@ public class Q11010_NewPotionDevelopment2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, SPIDER_ICHOR) < 20) && (getRandom(100) < 92)) { giveItems(killer, SPIDER_ICHOR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SPIDER_ICHOR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SCAVENGER_SPIDERS_AND_RED_SCAVENGER_SPIDERS_N_GO_HUNTING_AND_KILL_MOONSTONE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -193,12 +197,16 @@ public class Q11010_NewPotionDevelopment2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) < 20) && (getRandom(100) < 92)) { giveItems(killer, MOONSTONE_BEAST_SCALES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -206,4 +214,4 @@ public class Q11010_NewPotionDevelopment2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java index 78abcfdec6..74ca100b7c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java @@ -177,12 +177,16 @@ public class Q11011_NewPotionDevelopment3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ANTIDOTE) < 20) && (getRandom(100) < 95)) { giveItems(killer, ANTIDOTE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ANTIDOTE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_RATMAN_SCAVENGERS_N_GO_HUNTING_AND_KILL_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -191,12 +195,16 @@ public class Q11011_NewPotionDevelopment3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ARACHNID_TRACKER_THORN) < 20) && (getRandom(100) < 90)) { giveItems(killer, ARACHNID_TRACKER_THORN, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ARACHNID_TRACKER_THORN) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL_3, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -204,4 +212,4 @@ public class Q11011_NewPotionDevelopment3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java index 239058d00b..a408980e02 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java @@ -205,12 +205,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(2)) { giveItems(killer, WOLF_TAIL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOLF_TAIL) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ASHEN_WOLVES_N_GO_HUNTING_AND_KILL_GOBLINS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -219,12 +223,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(3)) { giveItems(killer, GOBLIN_POISONOUS_DART, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_POISONOUS_DART) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLINS_N_GO_HUNTING_AND_KILL_IMPS_AND_IMP_ELDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -234,12 +242,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(4)) { giveItems(killer, IMP_WING, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, IMP_WING) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_IMPS_AND_IMP_ELDERS_N_GO_HUNTING_AND_KILL_GREEN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -248,12 +260,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(5)) { giveItems(killer, FUNGUS_JUICE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, FUNGUS_JUICE) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GREEN_FUNGUS_N_GO_HUNTING_AND_KILL_BALOR_ORC_WARRIORS_BALOR_ORC_WARRIOR_CAPTAINS_AND_BALOR_ORC_WARRIOR_LIEUTENANTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -264,12 +280,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(6)) { giveItems(killer, BALOR_ORC_FANG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BALOR_ORC_FANG) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BALOR_ORC_WARRIORS_BALOR_ORC_WARRIOR_CAPTAINS_AND_BALOR_ORC_WARRIOR_LIEUTENANTS_NRETURN_TO_HIERARCH_TALOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -277,4 +297,4 @@ public class Q11013_ShilensHunt extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java index 6f1743398f..eac7abcfda 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java @@ -46,7 +46,7 @@ public class Q11014_SurpriseGift extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int ZOMBIE_FOREST_ELF = 20015; private static final int ZOMBIE_FOREST_ELF_RESEARCHER = 20020; @@ -100,7 +100,7 @@ public class Q11014_SurpriseGift extends Quest takeItems(player, OLD_BONE_FRAGMENT, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30136-03.html"; @@ -118,7 +118,7 @@ public class Q11014_SurpriseGift extends Quest takeItems(player, OLD_BONE_FRAGMENT, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30136-04.html"; @@ -203,12 +203,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ZOMBIE_FOREST_ELF_TOOTH) < 10) && (getRandom(100) < 85)) { giveItems(killer, ZOMBIE_FOREST_ELF_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ZOMBIE_FOREST_ELF_TOOTH) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ZOMBIE_FOREST_ELVES_AND_ZOMBIE_FOREST_ELF_RESEARCHERS_N_GO_HUNTING_AND_KILL_FESTERING_BATS_AND_RED_EYE_BATS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -218,12 +222,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, BAT_SKIN) < 10) && (getRandom(100) < 85)) { giveItems(killer, BAT_SKIN, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BAT_SKIN) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_FESTERING_BATS_AND_RED_EYE_BATS_N_GO_HUNTING_AND_KILL_STONE_GIANT_SOLDIERS_AND_STONE_GIANT_GUARDIANS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -233,12 +241,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, STONE_GIANTS_SHINY_ROCK) < 10) && (getRandom(100) < 85)) { giveItems(killer, STONE_GIANTS_SHINY_ROCK, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, STONE_GIANTS_SHINY_ROCK) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_SOLDIERS_AND_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_DARK_HORRORS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -247,12 +259,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, OLD_BONE_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, OLD_BONE_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, OLD_BONE_FRAGMENT) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_DARK_HORRORS_NRETURN_TO_ARMOR_MERCHANT_PAYNE, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -260,4 +276,4 @@ public class Q11014_SurpriseGift extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java index 691442fce7..61a9ece70e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java @@ -199,12 +199,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +217,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 87)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -229,12 +237,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -242,4 +254,4 @@ public class Q11015_PrepareForTrade1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java index 932cacf9a5..4c84e21a52 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java @@ -183,12 +183,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +201,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 87)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +221,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -226,4 +238,4 @@ public class Q11016_PrepareForTrade2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java index 3768253ada..b40e5299ea 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java @@ -183,12 +183,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +201,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 85)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +221,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -226,4 +238,4 @@ public class Q11017_PrepareForTrade3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java index c3761f1eb3..86916c941d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java @@ -126,12 +126,16 @@ public class Q11019_TribalBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, KASHA_WOLF_FUR) < 10))) { giveItems(killer, KASHA_WOLF_FUR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KASHA_WOLF_FUR) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_WOLVES_AND_KASHA_BEARS_N_GO_HUNTING_AND_KILL_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -140,12 +144,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ASHES_OF_ANCESTORS) < 10)) { giveItems(killer, ASHES_OF_ANCESTORS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, ASHES_OF_ANCESTORS) >= 10) && (getQuestItemsCount(killer, IMP_NECKLACE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS_N_GO_HUNTING_AND_KILL_MOUNTAIN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -154,12 +162,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, IMP_NECKLACE) < 10)) { giveItems(killer, IMP_NECKLACE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, ASHES_OF_ANCESTORS) >= 10) && (getQuestItemsCount(killer, IMP_NECKLACE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS_N_GO_HUNTING_AND_KILL_MOUNTAIN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -168,12 +180,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, MOUNTAIN_FUNGUS_SPORES) < 10)) { giveItems(killer, MOUNTAIN_FUNGUS_SPORES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOUNTAIN_FUNGUS_SPORES) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_MOUNTAIN_FUNGUS_N_GO_HUNTING_AND_KILL_MARAKU_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -182,12 +198,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, MARAKU_WEREWOLF_CLAW) < 10)) { giveItems(killer, MARAKU_WEREWOLF_CLAW, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MARAKU_WEREWOLF_CLAW) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_MARAKU_WEREWOLVES_N_GO_HUNTING_AND_KILL_EYES_OF_SEER, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -196,12 +216,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(6) && (getQuestItemsCount(killer, EYE_OF_SEER_TEARS) < 10)) { giveItems(killer, EYE_OF_SEER_TEARS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, EYE_OF_SEER_TEARS) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EYES_OF_SEER_NRETURN_TO_CENTURION_TIKU, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -269,4 +293,4 @@ public class Q11019_TribalBenefit extends Quest } return htmltext; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java index 8e3a1e7c8f..ecee5b9ec1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java @@ -46,7 +46,7 @@ public class Q11020_BlacksmithsRequest extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int EARRING_NOVICE = 49040; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int BLACKWING_BAT = 20316; private static final int TOMB_RAIDER_LEADER = 20320; @@ -199,12 +199,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BLACKWING_BAT_WING) < 20) && (getRandom(100) < 90)) { giveItems(killer, BLACKWING_BAT_WING, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BLACKWING_BAT_WING) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACKWING_BATS_N_GO_HUNTING_AND_KILL_GOBLIN_TOMB_RAIDER_LEADERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +217,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, GRAVE_ROBBERS_BELT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GRAVE_ROBBERS_BELT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GRAVE_ROBBERS_BELT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDER_LEADERS_N_GO_HUNTING_AND_KILL_GREYSTONE_GOLEMS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -227,12 +235,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOLEM_ORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOLEM_ORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOLEM_ORE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GREYSTONE_GOLEMS_N_GO_HUNTING_AND_KILL_EVIL_EYE_PATROLS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -241,12 +253,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, EVIL_EYE_PATROL_HIDE) < 20) && (getRandom(100) < 90)) { giveItems(killer, EVIL_EYE_PATROL_HIDE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, EVIL_EYE_PATROL_HIDE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EVIL_EYE_PATROLS_NRETURN_TO_BLACKSMITH_SUMARI, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -254,4 +270,4 @@ public class Q11020_BlacksmithsRequest extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java index 996895c049..4152e0523d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java @@ -195,12 +195,16 @@ public class Q11021_RedGemNecklace1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BEARS_SHIN_BONE) < 20) && (getRandom(100) < 92)) { giveItems(killer, BEARS_SHIN_BONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BEARS_SHIN_BONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_BEARS_N_GO_HUNTING_AND_KILL_KASHA_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -211,12 +215,16 @@ public class Q11021_RedGemNecklace1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, SHARP_SPIDER_LEG) < 30) && (getRandom(100) < 89)) { giveItems(killer, SHARP_SPIDER_LEG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SHARP_SPIDER_LEG) >= 30) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_SPIDERS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -224,4 +232,4 @@ public class Q11021_RedGemNecklace1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java index 2d13284f7a..2fec10cced 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java @@ -179,12 +179,16 @@ public class Q11022_RedGemNecklace2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BEARS_SHIN_BONE) < 20) && (getRandom(100) < 92)) { giveItems(killer, BEARS_SHIN_BONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BEARS_SHIN_BONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_BEARS_N_GO_HUNTING_AND_KILL_KASHA_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -195,12 +199,16 @@ public class Q11022_RedGemNecklace2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, SHARP_SPIDER_LEG) < 30) && (getRandom(100) < 89)) { giveItems(killer, SHARP_SPIDER_LEG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SHARP_SPIDER_LEG) >= 30) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_SPIDERS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -208,4 +216,4 @@ public class Q11022_RedGemNecklace2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java index f433bbeaa6..c46e010f00 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java @@ -177,12 +177,16 @@ public class Q11023_RedGemNecklace3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, HARD_LENS) < 20) && (getRandom(100) < 92)) { giveItems(killer, HARD_LENS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, HARD_LENS) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EVIL_EYE_SEERS_N_GO_HUNTING_AND_KILL_KASHA_IMPS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -191,12 +195,16 @@ public class Q11023_RedGemNecklace3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, RED_STONE) < 20) && (getRandom(100) < 91)) { giveItems(killer, RED_STONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, RED_STONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_IMPS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -204,4 +212,4 @@ public class Q11023_RedGemNecklace3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java index 688986453a..0935fda0fa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java @@ -126,12 +126,16 @@ public class Q10995_MutualBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, BALCK_WOLF_TOOTH) < 10))) { giveItems(killer, BALCK_WOLF_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BALCK_WOLF_TOOTH) >= 10) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACK_WOLVES_AND_GOBLIN_SNOOPERS_NGO_HUNTING_AND_KILL_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -140,12 +144,16 @@ public class Q10995_MutualBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) < 10))) { giveItems(killer, GOBLINS_NAVIGATION_DEVICE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BALCK_WOLF_TOOTH) >= 10) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACK_WOLVES_AND_GOBLIN_SNOOPERS_NGO_HUNTING_AND_KILL_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -155,12 +163,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, UTUKU_ORC_AMULET) < 10)) { giveItems(killer, UTUKU_ORC_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, UTUKU_ORC_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS_NGO_HUNTING_AND_KILL_GOBLIN_BRIGANDS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -169,12 +181,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOBLIN_BRIGANDS_OLD_SWORD) < 10)) { giveItems(killer, GOBLIN_BRIGANDS_OLD_SWORD, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_BRIGANDS_OLD_SWORD) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_BRIGANDS_N_GO_HUNTING_AND_KILL_GARUM_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -183,12 +199,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, GARUM_WEREWOLF_TAIL) < 10)) { giveItems(killer, GARUM_WEREWOLF_TAIL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GARUM_WEREWOLF_TAIL) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GARUM_WEREWOLVES_N_GO_HUNTING_AND_KILL_GOBLIN_BRIGAND_LIEUTENANTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +217,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(6) && (getQuestItemsCount(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE) < 10)) { giveItems(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_BRIGAND_LIEUTENANTS_NRETURN_TO_WEAPON_MERCHANT_REEP, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -274,4 +298,4 @@ public class Q10995_MutualBenefit extends Quest } return htmltext; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java index bbfde541ae..f4c81bcfd6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10996_TemplesDecorations/Q10996_TemplesDecorations.java @@ -46,7 +46,7 @@ public class Q10996_TemplesDecorations extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int BARBED_BATS = 20370; private static final int CRYSTAL_PUMA = 20510; @@ -99,7 +99,7 @@ public class Q10996_TemplesDecorations extends Quest takeItems(player, GOLEM_ORE, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30538-03.html"; @@ -117,7 +117,7 @@ public class Q10996_TemplesDecorations extends Quest takeItems(player, GOLEM_ORE, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30538-04.html"; @@ -201,12 +201,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BARBED_BAT_WING_SAC) < 20) && (getRandom(100) < 90)) { giveItems(killer, BARBED_BAT_WING_SAC, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BARBED_BAT_WING_SAC) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BARBED_BATS_N_GO_HUNTING_AND_KILL_CRYSTAL_PUMAS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -215,12 +219,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, PUMA_FUR) < 20) && (getRandom(100) < 90)) { giveItems(killer, PUMA_FUR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, PUMA_FUR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTAL_PUMAS_N_GO_HUNTING_AND_KILL_GOBLIN_LORDS_AND_GOBLIN_BRIGAND_LEADERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -230,12 +238,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOBLIN_JEWEL) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOBLIN_JEWEL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOBLIN_JEWEL) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_LORDS_AND_GOBLIN_BRIGAND_LEADERS_N_GO_HUNTING_AND_KILL_WHINSTONE_GOLEM_AND_OBSIDIAN_GOLEMS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -245,12 +257,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, GOLEM_ORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOLEM_ORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOLEM_ORE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WHINSTONE_GOLEM_AND_OBSIDIAN_GOLEMS_NRETURN_TO_PRIEST_OF_THE_EARTH_ZIMENF, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -258,4 +274,4 @@ public class Q10996_TemplesDecorations extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java index 08cff41099..b61181f06c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java @@ -178,12 +178,16 @@ public class Q10998_LoserPriest2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, HUNTER_TARANTULA_VENOM) < 20) && (getRandom(100) < 94)) { giveItems(killer, HUNTER_TARANTULA_VENOM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, HUNTER_TARANTULA_VENOM) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_HUNTER_TARANTULAS_N_GO_HUNTING_AND_KILL_PLUNDER_TARANTULAS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -192,12 +196,16 @@ public class Q10998_LoserPriest2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, PLUNDER_TARANTULA_KIDNEY) < 20) && (getRandom(100) < 94)) { giveItems(killer, PLUNDER_TARANTULA_KIDNEY, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, PLUNDER_TARANTULA_KIDNEY) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PLUNDER_TARANTULAS_NRETURN_TO_PRIEST_OF_THE_EARTH_GERALD, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -205,4 +213,4 @@ public class Q10998_LoserPriest2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java index c3d757ec35..952c639c4f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java @@ -182,12 +182,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BAT_BRISTLE) < 20) && (getRandom(100) < 90)) { giveItems(killer, BAT_BRISTLE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BAT_BRISTLE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_RED_EYE_BARBED_BATS_NGO_HUNTING_AND_KILL_NORTHERN_TRIMDENS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -196,12 +200,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, TRIMDEN_WEB) < 20) && (getRandom(100) < 90)) { giveItems(killer, TRIMDEN_WEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, TRIMDEN_WEB) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_NORTHERN_TRIMDENS_N_GO_HUNTING_AND_KILL_KEROPE_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -211,12 +219,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, KEROPE_WEREWOLF_TWIG_CHARM) < 20) && (getRandom(100) < 90)) { giveItems(killer, KEROPE_WEREWOLF_TWIG_CHARM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KEROPE_WEREWOLF_TWIG_CHARM) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KEROPE_WEREWOLVES_NRETURN_TO_PRIEST_OF_THE_EARTH_GERALD, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -224,4 +236,4 @@ public class Q10999_LoserPriest3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java index feaa6e4313..456313a0fd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java @@ -200,12 +200,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, WOLF_PELT) < 10) && (getRandom(100) < 93)) { giveItems(killer, WOLF_PELT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOLF_PELT) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WOLVES_N_GO_HUNTING_AND_KILL_ORCS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -216,12 +220,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ORC_AMULET) < 10) && (getRandom(100) < 93)) { giveItems(killer, ORC_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ORC_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORCS_NGO_HUNTING_AND_KILL_ORC_WARRIORS_AND_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -230,12 +238,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, BROKEN_SWORD) < 10) && (getRandom(100) < 89)) { giveItems(killer, BROKEN_SWORD, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BROKEN_SWORD) >= 10) && (getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -244,12 +256,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, WEREWOLFS_FANG) < 10) && (getRandom(100) < 100)) { giveItems(killer, WEREWOLFS_FANG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10) && (getQuestItemsCount(killer, BROKEN_SWORD) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -257,4 +273,4 @@ public class Q11001_TombsOfAncestors extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java index 16db8db562..cee0c0662c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11002_HelpWithTempleRestoration/Q11002_HelpWithTempleRestoration.java @@ -45,7 +45,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int ORC_LIEUTENANT = 20096; private static final int ORC_CAPTAIN = 20098; @@ -97,7 +97,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest takeItems(player, STONE_POWDER, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30035-03.html"; @@ -114,7 +114,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest takeItems(player, STONE_POWDER, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30035-04.html"; @@ -199,12 +199,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, WOODEN_POLE) < 20) && (getRandom(100) < 84)) { giveItems(killer, WOODEN_POLE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOODEN_POLE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORC_LIEUTENANTS_AND_ORC_CAPTAINS_N_GO_HUNTING_AND_KILL_WEREWOLF_HUNTERS_AND_WEREWOLF_CHIEFTAINS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -214,12 +218,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, WOODEN_DOOR_PANEL) < 25) && (getRandom(100) < 87)) { giveItems(killer, WOODEN_DOOR_PANEL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOODEN_DOOR_PANEL) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WEREWOLF_HUNTERS_AND_WEREWOLF_CHIEFTAINS_N_GO_HUNTING_AND_KILL_STONE_GOLEMS_AND_CRASHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -229,12 +237,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, STONE_POWDER) < 20) && (getRandom(100) < 84)) { giveItems(killer, STONE_POWDER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, STONE_POWDER) >= 20) && (getQuestItemsCount(killer, STONE_POWDER) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_HARRYS_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -242,4 +254,4 @@ public class Q11002_HelpWithTempleRestoration extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java index 578428fb11..3b95786637 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11003_PerfectLeatherArmor1/Q11003_PerfectLeatherArmor1.java @@ -198,12 +198,16 @@ public class Q11003_PerfectLeatherArmor1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -214,12 +218,16 @@ public class Q11003_PerfectLeatherArmor1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -227,4 +235,4 @@ public class Q11003_PerfectLeatherArmor1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java index 661328aa50..5a5560f006 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java @@ -183,12 +183,16 @@ public class Q11004_PerfectLeatherArmor2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -199,12 +203,16 @@ public class Q11004_PerfectLeatherArmor2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -212,4 +220,4 @@ public class Q11004_PerfectLeatherArmor2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java index d5d32b68ef..5b2286e9a0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java @@ -183,12 +183,16 @@ public class Q11005_PerfectLeatherArmor3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -199,12 +203,16 @@ public class Q11005_PerfectLeatherArmor3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -212,4 +220,4 @@ public class Q11005_PerfectLeatherArmor3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java index 8ce8278e7e..5f047e5677 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java @@ -141,12 +141,16 @@ public class Q11007_NoiseInWoods extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, TAIL_OF_A_GRAY_WOLF) < 10))) { giveItems(killer, TAIL_OF_A_GRAY_WOLF, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, TAIL_OF_A_GRAY_WOLF) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GRAY_WOLVES_N_GO_HUNTING_AND_KILL_GOBLIN_RAIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -155,12 +159,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, GOBLINS_PACK_OF_KNICKKNACKS) < 10)) { giveItems(killer, GOBLINS_PACK_OF_KNICKKNACKS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLINS_PACK_OF_KNICKKNACKS) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_RAIDERS_N_GO_HUNTING_AND_KILL_KABOO_ORCS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -171,12 +179,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, KABBO_ORC_STURDY_AMULET) < 10)) { giveItems(killer, KABBO_ORC_STURDY_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KABBO_ORC_STURDY_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KABOO_ORCS_N_GO_HUNTING_AND_KILL_SPORE_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -185,12 +197,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, MUSHROOM_SPORE_POWDER) < 20)) { giveItems(killer, MUSHROOM_SPORE_POWDER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MUSHROOM_SPORE_POWDER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SPORE_FUNGUS_N_RETURN_TO_SENTINEL_KENDELL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -262,4 +278,4 @@ public class Q11007_NoiseInWoods extends Quest } return htmltext; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java index 28ff350aa0..5ead32e1f5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11008_PreparationForDungeon/Q11008_PreparationForDungeon.java @@ -45,7 +45,7 @@ public class Q11008_PreparationForDungeon extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int KABOO_ORC_WARRIOR_CAPTAIN = 20472; private static final int KABOO_ORC_WARRIOR_LIEUTENANT = 20473; @@ -99,7 +99,7 @@ public class Q11008_PreparationForDungeon extends Quest takeItems(player, SPIDER_VENOM, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30220-03.html"; @@ -116,7 +116,7 @@ public class Q11008_PreparationForDungeon extends Quest takeItems(player, SPIDER_VENOM, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30220-04.html"; // Custom @@ -202,12 +202,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ORCS_BANDAGE) < 20) && (getRandom(100) < 90)) { giveItems(killer, ORCS_BANDAGE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ORCS_BANDAGE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KABOO_ORC_WARRIOR_LIEUTENANTS_AND_KABOO_ORC_WARRIOR_CAPTAINS_N_GO_HUNTING_AND_KILL_DRYADS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -217,12 +221,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, DRYADS_CRIMSON_HERB) < 20) && (getRandom(100) < 90)) { giveItems(killer, DRYADS_CRIMSON_HERB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, DRYADS_CRIMSON_HERB) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_DRYADS_N_GO_HUNTING_AND_KILL_CRIMSON_SPIDERS_HOOK_SPIDERS_AND_PINCER_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -233,12 +241,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, SPIDER_VENOM) < 20) && (getRandom(100) < 90)) { giveItems(killer, SPIDER_VENOM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, SPIDER_VENOM) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_SENTINEL_STARDEN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -246,4 +258,4 @@ public class Q11008_PreparationForDungeon extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java index 8dbfacb187..59a0e9fbef 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java @@ -195,12 +195,16 @@ public class Q11009_NewPotionDevelopment1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, SPIDER_ICHOR) < 20) && (getRandom(100) < 92)) { giveItems(killer, SPIDER_ICHOR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SPIDER_ICHOR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SCAVENGER_SPIDERS_AND_RED_SCAVENGER_SPIDERS_N_GO_HUNTING_AND_KILL_MOONSTONE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -209,12 +213,16 @@ public class Q11009_NewPotionDevelopment1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) < 20) && (getRandom(100) < 92)) { giveItems(killer, MOONSTONE_BEAST_SCALES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -222,4 +230,4 @@ public class Q11009_NewPotionDevelopment1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java index b7aeb07793..57ba0557fa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java @@ -179,12 +179,16 @@ public class Q11010_NewPotionDevelopment2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, SPIDER_ICHOR) < 20) && (getRandom(100) < 92)) { giveItems(killer, SPIDER_ICHOR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SPIDER_ICHOR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SCAVENGER_SPIDERS_AND_RED_SCAVENGER_SPIDERS_N_GO_HUNTING_AND_KILL_MOONSTONE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -193,12 +197,16 @@ public class Q11010_NewPotionDevelopment2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) < 20) && (getRandom(100) < 92)) { giveItems(killer, MOONSTONE_BEAST_SCALES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -206,4 +214,4 @@ public class Q11010_NewPotionDevelopment2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java index 78abcfdec6..74ca100b7c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java @@ -177,12 +177,16 @@ public class Q11011_NewPotionDevelopment3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ANTIDOTE) < 20) && (getRandom(100) < 95)) { giveItems(killer, ANTIDOTE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ANTIDOTE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_RATMAN_SCAVENGERS_N_GO_HUNTING_AND_KILL_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -191,12 +195,16 @@ public class Q11011_NewPotionDevelopment3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ARACHNID_TRACKER_THORN) < 20) && (getRandom(100) < 90)) { giveItems(killer, ARACHNID_TRACKER_THORN, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ARACHNID_TRACKER_THORN) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL_3, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -204,4 +212,4 @@ public class Q11011_NewPotionDevelopment3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java index 239058d00b..a408980e02 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java @@ -205,12 +205,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(2)) { giveItems(killer, WOLF_TAIL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOLF_TAIL) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ASHEN_WOLVES_N_GO_HUNTING_AND_KILL_GOBLINS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -219,12 +223,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(3)) { giveItems(killer, GOBLIN_POISONOUS_DART, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_POISONOUS_DART) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLINS_N_GO_HUNTING_AND_KILL_IMPS_AND_IMP_ELDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -234,12 +242,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(4)) { giveItems(killer, IMP_WING, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, IMP_WING) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_IMPS_AND_IMP_ELDERS_N_GO_HUNTING_AND_KILL_GREEN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -248,12 +260,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(5)) { giveItems(killer, FUNGUS_JUICE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, FUNGUS_JUICE) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GREEN_FUNGUS_N_GO_HUNTING_AND_KILL_BALOR_ORC_WARRIORS_BALOR_ORC_WARRIOR_CAPTAINS_AND_BALOR_ORC_WARRIOR_LIEUTENANTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -264,12 +280,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(6)) { giveItems(killer, BALOR_ORC_FANG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BALOR_ORC_FANG) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BALOR_ORC_WARRIORS_BALOR_ORC_WARRIOR_CAPTAINS_AND_BALOR_ORC_WARRIOR_LIEUTENANTS_NRETURN_TO_HIERARCH_TALOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -277,4 +297,4 @@ public class Q11013_ShilensHunt extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java index 6f1743398f..eac7abcfda 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11014_SurpriseGift/Q11014_SurpriseGift.java @@ -46,7 +46,7 @@ public class Q11014_SurpriseGift extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int ZOMBIE_FOREST_ELF = 20015; private static final int ZOMBIE_FOREST_ELF_RESEARCHER = 20020; @@ -100,7 +100,7 @@ public class Q11014_SurpriseGift extends Quest takeItems(player, OLD_BONE_FRAGMENT, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30136-03.html"; @@ -118,7 +118,7 @@ public class Q11014_SurpriseGift extends Quest takeItems(player, OLD_BONE_FRAGMENT, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30136-04.html"; @@ -203,12 +203,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ZOMBIE_FOREST_ELF_TOOTH) < 10) && (getRandom(100) < 85)) { giveItems(killer, ZOMBIE_FOREST_ELF_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ZOMBIE_FOREST_ELF_TOOTH) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ZOMBIE_FOREST_ELVES_AND_ZOMBIE_FOREST_ELF_RESEARCHERS_N_GO_HUNTING_AND_KILL_FESTERING_BATS_AND_RED_EYE_BATS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -218,12 +222,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, BAT_SKIN) < 10) && (getRandom(100) < 85)) { giveItems(killer, BAT_SKIN, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BAT_SKIN) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_FESTERING_BATS_AND_RED_EYE_BATS_N_GO_HUNTING_AND_KILL_STONE_GIANT_SOLDIERS_AND_STONE_GIANT_GUARDIANS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -233,12 +241,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, STONE_GIANTS_SHINY_ROCK) < 10) && (getRandom(100) < 85)) { giveItems(killer, STONE_GIANTS_SHINY_ROCK, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, STONE_GIANTS_SHINY_ROCK) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_SOLDIERS_AND_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_DARK_HORRORS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -247,12 +259,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, OLD_BONE_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, OLD_BONE_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, OLD_BONE_FRAGMENT) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_DARK_HORRORS_NRETURN_TO_ARMOR_MERCHANT_PAYNE, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -260,4 +276,4 @@ public class Q11014_SurpriseGift extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java index 691442fce7..61a9ece70e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11015_PrepareForTrade1/Q11015_PrepareForTrade1.java @@ -199,12 +199,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +217,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 87)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -229,12 +237,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -242,4 +254,4 @@ public class Q11015_PrepareForTrade1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java index 932cacf9a5..4c84e21a52 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java @@ -183,12 +183,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +201,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 87)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +221,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -226,4 +238,4 @@ public class Q11016_PrepareForTrade2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java index 3768253ada..b40e5299ea 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java @@ -183,12 +183,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +201,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 85)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +221,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -226,4 +238,4 @@ public class Q11017_PrepareForTrade3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java index c3761f1eb3..86916c941d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java @@ -126,12 +126,16 @@ public class Q11019_TribalBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, KASHA_WOLF_FUR) < 10))) { giveItems(killer, KASHA_WOLF_FUR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KASHA_WOLF_FUR) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_WOLVES_AND_KASHA_BEARS_N_GO_HUNTING_AND_KILL_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -140,12 +144,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ASHES_OF_ANCESTORS) < 10)) { giveItems(killer, ASHES_OF_ANCESTORS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, ASHES_OF_ANCESTORS) >= 10) && (getQuestItemsCount(killer, IMP_NECKLACE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS_N_GO_HUNTING_AND_KILL_MOUNTAIN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -154,12 +162,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, IMP_NECKLACE) < 10)) { giveItems(killer, IMP_NECKLACE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, ASHES_OF_ANCESTORS) >= 10) && (getQuestItemsCount(killer, IMP_NECKLACE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS_N_GO_HUNTING_AND_KILL_MOUNTAIN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -168,12 +180,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, MOUNTAIN_FUNGUS_SPORES) < 10)) { giveItems(killer, MOUNTAIN_FUNGUS_SPORES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOUNTAIN_FUNGUS_SPORES) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_MOUNTAIN_FUNGUS_N_GO_HUNTING_AND_KILL_MARAKU_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -182,12 +198,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, MARAKU_WEREWOLF_CLAW) < 10)) { giveItems(killer, MARAKU_WEREWOLF_CLAW, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MARAKU_WEREWOLF_CLAW) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_MARAKU_WEREWOLVES_N_GO_HUNTING_AND_KILL_EYES_OF_SEER, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -196,12 +216,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(6) && (getQuestItemsCount(killer, EYE_OF_SEER_TEARS) < 10)) { giveItems(killer, EYE_OF_SEER_TEARS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, EYE_OF_SEER_TEARS) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EYES_OF_SEER_NRETURN_TO_CENTURION_TIKU, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -269,4 +293,4 @@ public class Q11019_TribalBenefit extends Quest } return htmltext; } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java index 8e3a1e7c8f..ecee5b9ec1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11020_BlacksmithsRequest/Q11020_BlacksmithsRequest.java @@ -46,7 +46,7 @@ public class Q11020_BlacksmithsRequest extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int EARRING_NOVICE = 49040; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int BLACKWING_BAT = 20316; private static final int TOMB_RAIDER_LEADER = 20320; @@ -199,12 +199,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BLACKWING_BAT_WING) < 20) && (getRandom(100) < 90)) { giveItems(killer, BLACKWING_BAT_WING, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BLACKWING_BAT_WING) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACKWING_BATS_N_GO_HUNTING_AND_KILL_GOBLIN_TOMB_RAIDER_LEADERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +217,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, GRAVE_ROBBERS_BELT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GRAVE_ROBBERS_BELT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GRAVE_ROBBERS_BELT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDER_LEADERS_N_GO_HUNTING_AND_KILL_GREYSTONE_GOLEMS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -227,12 +235,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOLEM_ORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOLEM_ORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOLEM_ORE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GREYSTONE_GOLEMS_N_GO_HUNTING_AND_KILL_EVIL_EYE_PATROLS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -241,12 +253,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, EVIL_EYE_PATROL_HIDE) < 20) && (getRandom(100) < 90)) { giveItems(killer, EVIL_EYE_PATROL_HIDE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, EVIL_EYE_PATROL_HIDE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EVIL_EYE_PATROLS_NRETURN_TO_BLACKSMITH_SUMARI, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -254,4 +270,4 @@ public class Q11020_BlacksmithsRequest extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java index 996895c049..4152e0523d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11021_RedGemNecklace1/Q11021_RedGemNecklace1.java @@ -195,12 +195,16 @@ public class Q11021_RedGemNecklace1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BEARS_SHIN_BONE) < 20) && (getRandom(100) < 92)) { giveItems(killer, BEARS_SHIN_BONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BEARS_SHIN_BONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_BEARS_N_GO_HUNTING_AND_KILL_KASHA_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -211,12 +215,16 @@ public class Q11021_RedGemNecklace1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, SHARP_SPIDER_LEG) < 30) && (getRandom(100) < 89)) { giveItems(killer, SHARP_SPIDER_LEG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SHARP_SPIDER_LEG) >= 30) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_SPIDERS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -224,4 +232,4 @@ public class Q11021_RedGemNecklace1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java index 2d13284f7a..2fec10cced 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java @@ -179,12 +179,16 @@ public class Q11022_RedGemNecklace2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BEARS_SHIN_BONE) < 20) && (getRandom(100) < 92)) { giveItems(killer, BEARS_SHIN_BONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BEARS_SHIN_BONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_BEARS_N_GO_HUNTING_AND_KILL_KASHA_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -195,12 +199,16 @@ public class Q11022_RedGemNecklace2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, SHARP_SPIDER_LEG) < 30) && (getRandom(100) < 89)) { giveItems(killer, SHARP_SPIDER_LEG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SHARP_SPIDER_LEG) >= 30) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_SPIDERS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -208,4 +216,4 @@ public class Q11022_RedGemNecklace2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java index f433bbeaa6..c46e010f00 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java @@ -177,12 +177,16 @@ public class Q11023_RedGemNecklace3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, HARD_LENS) < 20) && (getRandom(100) < 92)) { giveItems(killer, HARD_LENS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, HARD_LENS) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EVIL_EYE_SEERS_N_GO_HUNTING_AND_KILL_KASHA_IMPS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -191,12 +195,16 @@ public class Q11023_RedGemNecklace3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, RED_STONE) < 20) && (getRandom(100) < 91)) { giveItems(killer, RED_STONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, RED_STONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_IMPS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -204,4 +212,4 @@ public class Q11023_RedGemNecklace3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java index 688986453a..0935fda0fa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10995_MutualBenefit/Q10995_MutualBenefit.java @@ -126,12 +126,16 @@ public class Q10995_MutualBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, BALCK_WOLF_TOOTH) < 10))) { giveItems(killer, BALCK_WOLF_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BALCK_WOLF_TOOTH) >= 10) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACK_WOLVES_AND_GOBLIN_SNOOPERS_NGO_HUNTING_AND_KILL_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -140,12 +144,16 @@ public class Q10995_MutualBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) < 10))) { giveItems(killer, GOBLINS_NAVIGATION_DEVICE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BALCK_WOLF_TOOTH) >= 10) && (getQuestItemsCount(killer, GOBLINS_NAVIGATION_DEVICE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACK_WOLVES_AND_GOBLIN_SNOOPERS_NGO_HUNTING_AND_KILL_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -155,12 +163,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, UTUKU_ORC_AMULET) < 10)) { giveItems(killer, UTUKU_ORC_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, UTUKU_ORC_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_UTUKU_ORCS_AND_UTUKU_ORC_ARCHERS_NGO_HUNTING_AND_KILL_GOBLIN_BRIGANDS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -169,12 +181,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOBLIN_BRIGANDS_OLD_SWORD) < 10)) { giveItems(killer, GOBLIN_BRIGANDS_OLD_SWORD, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_BRIGANDS_OLD_SWORD) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_BRIGANDS_N_GO_HUNTING_AND_KILL_GARUM_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -183,12 +199,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, GARUM_WEREWOLF_TAIL) < 10)) { giveItems(killer, GARUM_WEREWOLF_TAIL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GARUM_WEREWOLF_TAIL) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GARUM_WEREWOLVES_N_GO_HUNTING_AND_KILL_GOBLIN_BRIGAND_LIEUTENANTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +217,16 @@ public class Q10995_MutualBenefit extends Quest if (qs.isCond(6) && (getQuestItemsCount(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE) < 10)) { giveItems(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_BRIGAND_LIEUTENANT_NECKLACE) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_BRIGAND_LIEUTENANTS_NRETURN_TO_WEAPON_MERCHANT_REEP, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -274,4 +298,4 @@ public class Q10995_MutualBenefit extends Quest } return htmltext; } -} \ No newline at end of file +} 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 bbfde541ae..f4c81bcfd6 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 @@ -46,7 +46,7 @@ public class Q10996_TemplesDecorations extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int BARBED_BATS = 20370; private static final int CRYSTAL_PUMA = 20510; @@ -99,7 +99,7 @@ public class Q10996_TemplesDecorations extends Quest takeItems(player, GOLEM_ORE, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30538-03.html"; @@ -117,7 +117,7 @@ public class Q10996_TemplesDecorations extends Quest takeItems(player, GOLEM_ORE, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30538-04.html"; @@ -201,12 +201,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BARBED_BAT_WING_SAC) < 20) && (getRandom(100) < 90)) { giveItems(killer, BARBED_BAT_WING_SAC, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BARBED_BAT_WING_SAC) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BARBED_BATS_N_GO_HUNTING_AND_KILL_CRYSTAL_PUMAS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -215,12 +219,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, PUMA_FUR) < 20) && (getRandom(100) < 90)) { giveItems(killer, PUMA_FUR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, PUMA_FUR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTAL_PUMAS_N_GO_HUNTING_AND_KILL_GOBLIN_LORDS_AND_GOBLIN_BRIGAND_LEADERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -230,12 +238,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOBLIN_JEWEL) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOBLIN_JEWEL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOBLIN_JEWEL) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_LORDS_AND_GOBLIN_BRIGAND_LEADERS_N_GO_HUNTING_AND_KILL_WHINSTONE_GOLEM_AND_OBSIDIAN_GOLEMS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -245,12 +257,16 @@ public class Q10996_TemplesDecorations extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, GOLEM_ORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOLEM_ORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOLEM_ORE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WHINSTONE_GOLEM_AND_OBSIDIAN_GOLEMS_NRETURN_TO_PRIEST_OF_THE_EARTH_ZIMENF, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -258,4 +274,4 @@ public class Q10996_TemplesDecorations extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java index 08cff41099..b61181f06c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10998_LoserPriest2/Q10998_LoserPriest2.java @@ -178,12 +178,16 @@ public class Q10998_LoserPriest2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, HUNTER_TARANTULA_VENOM) < 20) && (getRandom(100) < 94)) { giveItems(killer, HUNTER_TARANTULA_VENOM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, HUNTER_TARANTULA_VENOM) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_HUNTER_TARANTULAS_N_GO_HUNTING_AND_KILL_PLUNDER_TARANTULAS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -192,12 +196,16 @@ public class Q10998_LoserPriest2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, PLUNDER_TARANTULA_KIDNEY) < 20) && (getRandom(100) < 94)) { giveItems(killer, PLUNDER_TARANTULA_KIDNEY, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, PLUNDER_TARANTULA_KIDNEY) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PLUNDER_TARANTULAS_NRETURN_TO_PRIEST_OF_THE_EARTH_GERALD, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -205,4 +213,4 @@ public class Q10998_LoserPriest2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java index c3d757ec35..952c639c4f 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q10999_LoserPriest3/Q10999_LoserPriest3.java @@ -182,12 +182,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BAT_BRISTLE) < 20) && (getRandom(100) < 90)) { giveItems(killer, BAT_BRISTLE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BAT_BRISTLE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_RED_EYE_BARBED_BATS_NGO_HUNTING_AND_KILL_NORTHERN_TRIMDENS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -196,12 +200,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, TRIMDEN_WEB) < 20) && (getRandom(100) < 90)) { giveItems(killer, TRIMDEN_WEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, TRIMDEN_WEB) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_NORTHERN_TRIMDENS_N_GO_HUNTING_AND_KILL_KEROPE_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -211,12 +219,16 @@ public class Q10999_LoserPriest3 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, KEROPE_WEREWOLF_TWIG_CHARM) < 20) && (getRandom(100) < 90)) { giveItems(killer, KEROPE_WEREWOLF_TWIG_CHARM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KEROPE_WEREWOLF_TWIG_CHARM) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KEROPE_WEREWOLVES_NRETURN_TO_PRIEST_OF_THE_EARTH_GERALD, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -224,4 +236,4 @@ public class Q10999_LoserPriest3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java index feaa6e4313..456313a0fd 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11001_TombsOfAncestors/Q11001_TombsOfAncestors.java @@ -200,12 +200,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, WOLF_PELT) < 10) && (getRandom(100) < 93)) { giveItems(killer, WOLF_PELT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOLF_PELT) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WOLVES_N_GO_HUNTING_AND_KILL_ORCS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -216,12 +220,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ORC_AMULET) < 10) && (getRandom(100) < 93)) { giveItems(killer, ORC_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ORC_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORCS_NGO_HUNTING_AND_KILL_ORC_WARRIORS_AND_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -230,12 +238,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, BROKEN_SWORD) < 10) && (getRandom(100) < 89)) { giveItems(killer, BROKEN_SWORD, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, BROKEN_SWORD) >= 10) && (getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -244,12 +256,16 @@ public class Q11001_TombsOfAncestors extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, WEREWOLFS_FANG) < 10) && (getRandom(100) < 100)) { giveItems(killer, WEREWOLFS_FANG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, WEREWOLFS_FANG) >= 10) && (getQuestItemsCount(killer, BROKEN_SWORD) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_FULFILLED_ALL_ALTRAN_S_REQUESTS_N_RETURN_TO_ALTRAN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -257,4 +273,4 @@ public class Q11001_TombsOfAncestors extends Quest } return super.onKill(npc, killer, isSummon); } -} \ 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 16db8db562..cee0c0662c 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 @@ -45,7 +45,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int ORC_LIEUTENANT = 20096; private static final int ORC_CAPTAIN = 20098; @@ -97,7 +97,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest takeItems(player, STONE_POWDER, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30035-03.html"; @@ -114,7 +114,7 @@ public class Q11002_HelpWithTempleRestoration extends Quest takeItems(player, STONE_POWDER, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30035-04.html"; @@ -199,12 +199,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, WOODEN_POLE) < 20) && (getRandom(100) < 84)) { giveItems(killer, WOODEN_POLE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOODEN_POLE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ORC_LIEUTENANTS_AND_ORC_CAPTAINS_N_GO_HUNTING_AND_KILL_WEREWOLF_HUNTERS_AND_WEREWOLF_CHIEFTAINS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -214,12 +218,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, WOODEN_DOOR_PANEL) < 25) && (getRandom(100) < 87)) { giveItems(killer, WOODEN_DOOR_PANEL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOODEN_DOOR_PANEL) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_WEREWOLF_HUNTERS_AND_WEREWOLF_CHIEFTAINS_N_GO_HUNTING_AND_KILL_STONE_GOLEMS_AND_CRASHERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -229,12 +237,16 @@ public class Q11002_HelpWithTempleRestoration extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, STONE_POWDER) < 20) && (getRandom(100) < 84)) { giveItems(killer, STONE_POWDER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, STONE_POWDER) >= 20) && (getQuestItemsCount(killer, STONE_POWDER) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_HARRYS_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -242,4 +254,4 @@ public class Q11002_HelpWithTempleRestoration extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} 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 578428fb11..3b95786637 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 @@ -198,12 +198,16 @@ public class Q11003_PerfectLeatherArmor1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -214,12 +218,16 @@ public class Q11003_PerfectLeatherArmor1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -227,4 +235,4 @@ public class Q11003_PerfectLeatherArmor1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java index 661328aa50..5a5560f006 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11004_PerfectLeatherArmor2/Q11004_PerfectLeatherArmor2.java @@ -183,12 +183,16 @@ public class Q11004_PerfectLeatherArmor2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -199,12 +203,16 @@ public class Q11004_PerfectLeatherArmor2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -212,4 +220,4 @@ public class Q11004_PerfectLeatherArmor2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java index d5d32b68ef..5b2286e9a0 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11005_PerfectLeatherArmor3/Q11005_PerfectLeatherArmor3.java @@ -183,12 +183,16 @@ public class Q11005_PerfectLeatherArmor3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, COBWEB) < 25) && (getRandom(100) < 87)) { giveItems(killer, COBWEB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, COBWEB) >= 25) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GIANT_SPIDERS_N_GO_HUNTING_AND_KILL_UNDINES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -199,12 +203,16 @@ public class Q11005_PerfectLeatherArmor3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ESSENCE_OF_WATER) < 20) && (getRandom(100) < 100)) { giveItems(killer, ESSENCE_OF_WATER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ESSENCE_OF_WATER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_ALL_OF_THE_ITEMS_LECTOR_REQUESTED_RETURN_TO_HIM, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -212,4 +220,4 @@ public class Q11005_PerfectLeatherArmor3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java index 8ce8278e7e..5f047e5677 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11007_NoiseInWoods/Q11007_NoiseInWoods.java @@ -141,12 +141,16 @@ public class Q11007_NoiseInWoods extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, TAIL_OF_A_GRAY_WOLF) < 10))) { giveItems(killer, TAIL_OF_A_GRAY_WOLF, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, TAIL_OF_A_GRAY_WOLF) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GRAY_WOLVES_N_GO_HUNTING_AND_KILL_GOBLIN_RAIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -155,12 +159,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, GOBLINS_PACK_OF_KNICKKNACKS) < 10)) { giveItems(killer, GOBLINS_PACK_OF_KNICKKNACKS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLINS_PACK_OF_KNICKKNACKS) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_RAIDERS_N_GO_HUNTING_AND_KILL_KABOO_ORCS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -171,12 +179,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, KABBO_ORC_STURDY_AMULET) < 10)) { giveItems(killer, KABBO_ORC_STURDY_AMULET, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KABBO_ORC_STURDY_AMULET) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KABOO_ORCS_N_GO_HUNTING_AND_KILL_SPORE_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -185,12 +197,16 @@ public class Q11007_NoiseInWoods extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, MUSHROOM_SPORE_POWDER) < 20)) { giveItems(killer, MUSHROOM_SPORE_POWDER, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MUSHROOM_SPORE_POWDER) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SPORE_FUNGUS_N_RETURN_TO_SENTINEL_KENDELL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -262,4 +278,4 @@ public class Q11007_NoiseInWoods extends Quest } return htmltext; } -} \ No newline at end of file +} 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 28ff350aa0..5ead32e1f5 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 @@ -45,7 +45,7 @@ public class Q11008_PreparationForDungeon extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int KABOO_ORC_WARRIOR_CAPTAIN = 20472; private static final int KABOO_ORC_WARRIOR_LIEUTENANT = 20473; @@ -99,7 +99,7 @@ public class Q11008_PreparationForDungeon extends Quest takeItems(player, SPIDER_VENOM, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30220-03.html"; @@ -116,7 +116,7 @@ public class Q11008_PreparationForDungeon extends Quest takeItems(player, SPIDER_VENOM, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30220-04.html"; // Custom @@ -202,12 +202,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ORCS_BANDAGE) < 20) && (getRandom(100) < 90)) { giveItems(killer, ORCS_BANDAGE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ORCS_BANDAGE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KABOO_ORC_WARRIOR_LIEUTENANTS_AND_KABOO_ORC_WARRIOR_CAPTAINS_N_GO_HUNTING_AND_KILL_DRYADS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -217,12 +221,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, DRYADS_CRIMSON_HERB) < 20) && (getRandom(100) < 90)) { giveItems(killer, DRYADS_CRIMSON_HERB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, DRYADS_CRIMSON_HERB) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_DRYADS_N_GO_HUNTING_AND_KILL_CRIMSON_SPIDERS_HOOK_SPIDERS_AND_PINCER_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -233,12 +241,16 @@ public class Q11008_PreparationForDungeon extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, SPIDER_VENOM) < 20) && (getRandom(100) < 90)) { giveItems(killer, SPIDER_VENOM, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, SPIDER_VENOM) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_SENTINEL_STARDEN, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -246,4 +258,4 @@ public class Q11008_PreparationForDungeon extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java index 8dbfacb187..59a0e9fbef 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11009_NewPotionDevelopment1/Q11009_NewPotionDevelopment1.java @@ -195,12 +195,16 @@ public class Q11009_NewPotionDevelopment1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, SPIDER_ICHOR) < 20) && (getRandom(100) < 92)) { giveItems(killer, SPIDER_ICHOR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SPIDER_ICHOR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SCAVENGER_SPIDERS_AND_RED_SCAVENGER_SPIDERS_N_GO_HUNTING_AND_KILL_MOONSTONE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -209,12 +213,16 @@ public class Q11009_NewPotionDevelopment1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) < 20) && (getRandom(100) < 92)) { giveItems(killer, MOONSTONE_BEAST_SCALES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -222,4 +230,4 @@ public class Q11009_NewPotionDevelopment1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java index b7aeb07793..57ba0557fa 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11010_NewPotionDevelopment2/Q11010_NewPotionDevelopment2.java @@ -179,12 +179,16 @@ public class Q11010_NewPotionDevelopment2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, SPIDER_ICHOR) < 20) && (getRandom(100) < 92)) { giveItems(killer, SPIDER_ICHOR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SPIDER_ICHOR) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_SCAVENGER_SPIDERS_AND_RED_SCAVENGER_SPIDERS_N_GO_HUNTING_AND_KILL_MOONSTONE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -193,12 +197,16 @@ public class Q11010_NewPotionDevelopment2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) < 20) && (getRandom(100) < 92)) { giveItems(killer, MOONSTONE_BEAST_SCALES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOONSTONE_BEAST_SCALES) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -206,4 +214,4 @@ public class Q11010_NewPotionDevelopment2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java index 78abcfdec6..74ca100b7c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11011_NewPotionDevelopment3/Q11011_NewPotionDevelopment3.java @@ -177,12 +177,16 @@ public class Q11011_NewPotionDevelopment3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ANTIDOTE) < 20) && (getRandom(100) < 95)) { giveItems(killer, ANTIDOTE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ANTIDOTE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_RATMAN_SCAVENGERS_N_GO_HUNTING_AND_KILL_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -191,12 +195,16 @@ public class Q11011_NewPotionDevelopment3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ARACHNID_TRACKER_THORN) < 20) && (getRandom(100) < 90)) { giveItems(killer, ARACHNID_TRACKER_THORN, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ARACHNID_TRACKER_THORN) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.RETURN_TO_GROCER_HERBIEL_3, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -204,4 +212,4 @@ public class Q11011_NewPotionDevelopment3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java index 239058d00b..a408980e02 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11013_ShilensHunt/Q11013_ShilensHunt.java @@ -205,12 +205,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(2)) { giveItems(killer, WOLF_TAIL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, WOLF_TAIL) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ASHEN_WOLVES_N_GO_HUNTING_AND_KILL_GOBLINS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -219,12 +223,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(3)) { giveItems(killer, GOBLIN_POISONOUS_DART, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GOBLIN_POISONOUS_DART) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLINS_N_GO_HUNTING_AND_KILL_IMPS_AND_IMP_ELDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -234,12 +242,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(4)) { giveItems(killer, IMP_WING, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, IMP_WING) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_IMPS_AND_IMP_ELDERS_N_GO_HUNTING_AND_KILL_GREEN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -248,12 +260,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(5)) { giveItems(killer, FUNGUS_JUICE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, FUNGUS_JUICE) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GREEN_FUNGUS_N_GO_HUNTING_AND_KILL_BALOR_ORC_WARRIORS_BALOR_ORC_WARRIOR_CAPTAINS_AND_BALOR_ORC_WARRIOR_LIEUTENANTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -264,12 +280,16 @@ public class Q11013_ShilensHunt extends Quest if (qs.isCond(6)) { giveItems(killer, BALOR_ORC_FANG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BALOR_ORC_FANG) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BALOR_ORC_WARRIORS_BALOR_ORC_WARRIOR_CAPTAINS_AND_BALOR_ORC_WARRIOR_LIEUTENANTS_NRETURN_TO_HIERARCH_TALOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -277,4 +297,4 @@ public class Q11013_ShilensHunt extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} 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 6f1743398f..eac7abcfda 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 @@ -46,7 +46,7 @@ public class Q11014_SurpriseGift extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int RING_NOVICE = 29497; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int ZOMBIE_FOREST_ELF = 20015; private static final int ZOMBIE_FOREST_ELF_RESEARCHER = 20020; @@ -100,7 +100,7 @@ public class Q11014_SurpriseGift extends Quest takeItems(player, OLD_BONE_FRAGMENT, 20); giveItems(player, WARRIORS_ARMOR, 1); giveItems(player, WARRIORS_GAITERS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30136-03.html"; @@ -118,7 +118,7 @@ public class Q11014_SurpriseGift extends Quest takeItems(player, OLD_BONE_FRAGMENT, 20); giveItems(player, MEDIUMS_TUNIC, 1); giveItems(player, MEDIUMS_STOCKINGS, 1); - giveItems(player, RING_NOVICE, 2); + giveItems(player, EARRING_NOVICE, 2); addExpAndSp(player, 80000, 0); qs.exitQuest(false, true); htmltext = "30136-04.html"; @@ -203,12 +203,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, ZOMBIE_FOREST_ELF_TOOTH) < 10) && (getRandom(100) < 85)) { giveItems(killer, ZOMBIE_FOREST_ELF_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, ZOMBIE_FOREST_ELF_TOOTH) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_ZOMBIE_FOREST_ELVES_AND_ZOMBIE_FOREST_ELF_RESEARCHERS_N_GO_HUNTING_AND_KILL_FESTERING_BATS_AND_RED_EYE_BATS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -218,12 +222,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, BAT_SKIN) < 10) && (getRandom(100) < 85)) { giveItems(killer, BAT_SKIN, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BAT_SKIN) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_FESTERING_BATS_AND_RED_EYE_BATS_N_GO_HUNTING_AND_KILL_STONE_GIANT_SOLDIERS_AND_STONE_GIANT_GUARDIANS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -233,12 +241,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, STONE_GIANTS_SHINY_ROCK) < 10) && (getRandom(100) < 85)) { giveItems(killer, STONE_GIANTS_SHINY_ROCK, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, STONE_GIANTS_SHINY_ROCK) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_SOLDIERS_AND_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_DARK_HORRORS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -247,12 +259,16 @@ public class Q11014_SurpriseGift extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, OLD_BONE_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, OLD_BONE_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, OLD_BONE_FRAGMENT) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_DARK_HORRORS_NRETURN_TO_ARMOR_MERCHANT_PAYNE, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -260,4 +276,4 @@ public class Q11014_SurpriseGift extends Quest } return super.onKill(npc, killer, isSummon); } -} \ 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 691442fce7..61a9ece70e 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 @@ -199,12 +199,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +217,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 87)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -229,12 +237,16 @@ public class Q11015_PrepareForTrade1 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -242,4 +254,4 @@ public class Q11015_PrepareForTrade1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java index 932cacf9a5..4c84e21a52 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11016_PrepareForTrade2/Q11016_PrepareForTrade2.java @@ -183,12 +183,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +201,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 87)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +221,16 @@ public class Q11016_PrepareForTrade2 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -226,4 +238,4 @@ public class Q11016_PrepareForTrade2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java index 3768253ada..b40e5299ea 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11017_PrepareForTrade3/Q11017_PrepareForTrade3.java @@ -183,12 +183,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, STONE_GIANTS_GUARDIANS_CORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, STONE_GIANTS_GUARDIANS_CORE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_STONE_GIANT_GUARDIANS_N_GO_HUNTING_AND_KILL_CRYSTALLINE_BEASTS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -197,12 +201,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) < 10) && (getRandom(100) < 85)) { giveItems(killer, CRYSTALLINE_BEASTS_SHINEDUST, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, CRYSTALLINE_BEASTS_SHINEDUST) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_CRYSTALLINE_BEASTS_N_GO_HUNTING_AND_KILL_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +221,16 @@ public class Q11017_PrepareForTrade3 extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GIANT_SPIDER_SKIN_FRAGMENT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GIANT_SPIDER_SKIN_FRAGMENT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_PROWLERS_GIANT_VENOMOUS_SPIDERS_AND_ARACHNID_TRACKERS_NRETURN_TO_GROCER_VOLLODOS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -226,4 +238,4 @@ public class Q11017_PrepareForTrade3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java index c3761f1eb3..86916c941d 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11019_TribalBenefit/Q11019_TribalBenefit.java @@ -126,12 +126,16 @@ public class Q11019_TribalBenefit extends Quest if ((qs.isCond(2) && (getQuestItemsCount(killer, KASHA_WOLF_FUR) < 10))) { giveItems(killer, KASHA_WOLF_FUR, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, KASHA_WOLF_FUR) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_WOLVES_AND_KASHA_BEARS_N_GO_HUNTING_AND_KILL_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -140,12 +144,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, ASHES_OF_ANCESTORS) < 10)) { giveItems(killer, ASHES_OF_ANCESTORS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, ASHES_OF_ANCESTORS) >= 10) && (getQuestItemsCount(killer, IMP_NECKLACE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS_N_GO_HUNTING_AND_KILL_MOUNTAIN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -154,12 +162,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, IMP_NECKLACE) < 10)) { giveItems(killer, IMP_NECKLACE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, ASHES_OF_ANCESTORS) >= 10) && (getQuestItemsCount(killer, IMP_NECKLACE) >= 10)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDERS_AND_RAKECLAW_IMP_HUNTERS_N_GO_HUNTING_AND_KILL_MOUNTAIN_FUNGUS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -168,12 +180,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, MOUNTAIN_FUNGUS_SPORES) < 10)) { giveItems(killer, MOUNTAIN_FUNGUS_SPORES, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MOUNTAIN_FUNGUS_SPORES) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_MOUNTAIN_FUNGUS_N_GO_HUNTING_AND_KILL_MARAKU_WEREWOLVES, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -182,12 +198,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, MARAKU_WEREWOLF_CLAW) < 10)) { giveItems(killer, MARAKU_WEREWOLF_CLAW, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, MARAKU_WEREWOLF_CLAW) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_MARAKU_WEREWOLVES_N_GO_HUNTING_AND_KILL_EYES_OF_SEER, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -196,12 +216,16 @@ public class Q11019_TribalBenefit extends Quest if (qs.isCond(6) && (getQuestItemsCount(killer, EYE_OF_SEER_TEARS) < 10)) { giveItems(killer, EYE_OF_SEER_TEARS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, EYE_OF_SEER_TEARS) >= 10) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EYES_OF_SEER_NRETURN_TO_CENTURION_TIKU, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(7); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -269,4 +293,4 @@ public class Q11019_TribalBenefit extends Quest } return htmltext; } -} \ No newline at end of file +} 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 8e3a1e7c8f..ecee5b9ec1 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 @@ -46,7 +46,7 @@ public class Q11020_BlacksmithsRequest extends Quest private static final int WARRIORS_GAITERS = 90307; private static final int MEDIUMS_TUNIC = 90308; private static final int MEDIUMS_STOCKINGS = 90309; - private static final int EARRING_NOVICE = 49040; + private static final int EARRING_NOVICE = 29486; // Monsters private static final int BLACKWING_BAT = 20316; private static final int TOMB_RAIDER_LEADER = 20320; @@ -199,12 +199,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BLACKWING_BAT_WING) < 20) && (getRandom(100) < 90)) { giveItems(killer, BLACKWING_BAT_WING, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BLACKWING_BAT_WING) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_BLACKWING_BATS_N_GO_HUNTING_AND_KILL_GOBLIN_TOMB_RAIDER_LEADERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -213,12 +217,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, GRAVE_ROBBERS_BELT) < 20) && (getRandom(100) < 90)) { giveItems(killer, GRAVE_ROBBERS_BELT, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, GRAVE_ROBBERS_BELT) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GOBLIN_TOMB_RAIDER_LEADERS_N_GO_HUNTING_AND_KILL_GREYSTONE_GOLEMS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -227,12 +235,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(4) && (getQuestItemsCount(killer, GOLEM_ORE) < 20) && (getRandom(100) < 90)) { giveItems(killer, GOLEM_ORE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, GOLEM_ORE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_GREYSTONE_GOLEMS_N_GO_HUNTING_AND_KILL_EVIL_EYE_PATROLS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(5); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -241,12 +253,16 @@ public class Q11020_BlacksmithsRequest extends Quest if (qs.isCond(5) && (getQuestItemsCount(killer, EVIL_EYE_PATROL_HIDE) < 20) && (getRandom(100) < 90)) { giveItems(killer, EVIL_EYE_PATROL_HIDE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if ((getQuestItemsCount(killer, EVIL_EYE_PATROL_HIDE) >= 20)) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EVIL_EYE_PATROLS_NRETURN_TO_BLACKSMITH_SUMARI, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(6); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -254,4 +270,4 @@ public class Q11020_BlacksmithsRequest extends Quest } return super.onKill(npc, killer, isSummon); } -} \ 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 996895c049..4152e0523d 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 @@ -195,12 +195,16 @@ public class Q11021_RedGemNecklace1 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BEARS_SHIN_BONE) < 20) && (getRandom(100) < 92)) { giveItems(killer, BEARS_SHIN_BONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BEARS_SHIN_BONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_BEARS_N_GO_HUNTING_AND_KILL_KASHA_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -211,12 +215,16 @@ public class Q11021_RedGemNecklace1 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, SHARP_SPIDER_LEG) < 30) && (getRandom(100) < 89)) { giveItems(killer, SHARP_SPIDER_LEG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SHARP_SPIDER_LEG) >= 30) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_SPIDERS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -224,4 +232,4 @@ public class Q11021_RedGemNecklace1 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java index 2d13284f7a..2fec10cced 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11022_RedGemNecklace2/Q11022_RedGemNecklace2.java @@ -179,12 +179,16 @@ public class Q11022_RedGemNecklace2 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, BEARS_SHIN_BONE) < 20) && (getRandom(100) < 92)) { giveItems(killer, BEARS_SHIN_BONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BEARS_SHIN_BONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_BEARS_N_GO_HUNTING_AND_KILL_KASHA_SPIDERS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -195,12 +199,16 @@ public class Q11022_RedGemNecklace2 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, SHARP_SPIDER_LEG) < 30) && (getRandom(100) < 89)) { giveItems(killer, SHARP_SPIDER_LEG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, SHARP_SPIDER_LEG) >= 30) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_SPIDERS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -208,4 +216,4 @@ public class Q11022_RedGemNecklace2 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +} diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java index f433bbeaa6..c46e010f00 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/quests/Q11023_RedGemNecklace3/Q11023_RedGemNecklace3.java @@ -177,12 +177,16 @@ public class Q11023_RedGemNecklace3 extends Quest if (qs.isCond(2) && (getQuestItemsCount(killer, HARD_LENS) < 20) && (getRandom(100) < 92)) { giveItems(killer, HARD_LENS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, HARD_LENS) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_EVIL_EYE_SEERS_N_GO_HUNTING_AND_KILL_KASHA_IMPS, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(3); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -191,12 +195,16 @@ public class Q11023_RedGemNecklace3 extends Quest if (qs.isCond(3) && (getQuestItemsCount(killer, RED_STONE) < 20) && (getRandom(100) < 91)) { giveItems(killer, RED_STONE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, RED_STONE) >= 20) { + playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); showOnScreenMsg(killer, NpcStringId.YOU_HAVE_KILLED_ENOUGH_KASHA_IMPS_NRETURN_TO_ACCESSORY_MERCHANT_USKA, ExShowScreenMessage.TOP_CENTER, 10000); qs.setCond(4); } + else + { + playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + } } break; } @@ -204,4 +212,4 @@ public class Q11023_RedGemNecklace3 extends Quest } return super.onKill(npc, killer, isSummon); } -} \ No newline at end of file +}