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

Cleanup for quest 503.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-11-16 00:53:31 +00:00
parent 57039c7dd1
commit b80b5ac85a
2 changed files with 84 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java vendored
View File

@ -308,8 +308,10 @@ public class Q00503_PursuitOfClanAmbition extends Quest
} }
case "SPAWN_WITCH": case "SPAWN_WITCH":
{ {
addSpawn(WITCH_ATHREA, 160688, 21296, -3714, 0); final Npc athrea = addSpawn(WITCH_ATHREA, 160688, 21296, -3714, 0, false, 0);
addSpawn(WITCH_KALIS, 160690, 21176, -3712, 0); athrea.setScriptValue(50301);
final Npc kalis = addSpawn(WITCH_KALIS, 160690, 21176, -3712, 0, false, 0);
kalis.setScriptValue(50302);
break; break;
} }
} }
@ -436,37 +438,34 @@ public class Q00503_PursuitOfClanAmbition extends Quest
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
if (qs.isCreated() || qs.isCompleted()) if (qs.isCreated() || qs.isCompleted())
{ {
if (npc.getId() == SIR_GUSTAV_ATHEBALDT) if ((npc.getId() == SIR_GUSTAV_ATHEBALDT) && (lqs != null))
{ {
if (lqs != null) if (player.isClanLeader())
{ {
if (player.isClanLeader()) final Clan clan = player.getClan();
if (clan != null)
{ {
final Clan clan = player.getClan(); if (clan.getLevel() < 4)
if (clan != null)
{ {
if (clan.getLevel() < 4) htmltext = "30760-01.html";
{ }
htmltext = "30760-01.html"; else if (clan.getLevel() >= 5)
} {
else if (clan.getLevel() >= 5) htmltext = "30760-02.html";
{ }
htmltext = "30760-02.html"; else if ((clan.getLevel() == 4) && hasQuestItems(player, SEAL_OF_ASPIRATION))
} {
else if ((clan.getLevel() == 4) && hasQuestItems(player, SEAL_OF_ASPIRATION)) htmltext = "30760-03.html";
{ }
htmltext = "30760-03.html"; else if ((clan.getLevel() == 4) && !hasQuestItems(player, SEAL_OF_ASPIRATION))
} {
else if ((clan.getLevel() == 4) && !hasQuestItems(player, SEAL_OF_ASPIRATION)) htmltext = "30760-04.html";
{
htmltext = "30760-04.html";
}
} }
} }
else }
{ else
htmltext = "30760-04t.html"; {
} htmltext = "30760-04t.html";
} }
} }
} }
@ -570,7 +569,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
{ {
if (lqs != null) if (lqs != null)
{ {
if ((qs.getMemoState() == 1000)) if (qs.getMemoState() == 1000)
{ {
if (!player.isClanLeader()) if (!player.isClanLeader())
{ {
@ -598,11 +597,11 @@ public class Q00503_PursuitOfClanAmbition extends Quest
htmltext = "30645-05.html"; htmltext = "30645-05.html";
} }
} }
else if ((qs.getMemoState() == 3000)) else if (qs.getMemoState() == 3000)
{ {
htmltext = "30645-07.html"; htmltext = "30645-07.html";
} }
else if ((qs.getMemoState() > 3000)) else if (qs.getMemoState() > 3000)
{ {
htmltext = "30645-08.html"; htmltext = "30645-08.html";
} }
@ -657,7 +656,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
{ {
if (lqs != null) if (lqs != null)
{ {
if ((qs.getMemoState() == 4000)) if (qs.getMemoState() == 4000)
{ {
if (!player.isClanLeader()) if (!player.isClanLeader())
{ {
@ -672,7 +671,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
htmltext = "30764-04.html"; htmltext = "30764-04.html";
} }
} }
else if ((qs.getMemoState() == 5000)) else if (qs.getMemoState() == 5000)
{ {
if (getQuestItemsCount(player, SPITEFUL_SOUL_ENERGY) < 10) if (getQuestItemsCount(player, SPITEFUL_SOUL_ENERGY) < 10)
{ {
@ -686,7 +685,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
htmltext = "30764-08a.html"; htmltext = "30764-08a.html";
} }
} }
else if ((qs.getMemoState() >= 6000)) else if (qs.getMemoState() >= 6000)
{ {
htmltext = "30764-09.html"; htmltext = "30764-09.html";
} }
@ -804,14 +803,20 @@ public class Q00503_PursuitOfClanAmbition extends Quest
{ {
case WITCH_ATHREA: case WITCH_ATHREA:
{ {
startQuestTimer("DESPAWN_WITCH_ATHREA", 180000, npc, null); if (npc.isScriptValue(50301))
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.WAR_AND_DEATH)); {
startQuestTimer("DESPAWN_WITCH_ATHREA", 180000, npc, null);
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.WAR_AND_DEATH));
}
break; break;
} }
case WITCH_KALIS: case WITCH_KALIS:
{ {
startQuestTimer("DESPAWN_WITCH_KALIS", 180000, npc, null); if (npc.isScriptValue(50302))
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AMBITION_AND_POWER)); {
startQuestTimer("DESPAWN_WITCH_KALIS", 180000, npc, null);
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AMBITION_AND_POWER));
}
break; break;
} }
case IMPERIAL_COFFER: case IMPERIAL_COFFER:

79
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java vendored
View File

@ -308,8 +308,10 @@ public class Q00503_PursuitOfClanAmbition extends Quest
} }
case "SPAWN_WITCH": case "SPAWN_WITCH":
{ {
addSpawn(WITCH_ATHREA, 160688, 21296, -3714, 0); final Npc athrea = addSpawn(WITCH_ATHREA, 160688, 21296, -3714, 0, false, 0);
addSpawn(WITCH_KALIS, 160690, 21176, -3712, 0); athrea.setScriptValue(50301);
final Npc kalis = addSpawn(WITCH_KALIS, 160690, 21176, -3712, 0, false, 0);
kalis.setScriptValue(50302);
break; break;
} }
} }
@ -436,37 +438,34 @@ public class Q00503_PursuitOfClanAmbition extends Quest
String htmltext = getNoQuestMsg(player); String htmltext = getNoQuestMsg(player);
if (qs.isCreated() || qs.isCompleted()) if (qs.isCreated() || qs.isCompleted())
{ {
if (npc.getId() == SIR_GUSTAV_ATHEBALDT) if ((npc.getId() == SIR_GUSTAV_ATHEBALDT) && (lqs != null))
{ {
if (lqs != null) if (player.isClanLeader())
{ {
if (player.isClanLeader()) final Clan clan = player.getClan();
if (clan != null)
{ {
final Clan clan = player.getClan(); if (clan.getLevel() < 4)
if (clan != null)
{ {
if (clan.getLevel() < 4) htmltext = "30760-01.html";
{ }
htmltext = "30760-01.html"; else if (clan.getLevel() >= 5)
} {
else if (clan.getLevel() >= 5) htmltext = "30760-02.html";
{ }
htmltext = "30760-02.html"; else if ((clan.getLevel() == 4) && hasQuestItems(player, SEAL_OF_ASPIRATION))
} {
else if ((clan.getLevel() == 4) && hasQuestItems(player, SEAL_OF_ASPIRATION)) htmltext = "30760-03.html";
{ }
htmltext = "30760-03.html"; else if ((clan.getLevel() == 4) && !hasQuestItems(player, SEAL_OF_ASPIRATION))
} {
else if ((clan.getLevel() == 4) && !hasQuestItems(player, SEAL_OF_ASPIRATION)) htmltext = "30760-04.html";
{
htmltext = "30760-04.html";
}
} }
} }
else }
{ else
htmltext = "30760-04t.html"; {
} htmltext = "30760-04t.html";
} }
} }
} }
@ -570,7 +569,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
{ {
if (lqs != null) if (lqs != null)
{ {
if ((qs.getMemoState() == 1000)) if (qs.getMemoState() == 1000)
{ {
if (!player.isClanLeader()) if (!player.isClanLeader())
{ {
@ -598,11 +597,11 @@ public class Q00503_PursuitOfClanAmbition extends Quest
htmltext = "30645-05.html"; htmltext = "30645-05.html";
} }
} }
else if ((qs.getMemoState() == 3000)) else if (qs.getMemoState() == 3000)
{ {
htmltext = "30645-07.html"; htmltext = "30645-07.html";
} }
else if ((qs.getMemoState() > 3000)) else if (qs.getMemoState() > 3000)
{ {
htmltext = "30645-08.html"; htmltext = "30645-08.html";
} }
@ -657,7 +656,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
{ {
if (lqs != null) if (lqs != null)
{ {
if ((qs.getMemoState() == 4000)) if (qs.getMemoState() == 4000)
{ {
if (!player.isClanLeader()) if (!player.isClanLeader())
{ {
@ -672,7 +671,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
htmltext = "30764-04.html"; htmltext = "30764-04.html";
} }
} }
else if ((qs.getMemoState() == 5000)) else if (qs.getMemoState() == 5000)
{ {
if (getQuestItemsCount(player, SPITEFUL_SOUL_ENERGY) < 10) if (getQuestItemsCount(player, SPITEFUL_SOUL_ENERGY) < 10)
{ {
@ -686,7 +685,7 @@ public class Q00503_PursuitOfClanAmbition extends Quest
htmltext = "30764-08a.html"; htmltext = "30764-08a.html";
} }
} }
else if ((qs.getMemoState() >= 6000)) else if (qs.getMemoState() >= 6000)
{ {
htmltext = "30764-09.html"; htmltext = "30764-09.html";
} }
@ -804,14 +803,20 @@ public class Q00503_PursuitOfClanAmbition extends Quest
{ {
case WITCH_ATHREA: case WITCH_ATHREA:
{ {
startQuestTimer("DESPAWN_WITCH_ATHREA", 180000, npc, null); if (npc.isScriptValue(50301))
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.WAR_AND_DEATH)); {
startQuestTimer("DESPAWN_WITCH_ATHREA", 180000, npc, null);
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.WAR_AND_DEATH));
}
break; break;
} }
case WITCH_KALIS: case WITCH_KALIS:
{ {
startQuestTimer("DESPAWN_WITCH_KALIS", 180000, npc, null); if (npc.isScriptValue(50302))
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AMBITION_AND_POWER)); {
startQuestTimer("DESPAWN_WITCH_KALIS", 180000, npc, null);
npc.broadcastPacket(new NpcSay(npc, ChatType.NPC_GENERAL, NpcStringId.AMBITION_AND_POWER));
}
break; break;
} }
case IMPERIAL_COFFER: case IMPERIAL_COFFER: