turned the rest of job numbers to constants

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7554 54d463be-8e91-2dee-dedb-b68131a5f0ec

6 files changed, 25 insertions, 27 deletions

diff --git a/npc/jobs/1-1/acolyte.txt b/npc/jobs/1-1/acolyte.txt
index c0b220c04..962f40be9 100644
--- a/npc/jobs/1-1/acolyte.txt
+++ b/npc/jobs/1-1/acolyte.txt
@@ -24,7 +24,7 @@
 prt_church.gat,184,41,4	script	Father Mareusis	60,{

 	callfunc "F_ToHigh",Job_Acolyte_High,"Acolyte High",Job_High_Priest,"Father Mareusis";

 	mes "[Father Mareusis]";

-	if(BaseJob==Job_Novice && job_acolyte_q > 0) goto L_Check;

+	if(BaseJob == Job_Novice && job_acolyte_q > 0) goto L_Check;

 	mes "What is it you are looking for?";

 	next;

 	menu "Father, I want to become an Acolyte.",M_0,"The Requirements.",M_1,"I'm just looking around that's all",M_End;

@@ -176,8 +176,8 @@ L_Check:
 // -- Father Rubalkabara --

 prt_fild03.gat,365,259,2	script	Father Rubalkabara	110,{

 	mes "[Father Rubalkabara]";

-	if(BaseJob==Job_Acolyte || BaseJob==Job_Priest) callfunc "F_FatherRub";

-	if(BaseJob==Job_Novice) goto L_Novice;

+	if(BaseJob == Job_Acolyte || BaseJob == Job_Priest) callfunc "F_FatherRub";

+	if(BaseJob == Job_Novice) goto L_Novice;

 

 L_Other:

 	mes "Oh.. Have you come here to train Or are you just a Wanderer..?";

@@ -237,7 +237,7 @@ L_Start:
 // -- Mother Marthilda --

 moc_fild07.gat,36,354,4	script	Mother Marthilda	79,{

 	mes "[Mother Marthilda]";

-	if(BaseJob == Job_Acolyte || BaseJob==Job_Priest) callfunc "F_MotherMart";

+	if(BaseJob == Job_Acolyte || BaseJob == Job_Priest) callfunc "F_MotherMart";

 	if(BaseJob == Job_Novice) goto L_Novice;

 

 L_Other:

@@ -292,7 +292,7 @@ L_Start:
 // -- Father Yosuke --

 prt_fild00.gat,208,218,6	script	Father Yosuke	120,{

 	mes "[Father Yosuke]";

-	if(BaseJob == Job_Acolyte || BaseJob==Job_Priest) callfunc "F_FatherYos";

+	if(BaseJob == Job_Acolyte || BaseJob == Job_Priest) callfunc "F_FatherYos";

 	if(BaseJob == Job_Novice) goto L_Novice;

 

 L_Other:

diff --git a/npc/jobs/1-1/archer.txt b/npc/jobs/1-1/archer.txt
index e1cf9c51e..2ed2c0afe 100644
--- a/npc/jobs/1-1/archer.txt
+++ b/npc/jobs/1-1/archer.txt
@@ -22,7 +22,7 @@
 payon_in02.gat,64,71,4	script	Archer Guildsman	59,{

 	callfunc "F_ToHigh",Job_Archer_High,"High Archer",Job_Sniper,"Archer Guildsman";

 	mes "[Archer Guildsman]";

-	if(BaseJob==Job_Novice && job_archer_q == 1) goto L_Check;

+	if(BaseJob == Job_Novice && job_archer_q == 1) goto L_Check;

 	mes "Good Day. How may I help you?";

 	next;

 	menu "I would like to become an Archer.",M_0,"What are the Requirements?",M_1,"Never mind.",M_End;

diff --git a/npc/jobs/1-1/mage.txt b/npc/jobs/1-1/mage.txt
index d135bd11e..890de725c 100644
--- a/npc/jobs/1-1/mage.txt
+++ b/npc/jobs/1-1/mage.txt
@@ -22,7 +22,7 @@
 // -- Expert Mage -- 

 geffen_in.gat,164,124,4	script	Expert Mage	123,{

 	callfunc "F_ToHigh",Job_Mage_High,"High Mage",Job_High_Wizard,"Expert Mage";

-	if(BaseJob==Job_Novice && job_magician_q >= 1) goto L_BeMage;

+	if(BaseJob == Job_Novice && job_magician_q >= 1) goto L_BeMage;

 

 	mes "[Expert Mage]";

 	mes "Hi hi!  What can I help you with today?";

diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt
index 41baf4dca..d04f0c2b0 100644
--- a/npc/jobs/1-1/merchant.txt
+++ b/npc/jobs/1-1/merchant.txt
@@ -25,10 +25,10 @@
 alberta_in.gat,53,43,6	script	Chief Mahnsoo	86,{

 	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;

-	if(BaseJob==Job_Novice && job_merchant_q3 == 5) goto L_Failed;

-	if(BaseJob==Job_Novice && job_merchant_q2 > 0) goto L_Back;

+	if(BaseJob == Job_Novice && job_merchant_q3 == 4) goto L_MakeMerc;

+	if(BaseJob == Job_Novice && job_merchant_q3 == 3) goto L_GiveRecpt;

+	if(BaseJob == Job_Novice && job_merchant_q3 == 5) goto L_Failed;

+	if(BaseJob == Job_Novice && job_merchant_q2 > 0) goto L_Back;

 

 	mes "What brings you here? Something on your mind?";

 M_Menu:

@@ -37,7 +37,7 @@ M_Menu:
 

      	M_0:

 

-     		if(BaseJob==Job_Merchant) {

+     		if(BaseJob == Job_Merchant) {

 			mes "[Chief Mahnsoo]";

 			mes "Huh? What did you say? You noodle head! Take a good look at yourself.  Your ALREADY A MERCHANT!  Good lord!";

 			emotion e_what;

@@ -401,7 +401,7 @@ L_Failed:
 

 // -- Wharehouse Manager Kay --

 alberta_in.gat,28,29,2	script	Merchant Guildsman	83,{

-	if(BaseJob==Job_Novice && job_merchant_q3 > 0) goto L_Check;

+	if(BaseJob == Job_Novice && job_merchant_q3 > 0) goto L_Check;

 

 	mes "[Wharehouse Manager Kay]";

 	mes "Hey~ What brings you here?";

@@ -410,7 +410,7 @@ alberta_in.gat,28,29,2	script	Merchant Guildsman	83,{
 

 	M_0:

 		mes "[Wharehouse Manager Kay]";

-		if(BaseJob!=0) goto L_NotNov;

+		if(BaseJob != Job_Novice) goto L_NotNov;

 		if(job_merchant_q==0) goto L_NotRdy;

 		mes "You're ^0000cc"+ strcharinfo(0) +"^000000, right?  Ok I'll give you a product to deliver.  First I'll need the destination";

 		next;

@@ -721,7 +721,7 @@ L_WrongDest:
 // -- Kafra(Prontera) --

 prontera.gat,248,42,8	script	Kafra#01	115,{

 	cutin "kafra_03",2;

-	if(BaseJob==Job_Novice && job_merchant_q3>0) goto L_Start;

+	if(BaseJob == Job_Novice && job_merchant_q3>0) goto L_Start;

 L_Other:

 	mes "[Kafra]";

 	mes "Hello.  I am a Kafra Service Agent.  As you can see, the ^3355FFSwordsman Association^000000 has moved to Izlude.";

@@ -828,7 +828,7 @@ L_WrongDest:
 // -- Guild Staff --

 geffen_in.gat,155,122,4	script	Guild Staff	47,{

 

-	if(BaseJob==Job_Novice && job_merchant_q3>0) goto L_Start;

+	if(BaseJob == Job_Novice && job_merchant_q3>0) goto L_Start;

 L_Other:

 	mes "[Guild Staff]";

 	mes "It should be arriving any time now...... it seems to be late.... Hmm...";

@@ -898,7 +898,7 @@ L_WrongProd:
 

 // -- Dyer's Student --

 morocc_in.gat,140,102,4	script	Dyer's Student	86,{

-	if(BaseJob==Job_Novice && job_merchant_q3>0) goto L_Start;

+	if(BaseJob == Job_Novice && job_merchant_q3>0) goto L_Start;

 

 L_Other:

 	mes "[Dyer's Student]";

diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt
index 0c9c5e058..0ec8f108b 100644
--- a/npc/jobs/1-1/swordman.txt
+++ b/npc/jobs/1-1/swordman.txt
@@ -28,7 +28,7 @@
 izlude_in.gat,74,172,5	script	Master Swordsman	119,{

 	callfunc "F_ToHigh",Job_Swordman_High,"Swordman High",Job_Lord_Knight,"Master Swordsman";

 	mes "[Master Swordsman]";

-	if(BaseJob==Job_Novice && job_sword_q == 2) goto L_Done;

+	if(BaseJob == Job_Novice && job_sword_q == 2) goto L_Done;

 	mes "Welcome to the Swordsman Association! So.. What business brings you to us?";

 L_Menu:

 	next;

@@ -174,7 +174,7 @@ L_Done:
 // == Warp ==

 // -- Warp to test room --

 izlude_in.gat,62,170,0	script	w1039	45,1,1,{

-	if(BaseJob==Job_Novice && job_sword_q > 0) warp "izlude_in.gat",40,170;

+	if(BaseJob == Job_Novice && job_sword_q > 0) warp "izlude_in.gat",40,170;

 	if(job_sword_q == 0) doevent "Swordsman::OnStart";

 	end;

 }

@@ -190,8 +190,8 @@ izlude_in.gat,65,171,5	script	Swordsman#02	-1,{
 

 OnStart:

 	mes "[Swordsman]";

-	if(BaseJob == 1) goto L_Sword;

-	if(BaseJob == 0) goto L_Novice;

+	if(BaseJob == Job_Swordman) goto L_Sword;

+	if(BaseJob == Job_Novice) goto L_Novice;

 

 L_Other:

 	mes "Who might you be?! Those who are not Novices are not permitted to go in! Please leave.";

diff --git a/npc/jobs/1-1/thief.txt b/npc/jobs/1-1/thief.txt
index 1bb5b1736..a64093317 100644
--- a/npc/jobs/1-1/thief.txt
+++ b/npc/jobs/1-1/thief.txt
@@ -157,8 +157,6 @@ M_Menu:
 		next;

 		mes "[Thief Guide]";

 		mes "   This sounds easy but ^009900do know, there are Monsters who guard Mushrooms^000000?";

-				// had to leave the engrish in, it was to good not too.  d^_^b

-				// And I took it out.  :D  [KillerBox]

 		mes "   Stop reading Fairy Tales and ^FF0000brace up your nerves; this will be the toughest experience ever^000000.";

 		next;

 		mes "[Thief Guide]";

@@ -244,8 +242,8 @@ M_Menu:
 // -- Test Grader --

 moc_prydb1.gat,42,133,2	script	Comrade Brad	118,{

 	callfunc "F_ToHigh",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Brad";

-	if(BaseJob == 0) goto L_Novice;

-	if(BaseJob == 6) goto L_Thief;

+	if(BaseJob == Job_Novice) goto L_Novice;

+	if(BaseJob == Job_Thief) goto L_Thief;

 

 L_Other:

 	mes "[Brad]";

@@ -338,8 +336,8 @@ L_4:
 

 // -- Irrelevant Man --

 moc_ruins.gat,141,125,3	script	Irrelevant Man	118,{

-	if(BaseJob == 6) goto L_Thief;

-	if(BaseJob == 0) goto L_Novice;

+	if(BaseJob == Job_Thief) goto L_Thief;

+	if(BaseJob == Job_Novice) goto L_Novice;

 

 L_Other:

 	if(@s_flag==1) goto L_1b;