lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various quest improvements.

Browse Source
This commit is contained in:
MobiusDev 2015-09-26 00:55:46 +00:00
parent dcfa9e52cc
commit cf64c5efc2
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trunk/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java vendored
View File

@ -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);
}

12
trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java vendored
View File

@ -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);

2
trunk/dist/game/data/scripts/quests/Q00183_RelicExploration/Q00183_RelicExploration.java vendored
View File

@ -188,7 +188,7 @@ public final class Q00183_RelicExploration extends Quest
}
}
}
if (qs.isCompleted())
else if (qs.isCompleted())
{
htmltext = getAlreadyCompletedMsg(player);
}

2
trunk/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java vendored
View File

@ -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())
{