summaryrefslogtreecommitdiff
path: root/npc/jobs/1-1/merchant.txt
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-11 06:51:38 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-11 06:51:38 +0000
commit859b7db3e221b7d74eee7ce176e8c411f635f61d (patch)
treed34c76f404816ace48f902be9a0a1fd6bfa90f57 /npc/jobs/1-1/merchant.txt
parent139975b43ca2e325add8d09a917b36e43716046e (diff)
downloadhercules-859b7db3e221b7d74eee7ce176e8c411f635f61d.tar.gz
hercules-859b7db3e221b7d74eee7ce176e8c411f635f61d.tar.bz2
hercules-859b7db3e221b7d74eee7ce176e8c411f635f61d.tar.xz
hercules-859b7db3e221b7d74eee7ce176e8c411f635f61d.zip
Completed full save/restore of Quest Skills on the REBIRTHING 8)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7089 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs/1-1/merchant.txt')
-rw-r--r--npc/jobs/1-1/merchant.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index 1d155ef64..cec41e4f3 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
//= eAthena 1.0 +
//===== Description: =========================================
@@ -14,13 +14,14 @@
//= v1.3 Added Baby Class support [Lupus]
//= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
//= 1.5 Changed Prontera->Izlude teleport price to 600 [Lupus]
+//= 1.6 Now saves/restores all quest skills [Lupus]
//============================================================
// == Guild NPCs ==
// -- Mahnsoo --
alberta_in.gat,53,43,6 script Chief Mahnsoo 86,{
- callfunc "F_ToHigh",Job_Merchant_High,"Merchant High",Job_Whitesmith,"White Smith",153,154,155,0,"Chief Mahnsoo";
+ callfunc "F_ToHigh",Job_Merchant_High,"Merchant High",Job_Whitesmith,"Chief Mahnsoo";
mes "[Chief Mahnsoo]";
if(BaseJob==Job_Novice && job_merchant_q3 == 4) goto L_MakeMerc;
if(BaseJob==Job_Novice && job_merchant_q3 == 3) goto L_GiveRecpt;