From a8c1669d193d6ada5a7a7d6f1cd495f9ea9dc8eb Mon Sep 17 00:00:00 2001
From: Adry85 <adrya85@hotmail.it>
Date: Sun, 27 Aug 2017 22:09:23 +0200
Subject: [PATCH] Cleanup in onTalk Quest, removing double null check on
getQuestState.
---
.../scripts/quests/AbstractSagaQuest.java | 401 +++++++++---------
.../Q00006_StepIntoTheFuture.java | 5 -
.../Q00007_ATripBegins.java | 5 -
.../Q00008_AnAdventureBegins.java | 5 -
.../Q00009_IntoTheCityOfHumans.java | 5 -
.../Q00010_IntoTheWorld.java | 5 -
.../Q00014_WhereaboutsOfTheArchaeologist.java | 5 -
.../Q00015_SweetWhispers.java | 5 -
.../Q00016_TheComingDarkness.java | 9 +-
.../Q00017_LightAndDarkness.java | 9 +-
.../Q00018_MeetingWithTheGoldenRam.java | 5 -
.../Q00019_GoToThePastureland.java | 5 -
.../Q00020_BringUpWithLove.java | 5 -
.../Q00021_HiddenTruth.java | 323 +++++++-------
...00024_InhabitantsOfTheForestOfTheDead.java | 14 +-
.../Q00026_TiredOfWaiting.java | 5 -
.../Q00027_ChestCaughtWithABaitOfWind.java | 11 +-
.../Q00028_ChestCaughtWithABaitOfIcyAir.java | 11 +-
.../Q00029_ChestCaughtWithABaitOfEarth.java | 11 +-
.../Q00030_ChestCaughtWithABaitOfFire.java | 10 +-
.../Q00031_SecretBuriedInTheSwamp.java | 4 -
.../Q00032_AnObviousLie.java | 5 -
.../Q00033_MakeAPairOfDressShoes.java | 5 -
.../Q00034_InSearchOfCloth.java | 5 -
.../Q00035_FindGlitteringJewelry.java | 5 -
.../Q00036_MakeASewingKit.java | 5 -
.../Q00037_MakeFormalWear.java | 6 +-
.../Q00040_ASpecialOrder.java | 4 -
.../Q00042_HelpTheUncle.java | 5 -
.../Q00043_HelpTheSister.java | 5 -
.../Q00044_HelpTheSon/Q00044_HelpTheSon.java | 5 -
.../Q00045_ToTalkingIsland.java | 8 +-
...0046_OnceMoreInTheArmsOfTheMotherTree.java | 8 +-
.../Q00047_IntoTheDarkElvenForest.java | 8 +-
.../Q00048_ToTheImmortalPlateau.java | 8 +-
.../Q00049_TheRoadHome.java | 8 +-
.../Q00050_LanoscosSpecialBait.java | 5 -
.../Q00051_OFullesSpecialBait.java | 5 -
.../Q00052_WilliesSpecialBait.java | 5 -
.../Q00053_LinnaeusSpecialBait.java | 7 +-
.../Q00101_SwordOfSolidarity.java | 193 +++++----
.../Q00102_SeaOfSporesFever.java | 247 ++++++-----
.../Q00104_SpiritOfMirrors.java | 89 ++--
.../Q00105_SkirmishWithOrcs.java | 9 +-
.../Q00106_ForgottenTruth.java | 11 +-
.../Q00108_JumbleTumbleDiamondFuss.java | 10 +-
.../Q00109_InSearchOfTheNest.java | 5 -
.../Q00110_ToThePrimevalIsle.java | 5 -
.../Q00111_ElrokianHuntersProof.java | 5 -
.../Q00112_WalkOfFate/Q00112_WalkOfFate.java | 5 -
.../Q00113_StatusOfTheBeaconTower.java | 6 -
.../Q00114_ResurrectionOfAnOldManager.java | 7 -
.../Q00115_TheOtherSideOfTruth.java | 5 -
.../Q00119_LastImperialPrince.java | 5 -
.../Q00121_PavelTheGiant.java | 5 -
.../Q00122_OminousNews.java | 5 -
.../Q00124_MeetingTheElroki.java | 5 -
.../Q00125_TheNameOfEvil1.java | 9 +-
.../Q00126_TheNameOfEvil2.java | 9 +-
.../Q00128_PailakaSongOfIceAndFire.java | 5 -
.../Q00129_PailakaDevilsLegacy.java | 5 -
.../Q00131_BirdInACage.java | 5 -
.../Q00132_MatrasCuriosity.java | 5 -
.../Q00133_ThatsBloodyHot.java | 11 +-
.../Q00134_TempleMissionary.java | 5 -
.../Q00135_TempleExecutor.java | 5 -
.../Q00136_MoreThanMeetsTheEye.java | 5 -
.../Q00137_TempleChampionPart1.java | 4 -
.../Q00138_TempleChampionPart2.java | 8 +-
.../Q00139_ShadowFoxPart1.java | 9 +-
.../Q00140_ShadowFoxPart2.java | 9 +-
.../Q00141_ShadowFoxPart3.java | 11 +-
.../Q00142_FallenAngelRequestOfDawn.java | 5 -
.../Q00143_FallenAngelRequestOfDusk.java | 5 -
.../Q00146_TheZeroHour.java | 9 +-
...Q00147_PathtoBecominganEliteMercenary.java | 5 -
...0148_PathtoBecominganExaltedMercenary.java | 9 +-
.../Q00151_CureForFever.java | 5 -
.../Q00152_ShardsOfGolem.java | 137 +++---
.../Q00153_DeliverGoods.java | 129 +++---
.../Q00155_FindSirWindawood.java | 5 -
.../Q00156_MillenniumLove.java | 79 ++--
.../Q00157_RecoverSmuggledGoods.java | 41 +-
.../Q00158_SeedOfEvil/Q00158_SeedOfEvil.java | 5 -
.../Q00159_ProtectTheWaterSource.java | 89 ++--
.../Q00161_FruitOfTheMotherTree.java | 7 +-
.../Q00162_CurseOfTheUndergroundFortress.java | 47 +-
.../Q00163_LegacyOfThePoet.java | 45 +-
.../Q00164_BloodFiend/Q00164_BloodFiend.java | 43 +-
.../Q00165_ShilensHunt.java | 45 +-
.../Q00166_MassOfDarkness.java | 87 ++--
.../Q00167_DwarvenKinship.java | 71 ++--
.../Q00168_DeliverSupplies.java | 149 ++++---
.../Q00169_OffspringOfNightmares.java | 43 +-
.../Q00170_DangerousSeduction.java | 5 -
.../Q00172_NewHorizons.java | 5 -
.../Q00173_ToTheIsleOfSouls.java | 9 +-
.../Q00174_SupplyCheck.java | 5 -
.../Q00176_StepsForHonor.java | 5 -
.../Q00179_IntoTheLargeCavern.java | 5 -
.../Q00234_FatesWhisper.java | 4 -
.../Q00237_WindsOfChange.java | 11 +-
.../Q00238_SuccessFailureOfBusiness.java | 11 +-
.../Q00239_WontYouJoinUs.java | 11 +-
.../Q00240_ImTheOnlyOneYouCanTrust.java | 5 -
.../Q00241_PossessorOfAPreciousSoul1.java | 4 -
.../Q00242_PossessorOfAPreciousSoul2.java | 4 -
.../Q00246_PossessorOfAPreciousSoul3.java | 4 -
.../Q00247_PossessorOfAPreciousSoul4.java | 4 -
.../Q00249_PoisonedPlainsOfTheLizardmen.java | 5 -
.../Q00250_WatchWhatYouEat.java | 5 -
.../Q00251_NoSecrets/Q00251_NoSecrets.java | 5 -
.../Q00254_LegendaryTales.java | 5 -
.../Q00257_TheGuardIsBusy.java | 9 +-
.../Q00258_BringWolfPelts.java | 5 -
.../Q00259_RequestFromTheFarmOwner.java | 5 -
.../Q00260_OrcHunting/Q00260_OrcHunting.java | 11 +-
.../Q00261_CollectorsDream.java | 5 -
.../Q00262_TradeWithTheIvoryTower.java | 5 -
.../Q00263_OrcSubjugation.java | 7 +-
.../Q00264_KeenClaws/Q00264_KeenClaws.java | 5 -
.../Q00265_BondsOfSlavery.java | 11 +-
.../Q00266_PleasOfPixies.java | 6 +-
.../Q00267_WrathOfVerdure.java | 43 +-
.../Q00268_TracesOfEvil.java | 45 +-
.../Q00270_TheOneWhoEndsSilence.java | 9 +-
.../Q00271_ProofOfValor.java | 59 ++-
.../Q00272_WrathOfAncestors.java | 43 +-
.../Q00273_InvadersOfTheHolyLand.java | 43 +-
.../Q00274_SkirmishWithTheWerewolves.java | 7 +-
.../Q00275_DarkWingedSpies.java | 5 -
.../Q00276_TotemOfTheHestui.java | 9 +-
.../Q00277_GatekeepersOffering.java | 5 -
.../Q00278_HomeSecurity.java | 5 -
.../Q00279_TargetOfOpportunity.java | 5 -
.../Q00280_TheFoodChain.java | 5 -
.../Q00281_HeadForTheHills.java | 5 -
.../Q00283_TheFewTheProudTheBrave.java | 9 +-
.../Q00287_FiguringItOut.java | 10 +-
.../Q00288_HandleWithCare.java | 5 -
.../Q00289_NoMoreSoupForYou.java | 9 +-
.../Q00290_ThreatRemoval.java | 9 +-
.../Q00293_TheHiddenVeins.java | 11 +-
.../Q00297_GatekeepersFavor.java | 5 -
.../Q00300_HuntingLetoLizardman.java | 5 -
.../Q00303_CollectArrowheads.java | 5 -
.../Q00306_CrystalOfFireAndIce.java | 5 -
.../Q00307_ControlDeviceOfTheGiants.java | 5 -
.../Q00308_ReedFieldMaintenance.java | 11 +-
.../Q00309_ForAGoodCause.java | 11 +-
.../Q00310_OnlyWhatRemains.java | 10 +-
.../Q00311_ExpulsionOfEvilSpirits.java | 5 -
.../Q00312_TakeAdvantageOfTheCrisis.java | 5 -
.../Q00313_CollectSpores.java | 5 -
.../Q00316_DestroyPlagueCarriers.java | 5 -
.../Q00317_CatchTheWind.java | 5 -
.../Q00319_ScentOfDeath.java | 5 -
.../Q00320_BonesTellTheFuture.java | 5 -
.../Q00324_SweetestVenom.java | 31 +-
.../Q00325_GrimCollector.java | 5 -
.../Q00326_VanquishRemnants.java | 49 +--
.../Q00327_RecoverTheFarmland.java | 1 -
.../Q00328_SenseForBusiness.java | 37 +-
.../Q00329_CuriosityOfADwarf.java | 5 -
.../Q00331_ArrowOfVengeance.java | 37 +-
.../Q00334_TheWishingPotion.java | 317 +++++++-------
.../Q00336_CoinsOfMagic.java | 4 -
.../Q00338_AlligatorHunter.java | 9 -
.../Q00341_HuntingForWildBeasts.java | 31 +-
.../Q00350_EnhanceYourWeapon.java | 5 -
.../Q00351_BlackSwan/Q00351_BlackSwan.java | 5 +-
.../Q00354_ConquestOfAlligatorIsland.java | 5 -
.../Q00360_PlunderTheirSupplies.java | 5 -
.../Q00365_DevilsLegacy.java | 5 -
.../Q00368_TrespassingIntoTheHolyGround.java | 5 -
.../Q00373_SupplierOfReagents.java | 5 +-
...00376_ExplorationOfTheGiantsCavePart1.java | 5 -
...00377_ExplorationOfTheGiantsCavePart2.java | 5 -
.../Q00384_WarehouseKeepersPastime.java | 41 +-
.../Q00386_StolenDignity.java | 2 +-
.../Q00431_WeddingMarch.java | 6 -
.../Q00432_BirthdayPartySong.java | 6 -
.../Q00450_GraveRobberRescue.java | 8 +-
.../Q00451_LuciensAltar.java | 8 +-
.../Q00452_FindingtheLostSoldiers.java | 5 -
.../Q00453_NotStrongEnoughAlone.java | 11 +-
.../Q00454_CompletelyLost.java | 1 -
.../Q00455_WingsOfSand.java | 7 +-
.../Q00456_DontKnowDontCare.java | 6 -
.../Q00457_LostAndFound.java | 5 -
.../Q00458_PerfectForm.java | 7 +-
.../Q00461_RumbleInTheBase.java | 11 +-
.../Q00463_IMustBeaGenius.java | 7 +-
.../quests/Q00464_Oath/Q00464_Oath.java | 4 +-
...504_CompetitionForTheBanditStronghold.java | 7 +-
.../Q00508_AClansReputation.java | 5 -
.../Q00509_AClansFame/Q00509_AClansFame.java | 5 -
.../Q00510_AClansPrestige.java | 5 -
.../Q00511_AwlUnderFoot.java | 54 ++-
.../Q00551_OlympiadStarter.java | 5 -
.../Q00552_OlympiadVeteran.java | 5 -
.../Q00553_OlympiadUndefeated.java | 5 -
.../Q00601_WatchingEyes.java | 6 -
.../Q00602_ShadowOfLight.java | 6 -
.../Q00605_AllianceWithKetraOrcs.java | 14 +-
.../Q00606_BattleAgainstVarkaSilenos.java | 5 -
.../Q00607_ProveYourCourageKetra.java | 5 -
.../Q00608_SlayTheEnemyCommanderKetra.java | 5 -
.../Q00609_MagicalPowerOfWaterPart1.java | 5 -
.../Q00610_MagicalPowerOfWaterPart2.java | 5 -
.../Q00611_AllianceWithVarkaSilenos.java | 14 +-
.../Q00612_BattleAgainstKetraOrcs.java | 5 -
.../Q00613_ProveYourCourageVarka.java | 5 -
.../Q00614_SlayTheEnemyCommanderVarka.java | 5 -
.../Q00615_MagicalPowerOfFirePart1.java | 5 -
.../Q00616_MagicalPowerOfFirePart2.java | 5 -
.../Q00617_GatherTheFlames.java | 5 -
.../Q00618_IntoTheFlame.java | 4 -
.../Q00619_RelicsOfTheOldEmpire.java | 5 -
.../Q00624_TheFinestIngredientsPart1.java | 37 +-
.../Q00626_ADarkTwilight.java | 4 -
.../Q00627_HeartInSearchOfPower.java | 4 -
.../Q00628_HuntGoldenRam.java | 5 -
.../Q00629_CleanUpTheSwampOfScreams.java | 5 -
.../Q00631_DeliciousTopChoiceMeat.java | 5 -
.../Q00632_NecromancersRequest.java | 5 -
.../Q00633_InTheForgottenVillage.java | 5 -
.../Q00638_SeekersOfTheHolyGrail.java | 5 -
.../Q00641_AttackSailren.java | 9 +-
.../Q00642_APowerfulPrimevalCreature.java | 1 -
.../Q00643_RiseAndFallOfTheElrokiTribe.java | 5 -
.../Q00644_GraveRobberAnnihilation.java | 5 -
.../Q00645_GhostsOfBatur.java | 5 -
.../Q00647_InfluxOfMachines.java | 5 -
.../Q00649_ALooterAndARailroadMan.java | 5 -
.../Q00650_ABrokenDream.java | 9 +-
.../Q00651_RunawayYouth.java | 5 -
.../Q00652_AnAgedExAdventurer.java | 5 -
.../Q00653_WildMaiden/Q00653_WildMaiden.java | 5 -
...00659_IdRatherBeCollectingFairyBreath.java | 5 -
.../Q00660_AidingTheFloranVillage.java | 5 -
.../Q00662_AGameOfCards.java | 5 -
.../Q00663_SeductiveWhispers.java | 5 -
.../Q00688_DefeatTheElrokianRaiders.java | 5 -
.../Q00690_JudesRequest.java | 6 -
.../Q00691_MatrasSuspiciousRequest.java | 5 -
.../Q00692_HowtoOpposeEvil.java | 5 -
.../Q00699_GuardianOfTheSkies.java | 39 +-
.../Q00700_CursedLife/Q00700_CursedLife.java | 43 +-
.../Q00701_ProofOfExistence.java | 9 +-
.../Q00702_ATrapForRevenge.java | 9 +-
.../Q00901_HowLavasaurusesAreMade.java | 7 +-
.../Q00902_ReclaimOurEra.java | 5 -
.../Q00903_TheCallOfAntharas.java | 7 +-
.../Q00905_RefinedDragonBlood.java | 7 +-
.../Q00906_TheCallOfValakas.java | 7 +-
.../Q00907_DragonTrophyValakas.java | 7 +-
.../Q10267_JourneyToGracia.java | 5 -
.../Q10268_ToTheSeedOfInfinity.java | 5 -
.../Q10269_ToTheSeedOfDestruction.java | 5 -
.../Q10271_TheEnvelopingDarkness.java | 9 +-
.../Q10272_LightFragment.java | 11 +-
.../Q10273_GoodDayToFly.java | 5 -
.../Q10274_CollectingInTheAir.java | 9 +-
.../Q10275_ContainingTheAttributePower.java | 5 -
.../Q10276_MutatedKaneusGludio.java | 5 -
.../Q10277_MutatedKaneusDion.java | 5 -
.../Q10278_MutatedKaneusHeine.java | 5 -
.../Q10279_MutatedKaneusOren.java | 5 -
.../Q10280_MutatedKaneusSchuttgart.java | 5 -
.../Q10281_MutatedKaneusRune.java | 5 -
.../Q10282_ToTheSeedOfAnnihilation.java | 5 -
.../Q10288_SecretMission.java | 5 -
.../Q10289_FadeToBlack.java | 9 +-
.../Q10291_FireDragonDestroyer.java | 6 -
.../Q10502_FreyaEmbroideredSoulCloak.java | 5 -
276 files changed, 1710 insertions(+), 2986 deletions(-)
diff --git a/dist/game/data/scripts/quests/AbstractSagaQuest.java b/dist/game/data/scripts/quests/AbstractSagaQuest.java
index caa833fd5b..7a5ef75d09 100644
--- a/dist/game/data/scripts/quests/AbstractSagaQuest.java
+++ b/dist/game/data/scripts/quests/AbstractSagaQuest.java
@@ -746,224 +746,221 @@ public abstract class AbstractSagaQuest extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st != null)
+ int npcId = npc.getId();
+ if ((npcId == _npc[0]) && st.isCompleted())
{
- int npcId = npc.getId();
- if ((npcId == _npc[0]) && st.isCompleted())
- {
- htmltext = getAlreadyCompletedMsg(player);
- }
- else if (player.getClassId().getId() == getPrevClass(player))
+ htmltext = getAlreadyCompletedMsg(player);
+ }
+ else if (player.getClassId().getId() == getPrevClass(player))
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
- {
- case 0:
- if (npcId == _npc[0])
- {
- htmltext = "0-01.htm";
- }
- break;
- case 1:
- if (npcId == _npc[0])
- {
- htmltext = "0-04.htm";
- }
- else if (npcId == _npc[2])
- {
- htmltext = "2-01.htm";
- }
- break;
- case 2:
- if (npcId == _npc[2])
- {
- htmltext = "2-02.htm";
- }
- else if (npcId == _npc[1])
- {
- htmltext = "1-01.htm";
- }
- break;
- case 3:
- if ((npcId == _npc[1]) && hasQuestItems(player, Items[0]))
- {
- if ((Items[11] == 0) || hasQuestItems(player, Items[11]))
- {
- htmltext = "1-03.htm";
- }
- else
- {
- htmltext = "1-02.htm";
- }
- }
- break;
- case 4:
- if (npcId == _npc[1])
- {
- htmltext = "1-04.htm";
- }
- else if (npcId == _npc[2])
- {
- htmltext = "2-03.htm";
- }
- break;
- case 5:
- if (npcId == _npc[2])
- {
- htmltext = "2-04.htm";
- }
- else if (npcId == _npc[5])
- {
- htmltext = "5-01.htm";
- }
- break;
- case 6:
- if (npcId == _npc[5])
- {
- htmltext = "5-03.htm";
- }
- else if (npcId == _npc[6])
- {
- htmltext = "6-01.htm";
- }
- break;
- case 7:
- if (npcId == _npc[6])
- {
- htmltext = "6-02.htm";
- }
- break;
- case 8:
- if (npcId == _npc[6])
- {
- htmltext = "6-04.htm";
- }
- else if (npcId == _npc[7])
- {
- htmltext = "7-01.htm";
- }
- break;
- case 9:
- if (npcId == _npc[7])
- {
- htmltext = "7-05.htm";
- }
- break;
- case 10:
- if (npcId == _npc[7])
- {
- htmltext = "7-07.htm";
- }
- else if (npcId == _npc[3])
- {
- htmltext = "3-01.htm";
- }
- break;
- case 11:
- case 12:
- if (npcId == _npc[3])
- {
- if (hasQuestItems(player, Items[2]))
- {
- htmltext = "3-05.htm";
- }
- else
- {
- htmltext = "3-04.htm";
- }
- }
- break;
- case 13:
- if (npcId == _npc[3])
- {
- htmltext = "3-06.htm";
- }
- else if (npcId == _npc[8])
- {
- htmltext = "8-01.htm";
- }
- break;
- case 14:
- if (npcId == _npc[8])
- {
- htmltext = "8-03.htm";
- }
- else if (npcId == _npc[11])
- {
- htmltext = "11-01.htm";
- }
- break;
- case 15:
- if (npcId == _npc[11])
- {
- htmltext = "11-02.htm";
- }
- else if (npcId == _npc[9])
- {
- htmltext = "9-01.htm";
- }
- break;
- case 16:
- if (npcId == _npc[9])
- {
- htmltext = "9-02.htm";
- }
- break;
- case 17:
- if (npcId == _npc[9])
- {
- htmltext = "9-04.htm";
- }
- else if (npcId == _npc[10])
+ case 0:
+ if (npcId == _npc[0])
+ {
+ htmltext = "0-01.htm";
+ }
+ break;
+ case 1:
+ if (npcId == _npc[0])
+ {
+ htmltext = "0-04.htm";
+ }
+ else if (npcId == _npc[2])
+ {
+ htmltext = "2-01.htm";
+ }
+ break;
+ case 2:
+ if (npcId == _npc[2])
+ {
+ htmltext = "2-02.htm";
+ }
+ else if (npcId == _npc[1])
+ {
+ htmltext = "1-01.htm";
+ }
+ break;
+ case 3:
+ if ((npcId == _npc[1]) && hasQuestItems(player, Items[0]))
+ {
+ if ((Items[11] == 0) || hasQuestItems(player, Items[11]))
{
- htmltext = "10-01.htm";
+ htmltext = "1-03.htm";
}
- break;
- case 18:
- if (npcId == _npc[10])
+ else
{
- htmltext = "10-05.htm";
+ htmltext = "1-02.htm";
}
- break;
- case 19:
- if (npcId == _npc[10])
+ }
+ break;
+ case 4:
+ if (npcId == _npc[1])
+ {
+ htmltext = "1-04.htm";
+ }
+ else if (npcId == _npc[2])
+ {
+ htmltext = "2-03.htm";
+ }
+ break;
+ case 5:
+ if (npcId == _npc[2])
+ {
+ htmltext = "2-04.htm";
+ }
+ else if (npcId == _npc[5])
+ {
+ htmltext = "5-01.htm";
+ }
+ break;
+ case 6:
+ if (npcId == _npc[5])
+ {
+ htmltext = "5-03.htm";
+ }
+ else if (npcId == _npc[6])
+ {
+ htmltext = "6-01.htm";
+ }
+ break;
+ case 7:
+ if (npcId == _npc[6])
+ {
+ htmltext = "6-02.htm";
+ }
+ break;
+ case 8:
+ if (npcId == _npc[6])
+ {
+ htmltext = "6-04.htm";
+ }
+ else if (npcId == _npc[7])
+ {
+ htmltext = "7-01.htm";
+ }
+ break;
+ case 9:
+ if (npcId == _npc[7])
+ {
+ htmltext = "7-05.htm";
+ }
+ break;
+ case 10:
+ if (npcId == _npc[7])
+ {
+ htmltext = "7-07.htm";
+ }
+ else if (npcId == _npc[3])
+ {
+ htmltext = "3-01.htm";
+ }
+ break;
+ case 11:
+ case 12:
+ if (npcId == _npc[3])
+ {
+ if (hasQuestItems(player, Items[2]))
{
- htmltext = "10-07.htm";
+ htmltext = "3-05.htm";
}
- else if (npcId == _npc[0])
+ else
{
- htmltext = "0-06.htm";
+ htmltext = "3-04.htm";
}
- break;
- case 20:
- if (npcId == _npc[0])
+ }
+ break;
+ case 13:
+ if (npcId == _npc[3])
+ {
+ htmltext = "3-06.htm";
+ }
+ else if (npcId == _npc[8])
+ {
+ htmltext = "8-01.htm";
+ }
+ break;
+ case 14:
+ if (npcId == _npc[8])
+ {
+ htmltext = "8-03.htm";
+ }
+ else if (npcId == _npc[11])
+ {
+ htmltext = "11-01.htm";
+ }
+ break;
+ case 15:
+ if (npcId == _npc[11])
+ {
+ htmltext = "11-02.htm";
+ }
+ else if (npcId == _npc[9])
+ {
+ htmltext = "9-01.htm";
+ }
+ break;
+ case 16:
+ if (npcId == _npc[9])
+ {
+ htmltext = "9-02.htm";
+ }
+ break;
+ case 17:
+ if (npcId == _npc[9])
+ {
+ htmltext = "9-04.htm";
+ }
+ else if (npcId == _npc[10])
+ {
+ htmltext = "10-01.htm";
+ }
+ break;
+ case 18:
+ if (npcId == _npc[10])
+ {
+ htmltext = "10-05.htm";
+ }
+ break;
+ case 19:
+ if (npcId == _npc[10])
+ {
+ htmltext = "10-07.htm";
+ }
+ else if (npcId == _npc[0])
+ {
+ htmltext = "0-06.htm";
+ }
+ break;
+ case 20:
+ if (npcId == _npc[0])
+ {
+ if (player.getLevel() >= 76)
{
- if (player.getLevel() >= 76)
+ htmltext = "0-09.htm";
+ if ((getClassId(player) < 131) || (getClassId(player) > 135)) // in Kamael quests, npc wants to chat for a bit before changing class
{
- htmltext = "0-09.htm";
- if ((getClassId(player) < 131) || (getClassId(player) > 135)) // in Kamael quests, npc wants to chat for a bit before changing class
+ st.exitQuest(false);
+ addExpAndSp(player, 2299404, 0);
+ giveAdena(player, 5000000, true);
+ giveItems(player, 6622, 1); // XXX rewardItems?
+ int classId = getClassId(player);
+ int prevClass = getPrevClass(player);
+ player.setClassId(classId);
+ if (!player.isSubClassActive() && (player.getBaseClass() == prevClass))
{
- st.exitQuest(false);
- addExpAndSp(player, 2299404, 0);
- giveAdena(player, 5000000, true);
- giveItems(player, 6622, 1); // XXX rewardItems?
- int classId = getClassId(player);
- int prevClass = getPrevClass(player);
- player.setClassId(classId);
- if (!player.isSubClassActive() && (player.getBaseClass() == prevClass))
- {
- player.setBaseClass(classId);
- }
- player.broadcastUserInfo();
- cast(npc, player, 4339, 1);
+ player.setBaseClass(classId);
}
- }
- else
- {
- htmltext = "0-010.htm";
+ player.broadcastUserInfo();
+ cast(npc, player, 4339, 1);
}
}
- break;
- }
+ else
+ {
+ htmltext = "0-010.htm";
+ }
+ }
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java b/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
index 9d7d4dfc8c..40736b63c2 100644
--- a/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
+++ b/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java
@@ -94,11 +94,6 @@ public class Q00006_StepIntoTheFuture extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ROXXY:
diff --git a/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java b/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
index 233f8599f7..ab91b8fa71 100644
--- a/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
+++ b/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java
@@ -94,11 +94,6 @@ public class Q00007_ATripBegins extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case MIRABEL:
diff --git a/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java b/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
index 79e9855d40..1684a9edee 100644
--- a/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
+++ b/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java
@@ -94,11 +94,6 @@ public class Q00008_AnAdventureBegins extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case JASMINE:
diff --git a/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java b/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
index 8a20cb70df..7889346f10 100644
--- a/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
+++ b/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java
@@ -83,11 +83,6 @@ public class Q00009_IntoTheCityOfHumans extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case PETUKAI:
diff --git a/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java b/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
index cbcc4f62c9..0fad8dd327 100644
--- a/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
+++ b/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java
@@ -97,11 +97,6 @@ public class Q00010_IntoTheWorld extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case BALANKI:
diff --git a/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java b/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
index 6e0465ec90..c3bd062c81 100644
--- a/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
+++ b/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
@@ -82,11 +82,6 @@ public class Q00014_WhereaboutsOfTheArchaeologist extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
final int npcId = npc.getId();
switch (st.getState())
{
diff --git a/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index 8ab2297d63..734ff3824e 100644
--- a/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -80,11 +80,6 @@ public class Q00015_SweetWhispers extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
final int npcId = npc.getId();
switch (st.getState())
{
diff --git a/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index 81b1240709..ffcdd0d74e 100644
--- a/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -18,14 +18,14 @@
*/
package quests.Q00016_TheComingDarkness;
-import quests.Q00017_LightAndDarkness.Q00017_LightAndDarkness;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00017_LightAndDarkness.Q00017_LightAndDarkness;
+
/**
* The Coming Darkness (16)<br>
* Original jython script by disKret.<br>
@@ -90,11 +90,6 @@ public class Q00016_TheComingDarkness extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
final QuestState st2 = player.getQuestState(Q00017_LightAndDarkness.class.getSimpleName());
if ((st2 != null) && !st2.isCompleted())
{
diff --git a/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index 5da2933a72..679174209c 100644
--- a/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -18,14 +18,14 @@
*/
package quests.Q00017_LightAndDarkness;
-import quests.Q00015_SweetWhispers.Q00015_SweetWhispers;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00015_SweetWhispers.Q00015_SweetWhispers;
+
/**
* Light And Darkness (17)<br>
* Original jython script by disKret, Skeleton & DrLecter.
@@ -95,11 +95,6 @@ public class Q00017_LightAndDarkness extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java b/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
index 704d788eb5..118dfdf7ef 100644
--- a/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
+++ b/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
@@ -89,11 +89,6 @@ public class Q00018_MeetingWithTheGoldenRam extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
final int npcId = npc.getId();
switch (st.getState())
{
diff --git a/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index d6dde85062..34ff742613 100644
--- a/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -91,11 +91,6 @@ public class Q00019_GoToThePastureland extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (npc.getId() == VLADIMIR)
{
switch (st.getState())
diff --git a/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index 47340e940a..c77189a27b 100644
--- a/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -97,11 +97,6 @@ public class Q00020_BringUpWithLove extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java b/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
index 0e81faa224..6b061491f1 100644
--- a/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
+++ b/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java
@@ -18,8 +18,6 @@
*/
package quests.Q00021_HiddenTruth;
-import quests.Q00022_TragedyInVonHellmannForest.Q00022_TragedyInVonHellmannForest;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.instancemanager.WalkingManager;
import com.l2jserver.gameserver.model.L2World;
@@ -34,6 +32,8 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
+import quests.Q00022_TragedyInVonHellmannForest.Q00022_TragedyInVonHellmannForest;
+
/**
* Hidden Truth (21)
* @author xban1x
@@ -220,216 +220,213 @@ public class Q00021_HiddenTruth extends Quest
{
QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (npc.getId())
{
- switch (npc.getId())
+ case MYSTERIOUS_WIZARD:
{
- case MYSTERIOUS_WIZARD:
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = "31522-01.htm";
- break;
- }
- case State.STARTED:
- {
- htmltext = "31522-05.html";
- break;
- }
- case State.COMPLETED:
- {
- htmltext = getAlreadyCompletedMsg(player);
- break;
- }
+ htmltext = "31522-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ htmltext = "31522-05.html";
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
- break;
- }
- case TOMBSTONE:
- {
- htmltext = "31523-01.html";
- break;
}
- case GHOST_OF_VON_HELLMAN:
+ break;
+ }
+ case TOMBSTONE:
+ {
+ htmltext = "31523-01.html";
+ break;
+ }
+ case GHOST_OF_VON_HELLMAN:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 2:
{
- case 2:
+ htmltext = "31524-01.html";
+ break;
+ }
+ case 3:
+ {
+ if (PAGE_SPAWNED)
{
- htmltext = "31524-01.html";
- break;
+ htmltext = "31524-07b.html";
}
- case 3:
+ else
{
- if (PAGE_SPAWNED)
+ if (PAGE_COUNT < 5)
{
- htmltext = "31524-07b.html";
+ final L2Npc PAGE = addSpawn(GHOST_OF_VON_HELLMANS_PAGE, PAGE_LOC, true, 0);
+ PAGE_COUNT++;
+ PAGE_SPAWNED = true;
+ PAGE.setScriptValue(player.getObjectId());
+ WalkingManager.getInstance().startMoving(PAGE, PAGE_ROUTE_NAME);
+ htmltext = "31524-07.html";
}
else
{
- if (PAGE_COUNT < 5)
- {
- final L2Npc PAGE = addSpawn(GHOST_OF_VON_HELLMANS_PAGE, PAGE_LOC, true, 0);
- PAGE_COUNT++;
- PAGE_SPAWNED = true;
- PAGE.setScriptValue(player.getObjectId());
- WalkingManager.getInstance().startMoving(PAGE, PAGE_ROUTE_NAME);
- htmltext = "31524-07.html";
- }
- else
- {
- htmltext = "31524-07a.html";
- }
+ htmltext = "31524-07a.html";
}
- break;
- }
- case 4:
- {
- htmltext = "31524-07c.html";
- break;
}
+ break;
}
- break;
- }
- case GHOST_OF_VON_HELLMANS_PAGE:
- {
- if (st.isCond(3))
+ case 4:
{
- if (MOVE_ENDED)
- {
- htmltext = "31525-02.html";
- st.startQuestTimer("DESPAWN", 3000, npc);
- }
- else
- {
- htmltext = "31525-01.html";
- }
+ htmltext = "31524-07c.html";
+ break;
}
- break;
}
- case BROKEN_BOOKSHELF:
+ break;
+ }
+ case GHOST_OF_VON_HELLMANS_PAGE:
+ {
+ if (st.isCond(3))
{
- switch (st.getCond())
+ if (MOVE_ENDED)
{
- case 3:
- {
- htmltext = "31526-01.html";
- break;
- }
- case 4:
- {
- st.setCond(5);
- st.playSound(Sound.AMDSOUND_ED_CHIMES);
- htmltext = "31526-10.html";
- break;
- }
- case 5:
- {
- htmltext = "31526-11.html";
- break;
- }
- case 6:
- {
- htmltext = "31526-15.html";
- break;
- }
+ htmltext = "31525-02.html";
+ st.startQuestTimer("DESPAWN", 3000, npc);
+ }
+ else
+ {
+ htmltext = "31525-01.html";
}
- break;
}
- case AGRIPEL:
+ break;
+ }
+ case BROKEN_BOOKSHELF:
+ {
+ switch (st.getCond())
{
- if (st.hasQuestItems(CROSS_OF_EINHASAD) && st.isCond(6))
+ case 3:
{
- st.set("AGRIPEL", "1");
- if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1))
- {
- htmltext = "31348-03.html";
- st.setCond(7);
- }
- else if ((st.getInt("DOMINIC") == 1) || (st.getInt("BENEDICT") == 1))
- {
- htmltext = "31348-02.html";
- }
- else
- {
- htmltext = "31348-01.html";
- }
+ htmltext = "31526-01.html";
+ break;
}
- else if (st.isCond(7))
+ case 4:
{
- htmltext = "31348-03.html";
+ st.setCond(5);
+ st.playSound(Sound.AMDSOUND_ED_CHIMES);
+ htmltext = "31526-10.html";
+ break;
+ }
+ case 5:
+ {
+ htmltext = "31526-11.html";
+ break;
+ }
+ case 6:
+ {
+ htmltext = "31526-15.html";
+ break;
}
- break;
}
-
- case BENEDICT:
+ break;
+ }
+ case AGRIPEL:
+ {
+ if (st.hasQuestItems(CROSS_OF_EINHASAD) && st.isCond(6))
{
- if (st.hasQuestItems(CROSS_OF_EINHASAD) && st.isCond(6))
+ st.set("AGRIPEL", "1");
+ if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1))
{
-
- st.set("BENEDICT", "1");
- if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1))
- {
- htmltext = "31349-03.html";
- st.setCond(7);
- }
- else if ((st.getInt("AGRIPEL") == 1) || (st.getInt("DOMINIC") == 1))
- {
- htmltext = "31349-02.html";
- }
- else
- {
- htmltext = "31349-01.html";
- }
+ htmltext = "31348-03.html";
+ st.setCond(7);
}
- else if (st.isCond(7))
+ else if ((st.getInt("DOMINIC") == 1) || (st.getInt("BENEDICT") == 1))
{
- htmltext = "31349-03.html";
+ htmltext = "31348-02.html";
+ }
+ else
+ {
+ htmltext = "31348-01.html";
}
- break;
}
- case DOMINIC:
+ else if (st.isCond(7))
{
- if (st.hasQuestItems(CROSS_OF_EINHASAD) && st.isCond(6))
+ htmltext = "31348-03.html";
+ }
+ break;
+ }
+
+ case BENEDICT:
+ {
+ if (st.hasQuestItems(CROSS_OF_EINHASAD) && st.isCond(6))
+ {
+
+ st.set("BENEDICT", "1");
+ if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1))
{
- st.set("DOMINIC", "1");
- if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1))
- {
- htmltext = "31350-03.html";
- st.setCond(7);
- }
- else if ((st.getInt("AGRIPEL") == 1) || (st.getInt("BENEDICT") == 1))
- {
- htmltext = "31350-02.html";
- }
- else
- {
- htmltext = "31350-01.html";
- }
+ htmltext = "31349-03.html";
+ st.setCond(7);
}
- else if (st.isCond(7))
+ else if ((st.getInt("AGRIPEL") == 1) || (st.getInt("DOMINIC") == 1))
{
- htmltext = "31350-03.html";
+ htmltext = "31349-02.html";
+ }
+ else
+ {
+ htmltext = "31349-01.html";
}
- break;
}
- case INNOCENTIN:
+ else if (st.isCond(7))
{
- if (st.isCond(7) && st.hasQuestItems(CROSS_OF_EINHASAD))
+ htmltext = "31349-03.html";
+ }
+ break;
+ }
+ case DOMINIC:
+ {
+ if (st.hasQuestItems(CROSS_OF_EINHASAD) && st.isCond(6))
+ {
+ st.set("DOMINIC", "1");
+ if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1))
{
- htmltext = "31328-01.html";
+ htmltext = "31350-03.html";
+ st.setCond(7);
}
- else if (st.isCompleted())
+ else if ((st.getInt("AGRIPEL") == 1) || (st.getInt("BENEDICT") == 1))
{
- st = player.getQuestState(Q00022_TragedyInVonHellmannForest.class.getSimpleName());
- if (st == null)
- {
- htmltext = "31328-06.html";
- }
+ htmltext = "31350-02.html";
+ }
+ else
+ {
+ htmltext = "31350-01.html";
+ }
+ }
+ else if (st.isCond(7))
+ {
+ htmltext = "31350-03.html";
+ }
+ break;
+ }
+ case INNOCENTIN:
+ {
+ if (st.isCond(7) && st.hasQuestItems(CROSS_OF_EINHASAD))
+ {
+ htmltext = "31328-01.html";
+ }
+ else if (st.isCompleted())
+ {
+ st = player.getQuestState(Q00022_TragedyInVonHellmannForest.class.getSimpleName());
+ if (st == null)
+ {
+ htmltext = "31328-06.html";
}
- break;
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java b/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
index 0b2bd2b3c2..d260a3a69a 100644
--- a/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
+++ b/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
@@ -18,9 +18,6 @@
*/
package quests.Q00024_InhabitantsOfTheForestOfTheDead;
-import quests.Q00023_LidiasHeart.Q00023_LidiasHeart;
-import quests.Q00025_HidingBehindTheTruth.Q00025_HidingBehindTheTruth;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -28,6 +25,9 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00023_LidiasHeart.Q00023_LidiasHeart;
+import quests.Q00025_HidingBehindTheTruth.Q00025_HidingBehindTheTruth;
+
/**
* Inhabitants of the Forest of the Dead (24)
* @author malyelfik
@@ -73,7 +73,7 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
String htmltext = event;
switch (event)
{
- // Dorian
+ // Dorian
case "31389-02.htm":
final QuestState qs = player.getQuestState(Q00023_LidiasHeart.class.getSimpleName());
if ((player.getLevel() >= 65) && (qs != null) && qs.isCompleted())
@@ -224,12 +224,6 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case DORIAN:
diff --git a/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java b/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
index 3a529c75df..5922b3b745 100644
--- a/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
+++ b/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
@@ -112,11 +112,6 @@ public final class Q00026_TiredOfWaiting extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ISAEL_SILVERSHADOW:
diff --git a/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java b/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
index 5384b70d5f..ecd15987cd 100644
--- a/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
+++ b/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
@@ -18,14 +18,14 @@
*/
package quests.Q00027_ChestCaughtWithABaitOfWind;
-import quests.Q00050_LanoscosSpecialBait.Q00050_LanoscosSpecialBait;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00050_LanoscosSpecialBait.Q00050_LanoscosSpecialBait;
+
/**
* Chest Caught With A Bait Of Wind (27)<br>
* Original Jython script by DooMIta.
@@ -81,7 +81,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
htmltext = "31434-01.htm";
}
break;
-
+
}
return htmltext;
}
@@ -91,11 +91,6 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java b/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
index 11eaea4a32..d0f4cd02e3 100644
--- a/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
+++ b/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
@@ -18,14 +18,14 @@
*/
package quests.Q00028_ChestCaughtWithABaitOfIcyAir;
-import quests.Q00051_OFullesSpecialBait.Q00051_OFullesSpecialBait;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00051_OFullesSpecialBait.Q00051_OFullesSpecialBait;
+
/**
* Chest Caught With A Bait Of Icy Air (28)<br>
* Original Jython script by Skeleton.
@@ -81,7 +81,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
htmltext = "31442-02.htm";
}
break;
-
+
}
return htmltext;
}
@@ -91,11 +91,6 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
final int npcId = npc.getId();
switch (st.getState())
{
diff --git a/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java b/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
index b4b1f8db9b..6b84814dda 100644
--- a/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
+++ b/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
@@ -18,14 +18,14 @@
*/
package quests.Q00029_ChestCaughtWithABaitOfEarth;
-import quests.Q00052_WilliesSpecialBait.Q00052_WilliesSpecialBait;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00052_WilliesSpecialBait.Q00052_WilliesSpecialBait;
+
/**
* Chest Caught With A Bait Of Earth (29)<br>
* Original Jython script by Skeleton.
@@ -81,7 +81,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
htmltext = "30909-02.htm";
}
break;
-
+
}
return htmltext;
}
@@ -91,11 +91,6 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
final int npcId = npc.getId();
switch (st.getState())
{
diff --git a/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java b/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
index 0bbd7c5ade..07a1b5eee4 100644
--- a/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
+++ b/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
@@ -18,14 +18,14 @@
*/
package quests.Q00030_ChestCaughtWithABaitOfFire;
-import quests.Q00053_LinnaeusSpecialBait.Q00053_LinnaeusSpecialBait;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00053_LinnaeusSpecialBait.Q00053_LinnaeusSpecialBait;
+
/**
* Chest Caught With A Bait Of Fire (30)<br>
* Original Jython script by Ethernaly.
@@ -90,13 +90,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
final int npcId = npc.getId();
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
index 9a73585c30..bb7dd1500c 100644
--- a/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
+++ b/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java
@@ -129,10 +129,6 @@ public final class Q00031_SecretBuriedInTheSwamp extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case ABERCROMBIE:
diff --git a/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
index 96922740be..a5ebecd96d 100644
--- a/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
+++ b/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java
@@ -184,11 +184,6 @@ public final class Q00032_AnObviousLie extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case MAXIMILIAN:
diff --git a/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
index 028b964eab..ac938dc3cb 100644
--- a/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
+++ b/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java
@@ -112,11 +112,6 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case WOODLEY:
diff --git a/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
index f9d6a3947d..ef8699defc 100644
--- a/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
+++ b/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java
@@ -141,11 +141,6 @@ public class Q00034_InSearchOfCloth extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case RADIA:
diff --git a/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
index a1e1e865d0..156fc3ef96 100644
--- a/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
+++ b/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java
@@ -133,11 +133,6 @@ public class Q00035_FindGlitteringJewelry extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ELLIE:
diff --git a/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
index 0b6230b306..f90136259c 100644
--- a/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
+++ b/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java
@@ -125,11 +125,6 @@ public class Q00036_MakeASewingKit extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
index 895ad31ead..2c67ae62d5 100644
--- a/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
+++ b/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java
@@ -129,10 +129,6 @@ public class Q00037_MakeFormalWear extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case ALEXIS:
@@ -172,7 +168,7 @@ public class Q00037_MakeFormalWear extends Quest
case 7:
htmltext = (st.hasQuestItems(DRESS_SHOES_BOX)) ? "31520-10.html" : "31520-11.html";
break;
-
+
}
}
break;
diff --git a/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
index 5ba795cb94..4063c8499a 100644
--- a/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
+++ b/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java
@@ -134,10 +134,6 @@ public final class Q00040_ASpecialOrder extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case HELVETIA:
diff --git a/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index 9daaa79d10..0635c25d52 100644
--- a/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -135,11 +135,6 @@ public class Q00042_HelpTheUncle extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case WATERS:
diff --git a/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 4ee2c4e3c6..b02d6c712a 100644
--- a/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -135,11 +135,6 @@ public class Q00043_HelpTheSister extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case COOPER:
diff --git a/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index 9494779765..25cecfb412 100644
--- a/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -136,11 +136,6 @@ public class Q00044_HelpTheSon extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case LUNDY:
diff --git a/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java b/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
index 9c4f0691e8..31b44f5f06 100644
--- a/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
+++ b/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java
@@ -21,8 +21,6 @@ package quests.Q00045_ToTalkingIsland;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00006_StepIntoTheFuture.Q00006_StepIntoTheFuture;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00006_StepIntoTheFuture.Q00006_StepIntoTheFuture;
+
/**
* To Talking Island (45)
* @author janiko
@@ -190,10 +190,6 @@ public final class Q00045_ToTalkingIsland extends Quest
{
QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
- if (st == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case GALLADUCCI:
diff --git a/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java b/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
index 5ff09b98dd..1bbd226e84 100644
--- a/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
+++ b/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java
@@ -21,8 +21,6 @@ package quests.Q00046_OnceMoreInTheArmsOfTheMotherTree;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00007_ATripBegins.Q00007_ATripBegins;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00007_ATripBegins.Q00007_ATripBegins;
+
/**
* Once More In The Arms Of The Mother Tree (46)
* @author janiko
@@ -190,10 +190,6 @@ public final class Q00046_OnceMoreInTheArmsOfTheMotherTree extends Quest
{
QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
- if (st == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case GALLADUCCI:
diff --git a/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java b/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
index 6ae4f29584..eab9f28593 100644
--- a/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
+++ b/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java
@@ -21,8 +21,6 @@ package quests.Q00047_IntoTheDarkElvenForest;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00008_AnAdventureBegins.Q00008_AnAdventureBegins;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00008_AnAdventureBegins.Q00008_AnAdventureBegins;
+
/**
* Into The Dark Elven Forest (47)
* @author janiko
@@ -190,10 +190,6 @@ public final class Q00047_IntoTheDarkElvenForest extends Quest
{
QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
- if (st == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case GALLADUCCI:
diff --git a/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java b/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
index df9a004c88..1a714d9eb5 100644
--- a/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
+++ b/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java
@@ -21,8 +21,6 @@ package quests.Q00048_ToTheImmortalPlateau;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00009_IntoTheCityOfHumans.Q00009_IntoTheCityOfHumans;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00009_IntoTheCityOfHumans.Q00009_IntoTheCityOfHumans;
+
/**
* To The Immortal Plateau (48)
* @author janiko
@@ -190,10 +190,6 @@ public final class Q00048_ToTheImmortalPlateau extends Quest
{
QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
- if (st == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case GALLADUCCI:
diff --git a/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java b/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
index 73f7624a3e..b4d860feba 100644
--- a/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
+++ b/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java
@@ -21,8 +21,6 @@ package quests.Q00049_TheRoadHome;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00010_IntoTheWorld.Q00010_IntoTheWorld;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00010_IntoTheWorld.Q00010_IntoTheWorld;
+
/**
* The Road Home (49)
* @author janiko
@@ -190,10 +190,6 @@ public final class Q00049_TheRoadHome extends Quest
{
QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
- if (st == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case GALLADUCCI:
diff --git a/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java b/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
index 69ba5565a6..8642a35383 100644
--- a/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
+++ b/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
@@ -112,11 +112,6 @@ public class Q00050_LanoscosSpecialBait extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java b/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
index f9f7b98f4d..7e658101df 100644
--- a/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
+++ b/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
@@ -108,11 +108,6 @@ public class Q00051_OFullesSpecialBait extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java b/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
index 6cb7bf9bca..ed82f37c45 100644
--- a/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
+++ b/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
@@ -108,11 +108,6 @@ public class Q00052_WilliesSpecialBait extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java b/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
index 016267058e..f64ee51def 100644
--- a/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
+++ b/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
@@ -41,7 +41,7 @@ public class Q00053_LinnaeusSpecialBait extends Quest
private static final int CRIMSON_DRAKE_HEART = 7624;
private static final int FLAMING_FISHING_LURE = 7613;
// Misc
- // Custom setting: whether or not to check for fishing skill level?
+ // TODO: Custom setting: whether or not to check for fishing skill level?
// Default False to require fishing skill level, any other value to ignore fishing and evaluate char level only.
private static final boolean ALT_IGNORE_FISHING = false;
@@ -120,11 +120,6 @@ public class Q00053_LinnaeusSpecialBait extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
index d87ac62f25..70d715dc6c 100644
--- a/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
+++ b/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java
@@ -18,10 +18,8 @@
*/
package quests.Q00101_SwordOfSolidarity;
-import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
@@ -29,6 +27,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+
/**
* Sword of Solidarity (101)
* @author xban1x
@@ -167,135 +167,132 @@ public class Q00101_SwordOfSolidarity extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (npc.getId())
{
- switch (npc.getId())
+ case ROIEN:
{
- case ROIEN:
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30008-02.htm" : "30008-08.htm" : "30008-01.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30008-02.htm" : "30008-08.htm" : "30008-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
+ {
+ if (st.hasQuestItems(ROIENS_LETTER))
+ {
+ htmltext = "30008-05.html";
+ }
+ break;
+ }
+ case 2:
{
- case 1:
+ if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP))
{
- if (st.hasQuestItems(ROIENS_LETTER))
- {
- htmltext = "30008-05.html";
- }
- break;
+ htmltext = "30008-11.html";
}
- case 2:
+ else if (st.hasQuestItems(DIRECTIONS_TO_RUINS))
{
- if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP))
- {
- htmltext = "30008-11.html";
- }
- else if (st.hasQuestItems(DIRECTIONS_TO_RUINS))
- {
- htmltext = "30008-10.html";
- }
- break;
+ htmltext = "30008-10.html";
}
- case 3:
+ break;
+ }
+ case 3:
+ {
+ if (st.hasQuestItems(BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP))
{
- if (st.hasQuestItems(BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP))
- {
- htmltext = "30008-12.html";
- }
- break;
+ htmltext = "30008-12.html";
}
- case 4:
+ break;
+ }
+ case 4:
+ {
+ if (st.hasQuestItems(ALTRANS_NOTE))
{
- if (st.hasQuestItems(ALTRANS_NOTE))
- {
- st.takeItems(ALTRANS_NOTE, -1);
- st.giveItems(BROKEN_SWORD_HANDLE, 1);
- st.setCond(5, true);
- htmltext = "30008-06.html";
- }
- break;
+ st.takeItems(ALTRANS_NOTE, -1);
+ st.giveItems(BROKEN_SWORD_HANDLE, 1);
+ st.setCond(5, true);
+ htmltext = "30008-06.html";
}
- case 5:
+ break;
+ }
+ case 5:
+ {
+ if (st.hasQuestItems(BROKEN_SWORD_HANDLE))
{
- if (st.hasQuestItems(BROKEN_SWORD_HANDLE))
- {
- htmltext = "30008-07.html";
- }
- break;
+ htmltext = "30008-07.html";
}
+ break;
}
- break;
- }
- case State.COMPLETED:
- {
- htmltext = getAlreadyCompletedMsg(player);
- break;
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
- break;
}
- case ALTRAN:
+ break;
+ }
+ case ALTRAN:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
{
- case 1:
+ if (st.hasQuestItems(ROIENS_LETTER))
{
- if (st.hasQuestItems(ROIENS_LETTER))
- {
- htmltext = "30283-01.html";
- }
- break;
+ htmltext = "30283-01.html";
}
- case 2:
+ break;
+ }
+ case 2:
+ {
+ if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP))
{
- if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP))
- {
- htmltext = "30283-08.html";
- }
- else if (st.hasQuestItems(DIRECTIONS_TO_RUINS))
- {
- htmltext = "30283-03.html";
- }
- break;
+ htmltext = "30283-08.html";
}
- case 3:
+ else if (st.hasQuestItems(DIRECTIONS_TO_RUINS))
{
- if (st.hasQuestItems(BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP))
- {
- takeItems(player, -1, DIRECTIONS_TO_RUINS, BROKEN_BLADE_TOP, BROKEN_BLADE_BOTTOM);
- st.giveItems(ALTRANS_NOTE, 1);
- st.setCond(4, true);
- htmltext = "30283-04.html";
- }
- break;
+ htmltext = "30283-03.html";
}
- case 4:
+ break;
+ }
+ case 3:
+ {
+ if (st.hasQuestItems(BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP))
{
- if (st.hasQuestItems(ALTRANS_NOTE))
- {
- htmltext = "30283-05.html";
- }
- break;
+ takeItems(player, -1, DIRECTIONS_TO_RUINS, BROKEN_BLADE_TOP, BROKEN_BLADE_BOTTOM);
+ st.giveItems(ALTRANS_NOTE, 1);
+ st.setCond(4, true);
+ htmltext = "30283-04.html";
}
- case 5:
+ break;
+ }
+ case 4:
+ {
+ if (st.hasQuestItems(ALTRANS_NOTE))
{
- if (st.hasQuestItems(BROKEN_SWORD_HANDLE))
- {
- htmltext = "30283-06.html";
- }
- break;
+ htmltext = "30283-05.html";
}
+ break;
+ }
+ case 5:
+ {
+ if (st.hasQuestItems(BROKEN_SWORD_HANDLE))
+ {
+ htmltext = "30283-06.html";
+ }
+ break;
}
- break;
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
index 7e857712fb..54ee6e1213 100644
--- a/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
+++ b/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java
@@ -21,8 +21,8 @@ package quests.Q00102_SeaOfSporesFever;
import java.util.HashMap;
import java.util.Map;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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,170 +123,167 @@ public class Q00102_SeaOfSporesFever extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (npc.getId())
{
- switch (npc.getId())
+ case ALBERIUS:
{
- case ALBERIUS:
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = player.getRace() == Race.ELF ? player.getLevel() >= MIN_LVL ? "30284-07.htm" : "30284-08.htm" : "30284-00.htm";
- break;
- }
- case State.STARTED:
+ htmltext = player.getRace() == Race.ELF ? player.getLevel() >= MIN_LVL ? "30284-07.htm" : "30284-08.htm" : "30284-00.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
{
- case 1:
+ if (st.hasQuestItems(ALBERIUS_LETTER))
{
- if (st.hasQuestItems(ALBERIUS_LETTER))
- {
- htmltext = "30284-03.html";
- }
- break;
+ htmltext = "30284-03.html";
}
- case 2:
+ break;
+ }
+ case 2:
+ {
+ if (st.hasQuestItems(EVERGREEN_AMULET))
{
- if (st.hasQuestItems(EVERGREEN_AMULET))
- {
- htmltext = "30284-09.html";
- }
- break;
+ htmltext = "30284-09.html";
+ }
+ break;
+ }
+ case 4:
+ {
+ if (st.hasQuestItems(COBENDELLS_MEDICINE1))
+ {
+ st.takeItems(COBENDELLS_MEDICINE1, 1);
+ st.giveItems(ALBERIUS_LIST, 1);
+ st.setCond(5);
+ htmltext = "30284-04.html";
}
- case 4:
+ break;
+ }
+ case 5:
+ {
+ if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5))
{
- if (st.hasQuestItems(COBENDELLS_MEDICINE1))
- {
- st.takeItems(COBENDELLS_MEDICINE1, 1);
- st.giveItems(ALBERIUS_LIST, 1);
- st.setCond(5);
- htmltext = "30284-04.html";
- }
- break;
+ htmltext = "30284-05.html";
}
- case 5:
+ break;
+ }
+ case 6:
+ {
+ if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5))
{
- if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5))
+ st.giveItems(LESSER_HEALING_POTION, 100);
+ st.giveItems(ECHO_CRYSTAL_THEME_OF_BATTLE, 10);
+ st.giveItems(ECHO_CRYSTAL_THEME_OF_LOVE, 10);
+ st.giveItems(ECHO_CRYSTAL_THEME_OF_SOLITUDE, 10);
+ st.giveItems(ECHO_CRYSTAL_THEME_OF_FEAST, 10);
+ st.giveItems(ECHO_CRYSTAL_THEME_OF_CELEBRATION, 10);
+ if (player.isMageClass())
{
- htmltext = "30284-05.html";
+ st.giveItems(STAFF_OF_SENTINEL, 1);
+ st.giveItems(SPIRITSHOT_NO_GRADE, 500);
}
- break;
- }
- case 6:
- {
- if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5))
+ else
{
- st.giveItems(LESSER_HEALING_POTION, 100);
- st.giveItems(ECHO_CRYSTAL_THEME_OF_BATTLE, 10);
- st.giveItems(ECHO_CRYSTAL_THEME_OF_LOVE, 10);
- st.giveItems(ECHO_CRYSTAL_THEME_OF_SOLITUDE, 10);
- st.giveItems(ECHO_CRYSTAL_THEME_OF_FEAST, 10);
- st.giveItems(ECHO_CRYSTAL_THEME_OF_CELEBRATION, 10);
- if (player.isMageClass())
- {
- st.giveItems(STAFF_OF_SENTINEL, 1);
- st.giveItems(SPIRITSHOT_NO_GRADE, 500);
- }
- else
- {
- st.giveItems(SWORD_OF_SENTINEL, 1);
- st.giveItems(SOULSHOT_NO_GRADE, 500);
- }
- st.addExpAndSp(30202, 1339);
- st.giveAdena(6331, true);
- st.exitQuest(false, true);
- htmltext = "30284-06.html";
+ st.giveItems(SWORD_OF_SENTINEL, 1);
+ st.giveItems(SOULSHOT_NO_GRADE, 500);
}
- break;
+ st.addExpAndSp(30202, 1339);
+ st.giveAdena(6331, true);
+ st.exitQuest(false, true);
+ htmltext = "30284-06.html";
}
+ break;
}
- break;
- }
- case State.COMPLETED:
- {
- htmltext = getAlreadyCompletedMsg(player);
- break;
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
- break;
}
- case COBENDELL:
+ break;
+ }
+ case COBENDELL:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
{
- case 1:
+ if (st.hasQuestItems(ALBERIUS_LETTER))
{
- if (st.hasQuestItems(ALBERIUS_LETTER))
- {
- st.takeItems(ALBERIUS_LETTER, 1);
- st.giveItems(EVERGREEN_AMULET, 1);
- st.setCond(2, true);
- htmltext = "30156-03.html";
- }
- break;
+ st.takeItems(ALBERIUS_LETTER, 1);
+ st.giveItems(EVERGREEN_AMULET, 1);
+ st.setCond(2, true);
+ htmltext = "30156-03.html";
}
- case 2:
+ break;
+ }
+ case 2:
+ {
+ if (st.hasQuestItems(EVERGREEN_AMULET) && (st.getQuestItemsCount(DRYADS_TEAR) < 10))
{
- if (st.hasQuestItems(EVERGREEN_AMULET) && (st.getQuestItemsCount(DRYADS_TEAR) < 10))
- {
- htmltext = "30156-04.html";
- }
- break;
+ htmltext = "30156-04.html";
}
- case 3:
+ break;
+ }
+ case 3:
+ {
+ if (st.getQuestItemsCount(DRYADS_TEAR) >= 10)
{
- if (st.getQuestItemsCount(DRYADS_TEAR) >= 10)
- {
- st.takeItems(EVERGREEN_AMULET, -1);
- st.takeItems(DRYADS_TEAR, -1);
- st.giveItems(COBENDELLS_MEDICINE1, 1);
- st.giveItems(COBENDELLS_MEDICINE2, 1);
- st.giveItems(COBENDELLS_MEDICINE3, 1);
- st.giveItems(COBENDELLS_MEDICINE4, 1);
- st.giveItems(COBENDELLS_MEDICINE5, 1);
- st.setCond(4, true);
- htmltext = "30156-05.html";
- }
- break;
+ st.takeItems(EVERGREEN_AMULET, -1);
+ st.takeItems(DRYADS_TEAR, -1);
+ st.giveItems(COBENDELLS_MEDICINE1, 1);
+ st.giveItems(COBENDELLS_MEDICINE2, 1);
+ st.giveItems(COBENDELLS_MEDICINE3, 1);
+ st.giveItems(COBENDELLS_MEDICINE4, 1);
+ st.giveItems(COBENDELLS_MEDICINE5, 1);
+ st.setCond(4, true);
+ htmltext = "30156-05.html";
}
- case 4:
+ break;
+ }
+ case 4:
+ {
+ if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5))
{
- if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5))
- {
- htmltext = "30156-06.html";
- }
- break;
+ htmltext = "30156-06.html";
}
- case 5:
+ break;
+ }
+ case 5:
+ {
+ if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5))
{
- if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5))
- {
- htmltext = "30156-07.html";
- }
- break;
+ htmltext = "30156-07.html";
}
+ break;
}
- break;
}
- case GARTRANDELL:
- case RAYEN:
- case VELTRESS:
- case BERROS:
+ break;
+ }
+ case GARTRANDELL:
+ case RAYEN:
+ case VELTRESS:
+ case BERROS:
+ {
+ if (st.hasQuestItems(ALBERIUS_LIST, SENTINELS.get(npc.getId())))
{
- if (st.hasQuestItems(ALBERIUS_LIST, SENTINELS.get(npc.getId())))
+ st.takeItems(SENTINELS.get(npc.getId()), -1);
+ if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5))
{
- st.takeItems(SENTINELS.get(npc.getId()), -1);
- if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5))
- {
- st.setCond(6);
- }
- htmltext = npc.getId() + "-01.html";
+ st.setCond(6);
}
- break;
+ htmltext = npc.getId() + "-01.html";
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
index b7ee0a1e42..98f56a0658 100644
--- a/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
+++ b/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java
@@ -21,10 +21,8 @@ package quests.Q00104_SpiritOfMirrors;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
@@ -33,6 +31,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+
/**
* Spirit of Mirrors (104)
* @author xban1x
@@ -118,65 +118,62 @@ public final class Q00104_SpiritOfMirrors extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (npc.getId())
{
- switch (npc.getId())
+ case GALLINT:
{
- case GALLINT:
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30017-03.htm" : "30017-02.htm" : "30017-01.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30017-03.htm" : "30017-02.htm" : "30017-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (st.isCond(3) && st.hasQuestItems(SPIRITBOUND_WAND1, SPIRITBOUND_WAND2, SPIRITBOUND_WAND3))
{
- if (st.isCond(3) && st.hasQuestItems(SPIRITBOUND_WAND1, SPIRITBOUND_WAND2, SPIRITBOUND_WAND3))
- {
- Q00281_HeadForTheHills.giveNewbieReward(player);
- for (ItemHolder reward : REWARDS)
- {
- st.giveItems(reward);
- }
- st.addExpAndSp(39750, 3407);
- st.giveAdena(16866, true);
- st.exitQuest(false, true);
- htmltext = "30017-06.html";
- }
- else
+ Q00281_HeadForTheHills.giveNewbieReward(player);
+ for (ItemHolder reward : REWARDS)
{
- htmltext = "30017-05.html";
+ st.giveItems(reward);
}
- break;
+ st.addExpAndSp(39750, 3407);
+ st.giveAdena(16866, true);
+ st.exitQuest(false, true);
+ htmltext = "30017-06.html";
}
- case State.COMPLETED:
+ else
{
- htmltext = getAlreadyCompletedMsg(player);
- break;
+ htmltext = "30017-05.html";
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
- break;
}
- case ARNOLD:
- case JOHNSTONE:
- case KENYOS:
+ break;
+ }
+ case ARNOLD:
+ case JOHNSTONE:
+ case KENYOS:
+ {
+ if (st.isCond(1))
{
- if (st.isCond(1))
+ if (!st.isSet(npc.getName()))
{
- if (!st.isSet(npc.getName()))
- {
- st.set(npc.getName(), "1");
- }
- if (st.isSet("Arnold") && st.isSet("Johnstone") && st.isSet("Kenyos"))
- {
- st.setCond(2, true);
- }
+ st.set(npc.getName(), "1");
+ }
+ if (st.isSet("Arnold") && st.isSet("Johnstone") && st.isSet("Kenyos"))
+ {
+ st.setCond(2, true);
}
- htmltext = npc.getId() + "-01.html";
- break;
}
+ htmltext = npc.getId() + "-01.html";
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
index 9f83919abe..d343947c6c 100644
--- a/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
+++ b/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java
@@ -21,8 +21,6 @@ package quests.Q00105_SkirmishWithOrcs;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -32,6 +30,8 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
+import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+
/**
* Skimirish with Orcs (105)
* @author janiko
@@ -158,11 +158,6 @@ public final class Q00105_SkirmishWithOrcs extends Quest
{
final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
index c20923ff3a..c62116d4bb 100644
--- a/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
+++ b/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java
@@ -18,10 +18,8 @@
*/
package quests.Q00106_ForgottenTruth;
-import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
+import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+
/**
* Forgotten Truth (106)
* @author janiko
@@ -117,11 +117,6 @@ public final class Q00106_ForgottenTruth extends Quest
{
final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case THIFIELL:
diff --git a/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
index 67de12b1a7..7e8bbd84f1 100644
--- a/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
+++ b/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java
@@ -21,10 +21,8 @@ package quests.Q00108_JumbleTumbleDiamondFuss;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
@@ -34,6 +32,8 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
+import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+
/**
* Jumble, Tumble, Diamond Fuss (108)
* @author Janiko
@@ -148,10 +148,6 @@ public final class Q00108_JumbleTumbleDiamondFuss extends Quest
{
final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
- if (st == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case COLLECTOR_GOUPH:
diff --git a/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index 60d7f628f4..75bd3b6c0d 100644
--- a/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -81,11 +81,6 @@ public class Q00109_InSearchOfTheNest extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case PIERCE:
diff --git a/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 3a33712d28..a45094f1cb 100644
--- a/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -74,11 +74,6 @@ public class Q00110_ToThePrimevalIsle extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ANTON:
diff --git a/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
index 1776301ea7..c2f02d654d 100644
--- a/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
+++ b/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java
@@ -252,11 +252,6 @@ public final class Q00111_ElrokianHuntersProof extends Quest
{
QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
switch (qs.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java b/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
index a2d1b46f1c..a165800979 100644
--- a/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
+++ b/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java
@@ -80,11 +80,6 @@ public class Q00112_WalkOfFate extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
index 2f8f97baf5..f665c08aa3 100644
--- a/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
+++ b/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
@@ -88,12 +88,6 @@ public class Q00113_StatusOfTheBeaconTower extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case MOIRA:
diff --git a/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
index 09968cdd16..ebc70c8f58 100644
--- a/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
+++ b/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
@@ -359,14 +359,7 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return getNoQuestMsg(player);
- }
-
int talk = st.getInt("talk");
-
switch (npc.getId())
{
case YUMI:
diff --git a/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
index 4d21980803..c7486ac852 100644
--- a/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
+++ b/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java
@@ -389,11 +389,6 @@ public class Q00115_TheOtherSideOfTruth extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 2ddcc9865e..b3b7566cfe 100644
--- a/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -104,11 +104,6 @@ public class Q00119_LastImperialPrince extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
index b00d9d9ae0..cecf330468 100644
--- a/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
+++ b/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
@@ -69,11 +69,6 @@ public class Q00121_PavelTheGiant extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case NEWYEAR:
diff --git a/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
index a7ca28bb77..c6dc6a757b 100644
--- a/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
+++ b/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
@@ -70,11 +70,6 @@ public class Q00122_OminousNews extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case MOIRA:
diff --git a/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 57a0f6779d..86810270e8 100644
--- a/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -101,11 +101,6 @@ public class Q00124_MeetingTheElroki extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case MARQUEZ:
diff --git a/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index c31d532ab1..563d5c5fe1 100644
--- a/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -21,8 +21,6 @@ package quests.Q00125_TheNameOfEvil1;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00124_MeetingTheElroki.Q00124_MeetingTheElroki;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -32,6 +30,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import quests.Q00124_MeetingTheElroki.Q00124_MeetingTheElroki;
+
/**
* The Name of Evil - 1 (125)
* @author Adry_85
@@ -293,11 +293,6 @@ public class Q00125_TheNameOfEvil1 extends Quest
{
String htmltext = getNoQuestMsg(player);
QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case MUSHIKA:
diff --git a/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index c82b7b5dbf..8e506c3ca5 100644
--- a/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -18,8 +18,6 @@
*/
package quests.Q00126_TheNameOfEvil2;
-import quests.Q00125_TheNameOfEvil1.Q00125_TheNameOfEvil1;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -28,6 +26,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
+import quests.Q00125_TheNameOfEvil1.Q00125_TheNameOfEvil1;
+
/**
* The Name of Evil - 2 (126)
* @author Adry_85
@@ -338,11 +338,6 @@ public class Q00126_TheNameOfEvil2 extends Quest
{
String htmltext = getNoQuestMsg(player);
QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ASAMAH:
diff --git a/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
index 072b827e4b..7c97b762aa 100644
--- a/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
+++ b/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java
@@ -184,11 +184,6 @@ public final class Q00128_PailakaSongOfIceAndFire extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ADLER1:
diff --git a/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
index 8a2c7bcadb..b9c65b2a68 100644
--- a/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
+++ b/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java
@@ -138,11 +138,6 @@ public final class Q00129_PailakaDevilsLegacy extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
- if (qs == null)
- {
- return getNoQuestMsg(player);
- }
-
switch (npc.getId())
{
case SURVIVOR:
diff --git a/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java b/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
index 4256daacb2..fcfd787ce2 100644
--- a/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
+++ b/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java
@@ -168,11 +168,6 @@ public class Q00131_BirdInACage extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java b/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
index be8615139e..99f6c0fa5b 100644
--- a/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
+++ b/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
@@ -143,11 +143,6 @@ public final class Q00132_MatrasCuriosity extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (st.isCreated())
{
htmltext = (player.getLevel() >= 76) ? "32245-01.htm" : "32245-02.htm";
diff --git a/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java b/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
index 852afbcecb..4cdf8c4f28 100644
--- a/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
+++ b/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
@@ -18,15 +18,15 @@
*/
package quests.Q00133_ThatsBloodyHot;
-import hellbound.HellboundEngine;
-import quests.Q00131_BirdInACage.Q00131_BirdInACage;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import hellbound.HellboundEngine;
+import quests.Q00131_BirdInACage.Q00131_BirdInACage;
+
/**
* That's Bloody Hot! (133)
* @author Zoey76
@@ -153,11 +153,6 @@ public class Q00133_ThatsBloodyHot extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
index b7eb78ff18..8d0d91859c 100644
--- a/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
+++ b/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java
@@ -163,11 +163,6 @@ public class Q00134_TempleMissionary extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case GLYVKA:
diff --git a/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
index d7de387aca..72da192bac 100644
--- a/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
+++ b/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java
@@ -153,11 +153,6 @@ public class Q00135_TempleExecutor extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case SHEGFIELD:
diff --git a/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
index be5e04ba42..4326a30ede 100644
--- a/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
+++ b/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java
@@ -173,11 +173,6 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case HARDIN:
diff --git a/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
index 56ee00b100..1db79cef6e 100644
--- a/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
+++ b/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java
@@ -119,10 +119,6 @@ public class Q00137_TempleChampionPart1 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
if (st.isCompleted())
{
return getAlreadyCompletedMsg(player);
diff --git a/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
index 72e09ac6a7..9846f71de6 100644
--- a/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
+++ b/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java
@@ -18,14 +18,14 @@
*/
package quests.Q00138_TempleChampionPart2;
-import quests.Q00137_TempleChampionPart1.Q00137_TempleChampionPart1;
-
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;
import com.l2jserver.gameserver.model.quest.QuestState;
+import quests.Q00137_TempleChampionPart1.Q00137_TempleChampionPart1;
+
/**
* Temple Champion - 2 (138)
* @author nonom
@@ -140,10 +140,6 @@ public class Q00138_TempleChampionPart2 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case SYLVAIN:
diff --git a/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
index 28e7c62367..471ee72603 100644
--- a/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
+++ b/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java
@@ -18,8 +18,6 @@
*/
package quests.Q00139_ShadowFoxPart1;
-import quests.Q00138_TempleChampionPart2.Q00138_TempleChampionPart2;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -27,6 +25,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00138_TempleChampionPart2.Q00138_TempleChampionPart2;
+
/**
* Shadow Fox - 1 (139)
* @author Nono
@@ -145,11 +145,6 @@ public class Q00139_ShadowFoxPart1 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
index 2976c1d7f5..82722acb45 100644
--- a/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
+++ b/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java
@@ -21,8 +21,6 @@ package quests.Q00140_ShadowFoxPart2;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00139_ShadowFoxPart1.Q00139_ShadowFoxPart1;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00139_ShadowFoxPart1.Q00139_ShadowFoxPart1;
+
/**
* Shadow Fox - 2 (140)
* @author Nono
@@ -155,11 +155,6 @@ public class Q00140_ShadowFoxPart2 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case KLUCK:
diff --git a/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
index 99de6d1914..9baf031df7 100644
--- a/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
+++ b/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java
@@ -21,9 +21,6 @@ package quests.Q00141_ShadowFoxPart3;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00140_ShadowFoxPart2.Q00140_ShadowFoxPart2;
-import quests.Q00998_FallenAngelSelect.Q00998_FallenAngelSelect;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -32,6 +29,9 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00140_ShadowFoxPart2.Q00140_ShadowFoxPart2;
+import quests.Q00998_FallenAngelSelect.Q00998_FallenAngelSelect;
+
/**
* Shadow Fox - 3 (141)
* @author Nono
@@ -150,11 +150,6 @@ public class Q00141_ShadowFoxPart3 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
index 36471c309c..8d6cbb3350 100644
--- a/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
+++ b/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java
@@ -177,11 +177,6 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case NATOOLS:
diff --git a/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
index 7ca6c161dd..33cc1aa388 100644
--- a/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
+++ b/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java
@@ -145,11 +145,6 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case NATOOLS:
diff --git a/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
index ff71955b88..db1f80a226 100644
--- a/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
+++ b/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
@@ -18,14 +18,14 @@
*/
package quests.Q00146_TheZeroHour;
-import quests.Q00109_InSearchOfTheNest.Q00109_InSearchOfTheNest;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00109_InSearchOfTheNest.Q00109_InSearchOfTheNest;
+
/**
* The Zero Hour (146)
* @author Gnacik, malyelfik
@@ -85,11 +85,6 @@ public class Q00146_TheZeroHour extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java b/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
index d8f0c70d27..6f874aab22 100644
--- a/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
+++ b/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
@@ -86,11 +86,6 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java b/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
index 3ac9f6ff76..232fdee044 100644
--- a/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
+++ b/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
@@ -18,14 +18,14 @@
*/
package quests.Q00148_PathtoBecominganExaltedMercenary;
-import quests.Q00147_PathtoBecominganEliteMercenary.Q00147_PathtoBecominganEliteMercenary;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00147_PathtoBecominganEliteMercenary.Q00147_PathtoBecominganEliteMercenary;
+
/**
* Path to Becoming an Exalted Mercenary (148)
* @author Gnacik
@@ -83,11 +83,6 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
index 9eb587f8a0..b817f53047 100644
--- a/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
+++ b/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java
@@ -87,11 +87,6 @@ public class Q00151_CureForFever extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ELLIAS:
diff --git a/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
index beb6725462..903c92c6f1 100644
--- a/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
+++ b/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java
@@ -110,104 +110,101 @@ public class Q00152_ShardsOfGolem extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (npc.getId())
{
- switch (npc.getId())
+ case HARRYS:
{
- case HARRYS:
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = player.getLevel() >= MIN_LVL ? "30035-02.htm" : "30035-01.htm";
- break;
- }
- case State.STARTED:
+ htmltext = player.getLevel() >= MIN_LVL ? "30035-02.htm" : "30035-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
{
- case 1:
+ if (st.hasQuestItems(HARRYS_1ST_RECIEPT))
{
- if (st.hasQuestItems(HARRYS_1ST_RECIEPT))
- {
- htmltext = "30035-04a.html";
- }
- break;
+ htmltext = "30035-04a.html";
}
- case 2:
- case 3:
+ break;
+ }
+ case 2:
+ case 3:
+ {
+ if (st.hasQuestItems(HARRYS_2ND_RECIEPT))
{
- if (st.hasQuestItems(HARRYS_2ND_RECIEPT))
- {
- htmltext = "30035-04.html";
- }
- break;
+ htmltext = "30035-04.html";
}
- case 4:
+ break;
+ }
+ case 4:
+ {
+ if (st.hasQuestItems(HARRYS_2ND_RECIEPT, TOOL_BOX))
{
- if (st.hasQuestItems(HARRYS_2ND_RECIEPT, TOOL_BOX))
- {
- st.giveItems(WOODEN_BREASTPLATE, 1);
- st.addExpAndSp(5000, 0);
- st.exitQuest(false, true);
- htmltext = "30035-05.html";
- }
- break;
+ st.giveItems(WOODEN_BREASTPLATE, 1);
+ st.addExpAndSp(5000, 0);
+ st.exitQuest(false, true);
+ htmltext = "30035-05.html";
}
+ break;
}
- break;
- }
- case State.COMPLETED:
- {
- htmltext = getAlreadyCompletedMsg(player);
- break;
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
- break;
}
- case ALTRAN:
+ break;
+ }
+ case ALTRAN:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
{
- case 1:
+ if (st.hasQuestItems(HARRYS_1ST_RECIEPT))
{
- if (st.hasQuestItems(HARRYS_1ST_RECIEPT))
- {
- htmltext = "30283-01.html";
- }
- break;
+ htmltext = "30283-01.html";
}
- case 2:
+ break;
+ }
+ case 2:
+ {
+ if (st.hasQuestItems(HARRYS_2ND_RECIEPT) && (st.getQuestItemsCount(GOLEM_SHARD) < 5))
{
- if (st.hasQuestItems(HARRYS_2ND_RECIEPT) && (st.getQuestItemsCount(GOLEM_SHARD) < 5))
- {
- htmltext = "30283-03.html";
- }
- break;
+ htmltext = "30283-03.html";
}
- case 3:
+ break;
+ }
+ case 3:
+ {
+ if (st.hasQuestItems(HARRYS_2ND_RECIEPT) && (st.getQuestItemsCount(GOLEM_SHARD) >= 5))
{
- if (st.hasQuestItems(HARRYS_2ND_RECIEPT) && (st.getQuestItemsCount(GOLEM_SHARD) >= 5))
- {
- st.takeItems(GOLEM_SHARD, -1);
- st.giveItems(TOOL_BOX, 1);
- st.setCond(4, true);
- htmltext = "30283-04.html";
- }
- break;
+ st.takeItems(GOLEM_SHARD, -1);
+ st.giveItems(TOOL_BOX, 1);
+ st.setCond(4, true);
+ htmltext = "30283-04.html";
}
- case 4:
+ break;
+ }
+ case 4:
+ {
+ if (st.hasQuestItems(HARRYS_2ND_RECIEPT, TOOL_BOX))
{
- if (st.hasQuestItems(HARRYS_2ND_RECIEPT, TOOL_BOX))
- {
- htmltext = "30283-05.html";
- }
- break;
+ htmltext = "30283-05.html";
}
+ break;
}
- break;
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
index cef4e3d5bc..bb3d139b60 100644
--- a/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
+++ b/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
@@ -80,87 +80,84 @@ public class Q00153_DeliverGoods extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st != null)
+ if (npc.getId() == ARNOLD_ID)
{
- if (npc.getId() == ARNOLD_ID)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
+ htmltext = (player.getLevel() >= 2) ? "30041-01.htm" : "30041-00.htm";
+ break;
+ case State.STARTED:
+ if (st.isCond(1))
+ {
+ htmltext = "30041-03.html";
+ }
+ else if (st.isCond(2))
+ {
+ st.takeItems(DELIVERY_LIST_ID, -1);
+ st.takeItems(JACKSONS_RECEIPT_ID, -1);
+ st.takeItems(SILVIAS_RECEIPT_ID, -1);
+ st.takeItems(RANTS_RECEIPT_ID, -1);
+ // On retail it gives 2 rings but one at the time.
+ st.giveItems(RING_OF_KNOWLEDGE_ID, 1);
+ st.giveItems(RING_OF_KNOWLEDGE_ID, 1);
+ st.addExpAndSp(XP_REWARD_AMOUNT, 0);
+ st.exitQuest(false);
+ htmltext = "30041-04.html";
+ }
+ break;
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ }
+ }
+ else
+ {
+ if (npc.getId() == JACKSON_ID)
+ {
+ if (st.hasQuestItems(HEAVY_WOOD_BOX_ID))
+ {
+ st.takeItems(HEAVY_WOOD_BOX_ID, -1);
+ st.giveItems(JACKSONS_RECEIPT_ID, 1);
+ htmltext = "30002-01.html";
+ }
+ else
{
- case State.CREATED:
- htmltext = (player.getLevel() >= 2) ? "30041-01.htm" : "30041-00.htm";
- break;
- case State.STARTED:
- if (st.isCond(1))
- {
- htmltext = "30041-03.html";
- }
- else if (st.isCond(2))
- {
- st.takeItems(DELIVERY_LIST_ID, -1);
- st.takeItems(JACKSONS_RECEIPT_ID, -1);
- st.takeItems(SILVIAS_RECEIPT_ID, -1);
- st.takeItems(RANTS_RECEIPT_ID, -1);
- // On retail it gives 2 rings but one at the time.
- st.giveItems(RING_OF_KNOWLEDGE_ID, 1);
- st.giveItems(RING_OF_KNOWLEDGE_ID, 1);
- st.addExpAndSp(XP_REWARD_AMOUNT, 0);
- st.exitQuest(false);
- htmltext = "30041-04.html";
- }
- break;
- case State.COMPLETED:
- htmltext = getAlreadyCompletedMsg(player);
- break;
+ htmltext = "30002-02.html";
}
}
- else
+ else if (npc.getId() == SILVIA_ID)
{
- if (npc.getId() == JACKSON_ID)
+ if (st.hasQuestItems(CLOTH_BUNDLE_ID))
{
- if (st.hasQuestItems(HEAVY_WOOD_BOX_ID))
- {
- st.takeItems(HEAVY_WOOD_BOX_ID, -1);
- st.giveItems(JACKSONS_RECEIPT_ID, 1);
- htmltext = "30002-01.html";
- }
- else
- {
- htmltext = "30002-02.html";
- }
+ st.takeItems(CLOTH_BUNDLE_ID, -1);
+ st.giveItems(SILVIAS_RECEIPT_ID, 1);
+ st.giveItems(SOULSHOT_NO_GRADE_ID, 3);
+ htmltext = "30003-01.html";
}
- else if (npc.getId() == SILVIA_ID)
+ else
{
- if (st.hasQuestItems(CLOTH_BUNDLE_ID))
- {
- st.takeItems(CLOTH_BUNDLE_ID, -1);
- st.giveItems(SILVIAS_RECEIPT_ID, 1);
- st.giveItems(SOULSHOT_NO_GRADE_ID, 3);
- htmltext = "30003-01.html";
- }
- else
- {
- htmltext = "30003-02.html";
- }
+ htmltext = "30003-02.html";
}
- else if (npc.getId() == RANT_ID)
+ }
+ else if (npc.getId() == RANT_ID)
+ {
+ if (st.hasQuestItems(CLAY_POT_ID))
{
- if (st.hasQuestItems(CLAY_POT_ID))
- {
- st.takeItems(CLAY_POT_ID, -1);
- st.giveItems(RANTS_RECEIPT_ID, 1);
- htmltext = "30054-01.html";
- }
- else
- {
- htmltext = "30054-02.html";
- }
+ st.takeItems(CLAY_POT_ID, -1);
+ st.giveItems(RANTS_RECEIPT_ID, 1);
+ htmltext = "30054-01.html";
}
-
- if (st.isCond(1) && st.hasQuestItems(JACKSONS_RECEIPT_ID) && st.hasQuestItems(SILVIAS_RECEIPT_ID) && st.hasQuestItems(RANTS_RECEIPT_ID))
+ else
{
- st.setCond(2, true);
+ htmltext = "30054-02.html";
}
}
+
+ if (st.isCond(1) && st.hasQuestItems(JACKSONS_RECEIPT_ID) && st.hasQuestItems(SILVIAS_RECEIPT_ID) && st.hasQuestItems(RANTS_RECEIPT_ID))
+ {
+ st.setCond(2, true);
+ }
}
return htmltext;
}
diff --git a/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
index b9a6809277..f78e2d7dd2 100644
--- a/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
+++ b/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java
@@ -65,11 +65,6 @@ public class Q00155_FindSirWindawood extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ABELLOS:
diff --git a/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java b/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
index b5ca6825a7..6c8678e30b 100644
--- a/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
+++ b/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java
@@ -108,65 +108,62 @@ public class Q00156_MillenniumLove extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (npc.getId())
{
- switch (npc.getId())
+ case LILITH:
{
- case LILITH:
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = "30368-01.htm";
- break;
- }
- case State.STARTED:
+ htmltext = "30368-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (st.isCond(1) && st.hasQuestItems(LILITHS_LETTER))
{
- if (st.isCond(1) && st.hasQuestItems(LILITHS_LETTER))
- {
- htmltext = "30368-06.html";
- }
- else if (st.isCond(2) && st.hasQuestItems(THEONS_DIARY))
- {
- st.giveItems(GREATER_COMP_SOULSHOUT_PACKAGE_NO_GRADE, 1);
- st.addExpAndSp(3000, 0);
- st.exitQuest(false, true);
- htmltext = "30368-07.html";
- }
- break;
+ htmltext = "30368-06.html";
}
- case State.COMPLETED:
+ else if (st.isCond(2) && st.hasQuestItems(THEONS_DIARY))
{
- htmltext = getAlreadyCompletedMsg(player);
- break;
+ st.giveItems(GREATER_COMP_SOULSHOUT_PACKAGE_NO_GRADE, 1);
+ st.addExpAndSp(3000, 0);
+ st.exitQuest(false, true);
+ htmltext = "30368-07.html";
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
- break;
}
- case BAENEDES:
+ break;
+ }
+ case BAENEDES:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
{
- case 1:
+ if (st.hasQuestItems(LILITHS_LETTER))
{
- if (st.hasQuestItems(LILITHS_LETTER))
- {
- htmltext = "30369-01.html";
- }
- break;
+ htmltext = "30369-01.html";
}
- case 2:
+ break;
+ }
+ case 2:
+ {
+ if (st.hasQuestItems(THEONS_DIARY))
{
- if (st.hasQuestItems(THEONS_DIARY))
- {
- htmltext = "30369-04.html";
- }
- break;
+ htmltext = "30369-04.html";
}
+ break;
}
- break;
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
index c322a6cd67..6a71a832c4 100644
--- a/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
+++ b/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java
@@ -99,34 +99,31 @@ public class Q00157_RecoverSmuggledGoods extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = player.getLevel() >= MIN_LVL ? "30005-02.htm" : "30005-01.htm";
- break;
- }
- case State.STARTED:
+ htmltext = player.getLevel() >= MIN_LVL ? "30005-02.htm" : "30005-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (st.isCond(2) && (st.getQuestItemsCount(ADAMANTITE_ORE) >= 20))
{
- if (st.isCond(2) && (st.getQuestItemsCount(ADAMANTITE_ORE) >= 20))
- {
- st.giveItems(BUCKLER, 1);
- st.exitQuest(false, true);
- htmltext = "30005-06.html";
- }
- else
- {
- htmltext = "30005-05.html";
- }
- break;
+ st.giveItems(BUCKLER, 1);
+ st.exitQuest(false, true);
+ htmltext = "30005-06.html";
}
- case State.COMPLETED:
+ else
{
- htmltext = getAlreadyCompletedMsg(player);
- break;
+ htmltext = "30005-05.html";
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
index 9a684e008f..101983cb7e 100644
--- a/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
+++ b/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java
@@ -94,11 +94,6 @@ public class Q00158_SeedOfEvil extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
index 83d8a1d4ed..22d1fc83c7 100644
--- a/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
+++ b/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java
@@ -18,8 +18,8 @@
*/
package quests.Q00159_ProtectTheWaterSource;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
@@ -109,65 +109,62 @@ public class Q00159_ProtectTheWaterSource extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL ? "30154-03.htm" : "30154-02.htm") : "30154-01.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL ? "30154-03.htm" : "30154-02.htm") : "30154-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
{
- case 1:
+ if (st.hasQuestItems(HYACINTH_CHARM) && !st.hasQuestItems(PLAGUE_DUST))
{
- if (st.hasQuestItems(HYACINTH_CHARM) && !st.hasQuestItems(PLAGUE_DUST))
- {
- htmltext = "30154-05.html";
- }
- break;
+ htmltext = "30154-05.html";
}
- case 2:
+ break;
+ }
+ case 2:
+ {
+ if (st.hasQuestItems(HYACINTH_CHARM, PLAGUE_DUST))
{
- if (st.hasQuestItems(HYACINTH_CHARM, PLAGUE_DUST))
- {
- st.takeItems(HYACINTH_CHARM, -1);
- st.takeItems(PLAGUE_DUST, -1);
- st.giveItems(HYACINTH_CHARM2, 1);
- st.setCond(3, true);
- htmltext = "30154-06.html";
- }
- break;
+ st.takeItems(HYACINTH_CHARM, -1);
+ st.takeItems(PLAGUE_DUST, -1);
+ st.giveItems(HYACINTH_CHARM2, 1);
+ st.setCond(3, true);
+ htmltext = "30154-06.html";
}
- case 3:
+ break;
+ }
+ case 3:
+ {
+ if (st.hasQuestItems(HYACINTH_CHARM2))
{
- if (st.hasQuestItems(HYACINTH_CHARM2))
- {
- htmltext = "30154-07.html";
- }
- break;
+ htmltext = "30154-07.html";
}
- case 4:
+ break;
+ }
+ case 4:
+ {
+ if (st.hasQuestItems(HYACINTH_CHARM2) && (st.getQuestItemsCount(PLAGUE_DUST) >= 5))
{
- if (st.hasQuestItems(HYACINTH_CHARM2) && (st.getQuestItemsCount(PLAGUE_DUST) >= 5))
- {
- st.giveAdena(18250, true);
- st.exitQuest(false, true);
- htmltext = "30154-08.html";
- }
- break;
+ st.giveAdena(18250, true);
+ st.exitQuest(false, true);
+ htmltext = "30154-08.html";
}
+ break;
}
- break;
- }
- case State.COMPLETED:
- {
- htmltext = getAlreadyCompletedMsg(player);
- break;
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
index 9267f61b50..741ffadbfa 100644
--- a/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
+++ b/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java
@@ -69,7 +69,7 @@ public class Q00161_FruitOfTheMotherTree extends Quest
default:
htmltext = null;
break;
-
+
}
return htmltext;
}
@@ -79,11 +79,6 @@ public class Q00161_FruitOfTheMotherTree extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ANDELLIA:
diff --git a/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
index b0729c5d4c..d4f508afb1 100644
--- a/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
+++ b/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java
@@ -21,8 +21,8 @@ package quests.Q00162_CurseOfTheUndergroundFortress;
import java.util.HashMap;
import java.util.Map;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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,36 +145,33 @@ public class Q00162_CurseOfTheUndergroundFortress extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30147-02.htm" : "30147-01.htm" : "30147-00.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30147-02.htm" : "30147-01.htm" : "30147-00.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if ((st.getQuestItemsCount(BONE_FRAGMENT) + st.getQuestItemsCount(ELF_SKULL)) >= REQUIRED_COUNT)
{
- if ((st.getQuestItemsCount(BONE_FRAGMENT) + st.getQuestItemsCount(ELF_SKULL)) >= REQUIRED_COUNT)
- {
- st.giveItems(BONE_SHIELD, 1);
- st.addExpAndSp(22652, 1004);
- st.giveAdena(24000, true);
- st.exitQuest(false, true);
- htmltext = "30147-06.html";
- }
- else
- {
- htmltext = "30147-05.html";
- }
- break;
+ st.giveItems(BONE_SHIELD, 1);
+ st.addExpAndSp(22652, 1004);
+ st.giveAdena(24000, true);
+ st.exitQuest(false, true);
+ htmltext = "30147-06.html";
}
- case State.COMPLETED:
+ else
{
- htmltext = getAlreadyCompletedMsg(player);
- break;
+ htmltext = "30147-05.html";
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
index 816f1f9f16..e2656e794b 100644
--- a/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
+++ b/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java
@@ -18,8 +18,8 @@
*/
package quests.Q00163_LegacyOfThePoet;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
@@ -146,35 +146,32 @@ public class Q00163_LegacyOfThePoet extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30220-02.htm" : "30220-01.htm" : "30220-00.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30220-02.htm" : "30220-01.htm" : "30220-00.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (st.hasQuestItems(RUMIELS_1ST_POEM, RUMIELS_2ND_POEM, RUMIELS_3RD_POEM, RUMIELS_4TH_POEM))
{
- if (st.hasQuestItems(RUMIELS_1ST_POEM, RUMIELS_2ND_POEM, RUMIELS_3RD_POEM, RUMIELS_4TH_POEM))
- {
- st.addExpAndSp(21643, 943);
- st.giveAdena(13890, true);
- st.exitQuest(false, true);
- htmltext = "30220-07.html";
- }
- else
- {
- htmltext = "30220-06.html";
- }
- break;
+ st.addExpAndSp(21643, 943);
+ st.giveAdena(13890, true);
+ st.exitQuest(false, true);
+ htmltext = "30220-07.html";
}
- case State.COMPLETED:
+ else
{
- htmltext = getAlreadyCompletedMsg(player);
- break;
+ htmltext = "30220-06.html";
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
index 63983e5747..eb142357df 100644
--- a/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
+++ b/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java
@@ -82,35 +82,32 @@ public class Q00164_BloodFiend extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() != Race.DARK_ELF) ? player.getLevel() >= MIN_LVL ? "30149-03.htm" : "30149-02.htm" : "30149-00.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() != Race.DARK_ELF) ? player.getLevel() >= MIN_LVL ? "30149-03.htm" : "30149-02.htm" : "30149-00.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (st.isCond(2) && st.hasQuestItems(KIRUNAK_SKULL))
{
- if (st.isCond(2) && st.hasQuestItems(KIRUNAK_SKULL))
- {
- st.giveAdena(42130, true);
- st.addExpAndSp(35637, 1854);
- st.exitQuest(false, true);
- htmltext = "30149-06.html";
- }
- else
- {
- htmltext = "30149-05.html";
- }
- break;
+ st.giveAdena(42130, true);
+ st.addExpAndSp(35637, 1854);
+ st.exitQuest(false, true);
+ htmltext = "30149-06.html";
}
- case State.COMPLETED:
+ else
{
- htmltext = getAlreadyCompletedMsg(player);
- break;
+ htmltext = "30149-05.html";
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
index ffbaf8165f..2c2da6352a 100644
--- a/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
+++ b/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java
@@ -21,8 +21,8 @@ package quests.Q00165_ShilensHunt;
import java.util.HashMap;
import java.util.Map;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
@@ -98,35 +98,32 @@ public class Q00165_ShilensHunt extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30348-02.htm" : "30348-01.htm" : "30348-00.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30348-02.htm" : "30348-01.htm" : "30348-00.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (st.isCond(2) && (st.getQuestItemsCount(DARK_BEZOAR) >= REQUIRED_COUNT))
{
- if (st.isCond(2) && (st.getQuestItemsCount(DARK_BEZOAR) >= REQUIRED_COUNT))
- {
- st.giveItems(LESSER_HEALING_POTION, 5);
- st.addExpAndSp(1000, 0);
- st.exitQuest(false, true);
- htmltext = "30348-05.html";
- }
- else
- {
- htmltext = "30348-04.html";
- }
- break;
+ st.giveItems(LESSER_HEALING_POTION, 5);
+ st.addExpAndSp(1000, 0);
+ st.exitQuest(false, true);
+ htmltext = "30348-05.html";
}
- case State.COMPLETED:
+ else
{
- htmltext = getAlreadyCompletedMsg(player);
- break;
+ htmltext = "30348-04.html";
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
index d272dd6592..f1337189d7 100644
--- a/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
+++ b/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java
@@ -81,66 +81,63 @@ public class Q00166_MassOfDarkness extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (npc.getId())
{
- switch (npc.getId())
+ case UNDRIAS:
{
- case UNDRIAS:
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30130-02.htm" : "30130-01.htm" : "30130-00.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30130-02.htm" : "30130-01.htm" : "30130-00.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (st.isCond(2) && st.hasQuestItems(UNDRIAS_LETTER, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE))
{
- if (st.isCond(2) && st.hasQuestItems(UNDRIAS_LETTER, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE))
- {
- showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE, 2, 5000); // TODO: Newbie Guide
- st.addExpAndSp(5672, 466);
- st.giveAdena(2966, true);
- st.exitQuest(false, true);
- htmltext = "30130-05.html";
- }
- else
- {
- htmltext = "30130-04.html";
- }
- break;
+ showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE, 2, 5000); // TODO: Newbie Guide
+ st.addExpAndSp(5672, 466);
+ st.giveAdena(2966, true);
+ st.exitQuest(false, true);
+ htmltext = "30130-05.html";
}
- case State.COMPLETED:
+ else
{
- htmltext = getAlreadyCompletedMsg(player);
- break;
+ htmltext = "30130-04.html";
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
- break;
}
- case IRIA:
- case DORANKUS:
- case TRUDY:
+ break;
+ }
+ case IRIA:
+ case DORANKUS:
+ case TRUDY:
+ {
+ if (st.isStarted())
{
- if (st.isStarted())
+ final int npcId = npc.getId();
+ final int itemId = NPCs.get(npcId);
+ if (st.isCond(1) && !st.hasQuestItems(itemId))
{
- final int npcId = npc.getId();
- final int itemId = NPCs.get(npcId);
- if (st.isCond(1) && !st.hasQuestItems(itemId))
- {
- st.giveItems(itemId, 1);
- if (st.hasQuestItems(CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE))
- {
- st.setCond(2, true);
- }
- htmltext = npcId + "-01.html";
- }
- else
+ st.giveItems(itemId, 1);
+ if (st.hasQuestItems(CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE))
{
- htmltext = npcId + "-02.html";
+ st.setCond(2, true);
}
- break;
+ htmltext = npcId + "-01.html";
}
+ else
+ {
+ htmltext = npcId + "-02.html";
+ }
+ break;
}
}
}
diff --git a/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
index 6ab9a5e97f..81fc9cc668 100644
--- a/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
+++ b/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java
@@ -111,55 +111,52 @@ public class Q00167_DwarvenKinship extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (npc.getId())
{
- switch (npc.getId())
+ case CARLON:
{
- case CARLON:
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getLevel() >= MIN_LVL) ? "30350-02.htm" : "30350-01.htm";
- break;
- }
- case State.STARTED:
- {
- if (st.isCond(1) && st.hasQuestItems(CARLONS_LETTER))
- {
- htmltext = "30350-04.html";
- }
- break;
- }
- case State.COMPLETED:
- {
- htmltext = getAlreadyCompletedMsg(player);
- break;
- }
+ htmltext = (player.getLevel() >= MIN_LVL) ? "30350-02.htm" : "30350-01.htm";
+ break;
}
- break;
- }
- case HAPROCK:
- {
- if (st.isCond(1) && st.hasQuestItems(CARLONS_LETTER))
+ case State.STARTED:
{
- htmltext = "30255-01.html";
+ if (st.isCond(1) && st.hasQuestItems(CARLONS_LETTER))
+ {
+ htmltext = "30350-04.html";
+ }
+ break;
}
- else if (st.isCond(2) && st.hasQuestItems(NORMANS_LETTER))
+ case State.COMPLETED:
{
- htmltext = "30255-05.html";
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
- break;
}
- case NORMAN:
+ break;
+ }
+ case HAPROCK:
+ {
+ if (st.isCond(1) && st.hasQuestItems(CARLONS_LETTER))
{
- if (st.isCond(2) && st.hasQuestItems(NORMANS_LETTER))
- {
- htmltext = "30210-01.html";
- }
- break;
+ htmltext = "30255-01.html";
+ }
+ else if (st.isCond(2) && st.hasQuestItems(NORMANS_LETTER))
+ {
+ htmltext = "30255-05.html";
+ }
+ break;
+ }
+ case NORMAN:
+ {
+ if (st.isCond(2) && st.hasQuestItems(NORMANS_LETTER))
+ {
+ htmltext = "30210-01.html";
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
index ea4232be9d..b9c0951c2f 100644
--- a/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
+++ b/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java
@@ -80,106 +80,103 @@ public class Q00168_DeliverSupplies extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (npc.getId())
{
- switch (npc.getId())
+ case JENNA:
{
- case JENNA:
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30349-02.htm" : "30349-01.htm" : "30349-00.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30349-02.htm" : "30349-01.htm" : "30349-00.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
{
- case 1:
+ if (st.hasQuestItems(JENNAS_LETTER))
{
- if (st.hasQuestItems(JENNAS_LETTER))
- {
- htmltext = "30349-04.html";
- }
- break;
+ htmltext = "30349-04.html";
}
- case 2:
+ break;
+ }
+ case 2:
+ {
+ if (st.hasQuestItems(SENTRY_BLADE1, SENTRY_BLADE2, SENTRY_BLADE3))
{
- if (st.hasQuestItems(SENTRY_BLADE1, SENTRY_BLADE2, SENTRY_BLADE3))
- {
- st.takeItems(SENTRY_BLADE1, -1);
- st.setCond(3, true);
- htmltext = "30349-05.html";
- }
- break;
+ st.takeItems(SENTRY_BLADE1, -1);
+ st.setCond(3, true);
+ htmltext = "30349-05.html";
}
- case 3:
+ break;
+ }
+ case 3:
+ {
+ if (hasAtLeastOneQuestItem(player, SENTRY_BLADE2, SENTRY_BLADE3))
{
- if (hasAtLeastOneQuestItem(player, SENTRY_BLADE2, SENTRY_BLADE3))
- {
- htmltext = "30349-07.html";
- }
- break;
+ htmltext = "30349-07.html";
}
- case 4:
+ break;
+ }
+ case 4:
+ {
+ if (st.getQuestItemsCount(OLD_BRONZE_SWORD) >= 2)
{
- if (st.getQuestItemsCount(OLD_BRONZE_SWORD) >= 2)
- {
- st.giveAdena(820, true);
- st.exitQuest(false, true);
- htmltext = "30349-07.html";
- }
- break;
+ st.giveAdena(820, true);
+ st.exitQuest(false, true);
+ htmltext = "30349-07.html";
}
+ break;
}
- break;
- }
- case State.COMPLETED:
- {
- htmltext = getAlreadyCompletedMsg(player);
- break;
}
+ break;
}
- break;
- }
- case HARANT:
- {
- if (st.isCond(1) && st.hasQuestItems(JENNAS_LETTER))
- {
- st.takeItems(JENNAS_LETTER, -1);
- st.giveItems(SENTRY_BLADE1, 1);
- st.giveItems(SENTRY_BLADE2, 1);
- st.giveItems(SENTRY_BLADE3, 1);
- st.setCond(2, true);
- htmltext = "30360-01.html";
- }
- else if (st.isCond(2))
+ case State.COMPLETED:
{
- htmltext = "30360-02.html";
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
- break;
}
- case ROSELYN:
- case KRISTIN:
+ break;
+ }
+ case HARANT:
+ {
+ if (st.isCond(1) && st.hasQuestItems(JENNAS_LETTER))
{
- if (st.isCond(3) && st.hasQuestItems(SENTRIES.get(npc.getId())))
- {
- st.takeItems(SENTRIES.get(npc.getId()), -1);
- st.giveItems(OLD_BRONZE_SWORD, 1);
- if (st.getQuestItemsCount(OLD_BRONZE_SWORD) >= 2)
- {
- st.setCond(4, true);
- }
- htmltext = npc.getId() + "-01.html";
- }
- else if (!st.hasQuestItems(SENTRIES.get(npc.getId())) && st.hasQuestItems(OLD_BRONZE_SWORD))
+ st.takeItems(JENNAS_LETTER, -1);
+ st.giveItems(SENTRY_BLADE1, 1);
+ st.giveItems(SENTRY_BLADE2, 1);
+ st.giveItems(SENTRY_BLADE3, 1);
+ st.setCond(2, true);
+ htmltext = "30360-01.html";
+ }
+ else if (st.isCond(2))
+ {
+ htmltext = "30360-02.html";
+ }
+ break;
+ }
+ case ROSELYN:
+ case KRISTIN:
+ {
+ if (st.isCond(3) && st.hasQuestItems(SENTRIES.get(npc.getId())))
+ {
+ st.takeItems(SENTRIES.get(npc.getId()), -1);
+ st.giveItems(OLD_BRONZE_SWORD, 1);
+ if (st.getQuestItemsCount(OLD_BRONZE_SWORD) >= 2)
{
- htmltext = npc.getId() + "-02.html";
+ st.setCond(4, true);
}
- break;
+ htmltext = npc.getId() + "-01.html";
+ }
+ else if (!st.hasQuestItems(SENTRIES.get(npc.getId())) && st.hasQuestItems(OLD_BRONZE_SWORD))
+ {
+ htmltext = npc.getId() + "-02.html";
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
index 142497f239..2e81849e3a 100644
--- a/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
+++ b/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java
@@ -18,8 +18,8 @@
*/
package quests.Q00169_OffspringOfNightmares;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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,36 +112,33 @@ public class Q00169_OffspringOfNightmares extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
+ {
+ htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30145-02.htm" : "30145-01.htm" : "30145-00.htm";
+ break;
+ }
+ case State.STARTED:
{
- case State.CREATED:
+ if (st.hasQuestItems(CRACKED_SKULL) && !st.hasQuestItems(PERFECT_SKULL))
{
- htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30145-02.htm" : "30145-01.htm" : "30145-00.htm";
- break;
+ htmltext = "30145-05.html";
}
- case State.STARTED:
+ else if (st.isCond(2) && st.hasQuestItems(PERFECT_SKULL))
{
- if (st.hasQuestItems(CRACKED_SKULL) && !st.hasQuestItems(PERFECT_SKULL))
- {
- htmltext = "30145-05.html";
- }
- else if (st.isCond(2) && st.hasQuestItems(PERFECT_SKULL))
- {
- htmltext = "30145-06.html";
- }
- else if (!st.hasQuestItems(CRACKED_SKULL, PERFECT_SKULL))
- {
- htmltext = "30145-04.html";
- }
- break;
+ htmltext = "30145-06.html";
}
- case State.COMPLETED:
+ else if (!st.hasQuestItems(CRACKED_SKULL, PERFECT_SKULL))
{
- htmltext = getAlreadyCompletedMsg(player);
- break;
+ htmltext = "30145-04.html";
}
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
index 48cbe83fe2..062a8deb63 100644
--- a/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
+++ b/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java
@@ -91,11 +91,6 @@ public class Q00170_DangerousSeduction extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java b/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
index 3ddcd366ff..d789497f68 100644
--- a/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
+++ b/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java
@@ -81,11 +81,6 @@ public class Q00172_NewHorizons extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ZENYA:
diff --git a/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java b/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
index a822985156..5ae5a72950 100644
--- a/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
+++ b/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java
@@ -18,8 +18,6 @@
*/
package quests.Q00173_ToTheIsleOfSouls;
-import quests.Q00172_NewHorizons.Q00172_NewHorizons;
-
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -27,6 +25,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00172_NewHorizons.Q00172_NewHorizons;
+
/**
* To the Isle of Souls (173)
* @author malyelfik
@@ -90,11 +90,6 @@ public class Q00173_ToTheIsleOfSouls extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case GALLADUCCI:
diff --git a/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java b/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
index 707fabf54c..37f600862f 100644
--- a/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
+++ b/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java
@@ -82,11 +82,6 @@ public class Q00174_SupplyCheck extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case MARCELA:
diff --git a/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java b/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
index 785a770198..49567866d2 100644
--- a/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
+++ b/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java
@@ -62,11 +62,6 @@ public class Q00176_StepsForHonor extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java b/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
index d9c18a1b29..aee5d94ce6 100644
--- a/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
+++ b/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
@@ -89,11 +89,6 @@ public class Q00179_IntoTheLargeCavern extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (npc.getId() == KEKROPUS)
{
switch (st.getState())
diff --git a/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java b/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
index ebba4d5b48..788960ff15 100644
--- a/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
+++ b/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java
@@ -188,10 +188,6 @@ public final class Q00234_FatesWhisper extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case ZENKIN:
diff --git a/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
index 56cf4e152b..4d3b638c25 100644
--- a/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
+++ b/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java
@@ -18,15 +18,15 @@
*/
package quests.Q00237_WindsOfChange;
-import quests.Q00238_SuccessFailureOfBusiness.Q00238_SuccessFailureOfBusiness;
-import quests.Q00239_WontYouJoinUs.Q00239_WontYouJoinUs;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00238_SuccessFailureOfBusiness.Q00238_SuccessFailureOfBusiness;
+import quests.Q00239_WontYouJoinUs.Q00239_WontYouJoinUs;
+
/**
* Winds of Change (237)<br>
* Original Jython script by Bloodshed.
@@ -155,11 +155,6 @@ public class Q00237_WindsOfChange extends Quest
{
String htmltext = getNoQuestMsg(talker);
final QuestState st = getQuestState(talker, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case FLAUEN:
diff --git a/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
index 9fbd7aa59b..c40c03b3fa 100644
--- a/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
+++ b/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java
@@ -18,9 +18,6 @@
*/
package quests.Q00238_SuccessFailureOfBusiness;
-import quests.Q00237_WindsOfChange.Q00237_WindsOfChange;
-import quests.Q00239_WontYouJoinUs.Q00239_WontYouJoinUs;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -28,6 +25,9 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00237_WindsOfChange.Q00237_WindsOfChange;
+import quests.Q00239_WontYouJoinUs.Q00239_WontYouJoinUs;
+
/**
* Success/Failure Of Business (238)<br>
* Original Jython script by Bloodshed.
@@ -141,11 +141,6 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
{
String htmltext = getNoQuestMsg(talker);
final QuestState st = getQuestState(talker, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
index 9640d6b4f3..b84605fad2 100644
--- a/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
+++ b/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java
@@ -18,9 +18,6 @@
*/
package quests.Q00239_WontYouJoinUs;
-import quests.Q00237_WindsOfChange.Q00237_WindsOfChange;
-import quests.Q00238_SuccessFailureOfBusiness.Q00238_SuccessFailureOfBusiness;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -28,6 +25,9 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00237_WindsOfChange.Q00237_WindsOfChange;
+import quests.Q00238_SuccessFailureOfBusiness.Q00238_SuccessFailureOfBusiness;
+
/**
* Won't You Join Us (239)<br>
* Original Jython script by Bloodshed.
@@ -141,11 +141,6 @@ public class Q00239_WontYouJoinUs extends Quest
{
String htmltext = getNoQuestMsg(talker);
final QuestState st = getQuestState(talker, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
index 2b28a3ef86..f3f96d3358 100644
--- a/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
+++ b/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -109,11 +109,6 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java b/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
index 2b7e441938..350269a508 100644
--- a/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
+++ b/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
@@ -263,10 +263,6 @@ public class Q00241_PossessorOfAPreciousSoul1 extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return getNoQuestMsg(player);
- }
if (st.isStarted() && !player.isSubClassActive())
{
return "no_sub.html";
diff --git a/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java b/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
index 45baada4c8..c42a6c40ba 100644
--- a/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
+++ b/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
@@ -167,10 +167,6 @@ public class Q00242_PossessorOfAPreciousSoul2 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
if (st.isStarted() && !player.isSubClassActive())
{
return "no_sub.html";
diff --git a/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java b/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
index 5a9268e246..38de69afcb 100644
--- a/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
+++ b/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
@@ -255,10 +255,6 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
if (st.isStarted() && !player.isSubClassActive())
{
return "no_sub.html";
diff --git a/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java b/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
index ccf253a1c8..62b9821451 100644
--- a/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
+++ b/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
@@ -101,10 +101,6 @@ public class Q00247_PossessorOfAPreciousSoul4 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
if (st.isStarted() && !player.isSubClassActive())
{
return "no_sub.html";
diff --git a/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java b/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
index 435ed640e0..70b9938fbd 100644
--- a/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
+++ b/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
@@ -73,11 +73,6 @@ public class Q00249_PoisonedPlainsOfTheLizardmen extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (npc.getId() == MOUEN)
{
switch (st.getState())
diff --git a/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java b/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
index 4b0614a958..4c2598218a 100644
--- a/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
+++ b/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
@@ -140,11 +140,6 @@ public class Q00250_WatchWhatYouEat extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (npc.getId() == SALLY)
{
switch (st.getState())
diff --git a/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java b/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
index e9259ec549..9c435e1c9e 100644
--- a/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
+++ b/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
@@ -119,11 +119,6 @@ public class Q00251_NoSecrets extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
index f701381ec0..5c32c80806 100644
--- a/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
+++ b/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java
@@ -106,11 +106,6 @@ public class Q00254_LegendaryTales extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
index a3aabc6d4f..4ee3e30f07 100644
--- a/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
+++ b/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java
@@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -33,6 +31,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+
/**
* The Guard is Busy (257)
* @author xban1x
@@ -151,11 +151,6 @@ public final class Q00257_TheGuardIsBusy extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
index 4ba778bd49..ffe2a4bfd0 100644
--- a/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
+++ b/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java
@@ -103,11 +103,6 @@ public final class Q00258_BringWolfPelts extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
index 1d648c75f9..cfa542420b 100644
--- a/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
+++ b/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java
@@ -141,11 +141,6 @@ public final class Q00259_RequestFromTheFarmOwner extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case EDMOND:
diff --git a/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
index fb247db123..eb449e12b8 100644
--- a/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
+++ b/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java
@@ -21,16 +21,16 @@ package quests.Q00260_OrcHunting;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+
/**
* Orc Hunting (260)
* @author xban1x
@@ -115,11 +115,6 @@ public final class Q00260_OrcHunting extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
index d170d78fdb..3bc9147615 100644
--- a/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
+++ b/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java
@@ -91,11 +91,6 @@ public final class Q00261_CollectorsDream extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
index 3a33c318d3..1a9d8b6f70 100644
--- a/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
+++ b/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java
@@ -103,11 +103,6 @@ public final class Q00262_TradeWithTheIvoryTower extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
index 25668bf32d..4c7590c061 100644
--- a/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
+++ b/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java
@@ -21,8 +21,8 @@ package quests.Q00263_OrcSubjugation;
import java.util.HashMap;
import java.util.Map;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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,11 +111,6 @@ public final class Q00263_OrcSubjugation extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
index 0a615a54d7..59f1171488 100644
--- a/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
+++ b/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java
@@ -110,11 +110,6 @@ public final class Q00264_KeenClaws extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
index fe4779e83e..9271f8d3a6 100644
--- a/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
+++ b/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java
@@ -21,16 +21,16 @@ package quests.Q00265_BondsOfSlavery;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+
/**
* Bonds of Slavery (265)
* @author xban1x
@@ -110,11 +110,6 @@ public final class Q00265_BondsOfSlavery extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
index c2098a2532..73507e7508 100644
--- a/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
+++ b/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java
@@ -23,8 +23,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
@@ -111,10 +111,6 @@ public final class Q00266_PleasOfPixies extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
index af1760020d..d73cac3354 100644
--- a/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
+++ b/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java
@@ -18,8 +18,8 @@
*/
package quests.Q00267_WrathOfVerdure;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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,34 +100,31 @@ public final class Q00267_WrathOfVerdure extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL) ? "31853-03.htm" : "31853-02.htm" : "31853-01.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL) ? "31853-03.htm" : "31853-02.htm" : "31853-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (st.hasQuestItems(GOBLIN_CLUB))
{
- if (st.hasQuestItems(GOBLIN_CLUB))
- {
- final long count = st.getQuestItemsCount(GOBLIN_CLUB);
- st.rewardItems(SILVERY_LEAF, count);
- if (count >= 10)
- {
- st.giveAdena(600, true);
- }
- st.takeItems(GOBLIN_CLUB, -1);
- htmltext = "31853-06.html";
- }
- else
+ final long count = st.getQuestItemsCount(GOBLIN_CLUB);
+ st.rewardItems(SILVERY_LEAF, count);
+ if (count >= 10)
{
- htmltext = "31853-05.html";
+ st.giveAdena(600, true);
}
- break;
+ st.takeItems(GOBLIN_CLUB, -1);
+ htmltext = "31853-06.html";
+ }
+ else
+ {
+ htmltext = "31853-05.html";
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java b/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
index 1bb09135b7..bfabe5c3ed 100644
--- a/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
+++ b/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java
@@ -90,38 +90,35 @@ public final class Q00268_TracesOfEvil extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getLevel() >= MIN_LVL) ? "30559-02.htm" : "30559-01.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getLevel() >= MIN_LVL) ? "30559-02.htm" : "30559-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
{
- case 1:
- {
- htmltext = (!st.hasQuestItems(CONTAMINATED_KASHA_SPIDER_VENOM)) ? "30559-04.html" : "30559-05.html";
- break;
- }
- case 2:
+ htmltext = (!st.hasQuestItems(CONTAMINATED_KASHA_SPIDER_VENOM)) ? "30559-04.html" : "30559-05.html";
+ break;
+ }
+ case 2:
+ {
+ if (st.getQuestItemsCount(CONTAMINATED_KASHA_SPIDER_VENOM) >= 30)
{
- if (st.getQuestItemsCount(CONTAMINATED_KASHA_SPIDER_VENOM) >= 30)
- {
- st.giveAdena(2474, true);
- st.addExpAndSp(8738, 409);
- st.exitQuest(true, true);
- htmltext = "30559-06.html";
- }
- break;
+ st.giveAdena(2474, true);
+ st.addExpAndSp(8738, 409);
+ st.exitQuest(true, true);
+ htmltext = "30559-06.html";
}
+ break;
}
- break;
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
index 90928e772f..c9bd7d8c76 100644
--- a/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
+++ b/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
@@ -18,8 +18,6 @@
*/
package quests.Q00270_TheOneWhoEndsSilence;
-import quests.Q10288_SecretMission.Q10288_SecretMission;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -28,6 +26,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.util.Util;
+import quests.Q10288_SecretMission.Q10288_SecretMission;
+
/**
* The One Who Ends Silence (270)
* @author Zoey76
@@ -339,11 +339,6 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
index 8baa89b097..9da6949a14 100644
--- a/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
+++ b/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java
@@ -18,8 +18,8 @@
*/
package quests.Q00271_ProofOfValor;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
@@ -92,46 +92,43 @@ public final class Q00271_ProofOfValor extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = null;
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? (hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR, NECKLACE_OF_COURAGE)) ? "30577-07.htm" : "30577-03.htm" : "30577-02.htm" : "30577-01.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? (hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR, NECKLACE_OF_COURAGE)) ? "30577-07.htm" : "30577-03.htm" : "30577-02.htm" : "30577-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
{
- case 1:
- {
- htmltext = "30577-05.html";
- break;
- }
- case 2:
+ htmltext = "30577-05.html";
+ break;
+ }
+ case 2:
+ {
+ if (st.getQuestItemsCount(KASHA_WOLF_FANG) >= 50)
{
- if (st.getQuestItemsCount(KASHA_WOLF_FANG) >= 50)
+ if (getRandom(100) <= 13)
+ {
+ st.rewardItems(NECKLACE_OF_VALOR, 1);
+ st.rewardItems(HEALING_POTION, 10);
+ }
+ else
{
- if (getRandom(100) <= 13)
- {
- st.rewardItems(NECKLACE_OF_VALOR, 1);
- st.rewardItems(HEALING_POTION, 10);
- }
- else
- {
- st.rewardItems(NECKLACE_OF_COURAGE, 1);
- }
- st.takeItems(KASHA_WOLF_FANG, -1);
- st.exitQuest(true, true);
- htmltext = "30577-06.html";
+ st.rewardItems(NECKLACE_OF_COURAGE, 1);
}
- break;
+ st.takeItems(KASHA_WOLF_FANG, -1);
+ st.exitQuest(true, true);
+ htmltext = "30577-06.html";
}
+ break;
}
- break;
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
index 00bb32e9c0..d926485bcb 100644
--- a/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
+++ b/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java
@@ -18,8 +18,8 @@
*/
package quests.Q00272_WrathOfAncestors;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
@@ -90,34 +90,31 @@ public final class Q00272_WrathOfAncestors extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = null;
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30572-03.htm" : "30572-02.htm" : "30572-01.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30572-03.htm" : "30572-02.htm" : "30572-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
+ {
+ htmltext = "30572-05.html";
+ break;
+ }
+ case 2:
{
- case 1:
- {
- htmltext = "30572-05.html";
- break;
- }
- case 2:
- {
- st.giveAdena(1500, true);
- st.exitQuest(true, true);
- htmltext = "30572-06.html";
- break;
- }
+ st.giveAdena(1500, true);
+ st.exitQuest(true, true);
+ htmltext = "30572-06.html";
+ break;
}
- break;
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
index 2dabe54cf9..f8aebd7254 100644
--- a/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
+++ b/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java
@@ -21,16 +21,16 @@ package quests.Q00273_InvadersOfTheHolyLand;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+
/**
* Invaders of the Holy Land (273)
* @author xban1x
@@ -117,32 +117,29 @@ public final class Q00273_InvadersOfTheHolyLand extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = null;
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
+ {
+ htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30566-03.htm" : "30566-02.htm" : "30566-01.htm";
+ break;
+ }
+ case State.STARTED:
{
- case State.CREATED:
+ if (hasAtLeastOneQuestItem(player, BLACK_SOULSTONE, RED_SOULSTONE))
{
- htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30566-03.htm" : "30566-02.htm" : "30566-01.htm";
- break;
+ final long black = st.getQuestItemsCount(BLACK_SOULSTONE);
+ final long red = st.getQuestItemsCount(RED_SOULSTONE);
+ st.giveAdena((red * 10) + (black * 3) + ((red > 0) ? (((red + black) >= 10) ? 1800 : 0) : ((black >= 10) ? 1500 : 0)), true);
+ takeItems(player, -1, BLACK_SOULSTONE, RED_SOULSTONE);
+ Q00281_HeadForTheHills.giveNewbieReward(player);
+ htmltext = (red > 0) ? "30566-07.html" : "30566-06.html";
}
- case State.STARTED:
+ else
{
- if (hasAtLeastOneQuestItem(player, BLACK_SOULSTONE, RED_SOULSTONE))
- {
- final long black = st.getQuestItemsCount(BLACK_SOULSTONE);
- final long red = st.getQuestItemsCount(RED_SOULSTONE);
- st.giveAdena((red * 10) + (black * 3) + ((red > 0) ? (((red + black) >= 10) ? 1800 : 0) : ((black >= 10) ? 1500 : 0)), true);
- takeItems(player, -1, BLACK_SOULSTONE, RED_SOULSTONE);
- Q00281_HeadForTheHills.giveNewbieReward(player);
- htmltext = (red > 0) ? "30566-07.html" : "30566-06.html";
- }
- else
- {
- htmltext = "30566-05.html";
- }
- break;
+ htmltext = "30566-05.html";
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
index 8fe1159054..ca779fd873 100644
--- a/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
+++ b/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java
@@ -18,8 +18,8 @@
*/
package quests.Q00274_SkirmishWithTheWerewolves;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
@@ -97,11 +97,6 @@ public final class Q00274_SkirmishWithTheWerewolves extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
index 40be011e44..3d5c6cbbb0 100644
--- a/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
+++ b/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java
@@ -129,11 +129,6 @@ public final class Q00275_DarkWingedSpies extends Quest
{
final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
index e149f23768..669e8021d1 100644
--- a/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
+++ b/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java
@@ -21,8 +21,6 @@ package quests.Q00276_TotemOfTheHestui;
import java.util.ArrayList;
import java.util.List;
-import quests.Q00261_CollectorsDream.Q00261_CollectorsDream;
-
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -32,6 +30,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.util.Util;
+import quests.Q00261_CollectorsDream.Q00261_CollectorsDream;
+
/**
* Totem of the Hestui (276)
* @author xban1x
@@ -133,11 +133,6 @@ public final class Q00276_TotemOfTheHestui extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
index 1d0e12e5da..4c16624336 100644
--- a/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
+++ b/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java
@@ -91,11 +91,6 @@ public class Q00277_GatekeepersOffering extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
index 02da6ea653..de4b9f7421 100644
--- a/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
+++ b/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
@@ -174,11 +174,6 @@ public class Q00278_HomeSecurity extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (st.isCreated())
{
htmltext = "31537-01.htm";
diff --git a/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java b/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
index 6853d294e4..c4de9f34c8 100644
--- a/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
+++ b/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
@@ -124,11 +124,6 @@ public final class Q00279_TargetOfOpportunity extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (st.getState() == State.CREATED)
{
htmltext = (player.getLevel() >= 82) ? "32302-01.htm" : "32302-02.html";
diff --git a/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java b/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
index 6da295c9f6..95c3a3df15 100644
--- a/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
+++ b/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java
@@ -176,11 +176,6 @@ public final class Q00280_TheFoodChain extends Quest
{
final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java b/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
index 03221b320f..d98bd286ba 100644
--- a/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
+++ b/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java
@@ -173,11 +173,6 @@ public final class Q00281_HeadForTheHills extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java b/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
index 894f9439a0..e001f5f58c 100644
--- a/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
+++ b/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java
@@ -18,14 +18,14 @@
*/
package quests.Q00283_TheFewTheProudTheBrave;
-import quests.Q00261_CollectorsDream.Q00261_CollectorsDream;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00261_CollectorsDream.Q00261_CollectorsDream;
+
/**
* The Few, The Proud, The Brave (283)
* @author xban1x
@@ -117,11 +117,6 @@ public final class Q00283_TheFewTheProudTheBrave extends Quest
{
final QuestState st = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java b/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
index e8aa01eccf..b9f8491d9a 100644
--- a/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
+++ b/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
@@ -21,8 +21,6 @@ package quests.Q00287_FiguringItOut;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00250_WatchWhatYouEat.Q00250_WatchWhatYouEat;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -31,6 +29,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00250_WatchWhatYouEat.Q00250_WatchWhatYouEat;
+
/**
* Figuring It Out! (287)
* @author malyelfik
@@ -184,12 +184,6 @@ public class Q00287_FiguringItOut extends Quest
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
final QuestState prev = player.getQuestState(Q00250_WatchWhatYouEat.class.getSimpleName());
-
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java b/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
index f1b1c8fa75..a2ff8eac89 100644
--- a/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
+++ b/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
@@ -189,11 +189,6 @@ public class Q00288_HandleWithCare extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java b/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
index b1ee14e911..df2918ce81 100644
--- a/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
+++ b/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
@@ -18,8 +18,6 @@
*/
package quests.Q00289_NoMoreSoupForYou;
-import quests.Q00252_ItSmellsDelicious.Q00252_ItSmellsDelicious;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -28,6 +26,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.util.Util;
+import quests.Q00252_ItSmellsDelicious.Q00252_ItSmellsDelicious;
+
/**
* No More Soup For You (289)
* @author kostantinos
@@ -238,11 +238,6 @@ public class Q00289_NoMoreSoupForYou extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (npc.getId() == STAN)
{
switch (st.getState())
diff --git a/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java b/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
index 2397ec6ba8..2e1928c7b7 100644
--- a/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
+++ b/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
@@ -21,8 +21,6 @@ package quests.Q00290_ThreatRemoval;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00251_NoSecrets.Q00251_NoSecrets;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -31,6 +29,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00251_NoSecrets.Q00251_NoSecrets;
+
/**
* Threat Removal (290)
* @author Adry_85
@@ -199,11 +199,6 @@ public class Q00290_ThreatRemoval extends Quest
{
QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
index 1efa53a674..da622cb4e9 100644
--- a/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
+++ b/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
@@ -18,16 +18,16 @@
*/
package quests.Q00293_TheHiddenVeins;
-import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
-
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+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;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
+
/**
* The Hidden Veins (293)
* @author xban1x
@@ -133,11 +133,6 @@ public final class Q00293_TheHiddenVeins extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case FILAUR:
diff --git a/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
index b9c443c94a..1bfa3bb9e2 100644
--- a/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
+++ b/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
@@ -91,11 +91,6 @@ public class Q00297_GatekeepersFavor extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
index 01b2e5cca4..2883a8e482 100644
--- a/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
+++ b/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java
@@ -146,11 +146,6 @@ public final class Q00300_HuntingLetoLizardman extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
index a79f4cdf05..699d77b6f4 100644
--- a/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
+++ b/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java
@@ -81,11 +81,6 @@ public final class Q00303_CollectArrowheads extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
index 0f04902a7e..3da26994bf 100644
--- a/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
+++ b/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java
@@ -127,11 +127,6 @@ public final class Q00306_CrystalOfFireAndIce extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 ce74965e5e..89f66d881b 100644
--- a/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
+++ b/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
@@ -172,11 +172,6 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 10b383e473..0431b881e3 100644
--- a/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
+++ b/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
@@ -21,9 +21,6 @@ package quests.Q00308_ReedFieldMaintenance;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00238_SuccessFailureOfBusiness.Q00238_SuccessFailureOfBusiness;
-import quests.Q00309_ForAGoodCause.Q00309_ForAGoodCause;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -33,6 +30,9 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.network.serverpackets.RadarControl;
import com.l2jserver.gameserver.util.Util;
+import quests.Q00238_SuccessFailureOfBusiness.Q00238_SuccessFailureOfBusiness;
+import quests.Q00309_ForAGoodCause.Q00309_ForAGoodCause;
+
/**
* Reed Field Maintenance (308)<br>
* Original Jython script by Bloodshed.
@@ -240,11 +240,6 @@ public class Q00308_ReedFieldMaintenance extends Quest
{
String htmltext = getNoQuestMsg(talker);
final QuestState st = getQuestState(talker, true);
- if (st == null)
- {
- return htmltext;
- }
-
final QuestState q309 = talker.getQuestState(Q00309_ForAGoodCause.class.getSimpleName());
if ((q309 != null) && q309.isStarted())
{
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 0e83c2fea0..f7598fc36c 100644
--- a/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
+++ b/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
@@ -21,9 +21,6 @@ package quests.Q00309_ForAGoodCause;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00239_WontYouJoinUs.Q00239_WontYouJoinUs;
-import quests.Q00308_ReedFieldMaintenance.Q00308_ReedFieldMaintenance;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -33,6 +30,9 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.network.serverpackets.RadarControl;
import com.l2jserver.gameserver.util.Util;
+import quests.Q00239_WontYouJoinUs.Q00239_WontYouJoinUs;
+import quests.Q00308_ReedFieldMaintenance.Q00308_ReedFieldMaintenance;
+
/**
* For A Good Cause (309)
* @author nonom, Zoey76, Joxit
@@ -243,11 +243,6 @@ public class Q00309_ForAGoodCause extends Quest
{
String htmltext = getNoQuestMsg(talker);
final QuestState st = getQuestState(talker, true);
- if (st == null)
- {
- return htmltext;
- }
-
final QuestState q308 = talker.getQuestState(Q00308_ReedFieldMaintenance.class.getSimpleName());
if ((q308 != null) && q308.isStarted())
{
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 5c0c8c81aa..2514be1b79 100644
--- a/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -21,8 +21,6 @@ package quests.Q00310_OnlyWhatRemains;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00240_ImTheOnlyOneYouCanTrust.Q00240_ImTheOnlyOneYouCanTrust;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00240_ImTheOnlyOneYouCanTrust.Q00240_ImTheOnlyOneYouCanTrust;
+
/**
* Only What Remains (310)<br>
* Original Jython script by Gnacik
@@ -133,12 +133,6 @@ public class Q00310_OnlyWhatRemains extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 b933a0af4d..3d25d877f4 100644
--- a/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
+++ b/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java
@@ -158,11 +158,6 @@ public final class Q00311_ExpulsionOfEvilSpirits extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
if (qs.isCreated())
{
htmltext = (player.getLevel() >= MIN_LEVEL) ? "32655-01.htm" : "32655-02.htm";
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 783a0673df..efb2a52ec4 100644
--- a/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
+++ b/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java
@@ -118,11 +118,6 @@ public class Q00312_TakeAdvantageOfTheCrisis extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
index 921d59539e..04c8037145 100644
--- a/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
+++ b/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java
@@ -98,11 +98,6 @@ public final class Q00313_CollectSpores extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
index 0d896b995a..4faef66752 100644
--- a/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
+++ b/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java
@@ -135,11 +135,6 @@ public final class Q00316_DestroyPlagueCarriers extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
if (qs.isCreated())
{
if (player.getRace() != Race.ELF)
diff --git a/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
index 776e9f48ec..295c31091c 100644
--- a/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
+++ b/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java
@@ -111,11 +111,6 @@ public final class Q00317_CatchTheWind extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
if (qs.isCreated())
{
htmltext = ((player.getLevel() >= MIN_LEVEL) ? "30361-03.htm" : "30361-02.htm");
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 b66a5cca8d..5893ad3c5b 100644
--- a/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
+++ b/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java
@@ -106,11 +106,6 @@ public class Q00319_ScentOfDeath extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return getNoQuestMsg(player);
- }
-
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{
diff --git a/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
index df455e1de7..74813ddc22 100644
--- a/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
+++ b/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java
@@ -83,11 +83,6 @@ public final class Q00320_BonesTellTheFuture extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 885cd08e66..89007c8929 100644
--- a/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
+++ b/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java
@@ -81,29 +81,26 @@ public class Q00324_SweetestVenom extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
+ {
+ htmltext = player.getLevel() < MIN_LVL ? "30351-02.html" : "30351-03.htm";
+ break;
+ }
+ case State.STARTED:
{
- case State.CREATED:
+ if (st.isCond(2))
{
- htmltext = player.getLevel() < MIN_LVL ? "30351-02.html" : "30351-03.htm";
- break;
+ st.giveAdena(ADENA_COUNT, true);
+ st.exitQuest(true, true);
+ htmltext = "30351-06.html";
}
- case State.STARTED:
+ else
{
- if (st.isCond(2))
- {
- st.giveAdena(ADENA_COUNT, true);
- st.exitQuest(true, true);
- htmltext = "30351-06.html";
- }
- else
- {
- htmltext = "30351-05.html";
- }
- break;
+ htmltext = "30351-05.html";
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
index 9fe7b5e090..a314d74b4d 100644
--- a/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
+++ b/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java
@@ -221,11 +221,6 @@ public final class Q00325_GrimCollector extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case GUARD_CURTIZ:
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 33e00d9354..478ce4d6b3 100644
--- a/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
+++ b/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
@@ -116,38 +116,35 @@ public final class Q00326_VanquishRemnants extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
- String htmltext = null;
- if (st != null)
+ String htmltext = getNoQuestMsg(player);
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getLevel() >= MIN_LVL) ? "30435-02.htm" : "30435-01.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getLevel() >= MIN_LVL) ? "30435-02.htm" : "30435-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ final long red_badges = st.getQuestItemsCount(RED_CROSS_BADGE);
+ final long blue_badges = st.getQuestItemsCount(BLUE_CROSS_BADGE);
+ final long black_badges = st.getQuestItemsCount(BLACK_CROSS_BADGE);
+ final long sum = red_badges + blue_badges + black_badges;
+ if (sum > 0)
{
- final long red_badges = st.getQuestItemsCount(RED_CROSS_BADGE);
- final long blue_badges = st.getQuestItemsCount(BLUE_CROSS_BADGE);
- final long black_badges = st.getQuestItemsCount(BLACK_CROSS_BADGE);
- final long sum = red_badges + blue_badges + black_badges;
- if (sum > 0)
- {
- if ((sum >= 100) && !st.hasQuestItems(BLACK_LION_MARK))
- {
- st.giveItems(BLACK_LION_MARK, 1);
- }
- st.giveAdena(((red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0)), true);
- takeItems(player, -1, RED_CROSS_BADGE, BLUE_CROSS_BADGE, BLACK_CROSS_BADGE);
- htmltext = (sum >= 100) ? (st.hasQuestItems(BLACK_LION_MARK)) ? "30435-09.html" : "30435-06.html" : "30435-05.html";
- }
- else
+ if ((sum >= 100) && !st.hasQuestItems(BLACK_LION_MARK))
{
- htmltext = "30435-04.html";
+ st.giveItems(BLACK_LION_MARK, 1);
}
- break;
+ st.giveAdena(((red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0)), true);
+ takeItems(player, -1, RED_CROSS_BADGE, BLUE_CROSS_BADGE, BLACK_CROSS_BADGE);
+ htmltext = (sum >= 100) ? (st.hasQuestItems(BLACK_LION_MARK)) ? "30435-09.html" : "30435-06.html" : "30435-05.html";
+ }
+ else
+ {
+ htmltext = "30435-04.html";
}
+ break;
}
}
return htmltext;
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 fab7c1f910..f7b70c03f8 100644
--- a/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
+++ b/dist/game/data/scripts/quests/Q00327_RecoverTheFarmland/Q00327_RecoverTheFarmland.java
@@ -372,7 +372,6 @@ public final class Q00327_RecoverTheFarmland extends Quest
{
final QuestState st = getQuestState(player, true);
String html = getNoQuestMsg(player);
-
switch (npc.getId())
{
case LEIKAN:
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 64829ddf95..ea7bdc297b 100644
--- a/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
+++ b/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
@@ -102,32 +102,29 @@ public class Q00328_SenseForBusiness extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
+ {
+ htmltext = player.getLevel() < MIN_LVL ? "30436-01.htm" : "30436-02.htm";
+ break;
+ }
+ case State.STARTED:
{
- case State.CREATED:
+ final long carcass = st.getQuestItemsCount(MONSTER_EYE_CARCASS);
+ final long lens = st.getQuestItemsCount(MONSTER_EYE_LENS);
+ final long gizzards = st.getQuestItemsCount(BASILISK_GIZZARD);
+ if ((carcass + lens + gizzards) > 0)
{
- htmltext = player.getLevel() < MIN_LVL ? "30436-01.htm" : "30436-02.htm";
- break;
+ st.giveAdena(((carcass * MONSTER_EYE_CARCASS_ADENA) + (lens * MONSTER_EYE_LENS_ADENA) + (gizzards * BASILISK_GIZZARD_ADENA) + ((carcass + lens + gizzards) >= BONUS_COUNT ? BONUS : 0)), true);
+ takeItems(player, -1, MONSTER_EYE_CARCASS, MONSTER_EYE_LENS, BASILISK_GIZZARD);
+ htmltext = "30436-05.html";
}
- case State.STARTED:
+ else
{
- final long carcass = st.getQuestItemsCount(MONSTER_EYE_CARCASS);
- final long lens = st.getQuestItemsCount(MONSTER_EYE_LENS);
- final long gizzards = st.getQuestItemsCount(BASILISK_GIZZARD);
- if ((carcass + lens + gizzards) > 0)
- {
- st.giveAdena(((carcass * MONSTER_EYE_CARCASS_ADENA) + (lens * MONSTER_EYE_LENS_ADENA) + (gizzards * BASILISK_GIZZARD_ADENA) + ((carcass + lens + gizzards) >= BONUS_COUNT ? BONUS : 0)), true);
- takeItems(player, -1, MONSTER_EYE_CARCASS, MONSTER_EYE_LENS, BASILISK_GIZZARD);
- htmltext = "30436-05.html";
- }
- else
- {
- htmltext = "30436-04.html";
- }
- break;
+ htmltext = "30436-04.html";
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
index 3a687f188f..721b5d942e 100644
--- a/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
+++ b/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -121,11 +121,6 @@ public final class Q00329_CuriosityOfADwarf extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 c710d9634a..f0231d78c6 100644
--- a/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
+++ b/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
@@ -101,32 +101,29 @@ public class Q00331_ArrowOfVengeance extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
+ {
+ htmltext = player.getLevel() < MIN_LVL ? "30125-01.htm" : "30125-02.htm";
+ break;
+ }
+ case State.STARTED:
{
- case State.CREATED:
+ final long harpyFeathers = st.getQuestItemsCount(HARPY_FEATHER);
+ final long medusaVenoms = st.getQuestItemsCount(MEDUSA_VENOM);
+ final long wyrmsTeeth = st.getQuestItemsCount(WYRMS_TOOTH);
+ if ((harpyFeathers + medusaVenoms + wyrmsTeeth) > 0)
{
- htmltext = player.getLevel() < MIN_LVL ? "30125-01.htm" : "30125-02.htm";
- break;
+ st.giveAdena(((harpyFeathers * HARPY_FEATHER_ADENA) + (medusaVenoms * MEDUSA_VENOM_ADENA) + (wyrmsTeeth * WYRMS_TOOTH_ADENA) + ((harpyFeathers + medusaVenoms + wyrmsTeeth) >= BONUS_COUNT ? BONUS : 0)), true);
+ takeItems(player, -1, HARPY_FEATHER, MEDUSA_VENOM, WYRMS_TOOTH);
+ htmltext = "30125-05.html";
}
- case State.STARTED:
+ else
{
- final long harpyFeathers = st.getQuestItemsCount(HARPY_FEATHER);
- final long medusaVenoms = st.getQuestItemsCount(MEDUSA_VENOM);
- final long wyrmsTeeth = st.getQuestItemsCount(WYRMS_TOOTH);
- if ((harpyFeathers + medusaVenoms + wyrmsTeeth) > 0)
- {
- st.giveAdena(((harpyFeathers * HARPY_FEATHER_ADENA) + (medusaVenoms * MEDUSA_VENOM_ADENA) + (wyrmsTeeth * WYRMS_TOOTH_ADENA) + ((harpyFeathers + medusaVenoms + wyrmsTeeth) >= BONUS_COUNT ? BONUS : 0)), true);
- takeItems(player, -1, HARPY_FEATHER, MEDUSA_VENOM, WYRMS_TOOTH);
- htmltext = "30125-05.html";
- }
- else
- {
- htmltext = "30125-04.html";
- }
- break;
+ htmltext = "30125-04.html";
}
+ break;
}
}
return htmltext;
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 38561cde90..cd168e0add 100644
--- a/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
+++ b/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java
@@ -122,202 +122,199 @@ public final class Q00334_TheWishingPotion extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs != null)
+ switch (npc.getId())
{
- switch (npc.getId())
+ case TORAI:
{
- case TORAI:
+ if (qs.hasQuestItems(Q_FOBBIDEN_LOVE_SCROLL))
{
- if (qs.hasQuestItems(Q_FOBBIDEN_LOVE_SCROLL))
- {
- qs.giveAdena(500000, true);
- qs.takeItems(Q_FOBBIDEN_LOVE_SCROLL, 1);
- qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
- return "30557-01.html";
- }
- break;
+ qs.giveAdena(500000, true);
+ qs.takeItems(Q_FOBBIDEN_LOVE_SCROLL, 1);
+ qs.playSound(Sound.ITEMSOUND_QUEST_MIDDLE);
+ return "30557-01.html";
}
- case ALCHEMIST_MATILD:
+ break;
+ }
+ case ALCHEMIST_MATILD:
+ {
+ if (qs.isCreated())
{
- if (qs.isCreated())
- {
- if (player.getLevel() < 30)
- {
- return "30738-01.htm";
- }
- return "30738-02.html";
- }
- if (!qs.hasQuestItems(Q_SECRET_BOOK_OF_POTION) && qs.hasQuestItems(Q_ALCHEMY_TEXT))
- {
- return "30738-05.html";
- }
- if (qs.hasQuestItems(Q_SECRET_BOOK_OF_POTION) && qs.hasQuestItems(Q_ALCHEMY_TEXT))
- {
- return "30738-06.html";
- }
- if (qs.hasQuestItems(Q_POTION_RECIPE_1, Q_POTION_RECIPE_2) && (!qs.hasQuestItems(Q_AMBER_SCALE) || (qs.hasQuestItems(Q_WIND_SOULSTONE) && !qs.hasQuestItems(Q_GLASS_EYE))
- || (!qs.hasQuestItems(Q_HORROR_ECTOPLASM) || !qs.hasQuestItems(Q_SILENOS_HORN) || !qs.hasQuestItems(Q_ANT_SOLDIER_APHID) || !qs.hasQuestItems(Q_TYRANTS_CHITIN) || !qs.hasQuestItems(Q_BUGBEAR_BLOOD))))
- {
- return "30738-08.html";
- }
- if (qs.hasQuestItems(Q_POTION_RECIPE_1, Q_POTION_RECIPE_2, Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD))
+ if (player.getLevel() < 30)
{
- return "30738-09.html";
+ return "30738-01.htm";
}
- if (qs.hasQuestItems(Q_MATILDS_ORB) && !qs.hasQuestItems(Q_POTION_RECIPE_1) && !qs.hasQuestItems(Q_POTION_RECIPE_2) && (!qs.hasQuestItems(Q_AMBER_SCALE) || (qs.hasQuestItems(Q_WIND_SOULSTONE) && !qs.hasQuestItems(Q_GLASS_EYE)) || !qs.hasQuestItems(Q_HORROR_ECTOPLASM)
- || !qs.hasQuestItems(Q_SILENOS_HORN) || !qs.hasQuestItems(Q_ANT_SOLDIER_APHID) || !qs.hasQuestItems(Q_TYRANTS_CHITIN) || !qs.hasQuestItems(Q_BUGBEAR_BLOOD)))
- {
- return "30738-12.html";
- }
- break;
+ return "30738-02.html";
}
- case FAIRY_RUPINA:
+ if (!qs.hasQuestItems(Q_SECRET_BOOK_OF_POTION) && qs.hasQuestItems(Q_ALCHEMY_TEXT))
{
- if (qs.getInt(FLAG) == 1)
+ return "30738-05.html";
+ }
+ if (qs.hasQuestItems(Q_SECRET_BOOK_OF_POTION) && qs.hasQuestItems(Q_ALCHEMY_TEXT))
+ {
+ return "30738-06.html";
+ }
+ if (qs.hasQuestItems(Q_POTION_RECIPE_1, Q_POTION_RECIPE_2) && (!qs.hasQuestItems(Q_AMBER_SCALE) || (qs.hasQuestItems(Q_WIND_SOULSTONE) && !qs.hasQuestItems(Q_GLASS_EYE))
+ || (!qs.hasQuestItems(Q_HORROR_ECTOPLASM) || !qs.hasQuestItems(Q_SILENOS_HORN) || !qs.hasQuestItems(Q_ANT_SOLDIER_APHID) || !qs.hasQuestItems(Q_TYRANTS_CHITIN) || !qs.hasQuestItems(Q_BUGBEAR_BLOOD))))
+ {
+ return "30738-08.html";
+ }
+ if (qs.hasQuestItems(Q_POTION_RECIPE_1, Q_POTION_RECIPE_2, Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD))
+ {
+ return "30738-09.html";
+ }
+ if (qs.hasQuestItems(Q_MATILDS_ORB) && !qs.hasQuestItems(Q_POTION_RECIPE_1) && !qs.hasQuestItems(Q_POTION_RECIPE_2) && (!qs.hasQuestItems(Q_AMBER_SCALE) || (qs.hasQuestItems(Q_WIND_SOULSTONE) && !qs.hasQuestItems(Q_GLASS_EYE)) || !qs.hasQuestItems(Q_HORROR_ECTOPLASM)
+ || !qs.hasQuestItems(Q_SILENOS_HORN) || !qs.hasQuestItems(Q_ANT_SOLDIER_APHID) || !qs.hasQuestItems(Q_TYRANTS_CHITIN) || !qs.hasQuestItems(Q_BUGBEAR_BLOOD)))
+ {
+ return "30738-12.html";
+ }
+ break;
+ }
+ case FAIRY_RUPINA:
+ {
+ if (qs.getInt(FLAG) == 1)
+ {
+ String html = null;
+ if ((getRandom(4) < 4))
{
- String html = null;
- if ((getRandom(4) < 4))
- {
- qs.giveItems(NECKLACE_OF_GRACE, 1);
- qs.set(FLAG, 0);
- html = "30742-01.html";
- }
- else
+ qs.giveItems(NECKLACE_OF_GRACE, 1);
+ qs.set(FLAG, 0);
+ html = "30742-01.html";
+ }
+ else
+ {
+ switch (getRandom(4))
{
- switch (getRandom(4))
+ case 0:
{
- case 0:
- {
- qs.giveItems(DEMONS_TUNIC_FABRIC, 1);
- break;
- }
- case 1:
- {
- qs.giveItems(DEMONS_HOSE_PATTERN, 1);
- break;
- }
- case 2:
- {
- qs.giveItems(DEMONS_BOOTS_FABRIC, 1);
- break;
- }
- case 3:
- {
- qs.giveItems(DEMONS_GLOVES_FABRIC, 1);
- }
+ qs.giveItems(DEMONS_TUNIC_FABRIC, 1);
+ break;
+ }
+ case 1:
+ {
+ qs.giveItems(DEMONS_HOSE_PATTERN, 1);
+ break;
+ }
+ case 2:
+ {
+ qs.giveItems(DEMONS_BOOTS_FABRIC, 1);
+ break;
+ }
+ case 3:
+ {
+ qs.giveItems(DEMONS_GLOVES_FABRIC, 1);
}
- html = "30742-02.html";
}
- qs.set(FLAG, 0);
- npc.deleteMe();
- return html;
+ html = "30742-02.html";
}
- break;
+ qs.set(FLAG, 0);
+ npc.deleteMe();
+ return html;
}
- case WISDOM_CHEST:
+ break;
+ }
+ case WISDOM_CHEST:
+ {
+ if (qs.getInt(FLAG) == 4)
{
- if (qs.getInt(FLAG) == 4)
+ int random = getRandom(100);
+ String html = null;
+ if (random < 10)
{
- int random = getRandom(100);
- String html = null;
- if (random < 10)
- {
- qs.giveItems(Q_FOBBIDEN_LOVE_SCROLL, 1);
- html = "30743-02.html";
- }
- else if ((random >= 10) && (random < 50))
+ qs.giveItems(Q_FOBBIDEN_LOVE_SCROLL, 1);
+ html = "30743-02.html";
+ }
+ else if ((random >= 10) && (random < 50))
+ {
+ switch (getRandom(4))
{
- switch (getRandom(4))
+ case 0:
{
- case 0:
- {
- qs.giveItems(DEMONS_TUNIC_FABRIC, 1);
- break;
- }
- case 1:
- {
- qs.giveItems(DEMONS_HOSE_PATTERN, 1);
- break;
- }
- case 2:
- {
- qs.giveItems(DEMONS_BOOTS_FABRIC, 1);
- break;
- }
- case 3:
- {
- qs.giveItems(DEMONS_GLOVES_FABRIC, 1);
- break;
- }
+ qs.giveItems(DEMONS_TUNIC_FABRIC, 1);
+ break;
+ }
+ case 1:
+ {
+ qs.giveItems(DEMONS_HOSE_PATTERN, 1);
+ break;
+ }
+ case 2:
+ {
+ qs.giveItems(DEMONS_BOOTS_FABRIC, 1);
+ break;
+ }
+ case 3:
+ {
+ qs.giveItems(DEMONS_GLOVES_FABRIC, 1);
+ break;
}
- html = "30743-03.html";
}
- else if ((random >= 50) && (random < 100))
+ html = "30743-03.html";
+ }
+ else if ((random >= 50) && (random < 100))
+ {
+ switch (getRandom(2))
{
- switch (getRandom(2))
+ case 0:
{
- case 0:
- {
- qs.giveItems(Q_MUSICNOTE_LOVE, 1);
- break;
- }
- case 1:
- {
- qs.giveItems(Q_MUSICNOTE_BATTLE, 1);
- break;
- }
+ qs.giveItems(Q_MUSICNOTE_LOVE, 1);
+ break;
+ }
+ case 1:
+ {
+ qs.giveItems(Q_MUSICNOTE_BATTLE, 1);
+ break;
}
- html = "30743-04.html";
}
- else if ((random >= 85) && (random < 95))
+ html = "30743-04.html";
+ }
+ else if ((random >= 85) && (random < 95))
+ {
+ switch (getRandom(4))
{
- switch (getRandom(4))
+ case 0:
{
- case 0:
- {
- qs.giveItems(DEMONS_TUNIC, 1);
- break;
- }
- case 1:
- {
- qs.giveItems(DEMONS_HOSE, 1);
- break;
- }
- case 2:
- {
- qs.giveItems(DEMONS_BOOTS, 1);
- break;
- }
- case 3:
- {
- qs.giveItems(DEMONS_GLOVES, 1);
- break;
- }
+ qs.giveItems(DEMONS_TUNIC, 1);
+ break;
+ }
+ case 1:
+ {
+ qs.giveItems(DEMONS_HOSE, 1);
+ break;
+ }
+ case 2:
+ {
+ qs.giveItems(DEMONS_BOOTS, 1);
+ break;
+ }
+ case 3:
+ {
+ qs.giveItems(DEMONS_GLOVES, 1);
+ break;
}
- html = "30743-05.html";
}
- else if (random >= 95)
+ html = "30743-05.html";
+ }
+ else if (random >= 95)
+ {
+ switch (getRandom(2))
{
- switch (getRandom(2))
+ case 0:
{
- case 0:
- {
- qs.giveItems(Q_GOLD_CIRCLET, 1);
- break;
- }
- case 1:
- {
- qs.giveItems(Q_SILVER_CIRCLET, 1);
- }
+ qs.giveItems(Q_GOLD_CIRCLET, 1);
+ break;
+ }
+ case 1:
+ {
+ qs.giveItems(Q_SILVER_CIRCLET, 1);
}
- html = "30743-06.htm";
}
- qs.set(FLAG, 0);
- npc.deleteMe();
- return html;
+ html = "30743-06.htm";
}
- break;
+ qs.set(FLAG, 0);
+ npc.deleteMe();
+ return html;
}
+ break;
}
}
return htmltext;
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 c866e94470..11ee34dd2a 100644
--- a/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
+++ b/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java
@@ -165,10 +165,6 @@ public final class Q00336_CoinsOfMagic extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case PANO:
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 c638eb8e1d..4a8244c7d5 100644
--- a/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
+++ b/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java
@@ -33,13 +33,10 @@ public class Q00338_AlligatorHunter extends Quest
{
// NPC
private static final int ENVERUN = 30892;
-
// Monster
private static final int ALLIGATOR = 20135;
-
// Items
private static final int ALLIGATOR_LEATHER = 4337;
-
// Misc
private static final int MIN_LEVEL = 40;
private static final int SECOND_CHANCE = 19;
@@ -50,7 +47,6 @@ public class Q00338_AlligatorHunter extends Quest
addStartNpc(ENVERUN);
addTalkId(ENVERUN);
addKillId(ALLIGATOR);
-
registerQuestItems(ALLIGATOR_LEATHER);
}
@@ -114,11 +110,6 @@ public class Q00338_AlligatorHunter extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 dd38a4c425..6cb50cf525 100644
--- a/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
+++ b/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
@@ -91,29 +91,26 @@ public class Q00341_HuntingForWildBeasts extends Quest
{
final QuestState st = getQuestState(player, false);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
+ {
+ htmltext = player.getLevel() >= MIN_LVL ? "30078-01.html" : "30078-02.htm";
+ break;
+ }
+ case State.STARTED:
{
- case State.CREATED:
+ if (st.isCond(2) && (st.getQuestItemsCount(BEAR_SKIN) >= REQUIRED_COUNT))
{
- htmltext = player.getLevel() >= MIN_LVL ? "30078-01.html" : "30078-02.htm";
- break;
+ st.giveAdena(ADENA_COUNT, true);
+ st.exitQuest(true, true);
+ htmltext = "30078-05.html";
}
- case State.STARTED:
+ else
{
- if (st.isCond(2) && (st.getQuestItemsCount(BEAR_SKIN) >= REQUIRED_COUNT))
- {
- st.giveAdena(ADENA_COUNT, true);
- st.exitQuest(true, true);
- htmltext = "30078-05.html";
- }
- else
- {
- htmltext = "30078-06.html";
- }
- break;
+ htmltext = "30078-06.html";
}
+ break;
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
index 4e9bab01c3..e204706d7c 100644
--- a/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
+++ b/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
@@ -221,11 +221,6 @@ public class Q00350_EnhanceYourWeapon extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (st.getState() == State.CREATED)
{
st.set("cond", "0");
diff --git a/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java b/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
index de125e21ad..58e4ef49ab 100644
--- a/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
+++ b/dist/game/data/scripts/quests/Q00351_BlackSwan/Q00351_BlackSwan.java
@@ -21,14 +21,14 @@ package quests.Q00351_BlackSwan;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00345_MethodToRaiseTheDead.Q00345_MethodToRaiseTheDead;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.util.Util;
+import quests.Q00345_MethodToRaiseTheDead.Q00345_MethodToRaiseTheDead;
+
/**
* Black Swan (351)
* @author Adry_85
@@ -187,7 +187,6 @@ public final class Q00351_BlackSwan extends Quest
QuestState qs = getQuestState(player, true);
QuestState qs2 = player.getQuestState(Q00345_MethodToRaiseTheDead.class.getSimpleName());
String htmltext = getNoQuestMsg(player);
-
switch (npc.getId())
{
case GOSTA:
diff --git a/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
index 3468075d39..830478168f 100644
--- a/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
+++ b/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
@@ -161,11 +161,6 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
if (st.isCreated())
{
htmltext = ((player.getLevel() >= MIN_LEVEL) ? "30895-01.htm" : "30895-03.html");
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 2b7f0cf787..eda35339ea 100644
--- a/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
+++ b/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
@@ -131,11 +131,6 @@ public final class Q00360_PlunderTheirSupplies extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java b/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
index 5115f08947..8cd09cad5e 100644
--- a/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
+++ b/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java
@@ -214,11 +214,6 @@ public final class Q00365_DevilsLegacy extends Quest
{
QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case RANDOLF:
diff --git a/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java b/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
index 9029d234c5..41e2cf957a 100644
--- a/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
+++ b/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java
@@ -122,11 +122,6 @@ public final class Q00368_TrespassingIntoTheHolyGround extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
if (st.isCreated())
{
htmltext = ((player.getLevel() >= MIN_LEVEL) ? "30926-01.htm" : "30926-03.html");
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 30f2539979..f6be0d710b 100644
--- a/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
+++ b/dist/game/data/scripts/quests/Q00373_SupplierOfReagents/Q00373_SupplierOfReagents.java
@@ -20,8 +20,6 @@ package quests.Q00373_SupplierOfReagents;
import java.util.HashMap;
-import quests.Q00235_MimirsElixir.Q00235_MimirsElixir;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -29,6 +27,8 @@ import com.l2jserver.gameserver.model.holders.ItemHolder;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
+import quests.Q00235_MimirsElixir.Q00235_MimirsElixir;
+
/**
* Supplier of Reagents (373)
* @author Joxit
@@ -430,7 +430,6 @@ public final class Q00373_SupplierOfReagents extends Quest
{
final QuestState qs = getQuestState(talker, true);
String htmltext = getNoQuestMsg(talker);
-
if (qs.isCreated())
{
if (talker.getLevel() < MIN_LVL)
diff --git a/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
index fe6e5ddcec..5ee1467383 100644
--- a/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
+++ b/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
@@ -115,11 +115,6 @@ public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
if (qs.isCreated())
{
htmltext = ((player.getLevel() >= 79) ? "31147-01.htm" : "31147-00.html");
diff --git a/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
index c2039748ed..8ee51528d5 100644
--- a/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
+++ b/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
@@ -128,11 +128,6 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
if (qs.isCreated())
{
htmltext = ((player.getLevel() >= 79) ? "31147-01.htm" : "31147-00.html");
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 f2876cdbda..08d904baec 100644
--- a/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
+++ b/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java
@@ -103,34 +103,31 @@ public final class Q00384_WarehouseKeepersPastime extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if ((qs != null))
+ switch (npc.getId())
{
- switch (npc.getId())
- {
- case CLIFF:
- if (qs.isCreated())
+ case CLIFF:
+ if (qs.isCreated())
+ {
+ if (player.getLevel() >= 40)
{
- if (player.getLevel() >= 40)
- {
- return "30182-01.htm";
- }
- return "30182-04.html";
+ return "30182-01.htm";
}
+ return "30182-04.html";
+ }
+ if (qs.getQuestItemsCount(Q_IRONGATE_MEDAL) < 10)
+ {
+ return "30182-06.html";
+ }
+ return "30182-07.html";
+ case WAREHOUSE_CHIEF_BAXT:
+ if (qs.hasMemoState())
+ {
if (qs.getQuestItemsCount(Q_IRONGATE_MEDAL) < 10)
{
- return "30182-06.html";
+ return "30685-06.html";
}
- return "30182-07.html";
- case WAREHOUSE_CHIEF_BAXT:
- if (qs.hasMemoState())
- {
- if (qs.getQuestItemsCount(Q_IRONGATE_MEDAL) < 10)
- {
- return "30685-06.html";
- }
- return "30685-07.html";
- }
- }
+ return "30685-07.html";
+ }
}
return htmltext;
}
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 ef52b5f3a6..550765bc59 100644
--- a/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
+++ b/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java
@@ -116,7 +116,7 @@ public final class Q00386_StolenDignity extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
+ if (npc.getId() == WAREHOUSE_KEEPER_ROMP)
{
if (qs.isCreated())
{
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 09490065bb..0999904278 100644
--- a/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
+++ b/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java
@@ -112,12 +112,6 @@ public class Q00431_WeddingMarch extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 821d298c3b..8d3a1baeaf 100644
--- a/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
+++ b/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
@@ -107,12 +107,6 @@ public class Q00432_BirthdayPartySong extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 d3b65249cb..3309b2ae61 100644
--- a/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -19,8 +19,8 @@
package quests.Q00450_GraveRobberRescue;
import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -93,12 +93,6 @@ public class Q00450_GraveRobberRescue extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return htmltext;
- }
-
if (npc.getId() == KANEMIKA)
{
switch (st.getState())
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 edeb909b1e..6074f35837 100644
--- a/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -18,8 +18,8 @@
*/
package quests.Q00451_LuciensAltar;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+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;
@@ -88,12 +88,6 @@ public class Q00451_LuciensAltar extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return htmltext;
- }
-
final int npcId = npc.getId();
if (npcId == DAICHIR)
{
diff --git a/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index a6e7c1327a..176ec12074 100644
--- a/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -97,11 +97,6 @@ public class Q00452_FindingtheLostSoldiers extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (npc.getId() == JAKAN)
{
switch (st.getState())
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 cb50af1588..75b27689c3 100644
--- a/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -18,10 +18,8 @@
*/
package quests.Q00453_NotStrongEnoughAlone;
-import quests.Q10282_ToTheSeedOfAnnihilation.Q10282_ToTheSeedOfAnnihilation;
-
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+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;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.serverpackets.ExQuestNpcLogList;
import com.l2jserver.gameserver.util.Util;
+import quests.Q10282_ToTheSeedOfAnnihilation.Q10282_ToTheSeedOfAnnihilation;
+
/**
* Not Strong Enough Alone (453)
* @author malyelfik
@@ -270,11 +270,6 @@ public class Q00453_NotStrongEnoughAlone extends Quest
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
QuestState prev = player.getQuestState(Q10282_ToTheSeedOfAnnihilation.class.getSimpleName());
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java b/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
index 66e3c93418..6302199bb6 100644
--- a/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
+++ b/dist/game/data/scripts/quests/Q00454_CompletelyLost/Q00454_CompletelyLost.java
@@ -448,7 +448,6 @@ public final class Q00454_CompletelyLost extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
-
switch (qs.getState())
{
case State.COMPLETED:
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 894d01fcc6..a88c9bd3e3 100644
--- a/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -21,8 +21,8 @@ package quests.Q00455_WingsOfSand;
import java.util.Arrays;
import java.util.List;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+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;
@@ -134,11 +134,6 @@ public class Q00455_WingsOfSand extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return getNoQuestMsg(player);
- }
-
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{
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 11b6200bc4..4262839198 100644
--- a/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -189,12 +189,6 @@ public final class Q00456_DontKnowDontCare extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
-
- if (qs == null)
- {
- return htmltext;
- }
-
if (Util.contains(SEPARATED_SOUL, npc.getId()))
{
switch (qs.getState())
diff --git a/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
index fa53705c8c..6f199560ce 100644
--- a/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
+++ b/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
@@ -208,11 +208,6 @@ public final class Q00457_LostAndFound extends Quest
{
String htmltext = getNoQuestMsg(player);
QuestState st = getQuestState(player, true);
- if (st == null)
- {
- st = newQuestState(player);
- }
-
switch (st.getState())
{
case State.CREATED:
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 8a263d5e47..0e3979fead 100644
--- a/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
+++ b/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java
@@ -18,8 +18,8 @@
*/
package quests.Q00458_PerfectForm;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -286,11 +286,6 @@ public class Q00458_PerfectForm extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
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 5737157ee1..f7853bfa49 100644
--- a/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
+++ b/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
@@ -21,16 +21,16 @@ package quests.Q00461_RumbleInTheBase;
import java.util.HashMap;
import java.util.Map;
-import quests.Q00252_ItSmellsDelicious.Q00252_ItSmellsDelicious;
-
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+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;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00252_ItSmellsDelicious.Q00252_ItSmellsDelicious;
+
/**
* Rumble in the Base (461)
* @author malyelfik
@@ -136,11 +136,6 @@ public class Q00461_RumbleInTheBase extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
final QuestState prev = player.getQuestState(Q00252_ItSmellsDelicious.class.getSimpleName());
switch (st.getState())
{
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 a73a24647b..55c243a924 100644
--- a/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
+++ b/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
@@ -21,8 +21,8 @@ package quests.Q00463_IMustBeaGenius;
import java.util.HashMap;
import java.util.Map;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+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;
@@ -209,11 +209,6 @@ public class Q00463_IMustBeaGenius extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
diff --git a/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
index aa5d4bace4..d038efb498 100644
--- a/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
+++ b/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
@@ -223,11 +223,9 @@ public class Q00464_Oath extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if ((st != null) && st.isStarted())
+ if (st.isStarted())
{
int npcId = npc.getId();
-
if (npcId == NPC[0][0])
{
switch (st.getCond())
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 f1692c426f..a0a11f2caa 100644
--- a/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
+++ b/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java
@@ -108,13 +108,8 @@ public final class Q00504_CompetitionForTheBanditStronghold extends Quest
public final String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return getNoQuestMsg(player);
- }
-
final L2Clan clan = player.getClan();
- String htmltext = null;
+ String htmltext = getNoQuestMsg(player);
if (!BANDIT_STRONGHOLD.isWaitingBattle())
{
htmltext = getHtm(player.getHtmlPrefix(), "35437-09.html");
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 f0017bb742..5712fd82e7 100644
--- a/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -162,11 +162,6 @@ public class Q00508_AClansReputation extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
L2Clan clan = player.getClan();
switch (st.getState())
{
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 b33652b5b0..ea197b61d3 100644
--- a/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -149,11 +149,6 @@ public class Q00509_AClansFame extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
L2Clan clan = player.getClan();
switch (st.getState())
{
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 6b6f7f50e9..e0e98bc06c 100644
--- a/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -111,11 +111,6 @@ public class Q00510_AClansPrestige extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
L2Clan clan = player.getClan();
switch (st.getState())
{
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 edc8703630..534266373e 100644
--- a/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -416,43 +416,41 @@ public final class Q00511_AwlUnderFoot extends Quest
{
return ret;
}
- else if (st != null)
+
+ int npcId = npc.getId();
+ int cond = 0;
+ if (st.getState() == State.CREATED)
{
- int npcId = npc.getId();
- int cond = 0;
- if (st.getState() == State.CREATED)
+ st.set("cond", "0");
+ }
+ else
+ {
+ cond = st.getInt("cond");
+ }
+ if (_fortDungeons.containsKey(npcId) && (cond == 0))
+ {
+ if (player.getLevel() >= 60)
{
- st.set("cond", "0");
+ htmltext = "FortressWarden-09.htm";
}
else
{
- cond = st.getInt("cond");
+ htmltext = "FortressWarden-00.htm";
+ st.exitQuest(true);
}
- if (_fortDungeons.containsKey(npcId) && (cond == 0))
+ }
+ else if (_fortDungeons.containsKey(npcId) && (cond > 0) && (st.getState() == State.STARTED))
+ {
+ long count = st.getQuestItemsCount(DL_MARK);
+ if ((cond == 1) && (count > 0))
{
- if (player.getLevel() >= 60)
- {
- htmltext = "FortressWarden-09.htm";
- }
- else
- {
- htmltext = "FortressWarden-00.htm";
- st.exitQuest(true);
- }
+ htmltext = "FortressWarden-14.htm";
+ st.takeItems(DL_MARK, -1);
+ st.rewardItems(KNIGHT_EPALUETTE, count);
}
- else if (_fortDungeons.containsKey(npcId) && (cond > 0) && (st.getState() == State.STARTED))
+ else if ((cond == 1) && (count == 0))
{
- long count = st.getQuestItemsCount(DL_MARK);
- if ((cond == 1) && (count > 0))
- {
- htmltext = "FortressWarden-14.htm";
- st.takeItems(DL_MARK, -1);
- st.rewardItems(KNIGHT_EPALUETTE, count);
- }
- else if ((cond == 1) && (count == 0))
- {
- htmltext = "FortressWarden-10.htm";
- }
+ htmltext = "FortressWarden-10.htm";
}
}
return htmltext;
diff --git a/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index c0f68827db..f8c7a9942d 100644
--- a/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -209,11 +209,6 @@ public class Q00551_OlympiadStarter extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if ((player.getLevel() < 75) || !player.isNoble())
{
htmltext = "31688-00.htm";
diff --git a/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java b/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
index 0374a6f3e1..5c7c9e370c 100644
--- a/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
+++ b/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
@@ -185,11 +185,6 @@ public class Q00552_OlympiadVeteran extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if ((player.getLevel() < 75) || !player.isNoble())
{
htmltext = "31688-00.htm";
diff --git a/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 7474a61c4e..a68afd0c2b 100644
--- a/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -151,11 +151,6 @@ public class Q00553_OlympiadUndefeated extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if ((player.getLevel() < 75) || !player.isNoble())
{
htmltext = "31688-00.htm";
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 845a341b8c..879f4fac34 100644
--- a/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
+++ b/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
@@ -144,12 +144,6 @@ public class Q00601_WatchingEyes extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 bfeec53a49..a09207cbfb 100644
--- a/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
+++ b/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
@@ -151,12 +151,6 @@ public class Q00602_ShadowOfLight extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 a072f4464d..18b809935f 100644
--- a/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
+++ b/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java
@@ -284,11 +284,6 @@ public class Q00605_AllianceWithKetraOrcs extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
@@ -304,13 +299,16 @@ public class Q00605_AllianceWithKetraOrcs extends Quest
htmltext = (st.hasQuestItems(KETRA_MARKS[0]) && (st.getQuestItemsCount(VARKA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[1]) && (st.getQuestItemsCount(VARKA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[1])) ? "31371-14.html" : "31371-13.html";
break;
case 3:
- htmltext = (st.hasQuestItems(KETRA_MARKS[1]) && (st.getQuestItemsCount(VARKA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[2]) && (st.getQuestItemsCount(VARKA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[2]) && (st.getQuestItemsCount(VARKA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[2])) ? "31371-17.html" : "31371-16.html";
+ htmltext = (st.hasQuestItems(KETRA_MARKS[1]) && (st.getQuestItemsCount(VARKA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[2]) && (st.getQuestItemsCount(VARKA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[2])
+ && (st.getQuestItemsCount(VARKA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[2])) ? "31371-17.html" : "31371-16.html";
break;
case 4:
- htmltext = (hasQuestItems(player, KETRA_MARKS[2], VALOR_TOTEM) && (st.getQuestItemsCount(VARKA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[3]) && (st.getQuestItemsCount(VARKA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[3]) && (st.getQuestItemsCount(VARKA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[3])) ? "31371-20.html" : "31371-19.html";
+ htmltext = (hasQuestItems(player, KETRA_MARKS[2], VALOR_TOTEM) && (st.getQuestItemsCount(VARKA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[3]) && (st.getQuestItemsCount(VARKA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[3])
+ && (st.getQuestItemsCount(VARKA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[3])) ? "31371-20.html" : "31371-19.html";
break;
case 5:
- if (!st.hasQuestItems(KETRA_MARKS[3]) || !st.hasQuestItems(WISDOM_TOTEM) || (st.getQuestItemsCount(VARKA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[4]) || (st.getQuestItemsCount(VARKA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[4]) || (st.getQuestItemsCount(VARKA_BADGE_CAPTAIN) < CAPTAIN_BADGE_COUNT[4]))
+ if (!st.hasQuestItems(KETRA_MARKS[3]) || !st.hasQuestItems(WISDOM_TOTEM) || (st.getQuestItemsCount(VARKA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[4]) || (st.getQuestItemsCount(VARKA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[4])
+ || (st.getQuestItemsCount(VARKA_BADGE_CAPTAIN) < CAPTAIN_BADGE_COUNT[4]))
{
return "31371-22.html";
}
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 76f7db92a0..3aff169cf5 100644
--- a/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
+++ b/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java
@@ -125,11 +125,6 @@ public class Q00606_BattleAgainstVarkaSilenos extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java b/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
index e79a2c415c..b18b034004 100644
--- a/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
+++ b/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java
@@ -108,11 +108,6 @@ public class Q00607_ProveYourCourageKetra extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java b/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
index 86b2d19878..583405f0eb 100644
--- a/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
+++ b/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java
@@ -108,11 +108,6 @@ public class Q00608_SlayTheEnemyCommanderKetra extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java b/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
index 54a3b97d78..80d701f9fb 100644
--- a/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
+++ b/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java
@@ -157,11 +157,6 @@ public class Q00609_MagicalPowerOfWaterPart1 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case WAHKAN:
diff --git a/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
index 9541817ef9..223d1f3ef1 100644
--- a/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
+++ b/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java
@@ -159,11 +159,6 @@ public class Q00610_MagicalPowerOfWaterPart2 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ASEFA:
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 416f03a098..8dfb1446f7 100644
--- a/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
+++ b/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java
@@ -284,11 +284,6 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
@@ -304,13 +299,16 @@ public class Q00611_AllianceWithVarkaSilenos extends Quest
htmltext = (st.hasQuestItems(VARKA_MARKS[0]) && (st.getQuestItemsCount(KETRA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[1]) && (st.getQuestItemsCount(KETRA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[1])) ? "31378-14.html" : "31378-13.html";
break;
case 3:
- htmltext = (st.hasQuestItems(VARKA_MARKS[1]) && (st.getQuestItemsCount(KETRA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[2]) && (st.getQuestItemsCount(KETRA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[2]) && (st.getQuestItemsCount(KETRA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[2])) ? "31378-17.html" : "31378-16.html";
+ htmltext = (st.hasQuestItems(VARKA_MARKS[1]) && (st.getQuestItemsCount(KETRA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[2]) && (st.getQuestItemsCount(KETRA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[2])
+ && (st.getQuestItemsCount(KETRA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[2])) ? "31378-17.html" : "31378-16.html";
break;
case 4:
- htmltext = (hasQuestItems(player, VARKA_MARKS[2], VALOR_FEATHER) && (st.getQuestItemsCount(KETRA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[3]) && (st.getQuestItemsCount(KETRA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[3]) && (st.getQuestItemsCount(KETRA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[3])) ? "31378-20.html" : "31378-19.html";
+ htmltext = (hasQuestItems(player, VARKA_MARKS[2], VALOR_FEATHER) && (st.getQuestItemsCount(KETRA_BADGE_SOLDIER) >= SOLDIER_BADGE_COUNT[3]) && (st.getQuestItemsCount(KETRA_BADGE_OFFICER) >= OFFICER_BADGE_COUNT[3])
+ && (st.getQuestItemsCount(KETRA_BADGE_CAPTAIN) >= CAPTAIN_BADGE_COUNT[3])) ? "31378-20.html" : "31378-19.html";
break;
case 5:
- if (!st.hasQuestItems(VARKA_MARKS[3]) || !st.hasQuestItems(WISDOM_FEATHER) || (st.getQuestItemsCount(KETRA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[4]) || (st.getQuestItemsCount(KETRA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[4]) || (st.getQuestItemsCount(KETRA_BADGE_CAPTAIN) < CAPTAIN_BADGE_COUNT[4]))
+ if (!st.hasQuestItems(VARKA_MARKS[3]) || !st.hasQuestItems(WISDOM_FEATHER) || (st.getQuestItemsCount(KETRA_BADGE_SOLDIER) < SOLDIER_BADGE_COUNT[4]) || (st.getQuestItemsCount(KETRA_BADGE_OFFICER) < OFFICER_BADGE_COUNT[4])
+ || (st.getQuestItemsCount(KETRA_BADGE_CAPTAIN) < CAPTAIN_BADGE_COUNT[4]))
{
return "31378-22.html";
}
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 457564bd3b..9fa4722593 100644
--- a/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
+++ b/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java
@@ -125,11 +125,6 @@ public class Q00612_BattleAgainstKetraOrcs extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java b/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
index 8156ff3038..66d4f4457c 100644
--- a/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
+++ b/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java
@@ -108,11 +108,6 @@ public class Q00613_ProveYourCourageVarka extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java b/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
index 5dd8cbd295..396ed8681b 100644
--- a/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
+++ b/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java
@@ -108,11 +108,6 @@ public class Q00614_SlayTheEnemyCommanderVarka extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java b/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
index 857483c44b..d8f626be38 100644
--- a/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
+++ b/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java
@@ -157,11 +157,6 @@ public class Q00615_MagicalPowerOfFirePart1 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case NARAN:
diff --git a/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
index 15bd97cd7a..677fce92d3 100644
--- a/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
+++ b/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java
@@ -159,11 +159,6 @@ public class Q00616_MagicalPowerOfFirePart2 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case UDAN:
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 d1ef863167..f37e89897b 100644
--- a/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -178,11 +178,6 @@ public class Q00617_GatherTheFlames extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ROONEY:
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 e70adc0176..6ee6a349b6 100644
--- a/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
+++ b/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
@@ -145,10 +145,6 @@ public class Q00618_IntoTheFlame extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
switch (npc.getId())
{
case KLEIN:
diff --git a/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java b/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
index 77c4b9d3ef..b1862ce4b0 100644
--- a/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
+++ b/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
@@ -308,11 +308,6 @@ public final class Q00619_RelicsOfTheOldEmpire extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
if (st.isCreated())
{
htmltext = ((player.getLevel() >= MIN_LEVEL) ? "31538-01.htm" : "31538-03.html");
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 31bbab3fae..f7445ea5ad 100644
--- a/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
+++ b/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
@@ -132,32 +132,29 @@ public final class Q00624_TheFinestIngredientsPart1 extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
- {
- htmltext = (player.getLevel() >= MIN_LVL) ? "31521-01.htm" : "31521-00.htm";
- break;
- }
- case State.STARTED:
+ htmltext = (player.getLevel() >= MIN_LVL) ? "31521-01.htm" : "31521-00.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (st.getCond())
{
- switch (st.getCond())
+ case 1:
{
- case 1:
- {
- htmltext = "31521-03.html";
- break;
- }
- case 2:
- {
- htmltext = "31521-04.html";
- break;
- }
+ htmltext = "31521-03.html";
+ break;
+ }
+ case 2:
+ {
+ htmltext = "31521-04.html";
+ break;
}
- break;
}
+ break;
}
}
return htmltext;
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 057c6b225d..e5a7791c93 100644
--- a/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
+++ b/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java
@@ -146,10 +146,6 @@ public class Q00626_ADarkTwilight extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
switch (st.getState())
{
case State.CREATED:
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 f027e7afd4..da5031dabb 100644
--- a/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
+++ b/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java
@@ -186,10 +186,6 @@ public class Q00627_HeartInSearchOfPower extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java b/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
index 77ecef9bdb..ce3bfd10f4 100644
--- a/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
+++ b/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java
@@ -157,11 +157,6 @@ public final class Q00628_HuntGoldenRam extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
switch (qs.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java b/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
index fca97c6c56..de4c67e901 100644
--- a/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
+++ b/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java
@@ -139,11 +139,6 @@ public final class Q00629_CleanUpTheSwampOfScreams extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
if (qs.isCreated())
{
htmltext = ((player.getLevel() >= MIN_LVL) ? "31553-01.htm" : "31553-02.htm");
diff --git a/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 9b335b216b..765825243a 100644
--- a/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -202,11 +202,6 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
if (st.isCreated())
{
htmltext = "31537-01.htm";
diff --git a/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java b/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
index 59df7cd313..7e6a18a829 100644
--- a/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
+++ b/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java
@@ -169,11 +169,6 @@ public final class Q00632_NecromancersRequest extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
if (qs.isCreated())
{
htmltext = player.getLevel() >= MIN_LEVEL ? "31522-101.htm" : "31522-103.htm";
diff --git a/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java b/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
index 9cec41f9eb..fea23806b4 100644
--- a/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
+++ b/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java
@@ -178,11 +178,6 @@ public final class Q00633_InTheForgottenVillage extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
if (qs.isCreated())
{
htmltext = ((player.getLevel() >= MIN_LVL) ? "31388-01.htm" : "31388-02.htm");
diff --git a/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java b/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
index 20ea40dfc0..d646902ac4 100644
--- a/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
+++ b/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java
@@ -235,11 +235,6 @@ public final class Q00638_SeekersOfTheHolyGrail extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
if (qs.isCreated())
{
htmltext = ((player.getLevel() >= MIN_LVL) ? "31328-01.htm" : "31328-02.htm");
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 ab377f7644..d895fc4e60 100644
--- a/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -18,8 +18,6 @@
*/
package quests.Q00641_AttackSailren;
-import quests.Q00126_TheNameOfEvil2.Q00126_TheNameOfEvil2;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -27,6 +25,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q00126_TheNameOfEvil2.Q00126_TheNameOfEvil2;
+
/**
* Attack Sailren! (641)
* @author Adry_85
@@ -111,11 +111,6 @@ public class Q00641_AttackSailren extends Quest
{
String htmltext = getNoQuestMsg(player);
QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index dfc6a99a37..d9ada08967 100644
--- a/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -149,7 +149,6 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
{
QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
-
if (qs.isCreated())
{
htmltext = player.getLevel() < MIN_LEVEL ? "32105-01.htm" : "32105-02.htm";
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 7ed114b362..9d6e0e0c86 100644
--- a/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -234,11 +234,6 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java b/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
index 0b48818dcc..5fd6114d31 100644
--- a/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
+++ b/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
@@ -136,11 +136,6 @@ public final class Q00644_GraveRobberAnnihilation extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 bfd7989e3d..2a110f5a4a 100644
--- a/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
+++ b/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
@@ -123,11 +123,6 @@ public class Q00645_GhostsOfBatur extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return getNoQuestMsg(player);
- }
-
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{
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 37d4d3fddc..7a27284582 100644
--- a/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
+++ b/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
@@ -141,11 +141,6 @@ public class Q00647_InfluxOfMachines extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 1879005141..587f53bade 100644
--- a/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
+++ b/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
@@ -104,11 +104,6 @@ public final class Q00649_ALooterAndARailroadMan extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 0bcca5ffca..64ebe10a42 100644
--- a/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
+++ b/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
@@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import quests.Q00117_TheOceanOfDistantStars.Q00117_TheOceanOfDistantStars;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -33,6 +31,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.util.Util;
+import quests.Q00117_TheOceanOfDistantStars.Q00117_TheOceanOfDistantStars;
+
/**
* A Broken Dream (650)
* @author netvirus
@@ -111,11 +111,6 @@ public final class Q00650_ABrokenDream extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java b/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
index bf99badeef..58ebe3d799 100644
--- a/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
+++ b/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
@@ -78,11 +78,6 @@ public class Q00651_RunawayYouth extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case IVAN:
diff --git a/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
index 27c09cbdaa..94bf8feb37 100644
--- a/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
+++ b/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
@@ -78,11 +78,6 @@ public class Q00652_AnAgedExAdventurer extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case TANTAN:
diff --git a/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java b/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
index 8ed0e815e7..9a3914e793 100644
--- a/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
+++ b/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
@@ -78,11 +78,6 @@ public class Q00653_WildMaiden extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case SUKI:
diff --git a/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java b/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
index 86f4312aa2..12168f814e 100644
--- a/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
+++ b/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java
@@ -123,11 +123,6 @@ public final class Q00659_IdRatherBeCollectingFairyBreath extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
if (st.isCreated())
{
htmltext = ((player.getLevel() >= MIN_LEVEL) ? "30634-01.htm" : "30634-03.html");
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 d9042d5b66..8609cd7bba 100644
--- a/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
+++ b/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java
@@ -297,11 +297,6 @@ public final class Q00660_AidingTheFloranVillage extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
if (qs.isCreated())
{
switch (npc.getId())
diff --git a/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index 44bf4c5847..23318aac96 100644
--- a/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -613,11 +613,6 @@ public final class Q00662_AGameOfCards extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 cd5c9d8f9e..c37aafecb8 100644
--- a/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
+++ b/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java
@@ -137,11 +137,6 @@ public class Q00663_SeductiveWhispers extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
switch (qs.getState())
{
case State.CREATED:
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 3af9b27c23..c5e3f6fd24 100644
--- a/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -145,11 +145,6 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 1297b06317..abeb83840d 100644
--- a/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
+++ b/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
@@ -161,12 +161,6 @@ public class Q00690_JudesRequest extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 fdbcb91707..02b22449b1 100644
--- a/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
+++ b/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
@@ -151,11 +151,6 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 76b9005765..57451a7ab8 100644
--- a/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
+++ b/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
@@ -204,11 +204,6 @@ public final class Q00692_HowtoOpposeEvil extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (st.isCreated())
{
htmltext = (player.getLevel() >= 75) ? "32549-01.htm" : "32549-00.htm";
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 8cbe08b018..79896d7a30 100644
--- a/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
+++ b/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java
@@ -21,8 +21,6 @@ package quests.Q00699_GuardianOfTheSkies;
import java.util.HashMap;
import java.util.Map;
-import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
+
/**
* Guardian of the Skies
* @author xban1x
@@ -142,31 +142,28 @@ public class Q00699_GuardianOfTheSkies extends Quest
{
QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
+ st = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName());
+ htmltext = ((st == null) || (!st.isCompleted()) || (player.getLevel() < MIN_LVL)) ? "32557-02.htm" : "32557-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ final long feathers = st.getQuestItemsCount(VULTURES_GOLDEN_FEATHER);
+ if (feathers > 0)
{
- st = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName());
- htmltext = ((st == null) || (!st.isCompleted()) || (player.getLevel() < MIN_LVL)) ? "32557-02.htm" : "32557-01.htm";
- break;
+ st.giveAdena(((feathers * VULTURES_GOLDEN_FEATHER_ADENA) + (feathers > BONUS_COUNT ? BONUS : 0)), true);
+ st.takeItems(VULTURES_GOLDEN_FEATHER, -1);
+ htmltext = (feathers > BONUS_COUNT) ? "32557-07.html" : "32557-06.html";
}
- case State.STARTED:
+ else
{
- final long feathers = st.getQuestItemsCount(VULTURES_GOLDEN_FEATHER);
- if (feathers > 0)
- {
- st.giveAdena(((feathers * VULTURES_GOLDEN_FEATHER_ADENA) + (feathers > BONUS_COUNT ? BONUS : 0)), true);
- st.takeItems(VULTURES_GOLDEN_FEATHER, -1);
- htmltext = (feathers > BONUS_COUNT) ? "32557-07.html" : "32557-06.html";
- }
- else
- {
- htmltext = "32557-05.html";
- }
- break;
+ htmltext = "32557-05.html";
}
+ break;
}
}
return htmltext;
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 1cd8f5b7b5..a25202b70e 100644
--- a/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
+++ b/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java
@@ -21,8 +21,6 @@ package quests.Q00700_CursedLife;
import java.util.HashMap;
import java.util.Map;
-import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
+
/**
* Cursed Life (700)
* @author xban1x
@@ -116,33 +116,30 @@ public class Q00700_CursedLife extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st != null)
+ switch (st.getState())
{
- switch (st.getState())
+ case State.CREATED:
{
- case State.CREATED:
+ htmltext = "32560-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ long bones = st.getQuestItemsCount(SWALLOWED_BONES);
+ long ribs = st.getQuestItemsCount(SWALLOWED_STERNUM);
+ long skulls = st.getQuestItemsCount(SWALLOWED_SKULL);
+ long sum = bones + ribs + skulls;
+ if (sum > 0)
{
- htmltext = "32560-01.htm";
- break;
+ st.giveAdena(((bones * SWALLOWED_BONES_ADENA) + (ribs * SWALLOWED_STERNUM_ADENA) + (skulls * SWALLOWED_SKULL_ADENA) + (sum >= 10 ? BONUS : 0)), true);
+ takeItems(player, -1, SWALLOWED_BONES, SWALLOWED_STERNUM, SWALLOWED_SKULL);
+ htmltext = sum < 10 ? "32560-07.html" : "32560-08.html";
}
- case State.STARTED:
+ else
{
- long bones = st.getQuestItemsCount(SWALLOWED_BONES);
- long ribs = st.getQuestItemsCount(SWALLOWED_STERNUM);
- long skulls = st.getQuestItemsCount(SWALLOWED_SKULL);
- long sum = bones + ribs + skulls;
- if (sum > 0)
- {
- st.giveAdena(((bones * SWALLOWED_BONES_ADENA) + (ribs * SWALLOWED_STERNUM_ADENA) + (skulls * SWALLOWED_SKULL_ADENA) + (sum >= 10 ? BONUS : 0)), true);
- takeItems(player, -1, SWALLOWED_BONES, SWALLOWED_STERNUM, SWALLOWED_SKULL);
- htmltext = sum < 10 ? "32560-07.html" : "32560-08.html";
- }
- else
- {
- htmltext = "32560-06.html";
- }
- break;
+ htmltext = "32560-06.html";
}
+ break;
}
}
return htmltext;
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 1a94eb06a9..8c406fe4c1 100644
--- a/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
+++ b/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java
@@ -21,8 +21,6 @@ package quests.Q00701_ProofOfExistence;
import java.util.HashMap;
import java.util.Map;
-import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -30,6 +28,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
+
/**
* Proof of Existence (701)
* @author malyelfik
@@ -142,11 +142,6 @@ public class Q00701_ProofOfExistence extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 860d78613f..df477461a9 100644
--- a/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
+++ b/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
@@ -18,8 +18,6 @@
*/
package quests.Q00702_ATrapForRevenge;
-import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -27,6 +25,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
+
/**
* A Trap for Revenge (702)
* @author malyelfik
@@ -366,11 +366,6 @@ public class Q00702_ATrapForRevenge extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
if (npc.getId() == PLENOS)
{
switch (st.getState())
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 2b99693661..1282c6585d 100644
--- a/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -18,8 +18,8 @@
*/
package quests.Q00901_HowLavasaurusesAreMade;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+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,11 +133,6 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
diff --git a/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
index db354c2503..eaf0528dd7 100644
--- a/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
+++ b/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java
@@ -171,11 +171,6 @@ public final class Q00902_ReclaimOurEra extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
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 a99d396be8..47eaf72bc6 100644
--- a/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
+++ b/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java
@@ -18,8 +18,8 @@
*/
package quests.Q00903_TheCallOfAntharas;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+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;
@@ -125,11 +125,6 @@ public class Q00903_TheCallOfAntharas extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return getNoQuestMsg(player);
- }
-
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{
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 295c3b307a..9a977a6432 100644
--- a/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
+++ b/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java
@@ -21,8 +21,8 @@ package quests.Q00905_RefinedDragonBlood;
import java.util.HashMap;
import java.util.Map;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+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;
@@ -163,11 +163,6 @@ public final class Q00905_RefinedDragonBlood extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return getNoQuestMsg(player);
- }
-
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{
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 4dfc88359f..aabb43d614 100644
--- a/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
+++ b/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java
@@ -18,8 +18,8 @@
*/
package quests.Q00906_TheCallOfValakas;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+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;
@@ -106,11 +106,6 @@ public class Q00906_TheCallOfValakas extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return getNoQuestMsg(player);
- }
-
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{
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 66f489bdba..d976d30f0c 100644
--- a/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
+++ b/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java
@@ -18,8 +18,8 @@
*/
package quests.Q00907_DragonTrophyValakas;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+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;
@@ -103,11 +103,6 @@ public class Q00907_DragonTrophyValakas extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return getNoQuestMsg(player);
- }
-
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{
diff --git a/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java b/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
index 9ced697b46..80da5f734a 100644
--- a/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
+++ b/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
@@ -78,11 +78,6 @@ public class Q10267_JourneyToGracia extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ORVEN:
diff --git a/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java b/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
index 04cfaadffd..85a97cdc85 100644
--- a/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
+++ b/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
@@ -67,11 +67,6 @@ public class Q10268_ToTheSeedOfInfinity extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case KEUCEREUS:
diff --git a/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java b/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
index 213586291b..5b7e436a10 100644
--- a/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
+++ b/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
@@ -67,11 +67,6 @@ public class Q10269_ToTheSeedOfDestruction extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case KEUCEREUS:
diff --git a/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java b/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
index 84262816da..8d8019e1fe 100644
--- a/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
+++ b/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java
@@ -18,14 +18,14 @@
*/
package quests.Q10271_TheEnvelopingDarkness;
-import quests.Q10269_ToTheSeedOfDestruction.Q10269_ToTheSeedOfDestruction;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q10269_ToTheSeedOfDestruction.Q10269_ToTheSeedOfDestruction;
+
/**
* The Enveloping Darkness (10271)
* @author Gladicek
@@ -80,11 +80,6 @@ public class Q10271_TheEnvelopingDarkness extends Quest
{
String htmltext = getNoQuestMsg(player);
QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ORBYU:
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 d8802418e7..dc1d4a6811 100644
--- a/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
+++ b/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
@@ -18,8 +18,6 @@
*/
package quests.Q10272_LightFragment;
-import quests.Q10271_TheEnvelopingDarkness.Q10271_TheEnvelopingDarkness;
-
import com.l2jserver.Config;
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -29,6 +27,8 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
+import quests.Q10271_TheEnvelopingDarkness.Q10271_TheEnvelopingDarkness;
+
/**
* Light Fragment (10272)
* @author Gladicek
@@ -56,7 +56,7 @@ public class Q10272_LightFragment extends Quest
22551, // Priest of Darkness
22552, // Mutation Drake
22596
- // White Dragon Leader
+ // White Dragon Leader
};
private static final int FRAGMENT_POWDER = 13853;
private static final int LIGHT_FRAGMENT_POWDER = 13854;
@@ -178,11 +178,6 @@ public class Q10272_LightFragment extends Quest
{
String htmltext = getNoQuestMsg(player);
QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case ORBYU:
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 79e3c8eae0..7d1ca37290 100644
--- a/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -124,11 +124,6 @@ public class Q10273_GoodDayToFly extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
final int transform = st.getInt("transform");
switch (st.getState())
{
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 c823b14ae2..94adab6a06 100644
--- a/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -18,8 +18,6 @@
*/
package quests.Q10274_CollectingInTheAir;
-import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
-
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -29,6 +27,8 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.model.skills.Skill;
+import quests.Q10273_GoodDayToFly.Q10273_GoodDayToFly;
+
/**
* Collecting in the Air (10274)<br>
* Original Jython script by Kerberos v1.0 on 2009/04/26.
@@ -123,11 +123,6 @@ public class Q10274_CollectingInTheAir extends Quest
{
String htmltext = getNoQuestMsg(player);
QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.COMPLETED:
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 7c371383e4..27bf5318ea 100644
--- a/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -179,11 +179,6 @@ public class Q10275_ContainingTheAttributePower extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case HOLLY:
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 a9504a93c5..a43a148df0 100644
--- a/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
+++ b/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java
@@ -114,11 +114,6 @@ public class Q10276_MutatedKaneusGludio extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case BATHIS:
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 4d2a043450..f22ec7c5a5 100644
--- a/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
+++ b/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java
@@ -114,11 +114,6 @@ public class Q10277_MutatedKaneusDion extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case LUKAS:
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 b7bb206796..ed63b32264 100644
--- a/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
+++ b/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java
@@ -114,11 +114,6 @@ public class Q10278_MutatedKaneusHeine extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case GOSTA:
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 749a94bc77..b706031bfe 100644
--- a/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
+++ b/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
@@ -114,11 +114,6 @@ public class Q10279_MutatedKaneusOren extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case MOUEN:
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 755c69cb1f..63e2cc2959 100644
--- a/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
+++ b/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java
@@ -114,11 +114,6 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case VISHOTSKY:
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 9a5adf4d53..250b42aa34 100644
--- a/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -112,11 +112,6 @@ public class Q10281_MutatedKaneusRune extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case MATHIAS:
diff --git a/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index 119aee8645..aae67dd527 100644
--- a/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -74,11 +74,6 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
final int npcId = npc.getId();
switch (st.getState())
{
diff --git a/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index 18a6a36959..88f7d0e166 100644
--- a/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -113,11 +113,6 @@ public class Q10288_SecretMission extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return htmltext;
- }
-
switch (npc.getId())
{
case DOMINIC:
diff --git a/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
index 283c0725c0..e297ea1c9e 100644
--- a/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
+++ b/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
@@ -18,14 +18,14 @@
*/
package quests.Q10289_FadeToBlack;
-import quests.Q10288_SecretMission.Q10288_SecretMission;
-
import com.l2jserver.gameserver.model.L2Party;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
+import quests.Q10288_SecretMission.Q10288_SecretMission;
+
/**
* Fade to Black (10289)
* @author Plim
@@ -241,11 +241,6 @@ public class Q10289_FadeToBlack extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
- if (qs == null)
- {
- return htmltext;
- }
-
if (qs.isCreated())
{
final QuestState q10288 = player.getQuestState(Q10288_SecretMission.class.getSimpleName());
diff --git a/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index b548896deb..a2f4650e0b 100644
--- a/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -112,12 +112,6 @@ public class Q10291_FireDragonDestroyer extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
-
- if (st == null)
- {
- return htmltext;
- }
-
switch (st.getState())
{
case State.CREATED:
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 5ae96b7041..d0f772f60f 100644
--- a/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
+++ b/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java
@@ -96,11 +96,6 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState st = getQuestState(player, true);
- if (st == null)
- {
- return getNoQuestMsg(player);
- }
-
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{
--
GitLab