Skip to content
Snippets Groups Projects
Commit 88f37b99 authored by Adry_85's avatar Adry_85
Browse files

BETA: Minor cleanup and fix for [10188].

	* You can see the movie only when all four books are read.
Reported by: janiko
Reviewed by: janiko, St3et
parent e3961152
No related branches found
No related tags found
No related merge requests found
...@@ -210,43 +210,54 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest ...@@ -210,43 +210,54 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
case "RIGHT_BOOK1": case "RIGHT_BOOK1":
{ {
qs.set("good1", "1"); qs.set("good1", "1");
npc.setScriptValue(1);
npc.setDisplayEffect(1); npc.setDisplayEffect(1);
player.showQuestMovie(25);
startQuestTimer("SPAWN_MOBS", 22000, npc, player); startQuestTimer("SPAWN_MOBS", 22000, npc, player);
htmltext = "32821-02.html"; htmltext = "32821-02.html";
if (hasCheckedAllRightBooks(qs))
{
player.showQuestMovie(25);
}
break; break;
} }
case "RIGHT_BOOK2": case "RIGHT_BOOK2":
{ {
qs.set("good2", "1"); qs.set("good2", "1");
npc.setScriptValue(1);
npc.setDisplayEffect(1); npc.setDisplayEffect(1);
npc.setTarget(player); npc.setTarget(player);
npc.doCast(VAMPIRIC_RAGE.getSkill()); npc.doCast(VAMPIRIC_RAGE.getSkill());
htmltext = "32821-02.html"; htmltext = "32821-02.html";
if (hasCheckedAllRightBooks(qs))
{
player.showQuestMovie(25);
}
break; break;
} }
case "RIGHT_BOOK3": case "RIGHT_BOOK3":
{ {
qs.set("good3", "1"); qs.set("good3", "1");
npc.setScriptValue(1);
npc.setDisplayEffect(1); npc.setDisplayEffect(1);
final L2Npc jude = addSpawn(JUDE_VAN_ETINA, 85783, -253471, -8320, 65, false, 0, false, player.getInstanceId()); final L2Npc jude = addSpawn(JUDE_VAN_ETINA, 85783, -253471, -8320, 65, false, 0, false, player.getInstanceId());
jude.setTarget(player); jude.setTarget(player);
jude.doCast(RESIST_HOLY.getSkill()); jude.doCast(RESIST_HOLY.getSkill());
htmltext = "32821-02.html"; htmltext = "32821-02.html";
if (hasCheckedAllRightBooks(qs))
{
player.showQuestMovie(25);
}
break; break;
} }
case "RIGHT_BOOK4": case "RIGHT_BOOK4":
{ {
qs.set("good4", "1"); qs.set("good4", "1");
npc.setScriptValue(1);
npc.setDisplayEffect(1); npc.setDisplayEffect(1);
final L2Npc solina = addSpawn(SOLINAS_EVIL_THOUGHTS, 85793, -247581, -8320, 0, false, 0, false, player.getInstanceId()); final L2Npc solina = addSpawn(SOLINAS_EVIL_THOUGHTS, 85793, -247581, -8320, 0, false, 0, false, player.getInstanceId());
solina.setTarget(player); solina.setTarget(player);
solina.doCast(RESIST_HOLY.getSkill()); solina.doCast(RESIST_HOLY.getSkill());
htmltext = "32821-02.html"; htmltext = "32821-02.html";
if (hasCheckedAllRightBooks(qs))
{
player.showQuestMovie(25);
}
break; break;
} }
case "DONE1": case "DONE1":
...@@ -340,7 +351,7 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest ...@@ -340,7 +351,7 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
{ {
if (qs.isCond(2)) if (qs.isCond(2))
{ {
if ((qs.getInt("good1") == 1) && (qs.getInt("good2") == 1) && (qs.getInt("good3") == 1) && (qs.getInt("good4") == 1)) if (hasCheckedAllRightBooks(qs))
{ {
qs.setCond(3, true); qs.setCond(3, true);
htmltext = "32803-04.html"; htmltext = "32803-04.html";
...@@ -432,6 +443,11 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest ...@@ -432,6 +443,11 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
return htmltext; return htmltext;
} }
public boolean hasCheckedAllRightBooks(QuestState qs)
{
return ((qs.getInt("good1") == 1) && (qs.getInt("good2") == 1) && (qs.getInt("good3") == 1) && (qs.getInt("good4") == 1));
}
public static void main(String args[]) public static void main(String args[])
{ {
new Q10294_SevenSignsToTheMonasteryOfSilence(); new Q10294_SevenSignsToTheMonasteryOfSilence();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment