From 2400ffd92c928b5961cd459f51945d0d1a869048 Mon Sep 17 00:00:00 2001
From: Adry_85 <Adrya85@hotmail.it>
Date: Thu, 23 Jan 2014 21:42:26 +0000
Subject: [PATCH] BETA: Seven Signs quest related fixes: * Adding
missing level check for reward. * Reported by: lion *
Minor typo in '''Seven Signs, Embryo''' onKill method. *
Reported by: jurchiks
---
.../Q00193_SevenSignsDyingMessage/30760-01.html | 2 +-
.../Q00193_SevenSignsDyingMessage.java | 15 +++++++++++----
.../level_check.html | 3 +++
.../30969-02.html | 2 +-
...Q00195_SevenSignsSecretRitualOfThePriests.java | 15 +++++++++++----
.../level_check.html | 3 +++
.../Q00198_SevenSignsEmbryo.java | 2 +-
7 files changed, 31 insertions(+), 11 deletions(-)
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/level_check.html
create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/level_check.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/30760-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/30760-01.html
index 79115b917c..c674fac801 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/30760-01.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/30760-01.html
@@ -1,5 +1,5 @@
<html><body>Sir Gustav Athebaldt:<br>
Aha! The good priest told me about you! As fast as your legs are, nothing spreads faster than gossip my friend!<br>
So you're here for your reward are you? Let's see what I can dig out for you....<br>
-<a action="bypass -h Quest Q00193_SevenSignsDyingMessage 30760-02.html">"Actually I came to offer my services, but I won't say no to a reward."</a>
+<a action="bypass -h Quest Q00193_SevenSignsDyingMessage reward">"Actually I came to offer my services, but I won't say no to a reward."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index 626e084bed..844d657e74 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -189,13 +189,20 @@ public final class Q00193_SevenSignsDyingMessage extends Quest
startQuestTimer("heal", 30000 - getRandom(20000), npc, player);
break;
}
- case "30760-02.html":
+ case "reward":
{
if (st.isCond(6))
{
- st.addExpAndSp(52518015, 5817677);
- st.exitQuest(false, true);
- htmltext = event;
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ st.addExpAndSp(52518015, 5817677);
+ st.exitQuest(false, true);
+ htmltext = "30760-02.html";
+ }
+ else
+ {
+ htmltext = "level_check.html";
+ }
}
break;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/level_check.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/level_check.html
new file mode 100644
index 0000000000..e446203226
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/level_check.html
@@ -0,0 +1,3 @@
+<html><body>
+Characters who are <font color="LEVEL">level 79 or above</font> may redeem the <font color="LEVEL">Reward for the Current Quest</font>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/30969-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/30969-02.html
index 8233148bfb..4263deed99 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/30969-02.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/30969-02.html
@@ -1,5 +1,5 @@
<html><body>Iason Heine:<br>
Of course it is! This document is 1500 years old, my child. The fact that it is still eligible at all is a miracle in its own right--most parchment this old is little more than dust and ash these days.<br>
But this... this is remarkable! The one document binding Shunaiman and the Merchants together... in my very hands. A historian's dream....<br>
-<a action="bypass -h Quest Q00195_SevenSignsSecretRitualOfThePriests 30969-03.html">"Can you understand the text?"</a>
+<a action="bypass -h Quest Q00195_SevenSignsSecretRitualOfThePriests reward">"Can you understand the text?"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
index 2b91e7715c..5336cd13d0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/Q00195_SevenSignsSecretRitualOfThePriests.java
@@ -169,13 +169,20 @@ public final class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
}
break;
}
- case "30969-03.html":
+ case "reward":
{
if (st.isCond(4) && st.hasQuestItems(SHUNAIMANS_CONTRACT))
{
- st.addExpAndSp(52518015, 5817677);
- st.exitQuest(false, true);
- htmltext = event;
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ st.addExpAndSp(52518015, 5817677);
+ st.exitQuest(false, true);
+ htmltext = "30969-03.html";
+ }
+ else
+ {
+ htmltext = "level_check.html";
+ }
}
break;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/level_check.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/level_check.html
new file mode 100644
index 0000000000..e446203226
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00195_SevenSignsSecretRitualOfThePriests/level_check.html
@@ -0,0 +1,3 @@
+<html><body>
+Characters who are <font color="LEVEL">level 79 or above</font> may redeem the <font color="LEVEL">Reward for the Current Quest</font>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index 1536b20c79..5a65059257 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -180,7 +180,7 @@ public final class Q00198_SevenSignsEmbryo extends Quest
return null;
}
- final QuestState st = getQuestState(player, false);
+ final QuestState st = getQuestState(partyMember, false);
if (npc.isInsideRadius(player, 1500, true, false))
{
st.giveItems(SCULPTURE_OF_DOUBT, 1);
--
GitLab