From fe1cadb093eb64243065633170b7ea2e8744731a Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 20 Jan 2016 11:47:20 +0000
Subject: [PATCH] Updated quest Backup Seekers (10329). Contributed by gyo.
---
.../quests/Q10329_BackupSeekers/30565-02.htm | 2 +-
.../{30565-03.html => 30565-03.htm} | 2 +-
.../{30565-05.html => 30565-05.htm} | 2 +-
.../quests/Q10329_BackupSeekers/33448-03.html | 2 +-
.../quests/Q10329_BackupSeekers/33448-04.html | 4 ++++
.../Q10329_BackupSeekers.java | 16 +++++-----------
6 files changed, 13 insertions(+), 15 deletions(-)
rename trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/{30565-03.html => 30565-03.htm} (86%)
rename trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/{30565-05.html => 30565-05.htm} (60%)
create mode 100644 trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/33448-04.html
diff --git a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-02.htm b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-02.htm
index 765572d534..1b01e6d7e1 100644
--- a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-02.htm
+++ b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-02.htm
@@ -1,5 +1,5 @@
Pa'agrio Lord Kakai:
The Evil Fragments continue to spread. It's beginning to be a toss up whether we're doing archaeology or parasite control over in the ruins. I'd love to send over some reinforcements, but we've had a rash of monster attacks in the village, so I can't just reassign troops.
Could you head on over to Ye Sagira and help out?
-
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-03.html b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-03.htm
similarity index 86%
rename from trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-03.html
rename to trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-03.htm
index 2eef2136f4..f67101a93d 100644
--- a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-03.html
+++ b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-03.htm
@@ -1,4 +1,4 @@
Pa'agrio Lord Kakai:
-You can find Atran at the crossroads, on the way from the village to Ye Sagira. Don't let his gruff exterior fool you, he talks like an ogre, but he's sweet as spun candy at the core.
+You can find Atran at the crossroads, on the way from the village to Ye Sagira. Don't let his gruff exterior fool you, he talks like an ogre, but he's sweet as spun candy at the core.
If you tell him I sent you, he'll tell you how to get to Ye Sagira. May the luck of Pa'agrio always find you.
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-05.html b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-05.htm
similarity index 60%
rename from trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-05.html
rename to trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-05.htm
index 71423c32b6..69b03863b1 100644
--- a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-05.html
+++ b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/30565-05.htm
@@ -1,4 +1,4 @@
Pa'agrio Lord Kakai:
-I taught Pantheon's son, Saril, swordmanship when he was a young lad. Nice kid. Has a mean. sixte parry.
+I taught Pantheon's son, Saril, swordsmanship when he was a young lad. Nice kid. Has a mean sixte parry.
(Only characters who have completed the Level 20 or below quest, Request to Seal Pieces of Evil, can take this quest.).
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/33448-03.html b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/33448-03.html
index 05ff30da7c..4fb55568fb 100644
--- a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/33448-03.html
+++ b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/33448-03.html
@@ -1,4 +1,4 @@
Atran:
-So, so, so, so, so bored.
+So, so, so, so, so, so bored.
(The quest has already been completed)
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/33448-04.html b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/33448-04.html
new file mode 100644
index 0000000000..3b7af04d37
--- /dev/null
+++ b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/33448-04.html
@@ -0,0 +1,4 @@
+Atran:
+You hit me?! Leave, now, before I lose my temper. Now
+(Only characters under level 20, who have completed the Request to Seal Evil Fragment quest, may start this quest)
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java
index 86258cefb5..6332e9db91 100644
--- a/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java
+++ b/trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java
@@ -46,11 +46,9 @@ public class Q10329_BackupSeekers extends Quest
private static final int KAKAI = 30565;
private static final int ATRAN = 33448;
private static final int BART = 33204;
-
// Items
private static final ItemHolder RING_OF_KNOWLEDGE = new ItemHolder(875, 2);
private static final ItemHolder NECKLACE_OF_KNOWLEDGE = new ItemHolder(906, 1);
-
// Misc
private static final int MAX_LEVEL = 20;
private static final Location BART_SPAWN_1 = new Location(-117955, 255832, -1320);
@@ -85,8 +83,8 @@ public class Q10329_BackupSeekers extends Quest
addTalkId(KAKAI, ATRAN);
addSpawnId(BART);
addMoveFinishedId(BART);
- addCondMaxLevel(MAX_LEVEL, "30565-05.html");
- addCondCompletedQuest(Q10328_RequestToSealTheEvilFragment.class.getSimpleName(), "30565-05.html");
+ addCondMaxLevel(MAX_LEVEL, "30565-05.htm");
+ addCondCompletedQuest(Q10328_RequestToSealTheEvilFragment.class.getSimpleName(), "30565-05.htm");
}
@Override
@@ -106,7 +104,7 @@ public class Q10329_BackupSeekers extends Quest
htmltext = event;
break;
}
- case "30565-03.html":
+ case "30565-03.htm":
{
qs.startQuest();
htmltext = event;
@@ -120,7 +118,7 @@ public class Q10329_BackupSeekers extends Quest
{
if (qs.isStarted())
{
- showOnScreenMsg(player, NpcStringId.ACCESSORIES_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 4500);
+ showOnScreenMsg(player, NpcStringId.ACCESSORIES_HAVE_BEEN_ADDED_TO_YOUR_INVENTORY, ExShowScreenMessage.TOP_CENTER, 10000);
giveAdena(player, 25000, true);
giveItems(player, RING_OF_KNOWLEDGE);
giveItems(player, NECKLACE_OF_KNOWLEDGE);
@@ -268,11 +266,7 @@ public class Q10329_BackupSeekers extends Quest
{
case State.CREATED:
{
- if (npc.getId() == KAKAI)
- {
- htmltext = "30565-01.htm";
- break;
- }
+ htmltext = npc.getId() == KAKAI ? "30565-01.htm" : "33448-04.html";
break;
}
case State.STARTED: