summaryrefslogtreecommitdiff
path: root/npc/jobs/1-1/merchant.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/jobs/1-1/merchant.txt')
-rw-r--r--npc/jobs/1-1/merchant.txt21
1 files changed, 9 insertions, 12 deletions
diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index 8204df6a9..afd58ac42 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -3,20 +3,21 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.0
+//= 1.1
//===== Compatible With: =====================================
-//= eAthena 7.15 +
+//= eAthena 1.0 +
//===== Description: =========================================
//= <Description>
//===== Additional Comments: =================================
//= Fully working
+//= v1.1 Added instant job change for High Novice [Lupus]
//============================================================
// == Guild NPCs ==
// -- Mahnsoo --
-alberta_in.gat,53,43,6 script Chief Mahnsoo 86,
-{
+alberta_in.gat,53,43,6 script Chief Mahnsoo 86,{
+ callfunc "F_ToHigh",29,"Merchant High",34,"White Smith",153,154,155,0,"Chief Mahnsoo";
mes "[Chief Mahnsoo]";
if(Class==Job_Novice && job_merchant_q3 == 4) goto L_MakeMerc;
if(Class==Job_Novice && job_merchant_q3 == 3) goto L_GiveRecpt;
@@ -396,8 +397,7 @@ L_Failed:
// -- Wharehouse Manager Kay --
-alberta_in.gat,28,29,2 script Merchant Guildsman 83,
-{
+alberta_in.gat,28,29,2 script Merchant Guildsman 83,{
if(Class==Job_Novice && job_merchant_q3 > 0) goto L_Check;
mes "[Wharehouse Manager Kay]";
@@ -716,8 +716,7 @@ L_WrongDest:
}
// -- Kafra(Prontera) --
-prontera.gat,248,42,8 script Kafra 115,
-{
+prontera.gat,248,42,8 script Kafra 115,{
cutin "kafra_03",2;
if(Class==Job_Novice && job_merchant_q3>0) goto L_Start;
L_Other:
@@ -824,8 +823,7 @@ L_WrongDest:
// == Other Npcs ==
// -- Guild Staff --
-geffen_in.gat,155,122,4 script Guild Staff 47,
-{
+geffen_in.gat,155,122,4 script Guild Staff 47,{
if(Class==Job_Novice && job_merchant_q3>0) goto L_Start;
L_Other:
@@ -896,8 +894,7 @@ L_WrongProd:
// -- Dyer's Student --
-morocc_in.gat,140,102,4 script Dyer's Student 86,
-{
+morocc_in.gat,140,102,4 script Dyer's Student 86,{
if(Class==Job_Novice && job_merchant_q3>0) goto L_Start;
L_Other: