summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-12 23:52:00 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-12 23:52:00 +0000
commitaa5eb06a2b9087d8765c4e42f3a748259b995315 (patch)
treebce72ff4951782df53570af64fa85c19265b9ba3 /npc
parentc618054184d216cb57dd3747a3aa9a5a912d1c0a (diff)
downloadhercules-aa5eb06a2b9087d8765c4e42f3a748259b995315.tar.gz
hercules-aa5eb06a2b9087d8765c4e42f3a748259b995315.tar.bz2
hercules-aa5eb06a2b9087d8765c4e42f3a748259b995315.tar.xz
hercules-aa5eb06a2b9087d8765c4e42f3a748259b995315.zip
Made it so both success and failure of the gaebolg quest count as completion.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12947 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/quests/quests_nameless.txt11
-rw-r--r--npc/quests/quests_prontera.txt5
3 files changed, 15 insertions, 5 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 03d684803..941af3d64 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,7 +1,9 @@
Date Added
======
+2008/07/13
+ * Rev. 12947 Made it so both success and failure of the gaebolg quest count as completion. [L0ne_W0lf]
2008/07/12
- * Rev. 12342, and 12343. THIS COMMIT IS SOLELY FOR THE PURPOSE OF SHUTTING PEOPLE THE FUCK UP. IN TEH LAST COMMIT PRIOR TO THIS I HAD TOTALLY FORGOTTEN TO ADD AN EXTRA BACKSLASH WHEN MAKING A COMMENT, RESULTING IN AN ERROR IN THE NPC PARSER. THIS ERROR HAS BEEN CORRECTED, AND THE MESSAGE "Whoops." LEFT IN THE CHANGELOG. [L0ne_W0lf]
+ * Rev. 12342, and 12343. \/ wuz typo'd [L0ne_W0lf]
* Rev. 12341 Fixed a typo when disabling a control device. [L0ne_W0lf]
* Rev. 12340 Updated Refiner function. cleaner, and less dated. [L0ne_W0lf]
* Rev. 12339 Added Nameless Island Dungeon quest. [L0ne_W0llf]
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 18dd0abbe..165541dbe 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -12,19 +12,26 @@
//= - Quest to gain access to Nameless Island and dungeon.
//= - Variable in use: aru_monas (Max: 26)
//= Peace to the Arunfeltz:
+//- - Not Implemented
//= - Variable in use: N/A (Max: N/A)
//= Z-Gang Quest:
+//- - Not Implemented
//= - Variable in use: N/A (Max: N/A)
//= Rogue Guild Investigation Assistance:
+//- - Not Implemented
//= - Variable in use: N/A (Max: N/A)
//= Maf's Loan:
+//- - Not Implemented
//= - Variable in use: N/A (Max: N/A)
//= Broken Diamond:
+//- - Not Implemented
//= - Variable in use: N/A (Max: N/A)
//= Unlucky Emerald:
+//- - Not Implemented
//= - Variable in use: N/A (Max: N/A)
//===== Additional Comments: =================================
//= 1.0 First version. [L0ne_W0lf]
+//= 1.1 Made quest accessable to "Failed" gaebolg quest. [L0ne_W0lf]
//============================================================
airplane_01,95,61,3 script Agent#Aru 899,5,5,{
@@ -35,7 +42,7 @@ OnInit:
end;
OnTouch:
- if ((prt_curse == 61) && (rachel_camel == 25) && (aru_monas < 1)) {
+ if ((prt_curse == 56 || prt_curse == 61) && (rachel_camel == 25) && (aru_monas < 1)) {
hideoffnpc "Agent#Aru";
mes "[????]";
mes "Are you "+strcharinfo(0)+"?";
diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt
index 24251f26f..2322ae24b 100644
--- a/npc/quests/quests_prontera.txt
+++ b/npc/quests/quests_prontera.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 2.2
+//= 2.3
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -38,6 +38,7 @@
//= 2.0b Corrected a Typo error. (bugreport:950) [Samuray22]
//= 2.1 Added missing checkweights. [L0ne_W0lf]
//= 2.2 Added Nameless Island quest addition. [L0ne_W0lf]
+//= 2.3 Bamph will now talk to those who failed the Gaebolg quest. [L0ne_W0lf]
//============================================================
// Prontera Culvert
@@ -2737,7 +2738,7 @@ prt_church,185,106,3 script Father Bamph 60,{
close;
}
else {
- if (prt_curse == 61) {
+ if (prt_curse == 56 || prt_curse == 61) {
// Begin Nameless Island Access Quest Addition
if (aru_monas == 1) {
mes "[Father Bamph]";