summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/jobs/1-1/acolyte.txt10
-rw-r--r--npc/jobs/1-1/archer.txt2
-rw-r--r--npc/jobs/1-1/mage.txt2
-rw-r--r--npc/jobs/1-1/merchant.txt20
-rw-r--r--npc/jobs/1-1/swordman.txt8
-rw-r--r--npc/jobs/1-1/thief.txt10
-rw-r--r--npc/jobs/2-1/assassin.txt2
-rw-r--r--npc/jobs/2-1/blacksmith.txt2
-rw-r--r--npc/jobs/2-1/hunter.txt6
-rw-r--r--npc/jobs/2-2/dancer.txt4
-rw-r--r--npc/jobs/2-2/rogue.txt2
-rw-r--r--npc/jobs/2-2/sage.txt30
-rw-r--r--npc/jobs/novice/novice.txt4
-rw-r--r--npc/jobs/novice/supernovice.txt4
15 files changed, 54 insertions, 54 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index dac712747..99f32a2c3 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -39,6 +39,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'
- Also fixed typos in those NPC city headers [Evera]
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;
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index 4c32c7cb8..ed95468e8 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -40,7 +40,7 @@ in_moc_16.gat,19,33,4 script Guildsman 55,{
callfunc "F_BlockHigh",Job_Thief_High,"Thief High",Job_Assassin_Cross,"Assassin Cross","Assassin Huey";
mes "[Angry looking man]";
- if(BaseJob==Job_Assassin) {
+ if(BaseJob == Job_Assassin) {
mes "[Assassin Huey]";
mes "Oohh, its you. You're...." + strcharinfo(0) + " right?";
next;
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index e1ff13b06..db4281a6a 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/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;
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 179b25a15..6ec98a86d 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -36,13 +36,13 @@ hu_in01.gat,386,374,4 script Hunter Sharon 727,{
callfunc "F_BlockHigh",Job_Archer_High,"High Archer",Job_Sniper,"Sniper","Hunter Sharon";
mes "[Hunter Sharon]";
- if(BaseJob==Job_Archer) goto L_Start;
- if(BaseJob==Job_Novice){
+ if(BaseJob == Job_Archer) goto L_Start;
+ if(BaseJob == Job_Novice){
mes "What's a novice like you doing here? Leave, we have nothing for you.";
emotion e_what;
close;
}
- if(BaseJob==Job_Hunter){
+ if(BaseJob == Job_Hunter){
mes "What up! "+strcharinfo(0)+" Why did you come back? Falcon run away or something? Te hehe.";
emotion e_heh;
next;
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;
diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt
index 8c06d6a47..7016a1fb2 100644
--- a/npc/jobs/novice/novice.txt
+++ b/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";
diff --git a/npc/jobs/novice/supernovice.txt b/npc/jobs/novice/supernovice.txt
index d28214673..63f611312 100644
--- a/npc/jobs/novice/supernovice.txt
+++ b/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.";
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-10 18:50:35 +0000