From 259f4e8644fbd6426804425ef377d4a93d6a8740 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 24 Aug 2015 13:30:26 +0000
Subject: [PATCH] Quest 10360 update. Contributed by spider.
---
.../Q10360_CertificationOfFate/30297-01.htm | 2 +-
.../Q10360_CertificationOfFate.java | 48 ++++++++++++++++++-
2 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/30297-01.htm b/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/30297-01.htm
index 2f67f65fd9..495b591577 100644
--- a/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/30297-01.htm
+++ b/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/30297-01.htm
@@ -1,6 +1,6 @@
Grand Master Tobias:
It's going to take longer than we thought for the lord to return, and all our guards are stationed outside of the town!
-We cannot delay though. We must stir our own heearts and steel ourselves. Sakum heads towards Dion as we speak, and we cannot simply stand by and let the great city fall.
+We cannot delay though. We must stir our own hearts and steel ourselves. Sakum heads towards Dion as we speak, and we cannot simply stand by and let the great city fall.
Could you help us?
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
index c0a4d41e22..d9483699d2 100644
--- a/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
+++ b/trunk/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java
@@ -59,7 +59,7 @@ public class Q10360_CertificationOfFate extends Quest
// Requirements
private static final int MIN_LEVEL = 38;
// Rewards
- private static final int ADENA_REWARD = 110000;
+ private static final int ADENA_REWARD = 1100;
private static final int EXP_REWARD = 2700000;
private static final int SP_REWARD = 648;
private static final ItemHolder PROOF_OF_JUSTICE = new ItemHolder(17822, 40);
@@ -108,6 +108,14 @@ public class Q10360_CertificationOfFate extends Quest
htmltext = event;
break;
}
+ case "30155-03.html":
+ case "30158-03.html":
+ case "30288-03.html":
+ case "30289-03.html":
+ case "30297-03.html":
+ case "30504-03.html":
+ case "30505-03.html":
+ case "32196-03.html":
case "33524-02.html":
case "33518-02.html":
case "33517-02.html":
@@ -180,18 +188,22 @@ public class Q10360_CertificationOfFate extends Quest
case DARK_ELF:
{
qs.setCond(12);
+ break;
}
case ORC:
{
qs.setCond(13);
+ break;
}
case DWARF:
{
qs.setCond(14);
+ break;
}
case KAMAEL:
{
qs.setCond(15);
+ break;
}
}
htmltext = event;
@@ -428,6 +440,10 @@ public class Q10360_CertificationOfFate extends Quest
{
htmltext = "30289-01.htm";
}
+ else
+ {
+ htmltext = getNoQuestMsg(player);
+ }
break;
}
case RAINS:
@@ -436,6 +452,10 @@ public class Q10360_CertificationOfFate extends Quest
{
htmltext = "30288-01.htm";
}
+ else
+ {
+ htmltext = getNoQuestMsg(player);
+ }
break;
}
case ELLENIA:
@@ -444,6 +464,10 @@ public class Q10360_CertificationOfFate extends Quest
{
htmltext = "30155-01.htm";
}
+ else
+ {
+ htmltext = getNoQuestMsg(player);
+ }
break;
}
case ESRANDELL:
@@ -452,6 +476,10 @@ public class Q10360_CertificationOfFate extends Quest
{
htmltext = "30158-01.htm";
}
+ else
+ {
+ htmltext = getNoQuestMsg(player);
+ }
break;
}
case TOBIAS:
@@ -460,6 +488,10 @@ public class Q10360_CertificationOfFate extends Quest
{
htmltext = "30297-01.htm";
}
+ else
+ {
+ htmltext = getNoQuestMsg(player);
+ }
break;
}
case DRIKUS:
@@ -468,6 +500,10 @@ public class Q10360_CertificationOfFate extends Quest
{
htmltext = "30505-01.htm";
}
+ else
+ {
+ htmltext = getNoQuestMsg(player);
+ }
break;
}
case MENDIO:
@@ -476,6 +512,10 @@ public class Q10360_CertificationOfFate extends Quest
{
htmltext = "30504-01.htm";
}
+ else
+ {
+ htmltext = getNoQuestMsg(player);
+ }
break;
}
case GERSHWIN:
@@ -484,6 +524,10 @@ public class Q10360_CertificationOfFate extends Quest
{
htmltext = "32196-01.htm";
}
+ else
+ {
+ htmltext = getNoQuestMsg(player);
+ }
break;
}
default:
@@ -644,10 +688,12 @@ public class Q10360_CertificationOfFate extends Quest
case SHILLIEN_ORACLE:
{
htmltext = "30297-04d.html";
+ break;
}
case DARK_WIZARD:
{
htmltext = "30297-04c.html";
+ break;
}
case ASSASSIN:
{