turned the rest of job numbers to constants

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

npc/Changelog.txt

@@ -38,6 +38,8 @@ Playtester
 
 Date		Added
 ======
+07/05
+	* Went trough all scripts and turned all job numbers -> constants [Lupus]
 07/05
 	* fixed missing labels socket_enchant.txt [Lupus]
 	* Standardized NPCs quest/quests_city headers, now says 'Quest NPCs related to'

npc/jobs/1-1/merchant.txt

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

npc/jobs/1-1/swordman.txt

@@ -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 == Job_Swordman) goto L_Sword;
-	if(BaseJob == 0) goto L_Novice;
+	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.";

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 == Job_Novice) goto L_Novice;
-	if(BaseJob == 6) goto L_Thief;
+	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 == Job_Thief) goto L_Thief;
-	if(BaseJob == 0) goto L_Novice;
+	if(BaseJob == Job_Novice) goto L_Novice;
 
 L_Other:
 	if(@s_flag==1) goto L_1b;

npc/jobs/2-1/blacksmith.txt

@@ -242,7 +242,7 @@ L_Change:
 //<=============================================== Geshupenschte: 1st, 2nd, 3rd Test ===================================================>\\
 ein_in01.gat,201,27,4	script	Geshupenschte	63,{
 
-	if(BaseJob==5) goto L_merchant;
+	if(BaseJob == Job_Merchant) goto L_merchant;
 	mes "[Geshupenschte]";
 	mes "Hello sir! I'm the blacksmith.  Geshupenschte! Nice to meet you!";
 	next;

npc/jobs/2-2/dancer.txt

@@ -71,7 +71,7 @@ L1:
 }
 //= 1st quest NPC, asks for Items and/or money, then passes you onto the next NPC
 job_duncer.gat,43,93,4	script	Aire	724,{
-	if ((BaseJob == Job_Archer) && (Sex == 0)) goto Larcher;
+	if (BaseJob == Job_Archer && Sex == 0) goto Larcher;
 	if (BaseJob == Job_Dancer) goto Ldancer;
 	if (Upper==1) goto LUpper1;
 	mes "[Aire]";
@@ -320,7 +320,7 @@ LUpper1:
 }
 //= 2nd "Quest" and Job changer for after the 3rd Quest
 job_duncer.gat,95,93,4	script	Bijou	101,{
-	if ((BaseJob == Job_Archer) && (Sex == 0)) goto LArcher;
+	if (BaseJob == Job_Archer && Sex == 0) goto LArcher;
 	if (BaseJob == Job_Dancer) goto LDancer;
 	mes "[Bijou]";
 	mes "Welcome to our Dance Theater, there are many dancers around here.";

npc/jobs/2-2/sage.txt

@@ -5,7 +5,7 @@
 //= Unknown Translator (1.0)
 //= Darkchild (1.2)
 //===== Current Version: ===================================== 
-//= 2.0
+//= 2.0a
 //===== Compatible With: ===================================== 
 //= eAthena 1.0 +
 //===== Description: ========================================= 
@@ -30,8 +30,8 @@
 //==================================
 yuno_in02.gat,38,61,4	script	Magic Academy Headmaster 	743,{
 	callfunc "F_BlockHigh",Job_Mage_High,"High Mage",Job_Professor,"Professor","Keiron";
-	if(BaseJob == 16) goto L_Menu3_3;
+	if(BaseJob == Job_Sage) goto L_Menu3_3;
-	if(BaseJob != 2) goto L_Menu2_1;
+	if(BaseJob != Job_Mage) goto L_Menu2_1;
 	if(SAGE_Q == 11) goto L_Menu3_1;
 	if(SAGE_Q >= 3) goto L_Menu2_2;
 	mes "[Keiron]";
@@ -160,8 +160,8 @@ L_Menu3_3:
 //Biotech Lab
 //===============================
 yuno_in03.gat,244,31,3	script	Physics Professor	120,{
-	if(BaseJob == 16) goto L_Menu3_2;
+	if(BaseJob == Job_Sage) goto L_Menu3_2;
-	if(BaseJob != 2) goto L_Menu1_1;
+	if(BaseJob != Job_Mage) goto L_Menu1_1;
 	if(SAGE_Q == 11) goto L_Menu3_1;
 	if(SAGE_Q2 == 8) goto L_Menu2_1;
 	if(SAGE_Q2 == 9) goto L_Menu2_3;
@@ -571,8 +571,8 @@ L_Menu3_2:
 //==================================
 
 yuno_in03.gat,32,102,0	script	Biology Professor	755,{
-	if(BaseJob == 16) goto L_Menu5_4;
+	if(BaseJob == Job_Sage) goto L_Menu5_4;
-	if(BaseJob != 2) goto L_Menu1_1;
+	if(BaseJob != Job_Mage) goto L_Menu1_1;
 	if(SAGE_Q == 11) goto L_Menu5_3;
 	if((SAGE_Q2 >= 1) && (SAGE_Q2 <= 3)) goto L_Menu3_1;
 	if((SAGE_Q2 >= 4) && (SAGE_Q2 <= 6)) goto L_Menu4_1;
@@ -942,8 +942,8 @@ L_Menu5_4:
 yuno_in03.gat,154,35,4	script	Academy Staff	742,{
 	callfunc "F_BlockHigh",26,"High Mage",40,"Professor","Mathias";
 
-	if(BaseJob == 16) goto L_Menu6_4;
+	if(BaseJob == Job_Sage) goto L_Menu6_4;
-	if(BaseJob != 2) goto L_Menu1_1;
+	if(BaseJob != Job_Mage) goto L_Menu1_1;
 	if(SAGE_Q == 11) goto L_Menu6_3;
 	if(SAGE_Q >= 4) goto L_Menu6_2;
 	if(SAGE_Q == 3) goto L_Menu6_1;
@@ -1227,8 +1227,8 @@ L_Menu6_4:
 }
 
 yuno_in03.gat,169,180,4	script	Test Professor	755,{
-	if(BaseJob == 16) goto L_Menu4_5;
+	if(BaseJob == Job_Sage) goto L_Menu4_5;
-	if(BaseJob != 2) goto L_Menu1_1;
+	if(BaseJob != Job_Mage) goto L_Menu1_1;
 	if(SAGE_Q == 5) goto L_Menu2_1;
 	if(SAGE_Q == 6) goto L_Menu2_3;
 	if(SAGE_Q == 7) goto L_Menu3_1;
@@ -1372,8 +1372,8 @@ L_Menu4_5:
 }
 
 yuno_in03.gat,62,176,3	script	History Professor	109,{
-	if(BaseJob == 16) goto L_Menu2_2;
+	if(BaseJob == Job_Sage) goto L_Menu2_2;
-	if(BaseJob != 2) goto L_Menu1_1;
+	if(BaseJob != Job_Mage) goto L_Menu1_1;
 	if(SAGE_Q == 11) goto L_Menu2_1;
 	mes "[Sapien]";
 	mes "You don't seem sure of your intended direction of study.";
@@ -1415,8 +1415,8 @@ L_Menu2_2:
 }
 
 yuno_in03.gat,105,177,4	script	Placement Test Professor	754,{
-	if(BaseJob == 16) goto L_Menu3_4;
+	if(BaseJob == Job_Sage) goto L_Menu3_4;
-	if(BaseJob != 2) goto L_Menu1_1;
+	if(BaseJob != Job_Mage) goto L_Menu1_1;
 	if(SAGE_Q == 11) goto L_Menu3_3;
 	if(SAGE_Q >= 6) goto L_Menu3_2;
 	if(SAGE_Q == 3) goto L_Menu1_2;

npc/jobs/novice/novice.txt

@@ -28,7 +28,7 @@ new_1-1.gat,66,114,4	script	Bulletin Board	111,{
 }
 
 new_1-1.gat,53,114,4	script	Shion	727,{
-	if(BaseJob != 0 || Upper==1) goto L_Fail;
+	if(BaseJob != Job_Novice || Upper==1) goto L_Fail;
 	switch (NEW_MES_FLAG0) {
 	case 0:	mes "[Shion]";
 		mes "Hello there~";
@@ -237,7 +237,7 @@ new_1-1.gat,144,107,2	script	Guard#02	105,{
 
 //Receptionist
 new_1-2.gat,100,29,4	script	Receptionist	86,{
-	if(BaseJob != 0 || Upper==1) goto L_Fail;
+	if(BaseJob != Job_Novice || Upper==1) goto L_Fail;
 	mes "[Training Grounds Receptionist]";
 	mes "Welcome!";
 	mes "You are at the entrance";

npc/jobs/novice/supernovice.txt

@@ -25,7 +25,7 @@
 aldeba_in.gat,223,167,3	script	Tozel	709,{
 	if(SUPNOV_Q == 1) goto L_Start2;
 	if(BaseJob == Job_SuperNovice) goto L_Twice;
-	if(BaseJob != 0 || Upper==1) goto L_Otherjob;
+	if(BaseJob != Job_Novice || Upper==1) goto L_Otherjob;
 	mes "[Tozel]";
 	mes "Hello, Novice!";
 	mes "Are you enjoying yourself as a novice, the preferred class of the common man?";
@@ -181,7 +181,7 @@ L_Otherjob:
 // -- Totaly Useless :) --
 aldeba_in.gat,216,169,5	script	Serei	86,{
 	if(BaseJob == Job_SuperNovice) goto L_Supernovice;
-	if(BaseJob != 0) goto L_Otherjob;
+	if(BaseJob != Job_Novice) goto L_Otherjob;
 	mes "[Serei]";
 	mes "You're pretty common.";
 	mes "A common man should live a happy life.";