From aa0c6f842d41eafbc60ca9cfbaa69e6914d46ae0 Mon Sep 17 00:00:00 2001
From: Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 7 Jul 2006 04:52:02 +0000
Subject: 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
---
 npc/jobs/2-2/dancer.txt |  4 ++--
 npc/jobs/2-2/rogue.txt  |  2 +-
 npc/jobs/2-2/sage.txt   | 30 +++++++++++++++---------------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'npc/jobs/2-2')

diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 15140a665..4d396c857 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/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.";
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 8988b799e..91c52d48d 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -663,7 +663,7 @@ function	script	F_RogueTest3	{
 	mes "[???]";
 	mes "Who's there?!!!";
 	mes "Who dares to trespass on my territory?";
-	if(BaseJob!=Job_Thief || ROGUE_Q<3 || ROGUE_Q2==0) close;
+	if(BaseJob != Job_Thief || ROGUE_Q<3 || ROGUE_Q2==0) close;
 
 	deletearray @choice$[1], 4;
 	next;
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index e4bdbc575..8bfbd733a 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/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 != 2) goto L_Menu2_1;
+	if(BaseJob == Job_Sage) goto L_Menu3_3;
+	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 != 2) goto L_Menu1_1;
+	if(BaseJob == Job_Sage) goto L_Menu3_2;
+	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 != 2) goto L_Menu1_1;
+	if(BaseJob == Job_Sage) goto L_Menu5_4;
+	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 != 2) goto L_Menu1_1;
+	if(BaseJob == Job_Sage) goto L_Menu6_4;
+	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 != 2) goto L_Menu1_1;
+	if(BaseJob == Job_Sage) goto L_Menu4_5;
+	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 != 2) goto L_Menu1_1;
+	if(BaseJob == Job_Sage) goto L_Menu2_2;
+	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 != 2) goto L_Menu1_1;
+	if(BaseJob == Job_Sage) goto L_Menu3_4;
+	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;
-- 
cgit v1.2.3-70-g09d2