summaryrefslogtreecommitdiff
path: root/npc/jobs/2-2
diff options
context:
space:
mode:
Diffstat (limited to 'npc/jobs/2-2')
-rw-r--r--npc/jobs/2-2/alchemist.txt7
-rw-r--r--npc/jobs/2-2/bard.txt7
-rw-r--r--npc/jobs/2-2/crusader.txt5
-rw-r--r--npc/jobs/2-2/dancer.txt15
-rw-r--r--npc/jobs/2-2/monk.txt5
-rw-r--r--npc/jobs/2-2/rogue.txt37
-rw-r--r--npc/jobs/2-2/sage.txt5
7 files changed, 44 insertions, 37 deletions
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 8590c9df8..4bee67f69 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -4,7 +4,7 @@
//= nestor_zulueta (Fusion)
//= converted by Darkchild
//===== Current Version: =====================================
-//= 1.6a
+//= 2.0
//===== Compatible With: =====================================
//= eAthena 1.0 +
//===== Description: =========================================
@@ -22,6 +22,7 @@
//= 2nd Job Quests again. It also guides adv classes where
//= to go. [Lupus]
//= 1.6a fixed some wrong answers, thanks to zlider for info [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
//============================================================
@@ -29,7 +30,7 @@
// Registration and First Test
//==================================================================================================//
alde_alche.gat,27,185,4 script Parmry Gianino 744,{
- callfunc "F_BlockHigh",29,"Merchant High",42,"Creator","Parmry Gianino";
+ callfunc "F_BlockHigh",Job_Merchant_High,"Merchant High",Job_Creator,"Creator","Parmry Gianino";
mes "[Parmry Gianino]";
if(BaseJob == 5) goto L_Merc;
@@ -1058,7 +1059,7 @@ L_Change:
mes "Ooh, Ok. You joined and learned the basics, too. Well done.";
next;
callfunc "Job_Change",Job_Alchem;
- emotion 46;
+ emotion e_grat;
mes "[Vincent Carsciallo]";
mes "From now on, you are also a member of the Union as an Alchemist.";
mes "I hope you learn a lot...";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 62e7936e3..2c99ab6f7 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib(The Prometheus Project), Lupus
//===== Current Version: =====================================
-//= 1.4
+//= 2.0
//===== Compatible With: =====================================
//= eAthena Final
//===== Description: =========================================
@@ -19,11 +19,12 @@
// 1.3 Updated flower sub-quest according to official [Lupus]
// 1.4 Changed priority for the gifts. Now you can win the 1st
// prize, too. Added Izidor flower [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
//============================================================
comodo.gat,226,123,5 script Wandering Bard 741,{
- callfunc "F_BlockHigh",27,"High Archer",43,"Clown","Wandering Bard";
+ callfunc "F_BlockHigh",Job_Archer_High,"High Archer",Job_Clown,"Clown","Wandering Bard";
if (BARD_Q == 1) goto L_BQ1;
if (BARD_Q == 2) goto L_BQ2;
@@ -190,7 +191,7 @@ L_UGLYFLOWER:
mes "What is it?! Please, back off and put it away from my face.";
mes "I do really hate maneater blossoms!!!";
mes "THEY ARE SO UGLY!";
- emotion 23;
+ emotion e_omg;
close;
M_NOTHAVE:
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index a0b1f24f8..8bed342e2 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -5,7 +5,7 @@
//= Converted by: Shin
//=
//===== Current Version: =====================================
-//= 1.7a
+//= 2.0
//===== Compatible With: =====================================
//= eAthena 0.5.2 +
//===== Description: =========================================
@@ -26,11 +26,12 @@
//= to go. [Lupus]
//= 1.7 Updated names and required items, Chivalry Emblem +
//= Hand of God allow to skip item gathering [DracoRPG]
+//= 2.0 Changed numbers to constants. [Vicious]
//============================================================
prt_castle.gat,45,169,4 script Senior Crusader 752,{
- callfunc "F_BlockHigh",25,"Swordman High",38,"Paladin","^000080Michael Halig^000000";
+ callfunc "F_BlockHigh",Job_Swordman_High,"Swordman High",Job_Paladin,"Paladin","^000080Michael Halig^000000";
mes "[^000080Michael Halig^000000]";
if (BaseJob > 0) goto NEXT_0;
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 157721066..f71a09e13 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -4,7 +4,7 @@
//= Kalen - Original jAthena
//= Fredzilla - Converted
//===== Current Version: =====================================
-//= 1.6
+//= 2.0
//===== Compatible With: =====================================
//= eAthena Final
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 1.6 Added a func which prevent advanced classes passing
//= 2nd Job Quests again. It also guides adv classes where
//= to go. [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
//============================================================
//= Warning Warp to escape the quest if need be
@@ -35,7 +36,7 @@ L_Can:
}
//= Warp man, takes you to the quest map (Comodo Theater)
comodo.gat,193,151,4 script Bor Robin 86,{
- callfunc "F_BlockHigh",27,"High Archer",44,"Gypsy","Bor Robin";
+ callfunc "F_BlockHigh",Job_Archer_High,"High Archer",Job_Gypsy,"Gypsy","Bor Robin";
mes "[Bor Robin]";
mes "Well...... alot of people seem to be coming here lately.";
@@ -311,7 +312,7 @@ LUpper1:
mes "[Aire]";
mes "It's such a big honor to salute envoys of Valhalla.";
mes "Come again.";
- emotion 2;
+ emotion e_ho;
close;
}
@@ -864,7 +865,7 @@ OnDE1:
emotion 21;
end;
OnDE2:
- emotion 23;
+ emotion e_omg;
end;
}
job_duncer.gat,66,113,4 script Back dancer #2::jdt2 724,{
@@ -880,7 +881,7 @@ OnDE1:
emotion 21;
end;
OnDE2:
- emotion 23;
+ emotion e_omg;
end;
}
job_duncer.gat,72,113,4 script Back dancer #3::jdt3 724,{
@@ -896,7 +897,7 @@ OnDE1:
emotion 21;
end;
OnDE2:
- emotion 23;
+ emotion e_omg;
end;
}
job_duncer.gat,75,110,4 script Back dancer #4::jdt4 724,{
@@ -912,7 +913,7 @@ OnDE1:
emotion 21;
end;
OnDE2:
- emotion 23;
+ emotion e_omg;
end;
}
job_duncer.gat,75,110,4 script jdt5 139,{
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 3a1e70bd4..8d52e1e14 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Dino9021, Edited / Translated by Celest
//===== Current Version: =====================================
-//= 1.9
+//= 2.0
//===== Compatible With: =====================================
//= eAthena 1.0 +
//===== Description: =========================================
@@ -20,6 +20,7 @@
//= 1.8 Fixed bugs. Fixed Green Potion exploit. Getting rid of Jfunc mess [Lupus]
//= 1.9 Added a missing check in Fuhai and fixed a LOT of Engrish. [Zephiris]
//= 1.9b Fixed another bug in Fuhai. [Zephiris]
+//= 2.0 Changed numbers to constants. [Vicious]
//============================================================
@@ -33,7 +34,7 @@ prt_monk.gat,55,249,4 script Tohobu the Guarding Monk 139,0,5,{
close;
}
prt_monk.gat,59,247,4 script Master 120,{
- callfunc "F_BlockHigh",28,"Acolyte High",39,"Champion","Tohobu";
+ callfunc "F_BlockHigh",Job_Acolyte_High,"Acolyte High",Job_Champion,"Champion","Tohobu";
if(MONK_Q == 1 ) goto Part1;
if(MONK_Q == 2 ) goto Part2;
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 2825d4071..26b13e64e 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.6
+//= 2.0
//===== Compatible With: =====================================
//= eAthena 1.0 +
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 1.6 Added a func which prevent advanced classes passing
//= 2nd Job Quests again. It also guides adv classes where
//= to go. [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
//============================================================
@@ -24,7 +25,7 @@
// Markie: Test 1 and Jobchange //
//***********************************************************************************************************************************************************//
in_rogue.gat,363,123,3 script Markie 747,{
- callfunc "F_BlockHigh",30,"Thief High",41,"Stalker","Markie";
+ callfunc "F_BlockHigh",Job_Thief_High,"Thief High",Job_Stalker,"Stalker","Markie";
mes "[Markie]";
if(BaseJob == Job_Thief) goto L_Thief;
@@ -114,7 +115,7 @@ L_Test1:
sL_Failed:
mes "*sigh*..... this is not the type of score I was expecting......";
mes "What can I say excecpt, with a score like this you're definitely not cut out to be a Rogue..........";
- emotion 4;
+ emotion e_swt;
next;
mes "[Markie]";
mes "Why don't you go do some more training shuga..... you need it..... *mumbles ( what a waste of my time...)*";
@@ -134,7 +135,7 @@ L_Test3:
close;
L_Test4:
mes "What are you doing here? I hope your not trying to skip the last test?.........";
- emotion 1;
+ emotion e_what;
next;
mes "[Markie]";
mes "Your almost finished so just keep trying. I know you can do it.";
@@ -146,14 +147,14 @@ L_Change:
//===========
mes "Oh, you're back and your in one piece! It looks like you've passed all of the tests sweetie.";
mes "You have proven that you are ready to become a Rogue!";
- emotion 5;
+ emotion e_ic;
next;
if(SkillPoint != 0) goto L_SkillP;
mes "[Markie]";
mes "Tada! Congratulations on becoming a Rogue. You showed a lot of effort and deserve a reward for it......";
setlook 7,0;
callfunc "Job_Change",Job_Rogue;
- emotion 46;
+ emotion e_grat;
next;
mes "[Markie]";
mes "Now that you are a Rogue you are free to go where ever you want to and do what ever you want.";
@@ -208,7 +209,7 @@ L_Thief:
next;
mes "[Mr. Smith]";
mes "...... CRAP! I forgot what I was counting!!";
- emotion 16;
+ emotion e_wah;
close;
//----------------------------------------------------------------------------------------------------
@@ -300,7 +301,7 @@ L_Check2:
L_NotEnuf:
mes ".... What the f@&#!?!? You don't have all of the items? Then why did you come back?? Don't tell me you forgot what to get.....";
- emotion 1;
+ emotion e_what;
next;
mes "[Mr. Smith]";
mes "Write this down! You need ^5533FF10,000^000000 zeny and:";
@@ -310,7 +311,7 @@ L_Check2:
next;
mes "[Mr. Smith]";
mes "Got it? DON'T come back until you have everything.........";
- emotion 32;
+ emotion e_pif;
close;
@@ -319,11 +320,11 @@ L_Test3:
//---------------
if(ROGUE_Q2 > 0) goto L_Check3;
mes "Let me see..... Who should I have you go find........ hmm.........";
- emotion 20;
+ emotion e_hmm;
next;
mes "[Mr. Smith]";
mes "Ah I know! Alright, in the previous test I had you go find some items. For this test you will need to find a specific person.";
- emotion 5;
+ emotion e_ic;
next;
mes "[Mr. Smith]";
set ROGUE_Q2, rand(1,3);
@@ -396,11 +397,11 @@ L_Test3:
L_Check3:
mes "What!?! Did you just say you forgot where to go?........";
- emotion 1;
+ emotion e_what;
next;
mes "[Mr. Smith]";
mes "GRRRR!!! That's why you need to WRITE down important things! Geez......";
- emotion 6;
+ emotion e_an;
next;
mes "[Mr. Smith]";
if(ROGUE_Q2 == 1) callsub sF3_R1;
@@ -424,15 +425,15 @@ L_Done:
in_rogue.gat,272,136,3 script Hermanthorn Jr. 85,{
mes "[Hermanthorn Jr.]";
mes "Huh? Wha.... who are you?! You're not from the Rogue guild!! Get out of here!";
- emotion 1;
+ emotion e_what;
next;
mes "[Hermanthorn Jr.]";
mes "You're..... I see! You're one of them!!! You've come here to kill me haven't you??!! No... NO!! I'm not ready to die yet!";
- emotion 0;
+ emotion e_gasp;
next;
mes "[Hermanthorn Jr.]";
mes "Aaaaaaaaaaaaaahhhh!! Go away! Get lost! Otherwise I am gonna KILL YOU!!!";
- emotion 16;
+ emotion e_wah;
close;
}
@@ -584,7 +585,7 @@ function script F_RogueTest4 {
next;
mes "[" + getarg(0) + "]";
mes "Aww who am I kidding...... Let's cut the crap. So are you ready to become a rogue?";
- emotion 4;
+ emotion e_swt;
next;
mes "[" + getarg(0) + "]";
mes "You see, the Rogue motto is...... ^5533FF'Avoid the strong! Be malicious to the weak!'^000000";
@@ -624,7 +625,7 @@ function script F_RogueTest4 {
L_Restart:
mes "[" + getarg(0) + "]";
mes "....... Looks like you got creamed.......";
- emotion 4;
+ emotion e_swt;
next;
mes "[" + getarg(0) + "]";
mes "If you're up for it, I'll send you back in. Failure has a way of teaching success.... yada yada yada....";
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 44645f94c..366f33e49 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: =====================================
-//= 1.7a
+//= 2.0
//===== Compatible With: =====================================
//= eAthena 1.0 +
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= 2nd Job Quests again. It also guides adv classes where to go. [Lupus]
//= 1.7 Fixed tuition fee. Fixed some answers, names & typos, added missing labels [Lupus]
//= 1.7a Moved JFunc back in the main file, fixed typos [Lupus]
+//= 2.0 Changed numbers to constants. [Vicious]
//============================================================
@@ -28,7 +29,7 @@
//Sage Castle
//==================================
yuno_in02.gat,38,61,4 script Magic Academy Headmaster 743,{
- callfunc "F_BlockHigh",26,"High Mage",40,"Professor","Keiron";
+ 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(SAGE_Q == 11) goto L_Menu3_1;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-05 13:41:37 +0000