Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Touched up Merchant quest Biliban Kafra function

Browse Source 
- Will now return to the previous script execution if all conditions fail.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11922 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2007-12-16 23:38:41 +00:00
parent f53f2a4d05
commit 23d79b9943
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/Changelog.txt
View File

@ -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".

6
npc/jobs/1-1/merchant.txt
View File

@ -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;
}