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.txt59
-rw-r--r--npc/jobs/2-2/bard.txt21
-rw-r--r--npc/jobs/2-2/crusader.txt132
-rw-r--r--npc/jobs/2-2/dancer.txt86
-rw-r--r--npc/jobs/2-2/monk.txt78
-rw-r--r--npc/jobs/2-2/rogue.txt75
-rw-r--r--npc/jobs/2-2/sage.txt54
7 files changed, 259 insertions, 246 deletions
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index dd568b9ef..7e5ca7e33 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -2,22 +2,23 @@
//= Alchemist Job Quest
//===== By: ==================================================
//= nestor_zulueta (Fusion), converted by Darkchild
-//===== Current Version: =====================================
-//= 3.0
-//===== Description: =========================================
+//===== Current Version: =====================================
+//= 3.1
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Alchemist classes
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 2.5 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//= No longer uses function "F_BlockHigh"
+//= No longer uses function "F_BlockHigh"
//= 2.6 Corrected a bug in advanced class checking. [L0ne_W0lf]
//= 2.7 Added missing checkweights. [L0ne_W0lf]
//= 2.8 Fixed minor typo in test section. [L0ne_W0lf]
//= 2.9 Added Quest Log commands. [Kisuka]
//= 3.0 Removed the need for use of 'goto.' [L0ne_W0lf]
-//============================================================
+//= 3.1 Added missing changequest commands. [Kisuka]
+//============================================================
-alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
+alde_alche,27,185,5 script Alchemist Guildsman#am 4_F_ALCHE,{
mes "[Parmy Gianino]";
if (Upper == 1) {
mes "Welcome to the";
@@ -175,7 +176,7 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
mes "Come back to me when you have 50,000 Zeny, otherwise we can't process your application.";
close;
}
- set zeny,zeny-50000;
+ Zeny -= 50000;
mes "[Parmy Gianino]";
mes "Let's see.";
mes "" + strcharinfo(0);
@@ -320,7 +321,7 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
}
}
-alde_alche,175,107,3 script Fastidious Alchemist#am 749,{
+alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{
mes "[Raspuchin Gregory]";
if (BaseJob != Job_Merchant) {
if (BaseJob == Job_Alchemist) {
@@ -440,7 +441,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 749,{
mes "Wait...";
mes "Maybe I've";
mes "misjudged you.";
- if (sex == 1) {
+ if (Sex) {
mes "You might be a pretty boy,";
mes "but I can tell you're smart";
mes "from your eyes.";
@@ -465,6 +466,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 749,{
mes "He'll teach you how to do the experiments. Just tell him that";
mes "I sent you.";
set ALCH_Q,6;
+ changequest 2031,2032;
close;
}
else {
@@ -789,7 +791,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 749,{
close;
}
-alde_alche,13,15,7 script Studying Man#am 750,{
+alde_alche,13,15,7 script Studying Man#am 4_M_ALCHE_C,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
mes "- Currently you are carrying -";
@@ -1090,6 +1092,7 @@ alde_alche,13,15,7 script Studying Man#am 750,{
mes "and cast away the last";
mes "vestiges of Merchant life!!";
set ALCH_Q,40;
+ changequest 2033,2034;
close;
}
else if (countitem(7134) > 2 && countitem(713) > 2 && countitem(507) > 0 && countitem(508) > 0 && countitem(509) > 0) {
@@ -1333,7 +1336,7 @@ alde_alche,13,15,7 script Studying Man#am 750,{
}
}
-alde_alche,79,19,5 script Experiment Expert#am 748,{
+alde_alche,79,19,5 script Experiment Expert#am 4_M_ALCHE_A,{
mes "[Van Helmont]";
if (BaseJob != Job_Merchant) {
if (BaseJob == Job_Alchemist) {
@@ -1585,7 +1588,7 @@ alde_alche,79,19,5 script Experiment Expert#am 748,{
}
}
-alde_alche,101,184,4 script Master Alchemist#am 122,{
+alde_alche,101,184,4 script Master Alchemist#am 2_M_DYEINGER,{
cutin "job_alche_vincent",2;
mes "[Vincent Carsciallo]";
if (Upper == 1) {
@@ -1687,6 +1690,9 @@ alde_alche,101,184,4 script Master Alchemist#am 122,{
if(checkquest(2039) != -1) {
changequest 2039,2040;
}
+ if(checkquest(2034) != -1) {
+ changequest 2034,2040;
+ }
mes "Ah, well done.";
mes "I can see that you";
mes "have learned all of";
@@ -1703,7 +1709,6 @@ alde_alche,101,184,4 script Master Alchemist#am 122,{
mes "illustrious Union.";
mes "I hope you learn a lot...";
next;
-
if (.@jlevel == 50) {
getitem 7133,1; //Slim_Potion_Create_Book
mes "[Vincent Carsciallo]";
@@ -1767,7 +1772,7 @@ alde_alche,101,184,4 script Master Alchemist#am 122,{
}
}
-alde_alche,145,19,1 script Chief Researcher#am 57,{
+alde_alche,145,19,1 script Chief Researcher#am 1_M_LIBRARYMASTER,{
if (checkweight(1201,1) == 0) {
mes "- Wait a minute! -";
mes "- Currently you are carrying -";
@@ -1888,8 +1893,7 @@ alde_alche,145,19,1 script Chief Researcher#am 57,{
}
}
else if (ALCH_Q == 22) {
- set .@now_weight,MaxWeight-Weight;
- if (.@now_weight < 1370) {
+ if (MaxWeight - Weight < 1370) {
mes "[Nicholas Flamel]";
mes "Whoa...";
mes "You're carrying too much stuff! First, put some of your things in Kafra Storage.";
@@ -1978,23 +1982,24 @@ alde_alche,145,19,1 script Chief Researcher#am 57,{
}
}
-//============================================================
+//============================================================
// Old changelog
-//============================================================
-//= v1.0 Working.
-//= npc/quests/counteragent_mixture.txt Also Needed
-//= npc/quests/quests_yuno.txt Also Needed [Darkchild]
-//= v1.1 Fixed some minor bugs. Optimized some lines. Re-organized the script a bit.
-//= Giving Parmry NPC, Hammer and Old Book now waves the 50000 fee. (based of mRO website)
-//= Having a joblvl of 50 allows you to skip Rasputin's test. (based of mRO website) [kobra_k88]
+//============================================================
+//= 1.0 Working.
+//= npc/quests/counteragent_mixture.txt Also Needed
+//= npc/quests/quests_yuno.txt Also Needed [Darkchild]
+//= 1.1 Fixed some minor bugs. Optimized some lines. Re-organized the script a bit.
+//= Giving Parmry NPC, Hammer and Old Book now waves the 50000 fee. (based of mRO website)
+//= Having a joblvl of 50 allows you to skip Rasputin's test. (based of mRO website) [kobra_k88]
//= 1.2 fixed a few typos (have to hunt more) [Lupus]
//= 1.3 Added Baby Class Support [Lupus]
//= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//= 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]
//= 2.2 Got rid of 'al_morgen' var. Now uses (MISC_QUEST & 4) [Lupus]
//= 2.3 Optimized, changed job numbers to constants. Fixed some spelling [Lupus]
//= 2.4 Added alternative prizes according to JobLevel [Lupus]
//= 2.4a Fixed 2 wrong answers in Rasputin's test [Lupus]
+//============================================================
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index 77a81374f..24d49cbce 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -2,9 +2,9 @@
//= Bard Job Quest
//===== By: ==================================================
//= Muad_Dib(The Prometheus Project), Lupus, Samuray22
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 2.6
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Bard class
//===== Additional Comments: =================================
@@ -25,7 +25,7 @@
// Ayealo
//============================================================
-comodo,226,123,5 script Wandering Bard 741,{
+comodo,226,123,5 script Wandering Bard 2_M_BARD_ORIENT,{
if(Upper == 1) {
mes "[Lalo]";
mes "Chosen ones who are destined to become Gods";
@@ -80,7 +80,7 @@ comodo,226,123,5 script Wandering Bard 741,{
mes "Always full of happy moments~";
next;
mes "[Lalo]";
- if (sex) {
+ if (Sex) {
mes "Forget about your worries~";
mes "And enjoy everything~";
}
@@ -94,7 +94,7 @@ comodo,226,123,5 script Wandering Bard 741,{
else if(BARD_Q == 0) {
cutin "job_bard_aiolo01",2;
mes "[Lalo]";
- if (sex) mes "Hi! Delightful Archer.";
+ if (Sex) mes "Hi! Delightful Archer.";
else mes "Hello! Beautiful Archer Lady.";
mes "How can a wanderer like me help you?";
next;
@@ -485,7 +485,7 @@ comodo,226,123,5 script Wandering Bard 741,{
mes "Turned into a dragon and ate him.";
next;
input .@Song$;
- if (.@Song$ != "There was a man")
+ if (.@Song$ != "There was a man")
set .@w_point,.@w_point+1;
mes "^3377FFThere was a man";
@@ -935,16 +935,17 @@ S_ChangeJob:
end;
}
-//============================================================
+//============================================================
// Old changelog
-//============================================================
+//============================================================
//= 07/06/05 : Added 1st Version. [Muad_Dib]
//= Converted to rAthena format by Dr.Evil
-//= Info about gifts and other info --> http://www.ragnainfo.net/forums/viewtopic.php?t=51467&start=0
+//= Info about gifts and other info --> http://www.ragnainfo.net/forums/viewtopic.php?t=51467&start=0
//= 1.1 Optimized, changed some stuff, fixed some bugs [Lupus]
//= 1.1a minor song test fix [Lupus]
//= 1.2 Fixed wrong item ID, added missing commands [Lupus]
//= 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]
+//= prize, too. Added Izidor flower [Lupus]
//= 2.0 Changed numbers to constants. [Vicious]
+//============================================================
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 3fa61960f..d5bcd70ea 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -1,16 +1,14 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Crusader Job Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= Made by: Black Dragon
//= Converted by: Shin
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 3.3
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Crusader classes
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 2.2 Updated All NPCs to the officials one [Samuray22]
//= -Based on the ASB 4.0 Package.
//=-Maybe need be checked the monsters in the test 2 and 4.
@@ -34,9 +32,9 @@
//= 3.3 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
-
-//=============== Senior Crusader: 1st Collect Items Test============================
-prt_castle,45,169,5 script Senior Crusader 752,{
+// Senior Crusader: 1st Collect Items Test
+//============================================================
+prt_castle,45,169,5 script Senior Crusader 4_M_CRU_OLD,{
mes "[Michael Halig]";
if (Upper == 1) { //the baby classes were totally blocked... due to missing == 1
mes "Go and train yourself in preparation for the holy war that is coming. Victory will be in the hands of those who are most ready to receive it.";
@@ -45,7 +43,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "You don't belong here, my friend.";
mes "Be advised to continue practicing yourself.";
close;
- }
+ }
else if(BaseJob != Job_Swordman) {
if(BaseJob == Job_Crusader) {
mes "Go and train yourself in preparation for the holy war that is coming. Victory will be in the hands of those who are most ready to receive it.";
@@ -70,7 +68,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "[Michael Halig]";
mes "As it happened one thousand years ago, evil forces will one day attack in droves in an attempt to take over the world once again.";
close;
- }
+ }
else if(CRUS_Q <= 3 && countitem(1004) && countitem(1009)) {
mes "Ah...";
mes "I see that you have been called to become a Crusader. We are assured of your will, but now we must test your capabilities.";
@@ -126,8 +124,8 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "[Michael Halig]";
mes "Train yourself more as a Swordsman and wait for your calling. I understand your intent, but as of now, you cannot join us.";
close;
- }
- if (Skillpoint) {
+ }
+ if (SkillPoint) {
mes "[Michael Halig]";
mes "You haven't finished learning everything as a Swordsman. Use all of your remaining skill points, and then return to me.";
close;
@@ -207,7 +205,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
close;
}
mes "[Michael Halig]";
- if (sex) mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
+ if (Sex) mes "If you, too, are a man of the sword, constantly train and prepare yourself. No one knows when the Holy War may begin.";
else mes "As a woman of the sword, you must train diligently and constantly. Prepare yourself, for no one knows when the Holy War may be coming.";
close;
}
@@ -216,25 +214,25 @@ prt_castle,45,169,5 script Senior Crusader 752,{
next;
switch(CRUS_Q) {
case 1:
- set @item1, 957;
- set @item2, 959;
- set @item3, 1099;
- set @item4, 901;
+ set .@item1, 957;
+ set .@item2, 959;
+ set .@item3, 1099;
+ set .@item4, 901;
break;
- Case 2:
- set @item1, 932;
- set @item2, 1043;
- set @item3, 1098;
- set @item4, 1094;
+ case 2:
+ set .@item1, 932;
+ set .@item2, 1043;
+ set .@item3, 1098;
+ set .@item4, 1094;
break;
- Case 3:
- set @item1, 958;
- set @item2, 930;
- set @item3, 1041;
- set @item4, 1062;
+ case 3:
+ set .@item1, 958;
+ set .@item2, 930;
+ set .@item3, 1041;
+ set .@item4, 1062;
break;
}
- if (countitem(@item1) > 9 && countitem(@item2) > 9 && countitem(@item3) > 9 && countitem(@item4) > 9) {
+ if (countitem(.@item1) > 9 && countitem(.@item2) > 9 && countitem(.@item3) > 9 && countitem(.@item4) > 9) {
mes "[Michael Halig]";
mes "Ah, well done.";
mes "I must acknowledge your efforts and determination. You may now proceed to take the next test.";
@@ -242,10 +240,10 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "[Michael Halig]";
mes "Meet with Moorenak Miyol who is training in the underground dungeon of the Prontera Castle. Go, and speak with him first.";
next;
- delitem @item1, 10;
- delitem @item2, 10;
- delitem @item3, 10;
- delitem @item4, 10;
+ delitem .@item1, 10;
+ delitem .@item2, 10;
+ delitem .@item3, 10;
+ delitem .@item4, 10;
set CRUS_Q, 4;
if(checkquest(3006) != -1) {
changequest 3006,3009;
@@ -264,10 +262,10 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "Ah, you still have not completed the task I have given to you. Bring me the following items, and prove your will to become a Crusader to me...";
next;
mes "[Michael Halig]";
- mes "10 ^3355FF"+getitemname(@item1)+"^000000";
- mes "10 ^3355FF"+getitemname(@item2)+"^000000";
- mes "10 ^3355FF"+getitemname(@item3)+"^000000";
- mes "10 ^3355FF"+getitemname(@item4)+"^000000";
+ mes "10 ^3355FF"+getitemname(.@item1)+"^000000";
+ mes "10 ^3355FF"+getitemname(.@item2)+"^000000";
+ mes "10 ^3355FF"+getitemname(.@item3)+"^000000";
+ mes "10 ^3355FF"+getitemname(.@item4)+"^000000";
next;
mes "[Michael Halig]";
mes "If you put forth the effort, you'll be able to accomplish this task. May Odin protect you on your journeys.";
@@ -295,10 +293,10 @@ prt_castle,45,169,5 script Senior Crusader 752,{
mes "[Michael Halig]";
mes "Now you are";
mes "one of us!";
- if (sex) mes "...Brother.";
+ if (Sex) mes "...Brother.";
else mes "...Comrade.";
next;
- if(.@JobLevel != 50) getitem 504, 6;
+ if(.@Joblevel != 50) getitem 504, 6;
else getitem 504, 12;
mes "[Michael Halig]";
mes "And use this in times of dire peril. It will give you strength when your wounds are most grievous.";
@@ -314,8 +312,9 @@ prt_castle,45,169,5 script Senior Crusader 752,{
close;
}
-//===================== Suffering Man: 2nd Endurance Test ===============================================
-prt_castle,164,32,1 script Man in Anguish 733,{
+// Suffering Man: 2nd Endurance Test
+//============================================================
+prt_castle,164,32,1 script Man in Anguish 4_M_JOB_KNIGHT1,{
mes "[Murnak Mijoul]";
if(BaseJob != Job_Swordman) {
if (BaseJob == Job_Crusader) {
@@ -346,7 +345,7 @@ prt_castle,164,32,1 script Man in Anguish 733,{
else if(CRUS_Q == 4) {
mes "What is it...?";
mes "Do you have business";
- if (sex) mes "with me, man of the sword?";
+ if (Sex) mes "with me, man of the sword?";
else mes "with me, woman of the sword?";
next;
if (select("I'd like to take the Crusader test.:Nothing.") == 1) {
@@ -447,8 +446,9 @@ prt_castle,164,32,1 script Man in Anguish 733,{
close;
}
-//===================== Gabriel Valentine: 3rd Knowledge Test =================================
-prt_church,95,127,3 script Crusader 745,{
+// Gabriel Valentine: 3rd Knowledge Test
+//============================================================
+prt_church,95,127,3 script Crusader 4_F_CRU,{
mes "[Gabriel Valentine]";
if(BaseJob != Job_Swordman) {
if (BaseJob == Job_Crusader) {
@@ -550,7 +550,7 @@ prt_church,95,127,3 script Crusader 745,{
mes "4. Which Undead monster";
mes "has the highest HP?";
next;
- if (select("Ghoul:Skeleton Prisoner:Wraith:Zombie Prisoner") == 4)
+ if (select("Ghoul:Skeleton Prisoner:Wraith:Zombie Prisoner") == 4)
set .@cru_t,.@cru_t+10;
mes "[Gabriel Valentine]";
@@ -769,7 +769,7 @@ prt_church,95,127,3 script Crusader 745,{
mes "[Gabriel Valentine]";
mes "Don't stress, you need to know a lot in order to pass this test. In any case, I'll be waiting right here. When you think you're ready, come back, alright?";
close;
- }
+ }
else if(CRUS_Q == 8 || CRUS_Q == 9) {
mes "Like I mentioned before, you should go to Prontera Castle and meet with Bliant Piyord to take your next test. Good luck, and become a Crusder soon, alright?";
close;
@@ -795,8 +795,9 @@ prt_church,95,127,3 script Crusader 745,{
close;
}
-//===================== Crusader: 4th Purification Test =====================================================
-prt_castle,35,151,5 script Patron Knight 751,{
+// Crusader: 4th Purification Test
+//============================================================
+prt_castle,35,151,5 script Patron Knight 4_M_CRU,{
mes "[Bliant Piyord]";
mes "Welcome.";
if(BaseJob != Job_Swordman) {
@@ -937,7 +938,7 @@ prt_castle,35,151,5 script Patron Knight 751,{
mes "I shall be";
mes "waiting.";
close;
- }
+ }
else if(CRUS_Q == 10) {
mes "Congratulations.";
mes "You have completed";
@@ -970,8 +971,12 @@ prt_castle,35,151,5 script Patron Knight 751,{
-//=== Actual tests ========================================
-//=== Endurance Test ======================================
+// Actual tests
+//============================================================
+
+//----------------------------------------------------------------------------
+// Endurance Test
+//----------------------------------------------------------------------------
job_cru,1,1,1 script Summoner#cr1 -1,{
OnTimer300000:
donpcevent "Summoner#cr1::OnReset";
@@ -1108,7 +1113,7 @@ OnInit:
monster "job_cru",98,80,"Greatest General",1277,1,"Summoner#cr3::OnDead";
monster "job_cru",92,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
monster "job_cru",104,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
- Initnpctimer;
+ initnpctimer;
end;
OnStart:
@@ -1121,7 +1126,7 @@ OnStart:
monster "job_cru",98,80,"Greatest General",1277,1,"Summoner#cr3::OnDead";
monster "job_cru",92,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
monster "job_cru",104,90,"Greatest General",1277,1,"Summoner#cr3::OnDead";
- Initnpctimer;
+ initnpctimer;
end;
OnReset:
@@ -1197,7 +1202,7 @@ OnDead:
}
-job_cru,98,105,4 script Summoner#cr5 45,3,3,{
+job_cru,98,105,4 script Summoner#cr5 WARPNPC,3,3,{
OnTouch:
set CRUS_Q,6;
changequest 3010,3011;
@@ -1205,8 +1210,10 @@ OnTouch:
end;
}
-//=== Purification Test ===================================
-job_cru,24,187,4 script Patron Knight#2 751,{
+//----------------------------------------------------------------------------
+// Purification Test
+//----------------------------------------------------------------------------
+job_cru,24,187,4 script Patron Knight#2 4_M_CRU,{
mes "[Bliant Piyord]";
mes "Welcome.";
mes "You will take";
@@ -1223,7 +1230,7 @@ job_cru,24,187,4 script Patron Knight#2 751,{
close;
}
-job_cru,24,187,2 script Waiting Room#cr1 700,{
+job_cru,24,187,2 script Waiting Room#cr1 8_F_GIRL,{
end;
OnInit:
@@ -1401,7 +1408,7 @@ OnDead:
end;
}
-job_cru,168,180,4 script Monster Summon#cr5 45,3,3,{
+job_cru,168,180,4 script Monster Summon#cr5 WARPNPC,3,3,{
OnInit:
disablenpc "Monster Summon#cr5";
end;
@@ -1458,9 +1465,9 @@ OnStop:
end;
}
-//============================================================
+//============================================================
// Old changelog
-//============================================================
+//============================================================
//= Need optimalization and fixing
//= thanks to Komurka, KiLLaLeN, Lupus (fixing error)
//= just a temp Job Quest
@@ -1478,4 +1485,5 @@ OnStop:
//= Hand of God allow to skip item gathering [DracoRPG]
//= 2.0 Changed numbers to constants. [Vicious]
//= 2.1 Fixed endless loop, wrong condition check [Lupus]
-//= also changed all job numbers to constants, fixed logic
+//= also changed all job numbers to constants, fixed logic
+//============================================================
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index b52d808fd..6b4ddf5b0 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -1,18 +1,16 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Dancer Job Quest
//===== By: ==================================================
//= Kalen - Original jAthena
//= Fredzilla - Converted, Lupus
-//===== Current Version: =====================================
-//= 3.7
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
+//===== Current Version: =====================================
+//= 3.7a
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Dancer classes
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 3.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//= No longer uses function "F_BlockHigh"
+//= No longer uses function "F_BlockHigh"
//= 3.2a Deleted unused variables. [Samuray22]
//= 3.3 Updated waiting room. (Removes global var) [L0ne_W0lf]
//= 3.4 Fixed bad variables, bugreport:1685 [Brainstorm]
@@ -20,9 +18,10 @@
//= 3.6 Applied Correction bug with for loop. [L0ne_W0lf]
//= 3.6a Fixed a little Exploit to bug the quest with a timeout. (bugreport:2252) [Samuray22]
//= 3.7 Added Quest Log commands. [Kisuka]
+//= 3.7a Fixed a label execution. [Euphy]
//============================================================
-comodo,180,153,4 script Sonotora#1 90,{
+comodo,180,153,4 script Sonotora#1 4_F_01,{
mes "[Athena Sonotora]";
mes "They say the";
mes "famous dance school";
@@ -42,7 +41,7 @@ comodo,180,153,4 script Sonotora#1 90,{
close;
}
-comodo,193,151,4 script Bor Robin#1 86,{
+comodo,193,151,4 script Bor Robin#1 4_M_04,{
mes "[Bor Robin]";
mes "Aah....";
mes "A prima donna";
@@ -75,7 +74,7 @@ comodo,193,151,4 script Bor Robin#1 86,{
close;
}
-job_duncer,43,93,4 script Aile#da 724,{
+job_duncer,43,93,4 script Aile#da 4_F_07,{
if (Upper == 1) {
mes "[Aile]";
mes "One two three four,";
@@ -132,7 +131,7 @@ job_duncer,43,93,4 script Aile#da 724,{
cutin "",255;
end;
}
- if (DANC_Q == 0 && sex == 0 && BaseJob == Job_Archer) {
+ if (DANC_Q == 0 && Sex == 0 && BaseJob == Job_Archer) {
cutin "job_dancer_eir01",2;
mes "[Aile]";
mes "Welcome~!";
@@ -208,7 +207,7 @@ job_duncer,43,93,4 script Aile#da 724,{
cutin "",255;
end;
}
- else if (sex == 1) {
+ else if (Sex == 1) {
cutin "job_dancer_eir03",2;
mes "[Aile]";
mes "Welco--Mmm?";
@@ -287,15 +286,15 @@ job_duncer,43,93,4 script Aile#da 724,{
}
else if (DANC_Q >= 2 && DANC_Q <= 4) {
switch(DANC_Q) {
- case 2:
+ case 2:
setarray .@item[0], 938,909,501,2403;
setarray .@count[0], 20,3,5,1;
break;
- case 3:
+ case 3:
setarray .@item[0], 1055,2405;
setarray .@count[0], 5,1;
break;
- case 4:
+ case 4:
setarray .@item[0], 965,503,909,1020,2401;
setarray .@count[0], 2,5,20,10,1;
break;
@@ -317,7 +316,7 @@ job_duncer,43,93,4 script Aile#da 724,{
mes "tuition fee.";
next;
cutin "job_dancer_eir01",2;
- set zeny,zeny-10000;
+ Zeny -= 10000;
mes "[Aile]";
mes "Next, go to ^CD6889Bijou^000000, who is in charge of the interviewing process. She will have a couple of things she'll need to ask you.";
set DANC_Q,5;
@@ -409,7 +408,7 @@ job_duncer,43,93,4 script Aile#da 724,{
}
}
-job_duncer,95,93,4 script Bijou#da 101,{
+job_duncer,95,93,4 script Bijou#da 4W_F_01,{
if (SkillPoint) {
mes "[Bijou]";
mes "You can't change jobs";
@@ -890,11 +889,11 @@ job_duncer,95,93,4 script Bijou#da 101,{
getitem 1950,1; //Rope
close;
}
-}
+}
// Waiting Room
-//============================================================
-job_duncer,32,154,1 script Waiting Room#dance 66,{
+//============================================================
+job_duncer,32,154,1 script Waiting Room#dance 1_F_01,{
end;
OnInit:
@@ -919,7 +918,7 @@ OnEnable:
end;
}
-job_duncer,32,154,1 script Waiting Room#click 66,{
+job_duncer,32,154,1 script Waiting Room#click 1_F_01,{
mes "[Pyorgin]";
mes "Please wait in";
mes "the waiting room.";
@@ -935,7 +934,7 @@ job_duncer,32,154,1 script Waiting Room#click 66,{
}
// Dance Timer
-//============================================================
+//============================================================
job_duncer,69,105,0 script Bijou#dance_timer -1,{
OnEnable:
initnpctimer;
@@ -1288,7 +1287,7 @@ OnEnable:
}
// Dance Move Triggers
-//============================================================
+//============================================================
- script dancestep::StepTrigger -1,1,1,{
OnTouch:
donpcevent "Backdancer#1::OnOmg";
@@ -1322,65 +1321,65 @@ OnDisable:
}
// Backup Dancers
-//============================================================
-job_duncer,63,110,4 script Backdancer#1::BackDancer 724,{
+//============================================================
+job_duncer,63,110,4 script Backdancer#1 4_F_07,{
end;
OnSmile:
- Emotion e_no1;
+ emotion e_no1;
donpcevent "Backdancer#2::OnSmile";
donpcevent "Backdancer#3::OnSmile";
donpcevent "Backdancer#4::OnSmile";
end;
OnOmg:
- Emotion e_omg;
+ emotion e_omg;
donpcevent "Backdancer#2::OnOmg";
donpcevent "Backdancer#3::OnOmg";
donpcevent "Backdancer#4::OnOmg";
end;
}
-job_duncer,66,113,4 script Backdancer#2 724,{
+job_duncer,66,113,4 script Backdancer#2 4_F_07,{
end;
OnSmile:
- Emotion e_no1;
+ emotion e_no1;
end;
OnOmg:
- Emotion e_omg;
+ emotion e_omg;
end;
}
-job_duncer,72,113,4 script Backdancer#3 724,{
+job_duncer,72,113,4 script Backdancer#3 4_F_07,{
end;
OnSmile:
- Emotion e_no1;
+ emotion e_no1;
end;
OnOmg:
- Emotion e_omg;
+ emotion e_omg;
end;
}
-job_duncer,75,110,4 script Backdancer#4 724,{
+job_duncer,75,110,4 script Backdancer#4 4_F_07,{
end;
OnSmile:
- Emotion e_no1;
+ emotion e_no1;
end;
OnOmg:
- Emotion e_omg;
+ emotion e_omg;
end;
}
-//============================================================
+//============================================================
// Old changelog
-//============================================================
-//= 1.1 Removed the warp I left here my accident, added a check for using
+//============================================================
+//= 1.1 Removed the warp I left here my accident, added a check for using
//= Improved Concentration and arrow shower, people could get away with it
//= [Fredzilla]
//= 1.0 I tried to keep as much the same from the Jap version as possible
@@ -1389,14 +1388,15 @@ OnOmg:
//= along with some optimization. [Fredzilla]
//= 1.5 Added Baby Class Support [Fredzilla]
//= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//= 2nd Job Quests again. It also guides adv classes where
+//= to go. [Lupus]
//= 2.0 Changed numbers to constants. [Vicious]
//= 2.1 Script check #1. [Lance]
//= 2.2 Fixed unpassable part, thx2 Alis [Lupus]
//= 2.3 Updated initnpctimer to attach player to jobDq script [Skotlex]
//= 2.4 Attached chrid to be able obtain player's SP on mobs death, optimized a bit [Lupus]
//= 2.5 Final fix of chrid issues, changed 'Improved
-//= Concentration' to 'Attention Concentrate' [Lupus]
+//= Concentration' to 'Attention Concentrate' [Lupus]
//= 3.0 Some optimization, typos, added missing dialogues (4Kb lighter) [Lupus]
//= 3.1 Implemented JOBLVL as in other quests [Lupus]
+//============================================================
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 125c01034..90fccf68c 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -1,24 +1,22 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Monk Job Quest
//===== By: ==================================================
//= Dino9021, Edited / Translated by Celest
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 2.5
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Monk classes
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 2.2 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//= No longer uses function "F_BlockHigh"
+//= No longer uses function "F_BlockHigh"
//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 2.3a Deleted unused variables. [Samuray22]
//= 2.4 Added Quest Log commands. [Kisuka]
//= 2.5 Removed the need for use of 'goto.' [L0ne_W0lf]
-//============================================================
+//============================================================
-prt_monk,59,247,1 script Guarding Monk#mk 120,6,2,{
+prt_monk,59,247,1 script Guarding Monk#mk 2_M_PHARMACIST,6,2,{
if (Upper == 1) {
mes "[Tohobu]";
mes "Hmm? What business do you have here?";
@@ -323,7 +321,7 @@ OnTouch:
end;
}
-monk_in,99,58,1 script Sensei Moohae#mk 60,{
+monk_in,99,58,1 script Sensei Moohae#mk 1_M_PASTOR,{
mes "[Sensei Moohae]";
mes "Greetings, you seem to be on a pure path.";
mes "Come in, come in, what can I do for you today?";
@@ -397,13 +395,13 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
next;
mes "[Sensei Moohae]";
switch (.@items[6]) {
- case 3: mes "Why the face? This is a test of your abilities."; break;
- case 4: mes "What's wrong? This is a test of your abilities."; break;
- case 5: mes "You do understand don't you? This is a test of your abilities."; break;
- case 6: mes "Don't look at me like that. This is a test of your abilities."; break;
- case 7: mes "You don't seem concerned, this is a test of your abilities You should take this seriously."; break;
- case 8: mes "It is a test of your abilities so make sure you acquire these on your own."; break;
- case 9: mes "Don't be concerned, I believe you can do it. This is only to test your abilities."; break;
+ case 3: mes "Why the face? This is a test of your abilities."; break;
+ case 4: mes "What's wrong? This is a test of your abilities."; break;
+ case 5: mes "You do understand don't you? This is a test of your abilities."; break;
+ case 6: mes "Don't look at me like that. This is a test of your abilities."; break;
+ case 7: mes "You don't seem concerned, this is a test of your abilities You should take this seriously."; break;
+ case 8: mes "It is a test of your abilities so make sure you acquire these on your own."; break;
+ case 9: mes "Don't be concerned, I believe you can do it. This is only to test your abilities."; break;
}
next;
mes "[Sensei Moohae]";
@@ -903,7 +901,7 @@ monk_in,99,58,1 script Sensei Moohae#mk 60,{
}
}
-prt_monk,251,255,1 script Touha#mk 79,{
+prt_monk,251,255,1 script Touha#mk 1_F_PRIEST,{
if (MONK_Q >= 10 && MONK_Q < 14) {
if (MONK_Q == 10) {
mes "[Touha]";
@@ -1682,7 +1680,7 @@ prt_monk,251,255,1 script Touha#mk 79,{
}
}
-prt_monk,57,179,1 script Boohae#mk 110,{
+prt_monk,57,179,1 script Boohae#mk 4_M_MINISTER,{
if (MONK_Q == 14 && BaseJob == Job_Acolyte) {
mes "[Boohae]";
mes "...";
@@ -1848,7 +1846,7 @@ prt_monk,57,179,1 script Boohae#mk 110,{
}
}
-prt_monk,199,169,3 script Door Keeper#mk 746,{
+prt_monk,199,169,3 script Door Keeper#mk 4_F_MONK,{
mes "[Keeper Chorip]";
mes "....this place is for those";
mes " in testing for becoming a monk.";
@@ -1881,7 +1879,7 @@ prt_monk,199,169,3 script Door Keeper#mk 746,{
}
}
-monk_test,329,61,3 script Bashu#mk 753,{
+monk_test,329,61,3 script Bashu#mk 4_M_MONK,{
if (MONK_Q > 14 && MONK_Q < 25) {
if (MONK_Q == 15) {
mes "[Bashu]";
@@ -1932,7 +1930,7 @@ monk_test,329,61,3 script Bashu#mk 753,{
}
}
-monk_test,386,388,4 script Apprentice Monk#mk 110,{
+monk_test,386,388,4 script Apprentice Monk#mk 4_M_MINISTER,{
mes "[Monk Apprentice]";
mes "W... welcome!";
mes "Th... this place is for testing the tolerance of monk candidates!";
@@ -1967,7 +1965,7 @@ monk_test,386,388,4 script Apprentice Monk#mk 110,{
close;
}
-monk_test,387,350,0 script Supervisor#race_monk 45,2,2,{
+monk_test,387,350,0 script Supervisor#race_monk WARPNPC,2,2,{
OnTouch:
if (MONK_Q >= 15 && MONK_Q <= 23) {
set MONK_Q,MONK_Q+1;
@@ -2025,7 +2023,7 @@ monk_test,387,42,0 duplicate(MonkTrap) Trap#t_monk7_2 -1,1,0
monk_test,389,43,0 duplicate(MonkTrap) Trap#t_monk7_3 -1
monk_test,389,42,0 duplicate(MonkTrap) Trap#t_monk7_4 -1
-job_monk,225,180,1 script Hyunmoo#mk 89,{
+job_monk,225,180,1 script Hyunmoo#mk 4_M_ORIENT02,{
if ((countitem(1069) > 0 || countitem(1070) > 0) && (countitem(1069) < 30 || countitem(1070) < 30)) {
mes "[Hyunmoo]";
mes "You didn't bring enough mushrooms... go get some more.";
@@ -2117,7 +2115,7 @@ job_monk,225,180,1 script Hyunmoo#mk 89,{
}
}
-prt_monk,225,180,1 script Hyunmoo#mk2 89,{
+prt_monk,225,180,1 script Hyunmoo#mk2 4_M_ORIENT02,{
if (MONK_Q < 25) {
mes "[Hyunmoo]";
mes "As I see vegetables growing, I feel myself growing within.";
@@ -2158,7 +2156,7 @@ prt_monk,225,180,1 script Hyunmoo#mk2 89,{
}
}
-monk_test,319,139,1 script Tomoon#mk 52,{
+monk_test,319,139,1 script Tomoon#mk 1_M_HOF,{
if (MONK_Q == 25) {
mes "[Tomoon]";
mes "Welcome young one.";
@@ -2229,7 +2227,7 @@ monk_test,319,139,1 script Tomoon#mk 52,{
}
}
-monk_test,82,85,1 script Proctor#mk 95,{
+monk_test,82,85,1 script Proctor#mk 4_F_SISTER,{
mes "[Proctor]";
mes "So, are you ready to undergo the spiritual training?";
next;
@@ -2321,7 +2319,7 @@ OnDisable:
end;
}
-monk_test,166,278,0 script exit_monk#1 45,1,1,{
+monk_test,166,278,0 script exit_monk#1 WARPNPC,1,1,{
OnTouch:
mes "[Proctor]";
mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2336,7 +2334,7 @@ OnTouch:
end;
}
-monk_test,88,91,1 script Proctor#mk2 52,{
+monk_test,88,91,1 script Proctor#mk2 1_M_HOF,{
mes "[Proctor]";
mes "So, are you ready to undergo this spiritual training?";
next;
@@ -2428,7 +2426,7 @@ OnDisable:
end;
}
-monk_test,166,178,0 script exit_monk#2 45,1,1,{
+monk_test,166,178,0 script exit_monk#2 WARPNPC,1,1,{
OnTouch:
mes "[Proctor]";
mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2443,7 +2441,7 @@ OnTouch:
end;
}
-monk_test,95,85,1 script Proctor#btl#3 79,{
+monk_test,95,85,1 script Proctor#btl#3 1_F_PRIEST,{
mes "[Proctor]";
mes "So, are you ready to undergo this spiritual training?";
next;
@@ -2535,7 +2533,7 @@ OnDisable:
end;
}
-monk_test,270,278,0 script exit_monk#3 45,1,1,{
+monk_test,270,278,0 script exit_monk#3 WARPNPC,1,1,{
OnTouch:
mes "[Proctor]";
mes "You did well. Please return to Tomoon, he's waiting for you.";
@@ -2577,7 +2575,7 @@ OnEnable:
end;
}
-monk_test,137,338,1 script switchreset#monkmonk 79,{
+monk_test,137,338,1 script switchreset#monkmonk 1_F_PRIEST,{
mes "Grrrr...";
mes "All monsters in the monk job chance place have been reset.";
mes "Timer's activated.";
@@ -2600,25 +2598,27 @@ monk_test,137,338,1 script switchreset#monkmonk 79,{
close;
}
-//============================================================
+//============================================================
// Monsters of Mushroom Collecting
-//============================================================
+//============================================================
job_monk,0,0,0,0 monster Thief Mushroom 1182,70,0,0,0
job_monk,0,0,0,0 monster Thief Bug Larva 1051,20,0,0,0
-//============================================================
+//============================================================
// Old changelog
-//============================================================
+//============================================================
//= 1.1 Fixed missing '";'. Now it's loading fine [Lupus]
//= 1.1+ Edited/Translated 5% [Celest]
//= 1.2 Made Poetry Quiz passable, Fixed Marathon Part [Lupus]
//= 1.3 Added Baby Class Support [Lupus]
//= 1.5 Fixed possible EXP abuse [Lupus]
//= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus] 1.7 Fixed warps19/20 [Yor]
+//= 2nd Job Quests again. It also guides adv classes where
+//= to go. [Lupus]
+//= 1.7 Fixed warps19/20 [Yor]
//= 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]
//= 2.1 Removed Duplicates [Silent]
+//============================================================
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index e8ce1904f..cf20d5203 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -1,29 +1,27 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Rogue Job Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= kobra_k88
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 2.9
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Rogue classes
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 2.4 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//= No longer uses function "F_BlockHigh"
+//= No longer uses function "F_BlockHigh"
//= 2.4a Deleted unused variables. [Samuray22]
-//= 2.4b Changed a Problem with JobLevel what made
-//= impossible get a Gladius [3]. (bugreport:481) [Samuray22]
+//= 2.4b Changed a Problem with JobLevel what made
+//= impossible get a Gladius [3]. (bugreport:481) [Samuray22]
//= 2.4c Corrected a Typo error ";;" and a typo error with "rouge". (bugreport:909) [Samuray22]
//= 2.5 Added dummy "OnMyMobDead" labels. (bugreport:1100) [L0ne_W0lf]
//= 2.6 Fixed a few bugs in the Rogue Guildsman. [L0ne_W0lf]
//= 2.7 Fixed a bug on Markie question 5, bugreport:1600 [Brainstorm]
//= 2.8 Moved "Thug" to Morroc Ruins. [L0ne_W0lf]
//= 2.9 Added Quest Log commands. [Kisuka]
-//============================================================
+//============================================================
-moc_ruins,86,103,1 script Thug#rg 118,{
+moc_ruins,86,103,1 script Thug#rg 2_M_THIEFMASTER,{
mes "[Thug]";
mes "*Sigh...*";
mes "What is life?";
@@ -54,7 +52,7 @@ moc_ruins,86,103,1 script Thug#rg 118,{
close;
}
-in_rogue,363,122,4 script Rogue Guildsman#rg 747,{
+in_rogue,363,122,4 script Rogue Guildsman#rg 4_F_ROGUE,{
if (Upper == 1) {
mes "[Markie]";
mes "Eh? You...you...?!";
@@ -84,7 +82,7 @@ in_rogue,363,122,4 script Rogue Guildsman#rg 747,{
mes "[Rogue Guildsman]";
mes "So what's a kid";
mes "like you doin' here?";
- if (sex == 1) {
+ if (Sex) {
mes "Oh, I get it now...";
mes "The widdle boy wants";
}
@@ -489,7 +487,7 @@ in_rogue,363,122,4 script Rogue Guildsman#rg 747,{
}
}
-in_rogue,376,23,1 script Mr. Smith#rg 57,{
+in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{
if (ROGUE_Q == 2) {
mes "[Mr. Smith]";
mes "Welcome to";
@@ -656,14 +654,14 @@ in_rogue,376,23,1 script Mr. Smith#rg 57,{
else if (ROGUE_Q == 4) callsub S_CheckItems,511,10,910,10,926,10,964,10;
else if (ROGUE_Q == 5) callsub S_CheckItems,508,10,948,10,935,10,940,10;
else if (ROGUE_Q == 6) {
- if (zeny > 9999 && countitem(915) > 4 && countitem(713) > 4 && countitem(1002) > 4 &&
+ if (Zeny > 9999 && countitem(915) > 4 && countitem(713) > 4 && countitem(1002) > 4 &&
countitem(953) > 4 && countitem(507) > 4 && countitem(919) > 4 && countitem(715) > 4 &&
countitem(913) > 4 && countitem(904) > 4 && countitem(942) > 4 && countitem(528) > 4 &&
countitem(914) > 4 && countitem(705) > 4 && countitem(916) > 4 && countitem(917) > 4 &&
countitem(908) > 4 && countitem(945) > 4) {
mes "[Mr. Smith]";
mes "Ummm...let's see...";
- set zeny,zeny-10000;
+ Zeny -= 10000;
delitem 915,5; //Chrysalis
delitem 713,5; //Empty_Bottle
delitem 1002,5; //Iron_Ore
@@ -976,7 +974,7 @@ S_CheckItems:
if (Zeny > 9999 && countitem(getarg(0)) >= getarg(1) && countitem(getarg(2)) >= getarg(3) && countitem(getarg(4)) >= getarg(5) && countitem(getarg(6)) >= getarg(7)) {
mes "[Mr. Smith]";
mes "Okay, we've got the application fee, ^FF000010,000 zeny^000000, "+getarg(1)+" "+getitemname(getarg(0))+", "+getarg(3)+" "+getitemname(getarg(2))+", "+getarg(5)+" "+getitemname(getarg(4))+" and "+getarg(7)+" "+getitemname(getarg(6))+"...";
- set zeny,zeny-10000;
+ Zeny -= 10000;
delitem getarg(0),getarg(1);
delitem getarg(2),getarg(3);
delitem getarg(4),getarg(5);
@@ -1011,7 +1009,7 @@ S_CheckItems:
close;
}
-cmd_fild09,106,195,0 script Warp#1 45,1,1,{
+cmd_fild09,106,195,0 script Warp#1 WARPNPC,1,1,{
OnTouch:
mes "[???]";
mes "Who's there?!";
@@ -1081,7 +1079,7 @@ OnTouch:
}
}
-cmd_fild09,335,143,0 script Warp#2 45,1,1,{
+cmd_fild09,335,143,0 script Warp#2 WARPNPC,1,1,{
OnTouch:
mes "[???]";
mes "Who's there?!";
@@ -1151,7 +1149,7 @@ OnTouch:
}
}
-cmd_fild04,304,180,0 script Warp#3 45,1,1,{
+cmd_fild04,304,180,0 script Warp#3 WARPNPC,1,1,{
OnTouch:
mes "[???]";
mes "Who's there?!";
@@ -1174,7 +1172,7 @@ OnTouch:
break;
case 4:
mes "[" + strcharinfo(0) + "]";
- mes "Hollgrehenn";
+ mes "Hollgrehenn";
break;
}
switch(select("enjoys:doesn't enjoy:likes:doesn't like")) {
@@ -1221,7 +1219,7 @@ OnTouch:
}
}
-in_rogue,272,135,1 script Hermanthorn Jr#rg 85,{
+in_rogue,272,135,1 script Hermanthorn Jr#rg 4_M_03,{
if (ROGUE_Q == 8) {
mes "[HermanthornJr.]";
mes "I see...";
@@ -1271,7 +1269,7 @@ in_rogue,272,135,1 script Hermanthorn Jr#rg 85,{
}
}
-in_rogue,270,130,0 script he_to_rogue#rg 45,1,1,{
+in_rogue,270,130,0 script he_to_rogue#rg WARPNPC,1,1,{
OnTouch:
mes "^3355FFThe door is locked. You'll need to enter the four number combination to open it.^000000";
next;
@@ -1279,7 +1277,7 @@ OnTouch:
if (.@input < 1 || .@input > 10000) {
if (ROGUE_Q == 12)
mes "^3355FFIt didn't work. Please re-enter the four number combination.^000000";
- else
+ else
mes "^3355FFPlease enter a combination of four numbers.^000000";
close;
}
@@ -1384,7 +1382,7 @@ OnMyMobDead:
end;
}
-in_rogue,9,389,0 script oneway_to_gu 45,1,1,{
+in_rogue,9,389,0 script oneway_to_gu WARPNPC,1,1,{
OnTouch:
donpcevent "gen_ro#4::OnDisable";
set ROGUE_Q,17;
@@ -1392,7 +1390,7 @@ OnTouch:
end;
}
-in_rogue,244,39,1 script Aragham Junior#rg 99,{
+in_rogue,244,39,1 script Aragham Junior#rg 4W_M_03,{
if (ROGUE_Q == 9) {
mes "[Aragham Jr.]";
mes "Oh, you must be";
@@ -1478,7 +1476,7 @@ in_rogue,244,39,1 script Aragham Junior#rg 99,{
}
}
-in_rogue,160,34,1 script Hollgrehenn junior#rg 85,{
+in_rogue,160,34,1 script Hollgrehenn junior#rg 4_M_03,{
if (ROGUE_Q == 11) {
mes "[Hollgrehenn Jr.]";
mes "Huh...";
@@ -1564,7 +1562,7 @@ in_rogue,160,34,1 script Hollgrehenn junior#rg 85,{
}
}
-in_rogue,177,109,1 script Antonio junior#rg 88,{
+in_rogue,177,109,1 script Antonio junior#rg 4_M_ORIENT01,{
if (ROGUE_Q == 10) {
mes "[Antonio Jr.]";
mes "You're from";
@@ -1649,7 +1647,7 @@ in_rogue,177,109,1 script Antonio junior#rg 88,{
}
}
-in_rogue,370,320,0 script quest_out 45,1,1,{
+in_rogue,370,320,0 script quest_out WARPNPC,1,1,{
OnTouch:
set ROGUE_Q,16;
warp "in_rogue",378,113;
@@ -1713,7 +1711,7 @@ OnTouch:
end;
OnDisable:
- killmonster "in_rogue","mob_rogue#3::OnMyMObDead";
+ killmonster "in_rogue","mob_rogue#3::OnMyMobDead";
end;
OnMyMobDead:
@@ -1990,7 +1988,7 @@ OnInit:
end;
}
-in_rogue,399,286,1 script switch#rogreset 88,{
+in_rogue,399,286,1 script switch#rogreset 4_M_ORIENT01,{
mes "^F08080Tah dah~";
mes "Monsters for the";
mes "Rogue Job Change";
@@ -2012,19 +2010,20 @@ in_rogue,399,286,1 script switch#rogreset 88,{
close;
}
-//============================================================
+//============================================================
// Old changelog
-//============================================================
+//============================================================
//= 1.1 fixed 3 wrong questions, added missing lines [Lupus]
//= 1.3 Baby Class Support + 40/50 JobLevel Item fix [Lupus]
//= 1.5 Fixed possible EXP abuse [Lupus]
//= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//= 2nd Job Quests again. It also guides adv classes where
+//= to go. [Lupus]
//= 2.0 Changed numbers to constants. [Vicious]
//= 2.1 Removed Duplicates [Silent]
//= 2.2 Merged JFunc [Lupus]
//= 2.3 Added a possibility for players doing Meginjyard quest
-//= to enter Rogue guild as there's a NPC inside [SinSloth]
+//= to enter Rogue guild as there's a NPC inside [SinSloth]
//= 2.3a fixed test4 person interaction, let BABY thieves pass
-//= the test, too [Lupus]
+//= the test, too [Lupus]
+//============================================================
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 1e188778e..72bacfaf1 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -4,14 +4,14 @@
//= jAthena (0.9) - I guess
//= Unknown Translator (1.0)
//= Darkchild (1.2)
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 2.8
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Sage classes
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 2.1 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//= No longer uses function "F_BlockHigh"
+//= No longer uses function "F_BlockHigh"
//= 2.2 Small bug fix (== -> !=) thanks to Saithis. [L0ne_W0lf]
//= 2.2b ANotehr smaLL bugfix, pointed out by Cara. [L0ne_W0lf]
//= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
@@ -19,15 +19,15 @@
//= 2.4a Deleted unused variables. [Samuray22]
//= 2.5 Updated waiting room. (Removes global var) [L0ne_W0lf]
//= 2.5a Corrected some "mes"s without the getitemname. (bugreport:1564) [Samuray22]
-// -Changed an incorrect "!=" to "==". (bugreport:1572)
-// -And Small Typo Error
+//= -Changed an incorrect "!=" to "==". (bugreport:1572)
+//= -And Small Typo Error
//= 2.6 Fixed Kayron Grik cutin not being removed as reported by jc1991, bugreport:1825 [Brainstorm]
//= 2.6a Fixed a Little Bug with Whispers Summoned in the Last Test. (bugreport:2253) [Samuray22]
//= 2.7 Added Quest Log commands. [Kisuka]
//= 2.8 Removed the need for use of 'goto.' [L0ne_W0lf]
-//============================================================
+//============================================================
-yuno_in02,38,61,5 script Dean of the Academy#sa 743,{
+yuno_in02,38,61,5 script Dean of the Academy#sa 2_M_SAGE_OLD,{
cutin "job_sage_kayron",2;
mes "[Kayron Grik]";
if (Upper == 1) {
@@ -193,7 +193,7 @@ yuno_in02,38,61,5 script Dean of the Academy#sa 743,{
end;
}
-yuno_in03,154,35,4 script Staff of the Academy#a 742,{
+yuno_in03,154,35,4 script Staff of the Academy#a 2_M_SAGE_B,{
mes "[Metheus Sylphe]";
if (Upper == 1) {
mes "Welcome to the";
@@ -343,7 +343,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
next;
if (select("Pay 70,000 zeny.:Give him Old Magicbook and Necklace of Wisdom.") == 1) {
if (Zeny > 69999) {
- set zeny,zeny-70000;
+ Zeny -= 70000;
mes "[Metheus Sylphe]";
mes "Thank you, your application has been accepted.";
mes "Next, you will take an entrance test.";
@@ -515,7 +515,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
next;
}
else if (Zeny > 69999) {
- set zeny,zeny-70000;
+ Zeny -= 70000;
mes "[Metheus Sylphe]";
mes "Well done. Let me proceed with your application request.";
set SAGE_Q,4;
@@ -525,8 +525,8 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
switch (SAGE_Q) {
case 1:
//Feather_Of_Bird, Fluff, Iron_Ore
- setarray .@item[0], 916,914,1002;
- setarray .@count[0], 50,50,25;
+ setarray .@item[0], 916,914,1002;
+ setarray .@count[0], 50,50,25;
break;
case 2:
//Clover, Feather, Chinese_Ink
@@ -539,13 +539,13 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
setarray .@count[0], 50,50,50,50;
break;
}
- set .@size, (getarraysize(.@item)-1);
+ set .@size, (getarraysize(.@item)-1);
for( set .@i,0 ; .@i < .@size && countitem(.@item[.@i]) >= .@count[.@i] ; set .@i,.@i+1 );
- if(.@i == .@size) {
+ if(.@i == .@size) {
if (Zeny > 29999) {
for (set .@i, 0; .@i < .@size ; set .@i, .@i+1)
- delitem .@item[.@i], .@count[.@i];
- set zeny,zeny-30000;
+ delitem .@item[.@i], .@count[.@i];
+ Zeny -= 30000;
mes "[Metheus Sylphe]";
mes "Well done. Let me proceed with your application request.";
set .@SAGE_Q_T,SAGE_Q;
@@ -634,7 +634,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
}
}
-yuno_in03,105,177,5 script Written Test Professor#s 754,{
+yuno_in03,105,177,5 script Written Test Professor#s 4_M_SAGE_A,{
mes "[Claytos Verdo]";
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Sage) {
@@ -1054,7 +1054,7 @@ L_AskQuestions:
}
//Practical Examination Professer
-yuno_in03,169,180,3 script Practical Examination P 755,{
+yuno_in03,169,180,3 script Practical Examination P 4_M_SAGE_C,{
mes "[Hermes Tris]";
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Sage) {
@@ -1255,7 +1255,7 @@ yuno_in03,169,180,3 script Practical Examination P 755,{
}
}
-yuno_in03,62,176,2 script History Professor#sa 109,{
+yuno_in03,62,176,2 script History Professor#sa 4_M_MANAGER,{
mes "[Saphien Layless]";
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Sage) {
@@ -1696,7 +1696,7 @@ yuno_in03,62,176,2 script History Professor#sa 109,{
}
}
-yuno_in03,32,102,1 script Biology Professor#sa 755,{
+yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{
mes "[Lucius Celsus]";
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Sage) {
@@ -2123,7 +2123,7 @@ yuno_in03,32,102,1 script Biology Professor#sa 755,{
}
}
-yuno_in03,244,31,3 script Physics Professor#sa 120,{
+yuno_in03,244,31,3 script Physics Professor#sa 2_M_PHARMACIST,{
mes "[Aebecee George]";
if (BaseJob != Job_Mage) {
if (BaseJob == Job_Sage) {
@@ -2542,7 +2542,7 @@ yuno_in03,244,31,3 script Physics Professor#sa 120,{
}
}
-job_sage,50,165,4 script Test Helper#talk 700,{
+job_sage,50,165,4 script Test Helper#talk 8_F_GIRL,{
mes "[Test Helper]";
mes "Welcome to the Sage practical examination hall.";
mes "If you wish to take the test right now, please enter the waiting room.";
@@ -2557,7 +2557,7 @@ job_sage,50,165,4 script Test Helper#talk 700,{
close;
}
-job_sage,50,165,4 script Waiting Room#sg 700,{
+job_sage,50,165,4 script Waiting Room#sg 8_F_GIRL,{
end;
OnInit:
@@ -2577,7 +2577,7 @@ OnEnable:
end;
}
-- script Arena#1 66,{
+- script Arena#1 1_F_01,{
OnInit:
disablenpc "Arena#1";
end;
@@ -2891,9 +2891,9 @@ OnTimer9000:
end;
}
-//============================================================
+//============================================================
// Old changelog
-//============================================================
+//============================================================
//= Script mostly based on translated jA script
//= Written test questions/answers weren't translated 100% corectly
//= So a lot of those are based upon mRO site and my own info
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-02 12:46:39 +0000