summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-09-18 19:37:42 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-09-18 19:37:42 +0000
commit7ea9a47875a1706b6028ed112ff6c0071484a013 (patch)
treee9d506448039b9a2c7f679fb2261609798714137
parent5cd75ecd95c257e61c15fef5692918c5642e2aea (diff)
downloadhercules-7ea9a47875a1706b6028ed112ff6c0071484a013.tar.gz
hercules-7ea9a47875a1706b6028ed112ff6c0071484a013.tar.bz2
hercules-7ea9a47875a1706b6028ed112ff6c0071484a013.tar.xz
hercules-7ea9a47875a1706b6028ed112ff6c0071484a013.zip
* Fixed a misplaced quest log entry in Priest job quest, bugreport:6702 (jobs\2-1\priest.txt)
* Fixed an incorrect check in Taekwon job quest, bugreport:6711 (jobs\1-1e\taekwon.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16786 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--conf/login_athena.conf3
-rw-r--r--npc/jobs/1-1e/taekwon.txt2
-rw-r--r--npc/jobs/2-1/priest.txt6
3 files changed, 5 insertions, 6 deletions
diff --git a/conf/login_athena.conf b/conf/login_athena.conf
index 3ad5db762..fcad206e9 100644
--- a/conf/login_athena.conf
+++ b/conf/login_athena.conf
@@ -141,8 +141,7 @@ client_hash_check: off
// Put your client hashes here, a player can login into the server using
// a hash with a group_id equal or lower the account group_id
-// Follow the model(without the //):
-// client_hash: group_id, hash
+// Format: group_id, hash
// Examples:
client_hash: 0, 113e195e6c051bb1cfb12a644bb084c5
client_hash: 99, cb1ea78023d337c38e8ba5124e2338ae
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 6d4b2ad52..6d748530f 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -62,7 +62,7 @@ payon,157,141,5 script Phoenix#TKJobChange 753,{
mes "I know that the answer";
mes "will come in time...";
next;
- if (Class != Job_Novice && TK_Q != 0) {
+ if (Class != Job_Novice) {
mes "[Phoenix]";
mes "Noble adventurer:";
mes "if you know anyone who";
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index 8aadc429b..ddbdb1f32 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -1,5 +1,5 @@
//===== rAthena Script =======================================
-//= Priest Quest
+//= Priest Job Quest
//===== By: ==================================================
//= Translated By: Pgro Team (OwNaGe)(Aegis)
//= Converted by: kobra_k88.
@@ -7,7 +7,7 @@
//===== Current Version: =====================================
//= 2.6
//===== Compatible With: =====================================
-//= rAthena SVN
+//= rAthena SVN
//===== Description: =========================================
//= [Aegis Conversion]
//= Job Change quest for Priest class.
@@ -829,6 +829,7 @@ prt_church,27,24,1 script Sister Cecilia 79,{
next;
if (select("I do.:No.") == 1) {
set PRIEST_Q,9;
+ changequest 8014,8015;
mes "[Sister Cecilia]";
mes "Now, you have completed your oath of Priesthood and accomplished all three trials required to become a Priest.";
next;
@@ -844,7 +845,6 @@ prt_church,27,24,1 script Sister Cecilia 79,{
mes "......";
next;
set PRIEST_Q,8;
- changequest 8014,8015;
mes "[Sister Cecilia]";
mes "You've come so far...";
mes "Why would you want";