Skip to content
Snippets Groups Projects
Commit 919d31dd authored by Adry_85's avatar Adry_85
Browse files

BETA: Small optimizations for Seven Signs quests. 

	Patch by: Adry_85, Zoey76
parent 786db52a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 349 additions and 436 deletions
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+ 67
− 61
View file @ 919d31dd
......@@ -165,7 +165,7 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
}
case "reward":
{
if (st.isCond(7) && st.hasQuestItems(CROOPS_LETTER) && (player.getLevel() >= MIN_LEVEL))
if (st.isCond(7) && st.hasQuestItems(CROOPS_LETTER))
{
if (player.getLevel() >= MIN_LEVEL)
{
......@@ -182,7 +182,6 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
break;
}
}
return htmltext;
}
......@@ -224,86 +223,93 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
}
case State.STARTED:
{
if (npc.getNpcId() == CROOP)
switch (npc.getNpcId())
{
switch (st.getCond())
case CROOP:
{
case 1:
{
htmltext = "30676-06.html";
break;
}
case 2:
{
st.giveItems(CROOPS_INTRODUCTION, 1);
st.setCond(3, true);
htmltext = "30676-07.html";
break;
}
case 3:
case 4:
case 5:
{
htmltext = "30676-08.html";
break;
}
case 6:
switch (st.getCond())
{
if (st.hasQuestItems(JACOBS_NECKLACE))
case 1:
{
htmltext = "30676-09.html";
htmltext = "30676-06.html";
break;
}
case 2:
{
st.giveItems(CROOPS_INTRODUCTION, 1);
st.setCond(3, true);
htmltext = "30676-07.html";
break;
}
case 3:
case 4:
case 5:
{
htmltext = "30676-08.html";
break;
}
case 6:
{
if (st.hasQuestItems(JACOBS_NECKLACE))
{
htmltext = "30676-09.html";
}
break;
}
break;
}
break;
}
}
else if (npc.getNpcId() == HECTOR)
{
if (st.isCond(3))
case HECTOR:
{
if (st.hasQuestItems(CROOPS_INTRODUCTION))
if (st.isCond(3))
{
htmltext = "30197-01.html";
if (st.hasQuestItems(CROOPS_INTRODUCTION))
{
htmltext = "30197-01.html";
}
}
else if (st.getCond() > 3)
{
htmltext = "30197-04.html";
}
break;
}
else if (st.getCond() > 3)
{
htmltext = "30197-04.html";
}
}
else if (npc.getNpcId() == STAN)
{
if (st.isCond(4))
{
htmltext = "30200-01.html";
}
else if (st.getCond() > 4)
case STAN:
{
htmltext = "30200-05.html";
}
}
else if (npc.getNpcId() == UNIDENTIFIED_BODY)
{
if (st.isCond(5))
{
htmltext = "32568-01.html";
if (st.isCond(4))
{
htmltext = "30200-01.html";
}
else if (st.getCond() > 4)
{
htmltext = "30200-05.html";
}
break;
}
else if (st.getCond() < 5)
case UNIDENTIFIED_BODY:
{
htmltext = "32568-03.html";
if (st.isCond(5))
{
htmltext = "32568-01.html";
}
else if (st.getCond() < 5)
{
htmltext = "32568-03.html";
}
break;
}
}
else if (npc.getNpcId() == HOLLINT)
{
if (st.isCond(7) && st.hasQuestItems(CROOPS_LETTER))
case HOLLINT:
{
htmltext = "30191-01.html";
if (st.isCond(7) && st.hasQuestItems(CROOPS_LETTER))
{
htmltext = "30191-01.html";
}
break;
}
}
break;
}
}
return htmltext;
}
......
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+ 60
− 76
View file @ 919d31dd
......@@ -92,21 +92,7 @@ public class Q00193_SevenSignsDyingMessage extends Quest
break;
}
case "32569-02.html":
{
if (st.isCond(1) && st.hasQuestItems(JACOBS_NECKLACE))
{
htmltext = event;
}
break;
}
case "32569-03.html":
{
if (st.isCond(1) && st.hasQuestItems(JACOBS_NECKLACE))
{
htmltext = event;
}
break;
}
case "32569-04.html":
{
if (st.isCond(1) && st.hasQuestItems(JACOBS_NECKLACE))
......@@ -137,13 +123,6 @@ public class Q00193_SevenSignsDyingMessage extends Quest
break;
}
case "32569-10.html":
{
if (st.isCond(5) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
{
htmltext = event;
}
break;
}
case "32569-11.html":
{
if (st.isCond(5) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
......@@ -218,7 +197,6 @@ public class Q00193_SevenSignsDyingMessage extends Quest
break;
}
}
return htmltext;
}
......@@ -250,87 +228,93 @@ public class Q00193_SevenSignsDyingMessage extends Quest
}
case State.STARTED:
{
if (npc.getNpcId() == HOLLINT)
switch (npc.getNpcId())
{
if (st.isCond(1) && st.hasQuestItems(JACOBS_NECKLACE))
case HOLLINT:
{
htmltext = "30191-04.html";
if (st.isCond(1) && st.hasQuestItems(JACOBS_NECKLACE))
{
htmltext = "30191-04.html";
}
break;
}
}
else if (npc.getNpcId() == CAIN)
{
switch (st.getCond())
case CAIN:
{
case 1:
switch (st.getCond())
{
if (st.hasQuestItems(JACOBS_NECKLACE))
case 1:
{
htmltext = "32569-01.html";
if (st.hasQuestItems(JACOBS_NECKLACE))
{
htmltext = "32569-01.html";
}
break;
}
break;
}
case 2:
{
htmltext = "32569-06.html";
break;
}
case 3:
{
if (st.hasQuestItems(DEADMANS_HERB))
case 2:
{
htmltext = "32569-07.html";
htmltext = "32569-06.html";
break;
}
break;
}
case 4:
{
if (isBusy)
case 3:
{
htmltext = "32569-13.html";
if (st.hasQuestItems(DEADMANS_HERB))
{
htmltext = "32569-07.html";
}
break;
}
else
case 4:
{
htmltext = "32569-08.html";
if (isBusy)
{
htmltext = "32569-13.html";
}
else
{
htmltext = "32569-08.html";
}
break;
}
break;
}
case 5:
{
if (st.hasQuestItems(SCULPTURE_OF_DOUBT))
case 5:
{
htmltext = "32569-09.html";
if (st.hasQuestItems(SCULPTURE_OF_DOUBT))
{
htmltext = "32569-09.html";
}
break;
}
break;
}
break;
}
}
else if (npc.getNpcId() == ERIC)
{
switch (st.getCond())
case ERIC:
{
case 2:
{
htmltext = "32570-01.html";
break;
}
case 3:
switch (st.getCond())
{
htmltext = "32570-03.html";
break;
case 2:
{
htmltext = "32570-01.html";
break;
}
case 3:
{
htmltext = "32570-03.html";
break;
}
}
break;
}
}
else if (npc.getNpcId() == SIR_GUSTAV_ATHEBALDT)
{
if (st.isCond(6))
case SIR_GUSTAV_ATHEBALDT:
{
htmltext = "30760-01.html";
if (st.isCond(6))
{
htmltext = "30760-01.html";
}
break;
}
}
break;
}
}
return htmltext;
}
......
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+ 159
− 173
View file @ 919d31dd
......@@ -113,13 +113,6 @@ public class Q00194_SevenSignsMammonsContract extends Quest
break;
}
case "32571-03.html":
{
if (st.isCond(3) && st.hasQuestItems(ATHEBALDTS_INTRODUCTION))
{
htmltext = event;
}
break;
}
case "32571-04.html":
{
if (st.isCond(3) && st.hasQuestItems(ATHEBALDTS_INTRODUCTION))
......@@ -262,13 +255,6 @@ public class Q00194_SevenSignsMammonsContract extends Quest
break;
}
case "32572-03.html":
{
if (st.isCond(4))
{
htmltext = event;
}
break;
}
case "32572-04.html":
{
if (st.isCond(4))
......@@ -306,13 +292,6 @@ public class Q00194_SevenSignsMammonsContract extends Quest
break;
}
case "32574-03.html":
{
if (st.isCond(10))
{
htmltext = event;
}
break;
}
case "32574-04.html":
{
if (st.isCond(10))
......@@ -357,7 +336,6 @@ public class Q00194_SevenSignsMammonsContract extends Quest
break;
}
}
return htmltext;
}
......@@ -389,202 +367,210 @@ public class Q00194_SevenSignsMammonsContract extends Quest
}
case State.STARTED:
{
if (npc.getNpcId() == SIR_GUSTAV_ATHEBALDT)
switch (npc.getNpcId())
{
if (st.isCond(1))
{
htmltext = "30760-02.html";
}
else if (st.isCond(2))
case SIR_GUSTAV_ATHEBALDT:
{
htmltext = "30760-06.html";
}
else if (st.isCond(3) && st.hasQuestItems(ATHEBALDTS_INTRODUCTION))
{
htmltext = "30760-08.html";
}
}
else if (npc.getNpcId() == COLIN)
{
switch (st.getCond())
{
case 1:
case 2:
if (st.isCond(1))
{
htmltext = "32571-01.html";
break;
htmltext = "30760-02.html";
}
case 3:
else if (st.isCond(2))
{
if (st.hasQuestItems(ATHEBALDTS_INTRODUCTION))
{
htmltext = "32571-02.html";
}
break;
htmltext = "30760-06.html";
}
case 4:
else if (st.isCond(3) && st.hasQuestItems(ATHEBALDTS_INTRODUCTION))
{
if (!st.hasQuestItems(FROG_KINGS_BEAD))
{
htmltext = (player.getTransformationId() != 111) ? "32571-06.html" : "32571-08.html";
}
break;
htmltext = "30760-08.html";
}
case 5:
break;
}
case COLIN:
{
switch (st.getCond())
{
if (st.hasQuestItems(FROG_KINGS_BEAD))
case 1:
case 2:
{
htmltext = "32571-10.html";
htmltext = "32571-01.html";
break;
}
break;
}
case 6:
{
htmltext = "32571-12.html";
break;
}
case 7:
{
if (!st.hasQuestItems(GRANDA_TESS_CANDY_POUCH))
case 3:
{
htmltext = (player.getTransformationId() != 112) ? "32571-14.html" : "32571-16.html";
if (st.hasQuestItems(ATHEBALDTS_INTRODUCTION))
{
htmltext = "32571-02.html";
}
break;
}
break;
}
case 8:
{
if (st.hasQuestItems(GRANDA_TESS_CANDY_POUCH))
case 4:
{
htmltext = "32571-18.html";
if (!st.hasQuestItems(FROG_KINGS_BEAD))
{
htmltext = (player.getTransformationId() != 111) ? "32571-06.html" : "32571-08.html";
}
break;
}
break;
}
case 9:
{
htmltext = "32571-20.html";
break;
}
case 10:
{
if (!st.hasQuestItems(NATIVES_GLOVE))
case 5:
{
htmltext = (player.getTransformationId() != 124) ? "32571-22.html" : "32571-24.html";
if (st.hasQuestItems(FROG_KINGS_BEAD))
{
htmltext = "32571-10.html";
}
break;
}
break;
}
case 11:
{
if (st.hasQuestItems(NATIVES_GLOVE))
case 6:
{
htmltext = "32571-26.html";
htmltext = "32571-12.html";
break;
}
case 7:
{
if (!st.hasQuestItems(GRANDA_TESS_CANDY_POUCH))
{
htmltext = (player.getTransformationId() != 112) ? "32571-14.html" : "32571-16.html";
}
break;
}
case 8:
{
if (st.hasQuestItems(GRANDA_TESS_CANDY_POUCH))
{
htmltext = "32571-18.html";
}
break;
}
case 9:
{
htmltext = "32571-20.html";
break;
}
case 10:
{
if (!st.hasQuestItems(NATIVES_GLOVE))
{
htmltext = (player.getTransformationId() != 124) ? "32571-22.html" : "32571-24.html";
}
break;
}
case 11:
{
if (st.hasQuestItems(NATIVES_GLOVE))
{
htmltext = "32571-26.html";
}
break;
}
case 12:
{
htmltext = "32571-28.html";
break;
}
break;
}
case 12:
{
htmltext = "32571-28.html";
break;
}
break;
}
}
else if (npc.getNpcId() == FROG)
{
switch (st.getCond())
case FROG:
{
case 1:
case 2:
case 3:
{
htmltext = "32572-01.html";
break;
}
case 4:
{
htmltext = (player.getTransformationId() == 111) ? "32572-02.html" : "32572-06.html";
break;
}
case 5:
switch (st.getCond())
{
if (st.hasQuestItems(FROG_KINGS_BEAD) && (player.getTransformationId() == 111))
case 1:
case 2:
case 3:
{
htmltext = "32572-01.html";
break;
}
case 4:
{
htmltext = "32572-07.html";
htmltext = (player.getTransformationId() == 111) ? "32572-02.html" : "32572-06.html";
break;
}
case 5:
{
if (st.hasQuestItems(FROG_KINGS_BEAD) && (player.getTransformationId() == 111))
{
htmltext = "32572-07.html";
}
break;
}
break;
}
break;
}
}
else if (npc.getNpcId() == TESS)
{
switch (st.getCond())
case TESS:
{
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
{
htmltext = "32573-01.html";
break;
}
case 7:
switch (st.getCond())
{
htmltext = (player.getTransformationId() == 112) ? "32573-02.html" : "32573-05.html";
break;
}
case 8:
{
if (st.hasQuestItems(GRANDA_TESS_CANDY_POUCH) && (player.getTransformationId() == 112))
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
{
htmltext = "32573-01.html";
break;
}
case 7:
{
htmltext = (player.getTransformationId() == 112) ? "32573-02.html" : "32573-05.html";
break;
}
case 8:
{
htmltext = "32573-06.html";
if (st.hasQuestItems(GRANDA_TESS_CANDY_POUCH) && (player.getTransformationId() == 112))
{
htmltext = "32573-06.html";
}
break;
}
break;
}
break;
}
}
else if (npc.getNpcId() == KUTA)
{
switch (st.getCond())
case KUTA:
{
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
case 8:
case 9:
{
htmltext = "32574-01.html";
break;
}
case 10:
{
htmltext = (player.getTransformationId() == 124) ? "32574-02.html" : "32574-06.html";
break;
}
case 11:
switch (st.getCond())
{
if (st.hasQuestItems(NATIVES_GLOVE) && (player.getTransformationId() == 124))
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
case 8:
case 9:
{
htmltext = "32574-01.html";
break;
}
case 10:
{
htmltext = (player.getTransformationId() == 124) ? "32574-02.html" : "32574-06.html";
break;
}
case 11:
{
htmltext = "32574-07.html";
if (st.hasQuestItems(NATIVES_GLOVE) && (player.getTransformationId() == 124))
{
htmltext = "32574-07.html";
}
break;
}
break;
}
break;
}
}
else if (npc.getNpcId() == CLAUDIA_ATHEBALDT)
{
if (st.isCond(12))
case CLAUDIA_ATHEBALDT:
{
htmltext = "31001-01.html";
if (st.isCond(12))
{
htmltext = "31001-01.html";
}
break;
}
}
break;
}
}
return htmltext;
}
......
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+ 63
− 96
View file @ 919d31dd
......@@ -79,10 +79,6 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
switch (event)
{
case "32593-02.htm":
{
htmltext = event;
break;
}
case "32593-03.htm":
{
htmltext = event;
......@@ -120,13 +116,6 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
break;
}
case "30857-02.html":
{
if (st.isCond(1))
{
htmltext = event;
}
break;
}
case "30857-03.html":
{
if (st.isCond(1))
......@@ -162,13 +151,6 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
break;
}
case "32595-02.html":
{
if (st.isCond(3))
{
htmltext = event;
}
break;
}
case "32595-03.html":
{
if (st.isCond(3))
......@@ -195,21 +177,7 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
break;
}
case "32595-06.html":
{
if (st.isCond(4) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
{
htmltext = event;
}
break;
}
case "32595-07.html":
{
if (st.isCond(4) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
{
htmltext = event;
}
break;
}
case "32595-08.html":
{
if (st.isCond(4) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
......@@ -228,13 +196,6 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
break;
}
case "32596-02.html":
{
if (st.isCond(5) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
{
htmltext = event;
}
break;
}
case "32596-03.html":
{
if (st.isCond(5) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
......@@ -254,7 +215,6 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
break;
}
}
return htmltext;
}
......@@ -287,91 +247,98 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
}
case State.STARTED:
{
if (npc.getNpcId() == WOOD)
switch (npc.getNpcId())
{
if ((st.getCond() > 0) && (st.getCond() < 6))
{
htmltext = "32593-06.html";
}
else if (st.isCond(6))
case WOOD:
{
if (st.hasQuestItems(MYSTERIOUS_HAND_WRITTEN_TEXT) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
if ((st.getCond() > 0) && (st.getCond() < 6))
{
htmltext = "32593-07.html";
htmltext = "32593-06.html";
}
else if (st.isCond(6))
{
if (st.hasQuestItems(MYSTERIOUS_HAND_WRITTEN_TEXT) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
{
htmltext = "32593-07.html";
}
}
break;
}
}
else if (npc.getNpcId() == ORVEN)
{
if (st.isCond(1))
{
htmltext = "30857-01.html";
}
else if (st.getCond() >= 2)
{
htmltext = "30857-05.html";
}
}
else if (npc.getNpcId() == LEOPARD)
{
if (st.isCond(2))
{
htmltext = "32594-01.html";
}
else if (st.getCond() >= 3)
case ORVEN:
{
htmltext = "32594-04.html";
}
}
else if (npc.getNpcId() == LAWRENCE)
{
if (st.isCond(3))
{
if (isBusy)
if (st.isCond(1))
{
htmltext = "32595-05.html";
htmltext = "30857-01.html";
}
else
else if (st.getCond() >= 2)
{
htmltext = "32595-01.html";
htmltext = "30857-05.html";
}
break;
}
else if (st.isCond(4))
case LEOPARD:
{
if (st.hasQuestItems(SCULPTURE_OF_DOUBT))
if (st.isCond(2))
{
htmltext = "32595-06.html";
htmltext = "32594-01.html";
}
}
else if (st.getCond() >= 5)
{
if (st.hasQuestItems(SCULPTURE_OF_DOUBT))
else if (st.getCond() >= 3)
{
htmltext = "32595-10.html";
htmltext = "32594-04.html";
}
break;
}
}
else if (npc.getNpcId() == SOPHIA)
{
if (st.isCond(5))
case LAWRENCE:
{
if (st.hasQuestItems(SCULPTURE_OF_DOUBT))
if (st.isCond(3))
{
if (isBusy)
{
htmltext = "32595-05.html";
}
else
{
htmltext = "32595-01.html";
}
}
else if (st.isCond(4))
{
if (st.hasQuestItems(SCULPTURE_OF_DOUBT))
{
htmltext = "32595-06.html";
}
}
else if (st.getCond() >= 5)
{
htmltext = "32596-01.html";
if (st.hasQuestItems(SCULPTURE_OF_DOUBT))
{
htmltext = "32595-10.html";
}
}
break;
}
else if (st.getCond() >= 6)
case SOPHIA:
{
if (st.hasQuestItems(SCULPTURE_OF_DOUBT) && st.hasQuestItems(MYSTERIOUS_HAND_WRITTEN_TEXT))
if (st.isCond(5))
{
if (st.hasQuestItems(SCULPTURE_OF_DOUBT))
{
htmltext = "32596-01.html";
}
}
else if (st.getCond() >= 6)
{
htmltext = "32596-05.html";
if (st.hasQuestItems(SCULPTURE_OF_DOUBT) && st.hasQuestItems(MYSTERIOUS_HAND_WRITTEN_TEXT))
{
htmltext = "32596-05.html";
}
}
break;
}
}
break;
}
}
return htmltext;
}
......
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+ 0
− 30
View file @ 919d31dd
......@@ -91,21 +91,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
break;
}
case "32597-02.html":
{
if (st.isCond(1))
{
htmltext = event;
}
break;
}
case "32597-03.html":
{
if (st.isCond(1))
{
htmltext = event;
}
break;
}
case "32597-04.html":
{
if (st.isCond(1))
......@@ -150,21 +136,7 @@ public class Q00198_SevenSignsEmbryo extends Quest
break;
}
case "32597-08.html":
{
if (st.isCond(2) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
{
htmltext = event;
}
break;
}
case "32597-09.html":
{
if (st.isCond(2) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
{
htmltext = event;
}
break;
}
case "32597-10.html":
{
if (st.isCond(2) && st.hasQuestItems(SCULPTURE_OF_DOUBT))
......@@ -190,7 +162,6 @@ public class Q00198_SevenSignsEmbryo extends Quest
break;
}
}
return htmltext;
}
......@@ -271,7 +242,6 @@ public class Q00198_SevenSignsEmbryo extends Quest
break;
}
}
return htmltext;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment