summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-16 23:38:41 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-16 23:38:41 +0000
commit6571c71701dca9d85f33b7be245879b6a9906d81 (patch)
tree5a414f8c5a3fa613fd8b32201680feaaf677089e
parent0b3f74672c5da3a7baa8603ca2314ebb50c3dcc8 (diff)
downloadhercules-6571c71701dca9d85f33b7be245879b6a9906d81.tar.gz
hercules-6571c71701dca9d85f33b7be245879b6a9906d81.tar.bz2
hercules-6571c71701dca9d85f33b7be245879b6a9906d81.tar.xz
hercules-6571c71701dca9d85f33b7be245879b6a9906d81.zip
Touched up Merchant quest Biliban Kafra function
- Will now return to the previous script execution if all conditions fail. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11922 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/jobs/1-1/merchant.txt6
2 files changed, 6 insertions, 2 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index d4d2d7635..8cc975cc8 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
Date Added
======
2007/12/16
+ * Rev. 11922 Touched up Merchant quest Biliban Kafra function [L0ne_W0lf]
+ - Will now return to the previous script execution if all conditions fail.
* Rev. 11921 Updated Louyang NPCs, quests, and warps. [L0ne_W0lf]
2007/12/14
* Commited the quick fix "emps not respawning if the emp breaker logs off".
diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index 384ab0ae5..2c0fb1284 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 1.9b
+//= 2.0
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -24,6 +24,7 @@
//= 1.9 Bugfixes, thanks to Barron-Monster. [L0ne_W0lf]
//= 1.9a Added a missing next; (Barron-Monster) [L0ne_W0lf]
//= 1.9b Typo. "nextl" -> "next;" (Barron-Monster) [L0ne_W0lf]
+//= 2.0 Should "fix" the problem with the Biliban Kafra. [L0ne_W0lf]
//============================================================
alberta_in,53,43,6 script Merchant#mer 86,{
@@ -1050,7 +1051,7 @@ prontera,248,42,0 script Kafra Employee#mer 116,{
//izlu2dun,106,58,4 script Kafra Employee#mer 116,{
function script F_MercKafra {
- if (job_merchant_q == 6 || job_merchant_q == 5 && job_merchant_q2 == 8 || job_merchant_q2 == 7) {
+ if ((job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 8 || job_merchant_q2 == 7)) {
mes "[Kafra Employee]";
mes "Oh hello~";
mes "Um, is there";
@@ -1144,4 +1145,5 @@ function script F_MercKafra {
cutin "",255;
end;
}
+ return;
}