From cf64c5efc23bd03162867a239463b21f0da4eec1 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 26 Sep 2015 00:55:46 +0000 Subject: [PATCH] Various quest improvements. --- .../scripts/instances/ElcadiasTent/ElcadiasTent.java | 5 ++++- .../Q00144_PailakaInjuredDragon.java | 12 ++++++------ .../Q00183_RelicExploration.java | 2 +- .../Q10295_SevenSignsSolinasTomb.java | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/trunk/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java b/trunk/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java index 4d7a8e87ee..0fecfcce1d 100644 --- a/trunk/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java +++ b/trunk/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java @@ -22,6 +22,7 @@ import instances.AbstractInstance; import quests.Q10292_SevenSignsGirlOfDoubt.Q10292_SevenSignsGirlOfDoubt; import quests.Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom; import quests.Q10294_SevenSignsToTheMonasteryOfSilence.Q10294_SevenSignsToTheMonasteryOfSilence; +import quests.Q10296_SevenSignsPowerOfTheSeal.Q10296_SevenSignsPowerOfTheSeal; import com.l2jserver.gameserver.instancemanager.InstanceManager; import com.l2jserver.gameserver.model.Location; @@ -66,10 +67,12 @@ public final class ElcadiasTent extends AbstractInstance final QuestState GirlOfDoubt = talker.getQuestState(Q10292_SevenSignsGirlOfDoubt.class.getSimpleName()); final QuestState ForbiddenBook = talker.getQuestState(Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.class.getSimpleName()); final QuestState Monastery = talker.getQuestState(Q10294_SevenSignsToTheMonasteryOfSilence.class.getSimpleName()); + final QuestState PowerOfSeal = talker.getQuestState(Q10296_SevenSignsPowerOfTheSeal.class.getSimpleName()); if (((GirlOfDoubt != null) && GirlOfDoubt.isStarted()) // || ((GirlOfDoubt != null) && GirlOfDoubt.isCompleted() && (ForbiddenBook == null)) // || ((ForbiddenBook != null) && ForbiddenBook.isStarted()) // - || ((ForbiddenBook != null) && ForbiddenBook.isCompleted() && (Monastery == null))) + || ((ForbiddenBook != null) && ForbiddenBook.isCompleted() && (Monastery == null)) // + || ((PowerOfSeal != null) && PowerOfSeal.isCompleted())) { enterInstance(talker, new ETWorld(), "ElcadiasTent.xml", TEMPLATE_ID); } diff --git a/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index c5f5b26af6..6286463279 100644 --- a/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -503,7 +503,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_FOOTMAN: case VARKA_SILENOS_RECRUIT: dropHerb(npc, player, HP_HERBS_DROPLIST); - if ((cond == 3) && qs.hasQuestItems(SPEAR) && !qs.hasQuestItems(STAGE1) && (Rnd.get(100) < 5)) + if ((cond == 3) && qs.hasQuestItems(SPEAR) && !qs.hasQuestItems(STAGE1) && (Rnd.get(100) < 25)) { qs.giveItems(STAGE1, 1); qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); @@ -517,7 +517,7 @@ public class Q00144_PailakaInjuredDragon extends Quest break; case VARKA_SILENOS_WARRIOR: dropHerb(npc, player, HP_HERBS_DROPLIST); - if ((cond == 3) && qs.hasQuestItems(SPEAR) && !qs.hasQuestItems(STAGE1) && (Rnd.get(100) < 10)) + if ((cond == 3) && qs.hasQuestItems(SPEAR) && !qs.hasQuestItems(STAGE1) && (Rnd.get(100) < 25)) { qs.giveItems(STAGE1, 1); qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); @@ -531,7 +531,7 @@ public class Q00144_PailakaInjuredDragon extends Quest break; case VARKA_ELITE_GUARD: dropHerb(npc, player, HP_HERBS_DROPLIST); - if ((cond == 3) && qs.hasQuestItems(SPEAR) && !qs.hasQuestItems(STAGE1) && (Rnd.get(100) < 15)) + if ((cond == 3) && qs.hasQuestItems(SPEAR) && !qs.hasQuestItems(STAGE1) && (Rnd.get(100) < 25)) { qs.giveItems(STAGE1, 1); qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); @@ -561,7 +561,7 @@ public class Q00144_PailakaInjuredDragon extends Quest case VARKA_SILENOS_GREAT_MAGUS: case VARKA_SILENOS_GENERAL: dropHerb(npc, player, HP_HERBS_DROPLIST); - if ((cond == 3) && qs.hasQuestItems(ENCHSPEAR) && !qs.hasQuestItems(STAGE2) && (Rnd.get(100) < 5)) + if ((cond == 3) && qs.hasQuestItems(ENCHSPEAR) && !qs.hasQuestItems(STAGE2) && (Rnd.get(100) < 25)) { qs.giveItems(STAGE2, 1); qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); @@ -575,7 +575,7 @@ public class Q00144_PailakaInjuredDragon extends Quest break; case VARKAS_PROPHET: dropHerb(npc, player, HP_HERBS_DROPLIST); - if ((cond == 3) && qs.hasQuestItems(ENCHSPEAR) && !qs.hasQuestItems(STAGE2) && (Rnd.get(100) < 10)) + if ((cond == 3) && qs.hasQuestItems(ENCHSPEAR) && !qs.hasQuestItems(STAGE2) && (Rnd.get(100) < 25)) { qs.giveItems(STAGE2, 1); qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); @@ -589,7 +589,7 @@ public class Q00144_PailakaInjuredDragon extends Quest break; case VARKA_SILENOS_HEAD_GUARD: dropHerb(npc, player, HP_HERBS_DROPLIST); - if ((cond == 3) && qs.hasQuestItems(ENCHSPEAR) && !qs.hasQuestItems(STAGE2) && (Rnd.get(100) < 20)) + if ((cond == 3) && qs.hasQuestItems(ENCHSPEAR) && !qs.hasQuestItems(STAGE2) && (Rnd.get(100) < 25)) { qs.giveItems(STAGE2, 1); qs.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET); diff --git a/trunk/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java b/trunk/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java index f4ae9cad2a..c8131a4617 100644 --- a/trunk/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java +++ b/trunk/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java @@ -188,7 +188,7 @@ public final class Q00183_RelicExploration extends Quest } } } - if (qs.isCompleted()) + else if (qs.isCompleted()) { htmltext = getAlreadyCompletedMsg(player); } diff --git a/trunk/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java b/trunk/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java index be6bc5ac61..1b18db3ca9 100644 --- a/trunk/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java +++ b/trunk/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java @@ -333,7 +333,7 @@ public final class Q10295_SevenSignsSolinasTomb extends Quest return htmltext; } - int cond = st.getInt("cond"); + int cond = st.getCond(); int npcId = npc.getId(); switch (st.getState()) {