From 0688be2be4871c9ef0117b648f411e1adb2d9851 Mon Sep 17 00:00:00 2001 From: Zealar <zealar@mail.bg> Date: Tue, 28 Mar 2017 23:38:17 +0300 Subject: [PATCH] Sound... rework DP : Quest part 2 (final) --- .../Q00307_ControlDeviceOfTheGiants.java | 8 +- .../Q00308_ReedFieldMaintenance.java | 6 +- .../Q00309_ForAGoodCause.java | 6 +- .../Q00310_OnlyWhatRemains.java | 4 +- .../Q00311_ExpulsionOfEvilSpirits.java | 4 +- .../Q00312_TakeAdvantageOfTheCrisis.java | 4 +- .../Q00319_ScentOfDeath.java | 4 +- .../Q00324_SweetestVenom.java | 4 +- .../Q00326_VanquishRemnants.java | 4 +- .../Q00327_RecoverTheFarmland.java | 6 +- .../Q00328_SenseForBusiness.java | 8 +- .../Q00330_AdeptOfTaste.java | 82 +++++++++---------- .../Q00331_ArrowOfVengeance.java | 4 +- .../Q00333_HuntOfTheBlackLion.java | 6 +- .../Q00334_TheWishingPotion.java | 50 +++++------ .../Q00336_CoinsOfMagic.java | 68 +++++++-------- .../Q00337_AudienceWithTheLandDragon.java | 24 +++--- .../Q00338_AlligatorHunter.java | 4 +- .../Q00340_SubjugationOfLizardmen.java | 10 +-- .../Q00341_HuntingForWildBeasts.java | 4 +- .../Q00343_UnderTheShadowOfTheIvoryTower.java | 8 +- .../Q00345_MethodToRaiseTheDead.java | 12 +-- .../Q00360_PlunderTheirSupplies.java | 6 +- .../Q00363_SorrowfulSoundOfFlute.java | 4 +- .../Q00364_JovialAccordion.java | 4 +- .../Q00367_ElectrifyingRecharge.java | 10 +-- .../Q00372_LegacyOfInsolence.java | 6 +- .../Q00373_SupplierOfReagents.java | 10 +-- .../Q00381_LetsBecomeARoyalMember.java | 8 +- .../Q00384_WarehouseKeepersPastime.java | 6 +- .../Q00386_StolenDignity.java | 6 +- .../Q00401_PathOfTheWarrior.java | 6 +- .../Q00402_PathOfTheHumanKnight.java | 26 +++--- .../Q00403_PathOfTheRogue.java | 6 +- .../Q00404_PathOfTheHumanWizard.java | 4 +- .../Q00405_PathOfTheCleric.java | 4 +- .../Q00406_PathOfTheElvenKnight.java | 4 +- .../Q00407_PathOfTheElvenScout.java | 4 +- .../Q00408_PathOfTheElvenWizard.java | 14 ++-- .../Q00410_PathOfThePalusKnight.java | 6 +- .../Q00411_PathOfTheAssassin.java | 4 +- .../Q00412_PathOfTheDarkWizard.java | 14 ++-- .../Q00413_PathOfTheShillienOracle.java | 6 +- .../Q00414_PathOfTheOrcRaider.java | 8 +- .../Q00415_PathOfTheOrcMonk.java | 20 ++--- .../Q00416_PathOfTheOrcShaman.java | 6 +- .../Q00418_PathOfTheArtisan.java | 10 +-- .../quests/Q00419_GetAPet/Q00419_GetAPet.java | 62 +++++++------- .../Q00420_LittleWing/Q00420_LittleWing.java | 4 +- .../Q00421_LittleWingsBigAdventure.java | 4 +- .../Q00422_RepentYourSins.java | 18 ++-- .../Q00426_QuestForFishingShot.java | 6 +- .../Q00431_WeddingMarch.java | 4 +- .../Q00432_BirthdayPartySong.java | 4 +- .../Q00450_GraveRobberRescue.java | 4 +- .../Q00451_LuciensAltar.java | 4 +- .../Q00453_NotStrongEnoughAlone.java | 8 +- .../Q00455_WingsOfSand.java | 4 +- .../Q00456_DontKnowDontCare.java | 4 +- .../Q00458_PerfectForm.java | 4 +- .../Q00461_RumbleInTheBase.java | 6 +- .../Q00463_IMustBeaGenius.java | 4 +- ...504_CompetitionForTheBanditStronghold.java | 6 +- .../Q00508_AClansReputation.java | 6 +- .../Q00509_AClansFame/Q00509_AClansFame.java | 6 +- .../Q00510_AClansPrestige.java | 6 +- .../Q00511_AwlUnderFoot.java | 4 +- .../Q00601_WatchingEyes.java | 4 +- .../Q00602_ShadowOfLight.java | 4 +- .../Q00604_DaimonTheWhiteEyedPart2.java | 4 +- .../Q00605_AllianceWithKetraOrcs.java | 4 +- .../Q00606_BattleAgainstVarkaSilenos.java | 4 +- .../Q00611_AllianceWithVarkaSilenos.java | 4 +- .../Q00612_BattleAgainstKetraOrcs.java | 4 +- .../Q00617_GatherTheFlames.java | 4 +- .../Q00618_IntoTheFlame.java | 4 +- .../Q00624_TheFinestIngredientsPart1.java | 6 +- .../Q00626_ADarkTwilight.java | 4 +- .../Q00627_HeartInSearchOfPower.java | 4 +- .../Q00637_ThroughOnceMore.java | 4 +- .../Q00641_AttackSailren.java | 4 +- .../Q00643_RiseAndFallOfTheElrokiTribe.java | 10 +-- .../Q00645_GhostsOfBatur.java | 4 +- .../Q00647_InfluxOfMachines.java | 4 +- .../Q00648_AnIceMerchantsDream.java | 14 ++-- .../Q00649_ALooterAndARailroadMan.java | 4 +- .../Q00650_ABrokenDream.java | 4 +- .../Q00655_AGrandPlanForTamingWildBeasts.java | 4 +- .../Q00660_AidingTheFloranVillage.java | 6 +- .../Q00663_SeductiveWhispers.java | 4 +- .../Q00688_DefeatTheElrokianRaiders.java | 4 +- .../Q00690_JudesRequest.java | 8 +- .../Q00691_MatrasSuspiciousRequest.java | 4 +- .../Q00692_HowtoOpposeEvil.java | 4 +- .../Q00699_GuardianOfTheSkies.java | 6 +- .../Q00700_CursedLife/Q00700_CursedLife.java | 10 +-- .../Q00701_ProofOfExistence.java | 6 +- .../Q00702_ATrapForRevenge.java | 4 +- .../Q00901_HowLavasaurusesAreMade.java | 4 +- .../Q00903_TheCallOfAntharas.java | 8 +- .../Q00904_DragonTrophyAntharas.java | 4 +- .../Q00905_RefinedDragonBlood.java | 8 +- .../Q00906_TheCallOfValakas.java | 6 +- .../Q00907_DragonTrophyValakas.java | 4 +- .../Q10272_LightFragment.java | 4 +- .../Q10273_GoodDayToFly.java | 4 +- .../Q10274_CollectingInTheAir.java | 4 +- .../Q10275_ContainingTheAttributePower.java | 6 +- .../Q10276_MutatedKaneusGludio.java | 6 +- .../Q10277_MutatedKaneusDion.java | 6 +- .../Q10278_MutatedKaneusHeine.java | 6 +- .../Q10279_MutatedKaneusOren.java | 6 +- .../Q10280_MutatedKaneusSchuttgart.java | 6 +- .../Q10281_MutatedKaneusRune.java | 4 +- .../Q10292_SevenSignsGirlOfDoubt.java | 6 +- .../Q10501_ZakenEmbroideredSoulCloak.java | 6 +- .../Q10502_FreyaEmbroideredSoulCloak.java | 6 +- .../Q10503_FrintezzaEmbroideredSoulCloak.java | 6 +- .../Q10504_JewelOfAntharas.java | 6 +- .../Q10505_JewelOfValakas.java | 6 +- 120 files changed, 490 insertions(+), 490 deletions(-) diff --git a/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java index d087eaa3f9..ce74965e5e 100644 --- a/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java +++ b/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java @@ -18,7 +18,7 @@ */ package quests.Q00307_ControlDeviceOfTheGiants; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -131,19 +131,19 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest case GORGOLOS: { st.giveItems(CET_1_SHEET, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); break; } case LAST_TITAN_UTENUS: { st.giveItems(CET_2_SHEET, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); break; } case GIANT_MARPANAK: { st.giveItems(CET_3_SHEET, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); break; } case HEKATON_PRIME: diff --git a/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java b/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java index 4f1e71fbe2..10b383e473 100644 --- a/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java +++ b/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java @@ -25,7 +25,7 @@ import quests.Q00238_SuccessFailureOfBusiness.Q00238_SuccessFailureOfBusiness; import quests.Q00309_ForAGoodCause.Q00309_ForAGoodCause; import com.l2jserver.Config; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -201,7 +201,7 @@ public class Q00308_ReedFieldMaintenance extends Quest { st.giveItems(item, 1); } - st.playSound(QuestSound.ITEMSOUND_QUEST_FINISH); + st.playSound(Sound.ITEMSOUND_QUEST_FINISH); htmltext = "32646-14.html"; } else @@ -229,7 +229,7 @@ public class Q00308_ReedFieldMaintenance extends Quest { st.giveItems(MUCROKIAN_HIDE, 1); } - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, killer, isSummon); diff --git a/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java b/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java index 092b3e2468..0e83c2fea0 100644 --- a/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java +++ b/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java @@ -25,7 +25,7 @@ import quests.Q00239_WontYouJoinUs.Q00239_WontYouJoinUs; import quests.Q00308_ReedFieldMaintenance.Q00308_ReedFieldMaintenance; import com.l2jserver.Config; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -203,7 +203,7 @@ public class Q00309_ForAGoodCause extends Quest { st.giveItems(item, 1); } - st.playSound(QuestSound.ITEMSOUND_QUEST_FINISH); + st.playSound(Sound.ITEMSOUND_QUEST_FINISH); htmltext = "32646-16.htm"; } else @@ -232,7 +232,7 @@ public class Q00309_ForAGoodCause extends Quest { st.giveItems(MUCROKIAN_HIDE, 1); } - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, killer, isSummon); diff --git a/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java index e1bfbdfcd0..5c0c8c81aa 100644 --- a/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java +++ b/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java @@ -23,7 +23,7 @@ import java.util.Map; import quests.Q00240_ImTheOnlyOneYouCanTrust.Q00240_ImTheOnlyOneYouCanTrust; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -123,7 +123,7 @@ public class Q00310_OnlyWhatRemains extends Quest if (getRandom(1000) < MOBS.get(npc.getId())) { st.giveItems(DIRTY_BEAD, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return super.onKill(npc, player, isSummon); } diff --git a/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java index e0ee2c6cf1..b933a0af4d 100644 --- a/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java +++ b/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java @@ -21,7 +21,7 @@ package quests.Q00311_ExpulsionOfEvilSpirits; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -141,7 +141,7 @@ public final class Q00311_ExpulsionOfEvilSpirits extends Quest { qs.setMemoStateEx(1, 0); qs.giveItems(SOUL_CORE_CONTAINING_EVIL_SPIRIT, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else { diff --git a/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java b/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java index f845720538..783a0673df 100644 --- a/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java +++ b/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java @@ -21,7 +21,7 @@ package quests.Q00312_TakeAdvantageOfTheCrisis; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -108,7 +108,7 @@ public class Q00312_TakeAdvantageOfTheCrisis extends Quest { final QuestState st = getQuestState(member, false); st.giveItems(MINERAL_FRAGMENT, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return super.onKill(npc, player, isSummon); } diff --git a/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java index 1d6b12472e..b66a5cca8d 100644 --- a/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java +++ b/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java @@ -18,7 +18,7 @@ */ package quests.Q00319_ScentOfDeath; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.holders.ItemHolder; @@ -91,7 +91,7 @@ public class Q00319_ScentOfDeath extends Quest st.giveItems(ZOMBIES_SKIN, 1); if (st.getQuestItemsCount(ZOMBIES_SKIN) < REQUIRED_ITEM_COUNT) { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else { diff --git a/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java index f93dbe2ae8..885cd08e66 100644 --- a/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java +++ b/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java @@ -21,7 +21,7 @@ package quests.Q00324_SweetestVenom; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -123,7 +123,7 @@ public class Q00324_SweetestVenom extends Quest st.giveItems(VENOM_SAC, 1); if ((++sacs) < REQUIRED_COUNT) { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else { diff --git a/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java index 6efe4703d5..33e00d9354 100644 --- a/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java +++ b/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java @@ -21,7 +21,7 @@ package quests.Q00326_VanquishRemnants; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -107,7 +107,7 @@ public final class Q00326_VanquishRemnants extends Quest if ((st != null) && st.isStarted() && (getRandom(100) < MONSTERS.get(npc.getId())[0])) { st.giveItems(MONSTERS.get(npc.getId())[1], 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return super.onKill(npc, killer, isSummon); } diff --git a/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java b/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java index 0e72f8089a..fab7c1f910 100644 --- a/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java +++ b/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java @@ -21,7 +21,7 @@ package quests.Q00327_RecoverTheFarmland; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.holders.ItemHolder; @@ -166,7 +166,7 @@ public final class Q00327_RecoverTheFarmland extends Quest { addExpAndSp(player, getQuestItemsCount(player, item.getId()) * item.getCount(), 0); takeItems(player, item.getId(), -1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); html = event; } break; @@ -180,7 +180,7 @@ public final class Q00327_RecoverTheFarmland extends Quest { addExpAndSp(player, getQuestItemsCount(player, it.getId()) * it.getCount(), 0); takeItems(player, it.getId(), -1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); rewarded = true; } } diff --git a/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java index ac51b06478..64829ddf95 100644 --- a/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java +++ b/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java @@ -21,7 +21,7 @@ package quests.Q00328_SenseForBusiness; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -145,12 +145,12 @@ public class Q00328_SenseForBusiness extends Quest if (chance < MONSTER_EYES.get(npc.getId())[0]) { st.giveItems(MONSTER_EYE_CARCASS, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else if (chance < MONSTER_EYES.get(npc.getId())[1]) { st.giveItems(MONSTER_EYE_LENS, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } else if (MONSTER_BASILISKS.containsKey(npc.getId())) @@ -158,7 +158,7 @@ public class Q00328_SenseForBusiness extends Quest if (chance < MONSTER_BASILISKS.get(npc.getId())) { st.giveItems(BASILISK_GIZZARD, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java b/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java index 4101ff8c75..8b219116e2 100644 --- a/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java +++ b/dist/game/data/scripts/quests/Q00330_AdeptOfTaste/Q00330_AdeptOfTaste.java @@ -18,7 +18,7 @@ */ package quests.Q00330_AdeptOfTaste; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -198,11 +198,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, HOBGOBLIN_AMULET, 1); if (getQuestItemsCount(killer, HOBGOBLIN_AMULET) == 30) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -223,11 +223,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, RED_MANDRAGORA_ROOT, 1); if (getQuestItemsCount(killer, RED_MANDRAGORA_ROOT) == 40) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -238,11 +238,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, WHITE_MANDRAGORA_ROOT, 1); if (getQuestItemsCount(killer, WHITE_MANDRAGORA_ROOT) == 40) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -264,11 +264,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, RED_MANDRAGORA_ROOT, 1); if (getQuestItemsCount(killer, RED_MANDRAGORA_ROOT) == 40) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -279,11 +279,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, WHITE_MANDRAGORA_ROOT, 1); if (getQuestItemsCount(killer, WHITE_MANDRAGORA_ROOT) == 40) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -305,11 +305,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, RED_MANDRAGORA_ROOT, 1); if (getQuestItemsCount(killer, RED_MANDRAGORA_ROOT) == 40) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -320,11 +320,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, WHITE_MANDRAGORA_ROOT, 1); if (getQuestItemsCount(killer, WHITE_MANDRAGORA_ROOT) == 40) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -346,11 +346,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, NECTAR, 1); if (getQuestItemsCount(killer, NECTAR) == 20) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -361,11 +361,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, ROYAL_JELLY, 1); if (getQuestItemsCount(killer, ROYAL_JELLY) == 10) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -387,11 +387,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, GREEN_MARSH_MOSS, 1); if (getQuestItemsCount(killer, GREEN_MARSH_MOSS) == 20) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -402,11 +402,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, BROWN_MARSH_MOSS, 1); if (getQuestItemsCount(killer, BROWN_MARSH_MOSS) == 20) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -428,11 +428,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, GREEN_MARSH_MOSS, 1); if (getQuestItemsCount(killer, GREEN_MARSH_MOSS) == 20) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -443,11 +443,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, BROWN_MARSH_MOSS, 1); if (getQuestItemsCount(killer, BROWN_MARSH_MOSS) == 20) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -469,11 +469,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, NECTAR, 1); if (getQuestItemsCount(killer, NECTAR) == 20) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -484,11 +484,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, ROYAL_JELLY, 1); if (getQuestItemsCount(killer, ROYAL_JELLY) == 10) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -508,12 +508,12 @@ public final class Q00330_AdeptOfTaste extends Quest if (getQuestItemsCount(killer, BODY_OF_MONSTER_EYE) == 29) { giveItems(killer, BODY_OF_MONSTER_EYE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { giveItems(killer, BODY_OF_MONSTER_EYE, 2); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } else if (i0 < 97) @@ -521,17 +521,17 @@ public final class Q00330_AdeptOfTaste extends Quest if (getQuestItemsCount(killer, BROWN_MARSH_MOSS) == 28) { giveItems(killer, BODY_OF_MONSTER_EYE, 2); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else if (getQuestItemsCount(killer, BROWN_MARSH_MOSS) == 29) { giveItems(killer, BODY_OF_MONSTER_EYE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { giveItems(killer, BODY_OF_MONSTER_EYE, 3); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } @@ -551,11 +551,11 @@ public final class Q00330_AdeptOfTaste extends Quest giveItems(killer, BODY_OF_MONSTER_EYE, 1); if (getQuestItemsCount(killer, BODY_OF_MONSTER_EYE) == 30) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } else @@ -563,12 +563,12 @@ public final class Q00330_AdeptOfTaste extends Quest if (getQuestItemsCount(killer, BROWN_MARSH_MOSS) == 29) { giveItems(killer, BODY_OF_MONSTER_EYE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { giveItems(killer, BODY_OF_MONSTER_EYE, 2); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } @@ -724,7 +724,7 @@ public final class Q00330_AdeptOfTaste extends Quest takeItems(player, BROWN_MOSS_BUNDLE, -1); takeItems(player, MONSTER_EYE_MEAT, -1); giveItems(player, JONASS_5TH_STEAK_DISH, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_JACKPOT); + playSound(player, Sound.ITEMSOUND_QUEST_JACKPOT); htmltext = "30469-05t5.html"; } else diff --git a/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java index b64b3516a8..c710d9634a 100644 --- a/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java +++ b/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java @@ -21,7 +21,7 @@ package quests.Q00331_ArrowOfVengeance; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -158,7 +158,7 @@ public class Q00331_ArrowOfVengeance extends Quest break; } } - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, player, isPet); diff --git a/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java b/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java index 2d742dd899..14f9552b51 100644 --- a/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java +++ b/dist/game/data/scripts/quests/Q00333_HuntOfTheBlackLion/Q00333_HuntOfTheBlackLion.java @@ -19,7 +19,7 @@ package quests.Q00333_HuntOfTheBlackLion; import com.l2jserver.gameserver.enums.CategoryType; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.itemcontainer.Inventory; @@ -984,7 +984,7 @@ public final class Q00333_HuntOfTheBlackLion extends Quest if (hasQuestItems(killer, SOPHYAS_3RD_ORDER)) { giveItems(killer, DELU_LIZARDMAN_FANG, 4); - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } break; } @@ -993,7 +993,7 @@ public final class Q00333_HuntOfTheBlackLion extends Quest if (hasQuestItems(killer, SOPHYAS_4TH_ORDER)) { giveItems(killer, STAKATO_TALON, 8); - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } break; } diff --git a/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java b/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java index b9d757d1c5..38561cde90 100644 --- a/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java +++ b/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java @@ -21,7 +21,7 @@ package quests.Q00334_TheWishingPotion; import java.util.ArrayList; import java.util.List; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -132,7 +132,7 @@ public final class Q00334_TheWishingPotion extends Quest { qs.giveAdena(500000, true); qs.takeItems(Q_FOBBIDEN_LOVE_SCROLL, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30557-01.html"; } break; @@ -424,7 +424,7 @@ public final class Q00334_TheWishingPotion extends Quest if (event.equals("QUEST_ACCEPTED")) { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT); + qs.playSound(Sound.ITEMSOUND_QUEST_ACCEPT); qs.startQuest(); qs.setMemoState(1); qs.setCond(1); @@ -433,7 +433,7 @@ public final class Q00334_TheWishingPotion extends Quest { qs.giveItems(Q_ALCHEMY_TEXT, 1); } - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30738-04.htm"; } @@ -478,7 +478,7 @@ public final class Q00334_TheWishingPotion extends Quest qs.takeItems(Q_POTION_RECIPE_1, -1); qs.takeItems(Q_POTION_RECIPE_2, -1); qs.setMemoState(2); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); qs.setCond(5); qs.showQuestionMark(334); return "30738-11.html"; @@ -721,7 +721,7 @@ public final class Q00334_TheWishingPotion extends Quest if (getRandom(10) == 0) { qs.giveItems(Q_WIND_SOULSTONE, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if (qs.hasQuestItems(Q_AMBER_SCALE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD)) { qs.setCond(4, true); @@ -729,7 +729,7 @@ public final class Q00334_TheWishingPotion extends Quest } else { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -743,7 +743,7 @@ public final class Q00334_TheWishingPotion extends Quest if (getRandom(10) == 0) { qs.giveItems(Q_ANT_SOLDIER_APHID, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD)) { qs.setCond(4, true); @@ -751,7 +751,7 @@ public final class Q00334_TheWishingPotion extends Quest } else { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -764,7 +764,7 @@ public final class Q00334_TheWishingPotion extends Quest if (getRandom(10) == 0) { qs.giveItems(Q_SILENOS_HORN, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD)) { qs.setCond(4, true); @@ -772,7 +772,7 @@ public final class Q00334_TheWishingPotion extends Quest } else { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -786,7 +786,7 @@ public final class Q00334_TheWishingPotion extends Quest if (getRandom(10) == 0) { qs.giveItems(Q_TYRANTS_CHITIN, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD)) { qs.setCond(4, true); @@ -794,7 +794,7 @@ public final class Q00334_TheWishingPotion extends Quest } else { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -807,7 +807,7 @@ public final class Q00334_TheWishingPotion extends Quest if (getRandom(10) == 0) { qs.giveItems(Q_AMBER_SCALE, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if (qs.hasQuestItems(Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD)) { qs.setCond(4, true); @@ -815,7 +815,7 @@ public final class Q00334_TheWishingPotion extends Quest } else { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -828,7 +828,7 @@ public final class Q00334_TheWishingPotion extends Quest if (getRandom(10) == 0) { qs.giveItems(Q_HORROR_ECTOPLASM, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD)) { qs.setCond(4, true); @@ -836,7 +836,7 @@ public final class Q00334_TheWishingPotion extends Quest } else { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -850,7 +850,7 @@ public final class Q00334_TheWishingPotion extends Quest if (getRandom(10) == 0) { qs.giveItems(Q_BUGBEAR_BLOOD, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD)) { qs.setCond(4, true); @@ -858,7 +858,7 @@ public final class Q00334_TheWishingPotion extends Quest } else { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -871,7 +871,7 @@ public final class Q00334_TheWishingPotion extends Quest if (getRandom(10) == 0) { qs.giveItems(Q_GLASS_EYE, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if (qs.hasQuestItems(Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD)) { qs.setCond(4, true); @@ -879,7 +879,7 @@ public final class Q00334_TheWishingPotion extends Quest } else { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -899,7 +899,7 @@ public final class Q00334_TheWishingPotion extends Quest { qs.giveAdena(900_000, true); } - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); qs.set(FLAG, 0); } } @@ -910,7 +910,7 @@ public final class Q00334_TheWishingPotion extends Quest if (qs.isMemoState(2) && !qs.hasQuestItems(Q_FOBBIDEN_LOVE_SCROLL) && (qs.getInt(FLAG) == 1) && (getRandom(1000) < 28)) { qs.giveItems(Q_FOBBIDEN_LOVE_SCROLL, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); qs.set(FLAG, 0); } break; @@ -920,7 +920,7 @@ public final class Q00334_TheWishingPotion extends Quest if (qs.isMemoState(2) && (qs.getInt(FLAG) == 3)) { qs.giveAdena(1_406_956, true); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); qs.set(FLAG, 0); } break; @@ -932,7 +932,7 @@ public final class Q00334_TheWishingPotion extends Quest qs.giveItems(Q_SECRET_BOOK_OF_POTION, 1); qs.setCond(2, true); qs.showQuestionMark(334); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } break; } diff --git a/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java index 361f399b77..c866e94470 100644 --- a/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java +++ b/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java @@ -21,7 +21,7 @@ package quests.Q00336_CoinsOfMagic; import java.util.ArrayList; import java.util.List; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -251,7 +251,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.setMemoState(3); qs.setCond(4); qs.showQuestionMark(336); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-07.html"; } if (qs.hasQuestItems(Q_CC_MEMBERSHIP_3) && (qs.getMemoState() == 3)) @@ -285,7 +285,7 @@ public final class Q00336_CoinsOfMagic extends Quest if (event.equals("QUEST_ACCEPTED")) { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT); + qs.playSound(Sound.ITEMSOUND_QUEST_ACCEPT); if (!qs.hasQuestItems(Q_COIN_DIAGRAM)) { qs.giveItems(Q_COIN_DIAGRAM, 1); @@ -293,7 +293,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.setMemoState(1); qs.startQuest(); qs.showQuestionMark(336); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-05.htm"; } if (event.contains(".htm")) @@ -796,7 +796,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.setMemoState(2); qs.setCond(2); qs.showQuestionMark(336); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30702-03.html"; } case 3: @@ -804,14 +804,14 @@ public final class Q00336_CoinsOfMagic extends Quest qs.setMemoState(2); qs.setCond(2); qs.showQuestionMark(336); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30702-04.html"; } case 4: { qs.setCond(7); qs.showQuestionMark(336); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30702-06.html"; } } @@ -845,7 +845,7 @@ public final class Q00336_CoinsOfMagic extends Quest { qs.setCond(9); qs.showQuestionMark(336); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); qs.takeItems(Q_CC_MEMBERSHIP_3, -1); qs.takeItems(Q_BLOOD_DREVANUL, 1); qs.takeItems(Q_BLOOD_WEREWOLF, 1); @@ -858,7 +858,7 @@ public final class Q00336_CoinsOfMagic extends Quest } qs.setCond(8); qs.showQuestionMark(336); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-13.html"; } if (qs.hasQuestItems(Q_CC_MEMBERSHIP_2)) @@ -867,7 +867,7 @@ public final class Q00336_CoinsOfMagic extends Quest { qs.setCond(11); qs.showQuestionMark(336); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); qs.takeItems(Q_CC_MEMBERSHIP_2, -1); qs.takeItems(Q_BLOOD_BASILISK, 1); qs.takeItems(Q_BLOOD_SUCCUBUS, 1); @@ -880,7 +880,7 @@ public final class Q00336_CoinsOfMagic extends Quest } qs.setCond(10); qs.showQuestionMark(336); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-14.html"; } if (qs.hasQuestItems(Q_CC_MEMBERSHIP_1)) @@ -909,14 +909,14 @@ public final class Q00336_CoinsOfMagic extends Quest { qs.setCond(6); qs.showQuestionMark(336); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-22.html"; } case 11: { qs.setCond(5); qs.showQuestionMark(336); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-23.html"; } case 20: @@ -927,7 +927,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(Q_SILVER_DRAGON, 1); qs.takeItems(Q_GOLD_WYRM, 13); qs.giveItems(DEMON_STAFF, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24a.html"; } return "30232-24.html"; @@ -941,7 +941,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(Q_SILVER_DRYAD, 1); qs.takeItems(Q_GOLD_GIANT, 1); qs.giveItems(DARK_SCREAMER, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24b.html"; } return "30232-24.html"; @@ -955,7 +955,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(Q_BLOOD_SUCCUBUS, 1); qs.takeItems(Q_BLOOD_BASILISK, 2); qs.giveItems(WIDOW_MAKER, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24c.html"; } return "30232-24.html"; @@ -969,7 +969,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(Q_BLOOD_DRAGON, 1); qs.takeItems(Q_SILVER_UNDINE, 1); qs.giveItems(SWORD_OF_LIMIT, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24d.html"; } return "30232-24.html"; @@ -980,7 +980,7 @@ public final class Q00336_CoinsOfMagic extends Quest { qs.takeItems(Q_MANAKS_GOLD_GIANT, 1); qs.giveItems(DEMONS_BOOTS, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24e.html"; } return "30232-24.html"; @@ -992,7 +992,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(Q_MANAKS_SILVER_DRYAD, 1); qs.takeItems(Q_SILVER_DRYAD, 1); qs.giveItems(DEMONS_HOSE, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24f.html"; } return "30232-24.html"; @@ -1003,7 +1003,7 @@ public final class Q00336_CoinsOfMagic extends Quest { qs.takeItems(Q_MANAKS_GOLD_GIANT, 1); qs.giveItems(DEMONS_GLOVES, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24g.html"; } return "30232-24.html"; @@ -1016,7 +1016,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(Q_GOLD_GIANT, 1); qs.takeItems(Q_GOLD_WYRM, 1); qs.giveItems(FULL_PLATE_HELMET, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24h.html"; } return "30232-24.html"; @@ -1030,7 +1030,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(Q_BLOOD_DREVANUL, 2); qs.takeItems(Q_GOLD_KNIGHT, 3); qs.giveItems(MOONSTONE_EARING, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24i.html"; } return "30232-24.html"; @@ -1044,7 +1044,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(Q_BLOOD_DREVANUL, 5); qs.takeItems(Q_SILVER_GOLEM, 5); qs.giveItems(NASSENS_EARING, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24j.html"; } return "30232-24.html"; @@ -1058,7 +1058,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(Q_GOLD_DRAKE, 4); qs.takeItems(Q_BLOOD_DREVANUL, 4); qs.giveItems(RING_OF_BINDING, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24k.html"; } return "30232-24.html"; @@ -1072,7 +1072,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(Q_GOLD_KNIGHT, 3); qs.takeItems(Q_BLOOD_DREVANUL, 3); qs.giveItems(NECKLACE_OF_PROTECTION, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30232-24l.html"; } return "30232-24.html"; @@ -1082,7 +1082,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(Q_CC_MEMBERSHIP_1, -1); qs.takeItems(Q_CC_MEMBERSHIP_2, -1); qs.takeItems(Q_CC_MEMBERSHIP_3, -1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_FINISH); + qs.playSound(Sound.ITEMSOUND_QUEST_FINISH); qs.exitQuest(true); return "30232-18a.html"; } @@ -1472,7 +1472,7 @@ public final class Q00336_CoinsOfMagic extends Quest { qs.takeItems(ITEM_1, 10 * mul * ITEM_1_MUL); qs.giveItems(REWARD_1, 1 * mul); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return npcId + "-07.html"; } break; @@ -1483,7 +1483,7 @@ public final class Q00336_CoinsOfMagic extends Quest { qs.takeItems(ITEM_2, 5 * mul); qs.giveItems(REWARD_2, 1 * mul); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return npcId + "-07.html"; } break; @@ -1494,7 +1494,7 @@ public final class Q00336_CoinsOfMagic extends Quest { qs.takeItems(ITEM_3, 5 * mul); qs.giveItems(REWARD_3, 1 * mul); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return npcId + "-07.html"; } break; @@ -1505,7 +1505,7 @@ public final class Q00336_CoinsOfMagic extends Quest { qs.takeItems(ITEM_4, 5 * mul); qs.giveItems(REWARD_4, 1 * mul); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return npcId + "-07.html"; } break; @@ -1543,7 +1543,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(ITEM_1_1, 10 * mul); qs.takeItems(ITEM_1_2, 10 * mul); qs.giveItems(REWARD_1, 1 * mul); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return npcId + "-07.html"; } break; @@ -1555,7 +1555,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(ITEM_2_1, 5 * mul); qs.takeItems(ITEM_2_2, 5 * mul); qs.giveItems(REWARD_2, 1 * mul); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return npcId + "-07.html"; } break; @@ -1567,7 +1567,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(ITEM_3_1, 5 * mul); qs.takeItems(ITEM_3_2, 5 * mul); qs.giveItems(REWARD_3, 1 * mul); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return npcId + "-07.html"; } break; @@ -1579,7 +1579,7 @@ public final class Q00336_CoinsOfMagic extends Quest qs.takeItems(ITEM_4_1, 5 * mul); qs.takeItems(ITEM_4_2, 5 * mul); qs.giveItems(REWARD_4, 1 * mul); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return npcId + "-07.html"; } break; diff --git a/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java index fead38198d..2dc5f0041f 100644 --- a/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java +++ b/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java @@ -18,7 +18,7 @@ */ package quests.Q00337_AudienceWithTheLandDragon; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -190,7 +190,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.4)) && !hasQuestItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_1ST)) { giveItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_1ST, 1); - playSound(attacker, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(attacker, Sound.ITEMSOUND_QUEST_ITEMGET); startQuestTimer("DESPAWN_240", 240000, npc, attacker); } } @@ -218,7 +218,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.4)) && !hasQuestItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_2ND)) { giveItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_2ND, 1); - playSound(attacker, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(attacker, Sound.ITEMSOUND_QUEST_ITEMGET); startQuestTimer("DESPAWN_240", 240000, npc, attacker); } } @@ -245,7 +245,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest if ((npc.getCurrentHp() < (npc.getMaxHp() * 0.4)) && !hasQuestItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_3RD)) { giveItems(attacker, FRAGMENT_OF_ABYSS_JEWEL_3RD, 1); - playSound(attacker, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(attacker, Sound.ITEMSOUND_QUEST_ITEMGET); } } @@ -374,7 +374,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest if (!hasQuestItems(killer, HAMRUT_LEG)) { giveItems(killer, HAMRUT_LEG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } break; } @@ -397,7 +397,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest if (!hasQuestItems(killer, KRANROT_SKIN)) { giveItems(killer, KRANROT_SKIN, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } break; } @@ -420,7 +420,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest if (!hasQuestItems(killer, MARSH_STALKER_HORN)) { giveItems(killer, MARSH_STALKER_HORN, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } break; } @@ -443,7 +443,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest if (!hasQuestItems(killer, MARSH_DRAKE_TALONS)) { giveItems(killer, MARSH_DRAKE_TALONS, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } break; } @@ -457,7 +457,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest if (!hasQuestItems(killer, MARA_FANG)) { giveItems(killer, MARA_FANG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -469,7 +469,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest if (!hasQuestItems(killer, MUSFEL_FANG)) { giveItems(killer, MUSFEL_FANG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -490,7 +490,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest if (!hasQuestItems(killer, REMAINS_OF_SACRAFICE)) { giveItems(killer, REMAINS_OF_SACRAFICE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } break; } @@ -513,7 +513,7 @@ public final class Q00337_AudienceWithTheLandDragon extends Quest if (!hasQuestItems(killer, TOTEM_OF_LAND_DRAGON)) { giveItems(killer, TOTEM_OF_LAND_DRAGON, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } break; } diff --git a/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java b/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java index ea178c0717..c638eb8e1d 100644 --- a/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java +++ b/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java @@ -18,7 +18,7 @@ */ package quests.Q00338_AlligatorHunter; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -104,7 +104,7 @@ public class Q00338_AlligatorHunter extends Quest { st.giveItems(ALLIGATOR_LEATHER, 1); } - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return super.onKill(npc, player, isSummon); } diff --git a/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java b/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java index 6a0cc99462..e4f53104f0 100644 --- a/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java +++ b/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java @@ -18,7 +18,7 @@ */ package quests.Q00340_SubjugationOfLizardmen; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -185,12 +185,12 @@ public final class Q00340_SubjugationOfLizardmen extends Quest if (!hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && (getRandom(100) <= 19)) { giveItems(killer, AGNESS_HOLY_SYMBOL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } else if (hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && !hasQuestItems(killer, AGNESS_ROSARY) && (getRandom(100) <= 18)) { giveItems(killer, AGNESS_ROSARY, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -203,12 +203,12 @@ public final class Q00340_SubjugationOfLizardmen extends Quest if (!hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && (getRandom(100) <= 18)) { giveItems(killer, AGNESS_HOLY_SYMBOL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } else if (hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && !hasQuestItems(killer, AGNESS_ROSARY) && (getRandom(100) <= 18)) { giveItems(killer, AGNESS_ROSARY, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java b/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java index 813a4846af..dd38a4c425 100644 --- a/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java +++ b/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java @@ -21,7 +21,7 @@ package quests.Q00341_HuntingForWildBeasts; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -133,7 +133,7 @@ public class Q00341_HuntingForWildBeasts extends Quest st.giveItems(BEAR_SKIN, 1); if ((++skins) < REQUIRED_COUNT) { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else { diff --git a/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java b/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java index 1b16b18887..553ff76ebb 100644 --- a/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java +++ b/dist/game/data/scripts/quests/Q00343_UnderTheShadowOfTheIvoryTower/Q00343_UnderTheShadowOfTheIvoryTower.java @@ -19,7 +19,7 @@ package quests.Q00343_UnderTheShadowOfTheIvoryTower; import com.l2jserver.gameserver.enums.CategoryType; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -518,7 +518,7 @@ public final class Q00343_UnderTheShadowOfTheIvoryTower extends Quest if (getRandom(100) < 63) { giveItems(killer, NEBULITE_ORB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } if (qs.getMemoStateEx(1) > 1) @@ -535,7 +535,7 @@ public final class Q00343_UnderTheShadowOfTheIvoryTower extends Quest if (getRandom(100) < 65) { giveItems(killer, NEBULITE_ORB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } if (qs.getMemoStateEx(1) > 1) @@ -552,7 +552,7 @@ public final class Q00343_UnderTheShadowOfTheIvoryTower extends Quest if (getRandom(100) < 68) { giveItems(killer, NEBULITE_ORB, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } if (qs.getMemoStateEx(1) > 1) diff --git a/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java b/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java index 0c8801a4de..8731c49a65 100644 --- a/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java +++ b/dist/game/data/scripts/quests/Q00345_MethodToRaiseTheDead/Q00345_MethodToRaiseTheDead.java @@ -18,7 +18,7 @@ */ package quests.Q00345_MethodToRaiseTheDead; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.itemcontainer.Inventory; @@ -215,7 +215,7 @@ public final class Q00345_MethodToRaiseTheDead extends Quest giveItems(qs.getPlayer(), USELESS_BONE_PIECES, 1); } - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } else if (random <= 11) { @@ -228,7 +228,7 @@ public final class Q00345_MethodToRaiseTheDead extends Quest giveItems(qs.getPlayer(), USELESS_BONE_PIECES, 1); } - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } else if (random <= 17) { @@ -241,7 +241,7 @@ public final class Q00345_MethodToRaiseTheDead extends Quest giveItems(qs.getPlayer(), USELESS_BONE_PIECES, 1); } - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } else if (random <= 23) { @@ -254,7 +254,7 @@ public final class Q00345_MethodToRaiseTheDead extends Quest giveItems(qs.getPlayer(), USELESS_BONE_PIECES, 1); } - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } else if (random <= 29) { @@ -267,7 +267,7 @@ public final class Q00345_MethodToRaiseTheDead extends Quest giveItems(qs.getPlayer(), USELESS_BONE_PIECES, 1); } - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } else if (random <= 60) { diff --git a/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java index cdc26248e9..2b7f0cf787 100644 --- a/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java +++ b/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java @@ -21,7 +21,7 @@ package quests.Q00360_PlunderTheirSupplies; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -107,7 +107,7 @@ public final class Q00360_PlunderTheirSupplies extends Quest if (getRandom(100) < MONSTER_DROP_CHANCES.get(npc.getId())) { st.giveItems(SUPPLY_ITEMS, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } if (getRandom(100) < 10) @@ -121,7 +121,7 @@ public final class Q00360_PlunderTheirSupplies extends Quest st.giveItems(RECIPE_OF_SUPPLY, 1); st.takeItems(SUSPICIOUS_DOCUMENT_PIECE, -1); } - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return super.onKill(npc, killer, isPet); } diff --git a/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java b/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java index 6d06bc9eb5..3d49567767 100644 --- a/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java +++ b/dist/game/data/scripts/quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java @@ -18,7 +18,7 @@ */ package quests.Q00363_SorrowfulSoundOfFlute; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -152,7 +152,7 @@ public final class Q00363_SorrowfulSoundOfFlute extends Quest case 6: { st.exitQuest(true, false); - st.playSound(QuestSound.ITEMSOUND_QUEST_GIVEUP); + st.playSound(Sound.ITEMSOUND_QUEST_GIVEUP); htmltext = "30956-10.html"; break; } diff --git a/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java b/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java index 44237b69b6..c9090c0bcd 100644 --- a/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java +++ b/dist/game/data/scripts/quests/Q00364_JovialAccordion/Q00364_JovialAccordion.java @@ -18,7 +18,7 @@ */ package quests.Q00364_JovialAccordion; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -249,7 +249,7 @@ public final class Q00364_JovialAccordion extends Quest { if (st.isMemoState(2)) { - st.playSound(QuestSound.ITEMSOUND_QUEST_GIVEUP); + st.playSound(Sound.ITEMSOUND_QUEST_GIVEUP); st.exitQuest(true, true); htmltext = "30957-06.html"; } diff --git a/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java b/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java index 2bbb275f41..633d80237b 100644 --- a/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java +++ b/dist/game/data/scripts/quests/Q00367_ElectrifyingRecharge/Q00367_ElectrifyingRecharge.java @@ -18,7 +18,7 @@ */ package quests.Q00367_ElectrifyingRecharge; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.holders.SkillHolder; @@ -131,19 +131,19 @@ public final class Q00367_ElectrifyingRecharge extends Quest { giveItems(luckyPlayer, TITAN_LAMP2, 1); takeItems(luckyPlayer, TITAN_LAMP1, -1); - playSound(luckyPlayer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(luckyPlayer, Sound.ITEMSOUND_QUEST_MIDDLE); } else if (hasQuestItems(luckyPlayer, TITAN_LAMP2)) { giveItems(luckyPlayer, TITAN_LAMP3, 1); takeItems(luckyPlayer, TITAN_LAMP2, -1); - playSound(luckyPlayer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(luckyPlayer, Sound.ITEMSOUND_QUEST_MIDDLE); } else if (hasQuestItems(luckyPlayer, TITAN_LAMP3)) { giveItems(luckyPlayer, TITAN_LAMP4, 1); takeItems(luckyPlayer, TITAN_LAMP3, -1); - playSound(luckyPlayer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(luckyPlayer, Sound.ITEMSOUND_QUEST_MIDDLE); } else if (hasQuestItems(luckyPlayer, TITAN_LAMP4)) { @@ -156,7 +156,7 @@ public final class Q00367_ElectrifyingRecharge extends Quest { giveItems(luckyPlayer, BROKEN_TITAN_LAMP, 1); takeItems(luckyPlayer, -1, TITAN_LAMP1, TITAN_LAMP2, TITAN_LAMP3, TITAN_LAMP4); - playSound(luckyPlayer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(luckyPlayer, Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onAttack(npc, attacker, damage, isSummon); diff --git a/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java b/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java index c21e7410ef..dcc027b419 100644 --- a/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java +++ b/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java @@ -21,7 +21,7 @@ package quests.Q00372_LegacyOfInsolence; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.holders.QuestItemHolder; @@ -462,7 +462,7 @@ public final class Q00372_LegacyOfInsolence extends Quest if (qs != null) { giveItems(qs.getPlayer(), item.getId(), item.getCount()); - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, killer, isSummon); @@ -500,7 +500,7 @@ public final class Q00372_LegacyOfInsolence extends Quest if ((rewardedPlayer != null) && Util.checkIfInRange(1500, npc, rewardedPlayer, true)) { giveItems(rewardedPlayer, item.getId(), item.getCount()); - playSound(rewardedPlayer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(rewardedPlayer, Sound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java b/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java index 796881b73a..30f2539979 100644 --- a/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java +++ b/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java @@ -22,7 +22,7 @@ import java.util.HashMap; import quests.Q00235_MimirsElixir.Q00235_MimirsElixir; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.holders.ItemHolder; @@ -230,7 +230,7 @@ public final class Q00373_SupplierOfReagents extends Quest // If the player has the chosen item (ingredient or catalyst), we save it (for the catalyst or the reward) qs.setMemoState(qs.getMemoState() + memoState); htmltext = event; - playSound(player, QuestSound.SKILLSOUND_LIQUID_MIX); + playSound(player, Sound.SKILLSOUND_LIQUID_MIX); } else { @@ -303,7 +303,7 @@ public final class Q00373_SupplierOfReagents extends Quest takeItem(player, item1); takeItem(player, item2); htmltext = (reward == null) ? "31149-44.html" : "31149-45.html"; - playSound(player, QuestSound.SKILLSOUND_LIQUID_FAIL); + playSound(player, Sound.SKILLSOUND_LIQUID_FAIL); } else if ((memoState != 1324) || ((memoState == 1324) && (q235 != null) && q235.isStarted() && !hasQuestItems(player, reward.getItem()))) { @@ -315,12 +315,12 @@ public final class Q00373_SupplierOfReagents extends Quest qs.setMemoState(0); qs.setMemoStateEx(1, 0); htmltext = reward.getHtml(); - playSound(player, QuestSound.SKILLSOUND_LIQUID_SUCCESS); + playSound(player, Sound.SKILLSOUND_LIQUID_SUCCESS); } else { htmltext = "31149-44.html"; - playSound(player, QuestSound.SKILLSOUND_LIQUID_FAIL); + playSound(player, Sound.SKILLSOUND_LIQUID_FAIL); } } else diff --git a/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java b/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java index 827d18f6ca..83b819e972 100644 --- a/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java +++ b/dist/game/data/scripts/quests/Q00381_LetsBecomeARoyalMember/Q00381_LetsBecomeARoyalMember.java @@ -18,7 +18,7 @@ */ package quests.Q00381_LetsBecomeARoyalMember; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -82,7 +82,7 @@ public final class Q00381_LetsBecomeARoyalMember extends Quest if (qs.isMemoState(1) && !hasQuestItems(player, COIN_ALBUM)) { qs.setMemoState(2); - playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(player, Sound.ITEMSOUND_QUEST_MIDDLE); htmltext = event; } break; @@ -155,7 +155,7 @@ public final class Q00381_LetsBecomeARoyalMember extends Quest { takeItems(talker, FOUR_LEAF_COIN, 1); giveItems(talker, COIN_ALBUM, 1); - playSound(talker, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(talker, Sound.ITEMSOUND_QUEST_MIDDLE); htmltext = "30090-04.html"; } else @@ -183,7 +183,7 @@ public final class Q00381_LetsBecomeARoyalMember extends Quest else if (qs.isMemoState(2) && !hasQuestItems(killer, FOUR_LEAF_COIN)) { giveItems(killer, FOUR_LEAF_COIN, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } } return super.onKill(npc, killer, isSummon); diff --git a/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java b/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java index aa055ce28f..4f8c5305d5 100644 --- a/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java +++ b/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -152,11 +152,11 @@ public final class Q00384_WarehouseKeepersPastime extends Quest { if (event.equals("QUEST_ACCEPTED")) { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT); + qs.playSound(Sound.ITEMSOUND_QUEST_ACCEPT); qs.setMemoState(384); qs.startQuest(); qs.showQuestionMark(384); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30182-05.htm"; } switch (ask) diff --git a/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index b9d22365da..ef52b5f3a6 100644 --- a/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -143,11 +143,11 @@ public final class Q00386_StolenDignity extends Quest { if (event.equals("QUEST_ACCEPTED")) { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT); + qs.playSound(Sound.ITEMSOUND_QUEST_ACCEPT); qs.setMemoState(386); qs.startQuest(); qs.showQuestionMark(386); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); return "30843-05.htm"; } if (event.contains(".html")) diff --git a/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java b/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java index 1c844c4585..28abe423cb 100644 --- a/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java +++ b/dist/game/data/scripts/quests/Q00401_PathOfTheWarrior/Q00401_PathOfTheWarrior.java @@ -18,7 +18,7 @@ */ package quests.Q00401_PathOfTheWarrior; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -210,7 +210,7 @@ public final class Q00401_PathOfTheWarrior extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -228,7 +228,7 @@ public final class Q00401_PathOfTheWarrior extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java b/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java index dd6bfed387..33c57a073f 100644 --- a/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java +++ b/dist/game/data/scripts/quests/Q00402_PathOfTheHumanKnight/Q00402_PathOfTheHumanKnight.java @@ -18,7 +18,7 @@ */ package quests.Q00402_PathOfTheHumanKnight; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -260,11 +260,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest giveItems(killer, LIZARDMANS_TOTEM, 1); if (getQuestItemsCount(killer, LIZARDMANS_TOTEM) == 20) { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -278,11 +278,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest giveItems(killer, VENOMOUS_SPIDERS_LEG, 1); if (getQuestItemsCount(killer, VENOMOUS_SPIDERS_LEG) == 20) { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -296,11 +296,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest giveItems(killer, GIANT_SPIDERS_HUSK, 1); if (getQuestItemsCount(killer, GIANT_SPIDERS_HUSK) == 20) { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -312,11 +312,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest giveItems(killer, SKULL_OF_SILENT_HORROR, 1); if (getQuestItemsCount(killer, SKULL_OF_SILENT_HORROR) == 10) { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -328,11 +328,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest giveItems(killer, BUGBEAR_NECKLACE, 1); if (getQuestItemsCount(killer, BUGBEAR_NECKLACE) == 10) { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -344,11 +344,11 @@ public final class Q00402_PathOfTheHumanKnight extends Quest giveItems(killer, EINHASAD_CRUCIFIX, 1); if (getQuestItemsCount(killer, EINHASAD_CRUCIFIX) == 12) { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java b/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java index 65f70ba19d..17308d1b2f 100644 --- a/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java +++ b/dist/game/data/scripts/quests/Q00403_PathOfTheRogue/Q00403_PathOfTheRogue.java @@ -21,7 +21,7 @@ package quests.Q00403_PathOfTheRogue; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -235,7 +235,7 @@ public final class Q00403_PathOfTheRogue extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -252,7 +252,7 @@ public final class Q00403_PathOfTheRogue extends Quest } else { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java b/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java index 1eef06402e..509f4042d9 100644 --- a/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java +++ b/dist/game/data/scripts/quests/Q00404_PathOfTheHumanWizard/Q00404_PathOfTheHumanWizard.java @@ -18,7 +18,7 @@ */ package quests.Q00404_PathOfTheHumanWizard; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -168,7 +168,7 @@ public final class Q00404_PathOfTheHumanWizard extends Quest } else { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java b/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java index 636e6456c0..c5ab4dc08d 100644 --- a/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java +++ b/dist/game/data/scripts/quests/Q00405_PathOfTheCleric/Q00405_PathOfTheCleric.java @@ -18,7 +18,7 @@ */ package quests.Q00405_PathOfTheCleric; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -125,7 +125,7 @@ public final class Q00405_PathOfTheCleric extends Quest if (hasQuestItems(killer, NECKLACE_OF_MOTHER) && !hasQuestItems(killer, PENDANT_OF_MOTHER)) { giveItems(killer, PENDANT_OF_MOTHER, 1); - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_MIDDLE); } } return super.onKill(npc, killer, isSummon); diff --git a/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java b/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java index 68c127d625..516141143a 100644 --- a/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java +++ b/dist/game/data/scripts/quests/Q00406_PathOfTheElvenKnight/Q00406_PathOfTheElvenKnight.java @@ -21,7 +21,7 @@ package quests.Q00406_PathOfTheElvenKnight; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -159,7 +159,7 @@ public final class Q00406_PathOfTheElvenKnight extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java b/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java index 790dff02d6..e48a1387d1 100644 --- a/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java +++ b/dist/game/data/scripts/quests/Q00407_PathOfTheElvenScout/Q00407_PathOfTheElvenScout.java @@ -18,7 +18,7 @@ */ package quests.Q00407_PathOfTheElvenScout; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -207,7 +207,7 @@ public final class Q00407_PathOfTheElvenScout extends Quest } else { - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java b/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java index 60d7292cf6..176c335269 100644 --- a/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java +++ b/dist/game/data/scripts/quests/Q00408_PathOfTheElvenWizard/Q00408_PathOfTheElvenWizard.java @@ -18,7 +18,7 @@ */ package quests.Q00408_PathOfTheElvenWizard; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -212,11 +212,11 @@ public final class Q00408_PathOfTheElvenWizard extends Quest giveItems(killer, GOLD_LEAVES, 1); if (getQuestItemsCount(killer, GOLD_LEAVES) == 5) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -228,11 +228,11 @@ public final class Q00408_PathOfTheElvenWizard extends Quest giveItems(killer, AMETHYST, 1); if (getQuestItemsCount(killer, AMETHYST) == 2) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -244,11 +244,11 @@ public final class Q00408_PathOfTheElvenWizard extends Quest giveItems(killer, RED_DOWN, 1); if (getQuestItemsCount(killer, RED_DOWN) == 5) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java b/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java index 8cbdb29b51..16749f3c00 100644 --- a/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java +++ b/dist/game/data/scripts/quests/Q00410_PathOfThePalusKnight/Q00410_PathOfThePalusKnight.java @@ -18,7 +18,7 @@ */ package quests.Q00410_PathOfThePalusKnight; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -185,7 +185,7 @@ public final class Q00410_PathOfThePalusKnight extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -201,7 +201,7 @@ public final class Q00410_PathOfThePalusKnight extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java b/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java index e80bc00545..ac76db6dea 100644 --- a/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java +++ b/dist/game/data/scripts/quests/Q00411_PathOfTheAssassin/Q00411_PathOfTheAssassin.java @@ -18,7 +18,7 @@ */ package quests.Q00411_PathOfTheAssassin; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -165,7 +165,7 @@ public final class Q00411_PathOfTheAssassin extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java b/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java index 9298f33431..2bd038c2ab 100644 --- a/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java +++ b/dist/game/data/scripts/quests/Q00412_PathOfTheDarkWizard/Q00412_PathOfTheDarkWizard.java @@ -18,7 +18,7 @@ */ package quests.Q00412_PathOfTheDarkWizard; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -188,11 +188,11 @@ public final class Q00412_PathOfTheDarkWizard extends Quest giveItems(killer, FAMILYS_REMAINS, 1); if (getQuestItemsCount(killer, FAMILYS_REMAINS) == 3) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -209,11 +209,11 @@ public final class Q00412_PathOfTheDarkWizard extends Quest giveItems(killer, KNEE_BONE, 1); if (getQuestItemsCount(killer, KNEE_BONE) == 2) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -228,11 +228,11 @@ public final class Q00412_PathOfTheDarkWizard extends Quest giveItems(killer, HEART_OF_LUNACY, 1); if (getQuestItemsCount(killer, HEART_OF_LUNACY) == 3) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java b/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java index acdb35748d..2d363574a8 100644 --- a/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java +++ b/dist/game/data/scripts/quests/Q00413_PathOfTheShillienOracle/Q00413_PathOfTheShillienOracle.java @@ -18,7 +18,7 @@ */ package quests.Q00413_PathOfTheShillienOracle; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -173,7 +173,7 @@ public final class Q00413_PathOfTheShillienOracle extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -190,7 +190,7 @@ public final class Q00413_PathOfTheShillienOracle extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java b/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java index 0642b23098..c4de700461 100644 --- a/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java +++ b/dist/game/data/scripts/quests/Q00414_PathOfTheOrcRaider/Q00414_PathOfTheOrcRaider.java @@ -18,7 +18,7 @@ */ package quests.Q00414_PathOfTheOrcRaider; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -179,7 +179,7 @@ public final class Q00414_PathOfTheOrcRaider extends Quest else { giveItems(killer, GREEN_BLOOD, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -197,7 +197,7 @@ public final class Q00414_PathOfTheOrcRaider extends Quest else { giveItems(killer, KURUKA_RATMAN_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -221,7 +221,7 @@ public final class Q00414_PathOfTheOrcRaider extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java b/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java index c9a03b5d38..f3c84c1c69 100644 --- a/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java +++ b/dist/game/data/scripts/quests/Q00415_PathOfTheOrcMonk/Q00415_PathOfTheOrcMonk.java @@ -18,7 +18,7 @@ */ package quests.Q00415_PathOfTheOrcMonk; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -300,7 +300,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest else { giveItems(killer, FELIM_LIZARDMAN_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -322,7 +322,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest else { giveItems(killer, VUKU_ORK_TUSK, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -344,7 +344,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest else { giveItems(killer, LANGK_LIZARDMAN_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -366,7 +366,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest else { giveItems(killer, RATMAN_FANG, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -385,7 +385,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest else { giveItems(killer, SCARLET_SALAMANDER_SCALE, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -403,7 +403,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -423,7 +423,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest else { giveItems(killer, KASHA_BLADE_SPIDER_TALON, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } else if (qs.isMemoState(3) && (getQuestItemsCount(killer, KASHA_SPIDERS_TOOTH) < 6)) @@ -437,7 +437,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -457,7 +457,7 @@ public final class Q00415_PathOfTheOrcMonk extends Quest else { giveItems(killer, KASHA_BEAR_CLAW, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java b/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java index a661743ced..9a7bc1ad24 100644 --- a/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java +++ b/dist/game/data/scripts/quests/Q00416_PathOfTheOrcShaman/Q00416_PathOfTheOrcShaman.java @@ -21,7 +21,7 @@ package quests.Q00416_PathOfTheOrcShaman; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -357,12 +357,12 @@ public final class Q00416_PathOfTheOrcShaman extends Quest { takeItems(player, DURKA_PARASITE, -1); addSpawn(DURKA_SPIRIT, npc.getX(), npc.getY(), npc.getZ(), 0, true, 0, false); - playSound(st.getPlayer(), QuestSound.ITEMSOUND_QUEST_BEFORE_BATTLE); + playSound(st.getPlayer(), Sound.ITEMSOUND_QUEST_BEFORE_BATTLE); } else { giveItems(st.getPlayer(), DURKA_PARASITE, 1); - playSound(st.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(st.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } else diff --git a/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java b/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java index 644767e72f..59f6686917 100644 --- a/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java +++ b/dist/game/data/scripts/quests/Q00418_PathOfTheArtisan/Q00418_PathOfTheArtisan.java @@ -18,7 +18,7 @@ */ package quests.Q00418_PathOfTheArtisan; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.base.ClassId; @@ -446,7 +446,7 @@ public final class Q00418_PathOfTheArtisan extends Quest if (getQuestItemsCount(killer, BOOGLE_RATMAN_TOOTH) == 9) { giveItems(killer, BOOGLE_RATMAN_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BOOGLE_RATMAN_LEADERS_TOOTH) >= 2) { qs.setCond(2); @@ -455,7 +455,7 @@ public final class Q00418_PathOfTheArtisan extends Quest else { giveItems(killer, BOOGLE_RATMAN_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -470,7 +470,7 @@ public final class Q00418_PathOfTheArtisan extends Quest if (getQuestItemsCount(killer, BOOGLE_RATMAN_LEADERS_TOOTH) == 1) { giveItems(killer, BOOGLE_RATMAN_LEADERS_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); if (getQuestItemsCount(killer, BOOGLE_RATMAN_TOOTH) >= 10) { qs.setCond(2); @@ -480,7 +480,7 @@ public final class Q00418_PathOfTheArtisan extends Quest else { giveItems(killer, BOOGLE_RATMAN_LEADERS_TOOTH, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java b/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java index d0a1377bf6..b56dc34100 100644 --- a/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java +++ b/dist/game/data/scripts/quests/Q00419_GetAPet/Q00419_GetAPet.java @@ -21,7 +21,7 @@ package quests.Q00419_GetAPet; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.Race; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -385,11 +385,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_NAIL, 1); if (getQuestItemsCount(killer, BLOODY_NAIL) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -404,11 +404,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_NAIL, 1); if (getQuestItemsCount(killer, BLOODY_NAIL) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -423,11 +423,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_FANG, 1); if (getQuestItemsCount(killer, BLOODY_FANG) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -442,11 +442,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_NAIL, 1); if (getQuestItemsCount(killer, BLOODY_NAIL) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -461,11 +461,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_FANG, 1); if (getQuestItemsCount(killer, BLOODY_FANG) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -480,11 +480,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_FANG, 1); if (getQuestItemsCount(killer, BLOODY_FANG) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -499,11 +499,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_CLAW, 1); if (getQuestItemsCount(killer, BLOODY_CLAW) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -518,11 +518,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_TARANTULA_NAIL, 1); if (getQuestItemsCount(killer, BLOODY_TARANTULA_NAIL) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -537,11 +537,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_CLAW, 1); if (getQuestItemsCount(killer, BLOODY_CLAW) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -556,11 +556,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_CLAW, 1); if (getQuestItemsCount(killer, BLOODY_CLAW) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -575,11 +575,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_KASHA_FANG, 1); if (getQuestItemsCount(killer, BLOODY_KASHA_FANG) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -594,11 +594,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_KASHA_FANG, 1); if (getQuestItemsCount(killer, BLOODY_KASHA_FANG) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -613,11 +613,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_KASHA_FANG, 1); if (getQuestItemsCount(killer, BLOODY_KASHA_FANG) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -632,11 +632,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_TARANTULA_NAIL, 1); if (getQuestItemsCount(killer, BLOODY_TARANTULA_NAIL) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -651,11 +651,11 @@ public final class Q00419_GetAPet extends Quest giveItems(killer, BLOODY_RED_CLAW, 1); if (getQuestItemsCount(killer, BLOODY_RED_CLAW) >= 50) { - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java b/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java index ce76313f04..985bda0bed 100644 --- a/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java +++ b/dist/game/data/scripts/quests/Q00420_LittleWing/Q00420_LittleWing.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -423,7 +423,7 @@ public final class Q00420_LittleWing extends Quest if ((qs != null) && (getQuestItemsCount(attacker, DELUXE_FAIRY_STONE) > 0) && (getRandom(100) < 30)) { takeItems(attacker, DELUXE_FAIRY_STONE, -1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); npc.broadcastPacket(new NpcSay(npc, Say2.NPC_ALL, NpcStringId.THE_STONE_THE_ELVEN_STONE_BROKE)); } return super.onAttack(npc, attacker, damage, isSummon); diff --git a/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java b/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java index e2ba516494..15aa13d0a1 100644 --- a/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java +++ b/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import com.l2jserver.gameserver.ai.CtrlIntention; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.L2Summon; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -405,7 +405,7 @@ public final class Q00421_LittleWingsBigAdventure extends Quest takeItems(attacker, FAIRY_LEAF, 1); qs.setMemoState(qs.getMemoState() + data.memoStateValue); qs.unset("hits"); - playSound(attacker, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(attacker, Sound.ITEMSOUND_QUEST_MIDDLE); if (qs.getMemoState() == 15) { diff --git a/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java b/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java index a6ec43a71e..33d5566801 100644 --- a/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java +++ b/dist/game/data/scripts/quests/Q00422_RepentYourSins/Q00422_RepentYourSins.java @@ -18,7 +18,7 @@ */ package quests.Q00422_RepentYourSins; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.L2Summon; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -88,7 +88,7 @@ public final class Q00422_RepentYourSins extends Quest qs.startQuest(); if ((player.getLevel() > 20) && (player.getLevel() < 31)) { - playSound(player, QuestSound.ITEMSOUND_QUEST_ACCEPT); + playSound(player, Sound.ITEMSOUND_QUEST_ACCEPT); qs.setMemoState(2); qs.setCond(3); htmltext = "30981-04.htm"; @@ -231,12 +231,12 @@ public final class Q00422_RepentYourSins extends Quest if (getQuestItemsCount(killer, RATMAN_SCAVENGERS_SKULL) == 9) { giveItems(killer, RATMAN_SCAVENGERS_SKULL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { giveItems(killer, RATMAN_SCAVENGERS_SKULL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -246,7 +246,7 @@ public final class Q00422_RepentYourSins extends Quest if (qs.isMemoState(7) && !hasQuestItems(killer, TYRANT_KINGPINS_HEART)) { giveItems(killer, TYRANT_KINGPINS_HEART, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } break; } @@ -257,12 +257,12 @@ public final class Q00422_RepentYourSins extends Quest if (getQuestItemsCount(killer, TUREK_WAR_HOUNDS_TAIL) == 9) { giveItems(killer, TUREK_WAR_HOUNDS_TAIL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { giveItems(killer, TUREK_WAR_HOUNDS_TAIL, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -274,12 +274,12 @@ public final class Q00422_RepentYourSins extends Quest if (getQuestItemsCount(killer, TRISALIM_TARANTULAS_VENOM_SAC) == 2) { giveItems(killer, TRISALIM_TARANTULAS_VENOM_SAC, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(killer, Sound.ITEMSOUND_QUEST_MIDDLE); } else { giveItems(killer, TRISALIM_TARANTULAS_VENOM_SAC, 1); - playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(killer, Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java b/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java index d9b4e65475..1c1daca719 100644 --- a/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java +++ b/dist/game/data/scripts/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java @@ -21,7 +21,7 @@ package quests.Q00426_QuestForFishingShot; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -395,14 +395,14 @@ public class Q00426_QuestForFishingShot extends Quest { rewardItems(qs.getPlayer(), SWEET_FLUID, MOBS_SPECIAL.get(npc.getId()).reward); } - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } else { if (Rnd.get(1000) <= MOBS.get(npc.getId()).chance) { rewardItems(qs.getPlayer(), SWEET_FLUID, MOBS.get(npc.getId()).reward); - playSound(qs.getPlayer(), QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java index 0feb0fc726..09490065bb 100644 --- a/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java +++ b/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java @@ -18,7 +18,7 @@ */ package quests.Q00431_WeddingMarch; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -100,7 +100,7 @@ public class Q00431_WeddingMarch extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java index 6935e14585..821d298c3b 100644 --- a/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java +++ b/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java @@ -18,7 +18,7 @@ */ package quests.Q00432_BirthdayPartySong; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -96,7 +96,7 @@ public class Q00432_BirthdayPartySong extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, player, isSummon); diff --git a/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java index 48acf76a02..d3b65249cb 100644 --- a/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java +++ b/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java @@ -19,7 +19,7 @@ package quests.Q00450_GraveRobberRescue; import com.l2jserver.gameserver.ai.CtrlIntention; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.Location; import com.l2jserver.gameserver.model.actor.L2Attackable; @@ -137,7 +137,7 @@ public class Q00450_GraveRobberRescue extends Quest if (getRandom(100) < 66) { st.giveItems(EVIDENCE_OF_MIGRATION, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, new Location(npc.getX() + 100, npc.getY() + 100, npc.getZ(), 0)); npc.setBusy(true); diff --git a/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java index e86fe2e105..edeb909b1e 100644 --- a/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java +++ b/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java @@ -18,7 +18,7 @@ */ package quests.Q00451_LuciensAltar; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -137,7 +137,7 @@ public class Q00451_LuciensAltar extends Quest st.set(String.valueOf(npcId), "1"); st.takeItems(REPLENISHED_BEAD, 1); st.giveItems(DISCHARGED_BEAD, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if (st.getQuestItemsCount(DISCHARGED_BEAD) >= 5) { diff --git a/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index 5e3157281e..cb50af1588 100644 --- a/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -20,7 +20,7 @@ package quests.Q00453_NotStrongEnoughAlone; import quests.Q10282_ToTheSeedOfAnnihilation.Q10282_ToTheSeedOfAnnihilation; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -147,7 +147,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest if (i < 15) { st.set(Integer.toString(npcId), Integer.toString(i + 1)); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } checkProgress(st, 15, MONSTER1[0], MONSTER1[1], MONSTER1[2], MONSTER1[3]); @@ -176,7 +176,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest if (i < 20) { st.set(Integer.toString(npcId), Integer.toString(i + 1)); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } checkProgress(st, 20, MONSTER2[0], MONSTER2[1], MONSTER2[2]); @@ -204,7 +204,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest if (i < 20) { st.set(Integer.toString(npcId), Integer.toString(i + 1)); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } checkProgress(st, 20, MONSTER3[0], MONSTER3[1], MONSTER3[2]); diff --git a/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 24f4180a4e..894d01fcc6 100644 --- a/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -21,7 +21,7 @@ package quests.Q00455_WingsOfSand; import java.util.Arrays; import java.util.List; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -79,7 +79,7 @@ public class Q00455_WingsOfSand extends Quest if ((st != null) && Util.checkIfInRange(1500, npc, player, false) && (getRandom(1000) < CHANCE)) { st.giveItems(LARGE_BABY_DRAGON, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if (st.getQuestItemsCount(LARGE_BABY_DRAGON) == 1) { st.setCond(2, true); diff --git a/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 562cc36bc0..ce35e19fb9 100644 --- a/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; import com.l2jserver.gameserver.datatables.ItemTable; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.AggroInfo; import com.l2jserver.gameserver.model.L2CommandChannel; @@ -175,7 +175,7 @@ public final class Q00456_DontKnowDontCare extends Quest } else { - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java index d3d4832ba6..8a263d5e47 100644 --- a/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java +++ b/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java @@ -18,7 +18,7 @@ */ package quests.Q00458_PerfectForm; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Attackable; import com.l2jserver.gameserver.model.actor.L2Npc; @@ -266,7 +266,7 @@ public class Q00458_PerfectForm extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } final ExQuestNpcLogList log = new ExQuestNpcLogList(getId()); diff --git a/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java b/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java index 6633f5ef82..5737157ee1 100644 --- a/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java +++ b/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java @@ -23,7 +23,7 @@ import java.util.Map; import quests.Q00252_ItSmellsDelicious.Q00252_ItSmellsDelicious; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -102,7 +102,7 @@ public class Q00461_RumbleInTheBase extends Quest if ((st != null) && st.isCond(1) && (st.getQuestItemsCount(SHINY_SALMON) < 5)) { st.giveItems(SHINY_SALMON, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if ((st.getQuestItemsCount(SHINY_SALMON) >= 5) && (st.getQuestItemsCount(SHOES_STRING_OF_SEL_MAHUM) >= 10)) { st.setCond(2, true); @@ -121,7 +121,7 @@ public class Q00461_RumbleInTheBase extends Quest if (st.getQuestItemsCount(SHOES_STRING_OF_SEL_MAHUM) < 10) { st.giveItems(SHOES_STRING_OF_SEL_MAHUM, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if ((st.getQuestItemsCount(SHINY_SALMON) >= 5) && (st.getQuestItemsCount(SHOES_STRING_OF_SEL_MAHUM) >= 10)) { st.setCond(2, true); diff --git a/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java index 1a54a2441d..a73a24647b 100644 --- a/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java +++ b/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java @@ -21,7 +21,7 @@ package quests.Q00463_IMustBeaGenius; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -192,7 +192,7 @@ public class Q00463_IMustBeaGenius extends Quest ns.addStringParameter(String.valueOf(number)); npc.broadcastPacket(ns); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); if (st.getQuestItemsCount(CORPSE_LOG) == st.getInt("number")) { st.takeItems(CORPSE_LOG, -1); diff --git a/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java b/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java index a2d959934d..f1692c426f 100644 --- a/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java +++ b/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java @@ -22,7 +22,7 @@ import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.instancemanager.CHSiegeManager; import com.l2jserver.gameserver.model.L2Clan; import com.l2jserver.gameserver.model.actor.L2Npc; @@ -94,11 +94,11 @@ public final class Q00504_CompetitionForTheBanditStronghold extends Quest st.giveItems(TARLK_AMULET, 1); if (st.getQuestItemsCount(TARLK_AMULET) < 30) { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + st.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); } } return null; diff --git a/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java index 497e192cf0..f0017bb742 100644 --- a/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java +++ b/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.L2Clan; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -150,7 +150,7 @@ public class Q00508_AClansReputation extends Quest if ((npc.getId() == REWARD_POINTS.get(raid).get(0)) && !st.hasQuestItems(REWARD_POINTS.get(raid).get(1))) { st.rewardItems(REWARD_POINTS.get(raid).get(1), 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -187,7 +187,7 @@ public class Q00508_AClansReputation extends Quest if (st.hasQuestItems(REWARD_POINTS.get(raid).get(1))) { htmltext = "30868-" + raid + "b.html"; - st.playSound(QuestSound.ITEMSOUND_QUEST_FANFARE_1); + st.playSound(Sound.ITEMSOUND_QUEST_FANFARE_1); st.takeItems(REWARD_POINTS.get(raid).get(1), -1); final int rep = REWARD_POINTS.get(raid).get(2); clan.addReputationScore(rep, true); diff --git a/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java index 68a3478df9..b33652b5b0 100644 --- a/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java +++ b/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.L2Clan; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -137,7 +137,7 @@ public class Q00509_AClansFame extends Quest if ((npc.getId() == REWARD_POINTS.get(raid).get(0)) && !st.hasQuestItems(REWARD_POINTS.get(raid).get(1))) { st.rewardItems(REWARD_POINTS.get(raid).get(1), 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -174,7 +174,7 @@ public class Q00509_AClansFame extends Quest if (st.hasQuestItems(REWARD_POINTS.get(raid).get(1))) { htmltext = "31331-" + raid + "b.html"; - st.playSound(QuestSound.ITEMSOUND_QUEST_FANFARE_1); + st.playSound(Sound.ITEMSOUND_QUEST_FANFARE_1); st.takeItems(REWARD_POINTS.get(raid).get(1), -1); final int rep = REWARD_POINTS.get(raid).get(2); clan.addReputationScore(rep, true); diff --git a/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java index a1782c8cbe..6b6f7f50e9 100644 --- a/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java +++ b/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java @@ -18,7 +18,7 @@ */ package quests.Q00510_AClansPrestige; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.L2Clan; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -101,7 +101,7 @@ public class Q00510_AClansPrestige extends Quest if ((st != null) && st.isStarted()) { st.rewardItems(TYRANNOSAURUS_CLAW, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return null; } @@ -137,7 +137,7 @@ public class Q00510_AClansPrestige extends Quest { int count = (int) st.getQuestItemsCount(TYRANNOSAURUS_CLAW); int reward = (count < 10) ? (30 * count) : (59 + (30 * count)); - st.playSound(QuestSound.ITEMSOUND_QUEST_FANFARE_1); + st.playSound(Sound.ITEMSOUND_QUEST_FANFARE_1); st.takeItems(TYRANNOSAURUS_CLAW, -1); clan.addReputationScore(reward, true); player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLAN_QUEST_COMPLETED_AND_S1_POINTS_GAINED).addInt(reward)); diff --git a/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index d65290c231..a881ada7d1 100644 --- a/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import com.l2jserver.gameserver.ThreadPoolManager; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.instancemanager.InstanceManager; import com.l2jserver.gameserver.model.L2Party; import com.l2jserver.gameserver.model.Location; @@ -464,7 +464,7 @@ public final class Q00511_AwlUnderFoot extends Quest if (st.isCond(1)) { st.giveItems(DL_MARK, 140); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java b/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java index 27c110fb2a..845a341b8c 100644 --- a/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java +++ b/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java @@ -21,7 +21,7 @@ package quests.Q00601_WatchingEyes; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -133,7 +133,7 @@ public class Q00601_WatchingEyes extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, player, isSummon); diff --git a/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java b/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java index 0072db4cee..bfeec53a49 100644 --- a/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java +++ b/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java @@ -18,7 +18,7 @@ */ package quests.Q00602_ShadowOfLight; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -140,7 +140,7 @@ public class Q00602_ShadowOfLight extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, player, isSummon); diff --git a/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java b/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java index bb72cfb551..b0fab6f176 100644 --- a/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java +++ b/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java @@ -19,7 +19,7 @@ package quests.Q00604_DaimonTheWhiteEyedPart2; import com.l2jserver.gameserver.datatables.SpawnTable; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.Location; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -82,7 +82,7 @@ public final class Q00604_DaimonTheWhiteEyedPart2 extends Quest } giveItems(player, ESSENCE_OF_DAIMON, 1); - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java b/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java index 168833883a..a072f4464d 100644 --- a/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java +++ b/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java @@ -21,7 +21,7 @@ package quests.Q00605_AllianceWithKetraOrcs; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -204,7 +204,7 @@ public class Q00605_AllianceWithKetraOrcs extends Quest return "31371-03.htm"; } st.setState(State.STARTED); - st.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT); + st.playSound(Sound.ITEMSOUND_QUEST_ACCEPT); for (int i = 0; i < KETRA_MARKS.length; i++) { if (st.hasQuestItems(KETRA_MARKS[i])) diff --git a/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java b/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java index 4676af3fb7..76f7db92a0 100644 --- a/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java +++ b/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java @@ -21,7 +21,7 @@ package quests.Q00606_BattleAgainstVarkaSilenos; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -115,7 +115,7 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest { final QuestState st = getQuestState(member, false); st.giveItems(MANE, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return super.onKill(npc, killer, isSummon); } diff --git a/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java b/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java index a7f262b266..416f03a098 100644 --- a/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java +++ b/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java @@ -21,7 +21,7 @@ package quests.Q00611_AllianceWithVarkaSilenos; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -204,7 +204,7 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest return "31378-03.htm"; } st.setState(State.STARTED); - st.playSound(QuestSound.ITEMSOUND_QUEST_ACCEPT); + st.playSound(Sound.ITEMSOUND_QUEST_ACCEPT); for (int i = 0; i < VARKA_MARKS.length; i++) { if (st.hasQuestItems(VARKA_MARKS[i])) diff --git a/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java b/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java index bd49655065..457564bd3b 100644 --- a/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java +++ b/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java @@ -21,7 +21,7 @@ package quests.Q00612_BattleAgainstKetraOrcs; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -115,7 +115,7 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest { final QuestState st = getQuestState(member, false); st.giveItems(MOLAR, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return super.onKill(npc, killer, isSummon); } diff --git a/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java index a79bc8e324..d1ef863167 100644 --- a/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java +++ b/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java @@ -21,7 +21,7 @@ package quests.Q00617_GatherTheFlames; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -169,7 +169,7 @@ public class Q00617_GatherTheFlames extends Quest { st.giveItems(TORCH, 1); } - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); return super.onKill(npc, player, isSummon); } diff --git a/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java index 359c41f471..e70adc0176 100644 --- a/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java +++ b/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java @@ -21,7 +21,7 @@ package quests.Q00618_IntoTheFlame; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -133,7 +133,7 @@ public class Q00618_IntoTheFlame extends Quest } else { - qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + qs.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java b/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java index 8ddcf82e0d..31bbab3fae 100644 --- a/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java +++ b/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java @@ -21,7 +21,7 @@ package quests.Q00624_TheFinestIngredientsPart1; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -111,7 +111,7 @@ public final class Q00624_TheFinestIngredientsPart1 extends Quest if (count < 50) { giveItems(partyMember, item, 50 - count); - playSound(partyMember, QuestSound.ITEMSOUND_QUEST_FANFARE_MIDDLE); + playSound(partyMember, Sound.ITEMSOUND_QUEST_FANFARE_MIDDLE); } if (getQuestItemsCount(partyMember, getRegisteredItemIds()) == 150) { @@ -121,7 +121,7 @@ public final class Q00624_TheFinestIngredientsPart1 extends Quest else { giveItems(partyMember, item, 1); - playSound(partyMember, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(partyMember, Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, killer, isSummon); diff --git a/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java index c9213fe21f..057c6b225d 100644 --- a/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java +++ b/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import com.l2jserver.Config; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -130,7 +130,7 @@ public class Q00626_ADarkTwilight extends Quest st.giveItems(BLOOD_OF_SAINT, 1); if (st.getQuestItemsCount(BLOOD_OF_SAINT) < ITEMS_COUNT_REQUIRED) { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else { diff --git a/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java index 8d872ccdca..f027e7afd4 100644 --- a/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java +++ b/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import com.l2jserver.Config; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -170,7 +170,7 @@ public class Q00627_HeartInSearchOfPower extends Quest st.giveItems(BEAD_OF_OBEDIENCE, 1); if (st.getQuestItemsCount(BEAD_OF_OBEDIENCE) < BEAD_OF_OBEDIENCE_COUNT_REQUIRED) { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else { diff --git a/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java b/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java index fd23d1f699..f81b571777 100644 --- a/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java +++ b/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java @@ -19,7 +19,7 @@ package quests.Q00637_ThroughOnceMore; import com.l2jserver.Config; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -101,7 +101,7 @@ public final class Q00637_ThroughOnceMore extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } st.giveItems(NECRO_HEART, numItems); diff --git a/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java index 354c49289c..ab377f7644 100644 --- a/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java +++ b/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java @@ -20,7 +20,7 @@ package quests.Q00641_AttackSailren; import quests.Q00126_TheNameOfEvil2.Q00126_TheNameOfEvil2; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -95,7 +95,7 @@ public class Q00641_AttackSailren extends Quest st.giveItems(GAZKH_FRAGMENT, 1); if (st.getQuestItemsCount(GAZKH_FRAGMENT) < 30) { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else { diff --git a/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java index 8007ebaef3..7ed114b362 100644 --- a/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java +++ b/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java @@ -19,7 +19,7 @@ package quests.Q00643_RiseAndFallOfTheElrokiTribe; import com.l2jserver.Config; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -172,7 +172,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest { st.rewardItems(PIECE[getRandom(PIECE.length)], 5); st.takeItems(BONES_OF_A_PLAINS_DINOSAUR, 300); - st.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + st.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); htmltext = "32117-05.html"; } break; @@ -204,7 +204,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest { st.rewardItems(BONES_OF_A_PLAINS_DINOSAUR, 1); } - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } if (Util.contains(MOBS2, npcId)) @@ -213,7 +213,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest if (getRandom(1000) < chance) { st.rewardItems(BONES_OF_A_PLAINS_DINOSAUR, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } @@ -223,7 +223,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest if (getRandom(1000) < chance) { st.rewardItems(BONES_OF_A_PLAINS_DINOSAUR, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, player, isSummon); diff --git a/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java index cfadcffb2a..bfd7989e3d 100644 --- a/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java +++ b/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java @@ -18,7 +18,7 @@ */ package quests.Q00645_GhostsOfBatur; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -112,7 +112,7 @@ public class Q00645_GhostsOfBatur extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java index 28dc34fda6..37d4d3fddc 100644 --- a/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java +++ b/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java @@ -21,7 +21,7 @@ package quests.Q00647_InfluxOfMachines; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -129,7 +129,7 @@ public class Q00647_InfluxOfMachines extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java index 1822d1215f..9479810855 100644 --- a/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java +++ b/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java @@ -23,7 +23,7 @@ import java.util.Map; import quests.Q00115_TheOtherSideOfTruth.Q00115_TheOtherSideOfTruth; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -214,7 +214,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest takeItems(player, SILVER_ICE_CRYSTAL, 1); int val = (st.getInt("ex") + 1); st.set("ex", val); - playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY); + playSound(player, Sound.ITEMSOUND_BROKEN_KEY); htmltext = event; } break; @@ -226,7 +226,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest takeItems(player, SILVER_ICE_CRYSTAL, 1); int val = (st.getInt("ex") + 2); st.set("ex", val); - playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY); + playSound(player, Sound.ITEMSOUND_BROKEN_KEY); htmltext = event; } break; @@ -242,12 +242,12 @@ public final class Q00648_AnIceMerchantsDream extends Quest { htmltext = "32023-07.html"; giveItems(player, BLACK_ICE_CRYSTAL, 1); - playSound(player, QuestSound.ITEMSOUND_ENCHANT_SUCCESS); + playSound(player, Sound.ITEMSOUND_ENCHANT_SUCCESS); } else { htmltext = "32023-08.html"; - playSound(player, QuestSound.ITEMSOUND_ENCHANT_FAILED); + playSound(player, Sound.ITEMSOUND_ENCHANT_FAILED); } st.set("ex", 0); } @@ -264,12 +264,12 @@ public final class Q00648_AnIceMerchantsDream extends Quest { htmltext = "32023-07.html"; giveItems(player, BLACK_ICE_CRYSTAL, 1); - playSound(player, QuestSound.ITEMSOUND_ENCHANT_SUCCESS); + playSound(player, Sound.ITEMSOUND_ENCHANT_SUCCESS); } else { htmltext = "32023-08.html"; - playSound(player, QuestSound.ITEMSOUND_ENCHANT_FAILED); + playSound(player, Sound.ITEMSOUND_ENCHANT_FAILED); } st.set("ex", 0); } diff --git a/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java b/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java index 78b0af11af..1879005141 100644 --- a/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java +++ b/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java @@ -21,7 +21,7 @@ package quests.Q00649_ALooterAndARailroadMan; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -138,7 +138,7 @@ public final class Q00649_ALooterAndARailroadMan extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, killer, isSummon); diff --git a/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java index 38a60d6100..0bcca5ffca 100644 --- a/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java +++ b/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java @@ -25,7 +25,7 @@ import java.util.Map; import quests.Q00117_TheOceanOfDistantStars.Q00117_TheOceanOfDistantStars; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -170,7 +170,7 @@ public final class Q00650_ABrokenDream extends Quest if ((getRandom(1000) < monsterChance) && Util.checkIfInRange(1500, npc, player, true)) { giveItems(player, REMNANTS_OF_OLD_DWARVES_DREAMS, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); } } return super.onKill(npc, killer, isSummon); diff --git a/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java b/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java index 15ca3e4baf..30cbf059a6 100644 --- a/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java +++ b/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java @@ -22,7 +22,7 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import com.l2jserver.gameserver.cache.HtmCache; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.instancemanager.CHSiegeManager; import com.l2jserver.gameserver.model.L2Clan; import com.l2jserver.gameserver.model.actor.L2Npc; @@ -249,7 +249,7 @@ public final class Q00655_AGrandPlanForTamingWildBeasts extends Quest } else { - playSound(clanLeader, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(clanLeader, Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java index 429175575f..d9042d5b66 100644 --- a/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java +++ b/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java @@ -21,7 +21,7 @@ package quests.Q00660_AidingTheFloranVillage; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.holders.ItemChanceHolder; @@ -121,7 +121,7 @@ public final class Q00660_AidingTheFloranVillage extends Quest { qs.setState(State.STARTED); qs.setCond(2); - playSound(player, QuestSound.ITEMSOUND_QUEST_ACCEPT); + playSound(player, Sound.ITEMSOUND_QUEST_ACCEPT); } htmltext = event; } @@ -286,7 +286,7 @@ public final class Q00660_AidingTheFloranVillage extends Quest { giveItems(player, DELU_LIZARDMANS_SCALE, 1); } - playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(player, Sound.ITEMSOUND_QUEST_MIDDLE); } } return super.onKill(npc, player, isSummon); diff --git a/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 852ddda393..776a375978 100644 --- a/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -23,7 +23,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.holders.ItemHolder; @@ -769,7 +769,7 @@ public class Q00663_SeductiveWhispers extends Quest else if (rnd < MONSTERS.get(npc.getId())) { giveItems(rewardedPlayer, SPIRIT_BEAD, 1); - playSound(rewardedPlayer, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(rewardedPlayer, Sound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java index af53a56397..3af9b27c23 100644 --- a/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java +++ b/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java @@ -19,7 +19,7 @@ package quests.Q00688_DefeatTheElrokianRaiders; import com.l2jserver.Config; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -135,7 +135,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest if (getRandom(1000) < chance) { st.rewardItems(DINOSAUR_FANG_NECKLACE, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return super.onKill(npc, player, isSummon); } diff --git a/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java b/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java index b576de2c33..1297b06317 100644 --- a/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java +++ b/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java @@ -19,7 +19,7 @@ package quests.Q00690_JudesRequest; import com.l2jserver.Config; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -93,7 +93,7 @@ public class Q00690_JudesRequest extends Quest { st.giveItems(REWARDS[0][getRandom(REWARDS[0].length)], 1); st.takeItems(EVIL_WEAPON, 200); - st.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + st.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); htmltext = "32356-07.htm"; } else @@ -112,7 +112,7 @@ public class Q00690_JudesRequest extends Quest { st.giveItems(REWARDS[1][getRandom(REWARDS[1].length)], 1); st.takeItems(EVIL_WEAPON, 5); - st.playSound(QuestSound.ITEMSOUND_QUEST_MIDDLE); + st.playSound(Sound.ITEMSOUND_QUEST_MIDDLE); htmltext = "32356-09.htm"; } else @@ -151,7 +151,7 @@ public class Q00690_JudesRequest extends Quest if (getRandom(1000) <= chance) { st.giveItems(EVIL_WEAPON, Math.max(chance / 1000, 1)); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return null; } diff --git a/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java b/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java index ee494a3cd4..fdbcb91707 100644 --- a/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java +++ b/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import com.l2jserver.Config; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -141,7 +141,7 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest if (getRandom(1000) <= chance) { st.giveItems(RED_GEM, numItems); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return super.onKill(npc, player, isSummon); } diff --git a/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java b/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java index 939c5ea463..76b9005765 100644 --- a/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java +++ b/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java @@ -22,7 +22,7 @@ import java.util.HashMap; import java.util.Map; import com.l2jserver.Config; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.holders.ItemHolder; @@ -193,7 +193,7 @@ public final class Q00692_HowtoOpposeEvil extends Quest if (numItems > 0) { st.giveItems(QUEST_MOBS.get(npcId).getId(), numItems); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } return null; diff --git a/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java b/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java index e00322ce11..8cbe08b018 100644 --- a/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java +++ b/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java @@ -23,7 +23,7 @@ import java.util.Map; import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -123,14 +123,14 @@ public class Q00699_GuardianOfTheSkies extends Quest amount = getRandom(10) + 60; } st.giveItems(VULTURES_GOLDEN_FEATHER, amount); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else { if (getRandom(1000) < MONSTERS.get(npc.getId())) { st.giveItems(VULTURES_GOLDEN_FEATHER, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java b/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java index 1160487f49..1cd8f5b7b5 100644 --- a/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java +++ b/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java @@ -23,7 +23,7 @@ import java.util.Map; import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -242,7 +242,7 @@ public class Q00700_CursedLife extends Quest amount = getRandom(6) + 17; } st.giveItems(SWALLOWED_SKULL, amount); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else { @@ -251,17 +251,17 @@ public class Q00700_CursedLife extends Quest if (chance < chances[0]) { st.giveItems(SWALLOWED_BONES, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else if (chance < chances[1]) { st.giveItems(SWALLOWED_STERNUM, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else if (chance < chances[2]) { st.giveItems(SWALLOWED_SKULL, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java b/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java index f53b1a7371..1a94eb06a9 100644 --- a/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java +++ b/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java @@ -23,7 +23,7 @@ import java.util.Map; import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -127,12 +127,12 @@ public class Q00701_ProofOfExistence extends Quest count = getRandom(5) + 14; } st.giveItems(BANSHEE_QUEENS_EYE, count); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else if (getRandom(1000) < MOBS.get(npc.getId())) { st.giveItems(DEADMANS_REMAINS, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } return super.onKill(npc, player, isSummon); } diff --git a/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java index 3ff94a5467..860d78613f 100644 --- a/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java +++ b/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java @@ -20,7 +20,7 @@ package quests.Q00702_ATrapForRevenge; import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -357,7 +357,7 @@ public class Q00702_ATrapForRevenge extends Quest st.giveItems(VARIANT_DRAKE_WING_HORNS, count); break; } - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); return null; } diff --git a/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index 1ef1937755..2b99693661 100644 --- a/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -18,7 +18,7 @@ */ package quests.Q00901_HowLavasaurusesAreMade; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -184,7 +184,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest if (st.getQuestItemsCount(itemId) < 10) { st.giveItems(itemId, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else if (gotAllQuestItems(st)) { diff --git a/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java index cb64a8a043..a99d396be8 100644 --- a/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java +++ b/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java @@ -18,7 +18,7 @@ */ package quests.Q00903_TheCallOfAntharas; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -66,13 +66,13 @@ public class Q00903_TheCallOfAntharas extends Quest case BEHEMOTH_DRAGON: { st.giveItems(BEHEMOTH_DRAGON_LEATHER, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); break; } case TARASK_DRAGON: { st.giveItems(TARASK_DRAGONS_LEATHER_FRAGMENT, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); break; } } @@ -161,7 +161,7 @@ public class Q00903_TheCallOfAntharas extends Quest case 2: { st.giveItems(SCROLL_ANTHARAS_CALL, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(QuestType.DAILY, true); htmltext = "30755-08.html"; break; diff --git a/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java b/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java index db59c7664b..38d22bd1be 100644 --- a/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java +++ b/dist/game/data/scripts/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java @@ -18,7 +18,7 @@ */ package quests.Q00904_DragonTrophyAntharas; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -134,7 +134,7 @@ public final class Q00904_DragonTrophyAntharas extends Quest case 2: { st.giveItems(MEDAL_OF_GLORY, 30); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(QuestType.DAILY, true); htmltext = "30755-09.html"; break; diff --git a/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java index 77e2c4a0a0..295c3b307a 100644 --- a/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java +++ b/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java @@ -21,7 +21,7 @@ package quests.Q00905_RefinedDragonBlood; import java.util.HashMap; import java.util.Map; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -98,7 +98,7 @@ public final class Q00905_RefinedDragonBlood extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -134,7 +134,7 @@ public final class Q00905_RefinedDragonBlood extends Quest case "32864-11.html": { st.giveItems(REFINED_RED_DRAGON_BLOOD, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(QuestType.DAILY, true); htmltext = event; break; @@ -142,7 +142,7 @@ public final class Q00905_RefinedDragonBlood extends Quest case "32864-12.html": { st.giveItems(REFINED_BLUE_DRAGON_BLOOD, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(QuestType.DAILY, true); htmltext = event; break; diff --git a/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java index d4e7fb191f..4dfc88359f 100644 --- a/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java +++ b/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java @@ -18,7 +18,7 @@ */ package quests.Q00906_TheCallOfValakas; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -60,7 +60,7 @@ public class Q00906_TheCallOfValakas extends Quest if ((st != null) && Util.checkIfInRange(1500, npc, player, false)) { st.giveItems(LAVASAURUS_ALPHA_FRAGMENT, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); st.setCond(2, true); } } @@ -142,7 +142,7 @@ public class Q00906_TheCallOfValakas extends Quest case 2: { st.giveItems(SCROLL_VALAKAS_CALL, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(QuestType.DAILY, true); htmltext = "31540-08.html"; break; diff --git a/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java index 9f56d4b392..66f489bdba 100644 --- a/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java +++ b/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java @@ -18,7 +18,7 @@ */ package quests.Q00907_DragonTrophyValakas; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.enums.QuestType; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -139,7 +139,7 @@ public class Q00907_DragonTrophyValakas extends Quest case 2: { st.giveItems(MEDAL_OF_GLORY, 30); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(QuestType.DAILY, true); htmltext = "31540-09.html"; break; diff --git a/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java index 2ddbf1005f..d8802418e7 100644 --- a/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java +++ b/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java @@ -21,7 +21,7 @@ package quests.Q10272_LightFragment; import quests.Q10271_TheEnvelopingDarkness.Q10271_TheEnvelopingDarkness; import com.l2jserver.Config; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.itemcontainer.Inventory; @@ -165,7 +165,7 @@ public class Q10272_LightFragment extends Quest if (numItems > 0) { st.giveItems(FRAGMENT_POWDER, numItems); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java index 7a74f73150..79e3c8eae0 100644 --- a/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java +++ b/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java @@ -18,7 +18,7 @@ */ package quests.Q10273_GoodDayToFly; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.holders.SkillHolder; @@ -113,7 +113,7 @@ public class Q10273_GoodDayToFly extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } return null; diff --git a/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java index 4f8f4c51ee..c823b14ae2 100644 --- a/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java +++ b/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java @@ -20,7 +20,7 @@ package quests.Q10274_CollectingInTheAir; import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.L2Object; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -112,7 +112,7 @@ public class Q10274_CollectingInTheAir extends Quest st.giveItems(GREEN, 1); break; } - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); npc.doDie(caster); } return super.onSkillSee(npc, caster, skill, targets, isSummon); diff --git a/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java index 0001546395..7c371383e4 100644 --- a/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java +++ b/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java @@ -18,7 +18,7 @@ */ package quests.Q10275_ContainingTheAttributePower; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.Elementals; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; @@ -151,7 +151,7 @@ public class Q10275_ContainingTheAttributePower extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } break; @@ -165,7 +165,7 @@ public class Q10275_ContainingTheAttributePower extends Quest } else { - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } break; diff --git a/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java b/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java index 1504a0d1e5..a9504a93c5 100644 --- a/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java +++ b/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java @@ -21,7 +21,7 @@ package quests.Q10276_MutatedKaneusGludio; import java.util.ArrayList; import java.util.List; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -161,12 +161,12 @@ public class Q10276_MutatedKaneusGludio extends Quest if ((npcId == TOMLAN_KAMOS) && !st.hasQuestItems(TISSUE_TK)) { st.giveItems(TISSUE_TK, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else if ((npcId == OL_ARIOSH) && !st.hasQuestItems(TISSUE_OA)) { st.giveItems(TISSUE_OA, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java b/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java index c6f9b20152..4d2a043450 100644 --- a/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java +++ b/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java @@ -21,7 +21,7 @@ package quests.Q10277_MutatedKaneusDion; import java.util.ArrayList; import java.util.List; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -161,12 +161,12 @@ public class Q10277_MutatedKaneusDion extends Quest if ((npcId == CRIMSON_HATU) && !st.hasQuestItems(TISSUE_CH)) { st.giveItems(TISSUE_CH, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else if ((npcId == SEER_FLOUROS) && !st.hasQuestItems(TISSUE_SF)) { st.giveItems(TISSUE_SF, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java b/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java index 551317a37d..b7bb206796 100644 --- a/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java +++ b/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java @@ -21,7 +21,7 @@ package quests.Q10278_MutatedKaneusHeine; import java.util.ArrayList; import java.util.List; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -161,12 +161,12 @@ public class Q10278_MutatedKaneusHeine extends Quest if ((npcId == BLADE_OTIS) && !st.hasQuestItems(TISSUE_BO)) { st.giveItems(TISSUE_BO, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else if ((npcId == WEIRD_BUNEI) && !st.hasQuestItems(TISSUE_WB)) { st.giveItems(TISSUE_WB, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java b/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java index d0174c8a89..749a94bc77 100644 --- a/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java +++ b/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java @@ -21,7 +21,7 @@ package quests.Q10279_MutatedKaneusOren; import java.util.ArrayList; import java.util.List; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -161,12 +161,12 @@ public class Q10279_MutatedKaneusOren extends Quest if ((npcId == KAIM_ABIGORE) && !st.hasQuestItems(TISSUE_KA)) { st.giveItems(TISSUE_KA, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else if ((npcId == KNIGHT_MONTAGNAR) && !st.hasQuestItems(TISSUE_KM)) { st.giveItems(TISSUE_KM, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java b/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java index 6e3fe43f21..755c69cb1f 100644 --- a/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java +++ b/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java @@ -21,7 +21,7 @@ package quests.Q10280_MutatedKaneusSchuttgart; import java.util.ArrayList; import java.util.List; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -161,12 +161,12 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest if ((npcId == VENOMOUS_STORACE) && !st.hasQuestItems(TISSUE_VS)) { st.giveItems(TISSUE_VS, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } else if ((npcId == KEL_BILETTE) && !st.hasQuestItems(TISSUE_KB)) { st.giveItems(TISSUE_KB, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } } diff --git a/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java index 68eb469792..9a5adf4d53 100644 --- a/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java +++ b/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java @@ -21,7 +21,7 @@ package quests.Q10281_MutatedKaneusRune; import java.util.ArrayList; import java.util.List; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -157,6 +157,6 @@ public class Q10281_MutatedKaneusRune extends Quest private final void rewardItem(int npcId, QuestState st) { st.giveItems(TISSUE_WA, 1); - st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); + st.playSound(Sound.ITEMSOUND_QUEST_ITEMGET); } } diff --git a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 35cde65de0..062e1df392 100644 --- a/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -21,7 +21,7 @@ package quests.Q10292_SevenSignsGirlOfDoubt; import quests.Q00198_SevenSignsEmbryo.Q00198_SevenSignsEmbryo; import com.l2jserver.gameserver.ThreadPoolManager; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.holders.ItemHolder; @@ -126,7 +126,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest { if (st.isCond(4) && hasItem(player, ELCADIAS_MARK)) { - playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(player, Sound.ITEMSOUND_QUEST_MIDDLE); htmltext = event; } break; @@ -280,7 +280,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest { if (hasItem(player, ELCADIAS_MARK)) { - playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); + playSound(player, Sound.ITEMSOUND_QUEST_MIDDLE); htmltext = "32784-05.html"; } break; diff --git a/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java b/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java index fb60afc292..999a8ef9d8 100644 --- a/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java +++ b/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java @@ -18,7 +18,7 @@ */ package quests.Q10501_ZakenEmbroideredSoulCloak; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -68,7 +68,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest else { giveItems(player, ZAKENS_SOUL_FRAGMENT, count); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -118,7 +118,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest if (getQuestItemsCount(player, ZAKENS_SOUL_FRAGMENT) >= FRAGMENT_COUNT) { giveItems(player, SOUL_CLOAK_OF_ZAKEN, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(false, true); htmltext = "32612-06.html"; } diff --git a/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java index 08d5ca4b05..5ae96b7041 100644 --- a/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java +++ b/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java @@ -18,7 +18,7 @@ */ package quests.Q10502_FreyaEmbroideredSoulCloak; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -68,7 +68,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest else { giveItems(player, FREYAS_SOUL_FRAGMENT, count); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -123,7 +123,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest if (getQuestItemsCount(player, FREYAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT) { giveItems(player, SOUL_CLOAK_OF_FREYA, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(false, true); htmltext = "32612-06.html"; } diff --git a/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java b/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java index 8c4803a11a..a602c20bab 100644 --- a/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java +++ b/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java @@ -18,7 +18,7 @@ */ package quests.Q10503_FrintezzaEmbroideredSoulCloak; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -69,7 +69,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest else { giveItems(player, FRINTEZZAS_SOUL_FRAGMENT, count); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); } } } @@ -119,7 +119,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest if (getQuestItemsCount(player, FRINTEZZAS_SOUL_FRAGMENT) >= FRAGMENT_COUNT) { giveItems(player, SOUL_CLOAK_OF_FRINTEZZA, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(false, true); htmltext = "32612-06.html"; } diff --git a/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java b/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java index f07ccef385..31a4c44c0a 100644 --- a/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java +++ b/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java @@ -18,7 +18,7 @@ */ package quests.Q10504_JewelOfAntharas; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -61,7 +61,7 @@ public final class Q10504_JewelOfAntharas extends Quest { takeItems(player, CLEAR_CRYSTAL, -1); giveItems(player, FILLED_CRYSTAL_ANTHARAS_ENERGY, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); st.setCond(2, true); } } @@ -148,7 +148,7 @@ public final class Q10504_JewelOfAntharas extends Quest case 2: { giveItems(player, JEWEL_OF_ANTHARAS, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(false, true); htmltext = "30755-10.html"; break; diff --git a/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java b/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java index 6da357c4e0..af547b774e 100644 --- a/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java +++ b/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java @@ -18,7 +18,7 @@ */ package quests.Q10505_JewelOfValakas; -import com.l2jserver.gameserver.enums.QuestSound; +import com.l2jserver.gameserver.enums.audio.Sound; import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.model.quest.Quest; @@ -61,7 +61,7 @@ public class Q10505_JewelOfValakas extends Quest { takeItems(player, EMPTY_CRYSTAL, -1); giveItems(player, FILLED_CRYSTAL_VALAKAS_ENERGY, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); st.setCond(2, true); } } @@ -148,7 +148,7 @@ public class Q10505_JewelOfValakas extends Quest case 2: { giveItems(player, JEWEL_OF_VALAKAS, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET); + playSound(player, Sound.ITEMSOUND_QUEST_ITEMGET); st.exitQuest(false, true); htmltext = "31540-10.html"; break; -- GitLab