Removed some redundant quest checks.

This commit is contained in:
MobiusDev
2018-03-30 02:42:02 +00:00
parent a4b68e37e7
commit fb861c24a7
6 changed files with 102 additions and 120 deletions

View File

@@ -121,32 +121,29 @@ public class Q10522_TheDarkSecretOfVarkaSilenos extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (npc.getId() == HANSEN)
switch (qs.getState())
{
switch (qs.getState())
case State.CREATED:
{
case State.CREATED:
htmltext = "33853-01.htm";
break;
}
case State.STARTED:
{
if (qs.isCond(1))
{
htmltext = "33853-01.htm";
break;
htmltext = "33853-05.html";
}
case State.STARTED:
else if (qs.isCond(2))
{
if (qs.isCond(1))
{
htmltext = "33853-05.html";
}
else if (qs.isCond(2))
{
htmltext = "33853-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
htmltext = "33853-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;

View File

@@ -103,32 +103,29 @@ public class Q10523_TheAssassinationOfTheVarkaSilenosCommander extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (npc.getId() == HANSEN)
switch (qs.getState())
{
switch (qs.getState())
case State.CREATED:
{
case State.CREATED:
htmltext = "33853-01.htm";
break;
}
case State.STARTED:
{
if (qs.isCond(1))
{
htmltext = "33853-01.htm";
break;
htmltext = "33853-05.html";
}
case State.STARTED:
else if (qs.isCond(2))
{
if (qs.isCond(1))
{
htmltext = "33853-05.html";
}
else if (qs.isCond(2))
{
htmltext = "33853-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
htmltext = "33853-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;

View File

@@ -106,32 +106,29 @@ public class Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief extends Ques
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (npc.getId() == HANSEN)
switch (qs.getState())
{
switch (qs.getState())
case State.CREATED:
{
case State.CREATED:
htmltext = "33853-01.htm";
break;
}
case State.STARTED:
{
if (qs.isCond(1))
{
htmltext = "33853-01.htm";
break;
htmltext = "33853-05.html";
}
case State.STARTED:
else if (qs.isCond(2))
{
if (qs.isCond(1))
{
htmltext = "33853-05.html";
}
else if (qs.isCond(2))
{
htmltext = "33853-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
htmltext = "33853-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;

View File

@@ -126,32 +126,29 @@ public class Q10526_TheDarkSecretOfTheKetraOrcs extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (npc.getId() == LUGONNES)
switch (qs.getState())
{
switch (qs.getState())
case State.CREATED:
{
case State.CREATED:
htmltext = "33852-01.htm";
break;
}
case State.STARTED:
{
if (qs.isCond(1))
{
htmltext = "33852-01.htm";
break;
htmltext = "33852-05.html";
}
case State.STARTED:
else if (qs.isCond(2))
{
if (qs.isCond(1))
{
htmltext = "33852-05.html";
}
else if (qs.isCond(2))
{
htmltext = "33852-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
htmltext = "33852-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;

View File

@@ -104,32 +104,29 @@ public class Q10527_TheAssassinationOfTheKetraOrcCommander extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (npc.getId() == LUGONNES)
switch (qs.getState())
{
switch (qs.getState())
case State.CREATED:
{
case State.CREATED:
htmltext = "33852-01.htm";
break;
}
case State.STARTED:
{
if (qs.isCond(1))
{
htmltext = "33852-01.htm";
break;
htmltext = "33852-05.html";
}
case State.STARTED:
else if (qs.isCond(2))
{
if (qs.isCond(1))
{
htmltext = "33852-05.html";
}
else if (qs.isCond(2))
{
htmltext = "33852-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
htmltext = "33852-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;

View File

@@ -107,32 +107,29 @@ public class Q10528_TheAssassinationOfTheKetraOrcChief extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (npc.getId() == LUGONNES)
switch (qs.getState())
{
switch (qs.getState())
case State.CREATED:
{
case State.CREATED:
htmltext = "33852-01.htm";
break;
}
case State.STARTED:
{
if (qs.isCond(1))
{
htmltext = "33852-01.htm";
break;
htmltext = "33852-05.html";
}
case State.STARTED:
else if (qs.isCond(2))
{
if (qs.isCond(1))
{
htmltext = "33852-05.html";
}
else if (qs.isCond(2))
{
htmltext = "33852-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
htmltext = "33852-06.html";
}
break;
}
case State.COMPLETED:
{
htmltext = getAlreadyCompletedMsg(player);
break;
}
}
return htmltext;