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.txt38
-rw-r--r--npc/jobs/2-2/bard.txt15
-rw-r--r--npc/jobs/2-2/crusader.txt98
-rw-r--r--npc/jobs/2-2/dancer.txt58
-rw-r--r--npc/jobs/2-2/monk.txt28
-rw-r--r--npc/jobs/2-2/rogue.txt39
-rw-r--r--npc/jobs/2-2/sage.txt24
7 files changed, 154 insertions, 146 deletions
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index dd568b9ef..e0ea187ea 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -2,20 +2,20 @@
//= Alchemist Job Quest
//===== By: ==================================================
//= nestor_zulueta (Fusion), converted by Darkchild
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 3.0
-//===== Description: =========================================
+//===== 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]
-//============================================================
+//============================================================
alde_alche,27,185,5 script Alchemist Guildsman#am 744,{
mes "[Parmy Gianino]";
@@ -175,7 +175,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;
+ set Zeny, Zeny-50000;
mes "[Parmy Gianino]";
mes "Let's see.";
mes "" + strcharinfo(0);
@@ -440,7 +440,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.";
@@ -1888,8 +1888,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 +1977,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..3b7c5d509 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: =================================
@@ -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;
@@ -935,9 +935,9 @@ 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
@@ -946,5 +946,6 @@ S_ChangeJob:
//= 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..e11a45382 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,8 +32,8 @@
//= 3.3 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
-
-//=============== Senior Crusader: 1st Collect Items Test============================
+// Senior Crusader: 1st Collect Items Test
+//============================================================
prt_castle,45,169,5 script Senior Crusader 752,{
mes "[Michael Halig]";
if (Upper == 1) { //the baby classes were totally blocked... due to missing == 1
@@ -127,7 +125,7 @@ prt_castle,45,169,5 script Senior Crusader 752,{
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,7 +293,7 @@ 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;
@@ -314,7 +312,8 @@ prt_castle,45,169,5 script Senior Crusader 752,{
close;
}
-//===================== Suffering Man: 2nd Endurance Test ===============================================
+// Suffering Man: 2nd Endurance Test
+//============================================================
prt_castle,164,32,1 script Man in Anguish 733,{
mes "[Murnak Mijoul]";
if(BaseJob != Job_Swordman) {
@@ -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,7 +446,8 @@ prt_castle,164,32,1 script Man in Anguish 733,{
close;
}
-//===================== Gabriel Valentine: 3rd Knowledge Test =================================
+// Gabriel Valentine: 3rd Knowledge Test
+//============================================================
prt_church,95,127,3 script Crusader 745,{
mes "[Gabriel Valentine]";
if(BaseJob != Job_Swordman) {
@@ -795,7 +795,8 @@ prt_church,95,127,3 script Crusader 745,{
close;
}
-//===================== Crusader: 4th Purification Test =====================================================
+// Crusader: 4th Purification Test
+//============================================================
prt_castle,35,151,5 script Patron Knight 751,{
mes "[Bliant Piyord]";
mes "Welcome.";
@@ -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";
@@ -1205,7 +1210,9 @@ OnTouch:
end;
}
-//=== Purification Test ===================================
+//----------------------------------------------------------------------------
+// Purification Test
+//----------------------------------------------------------------------------
job_cru,24,187,4 script Patron Knight#2 751,{
mes "[Bliant Piyord]";
mes "Welcome.";
@@ -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..88157d40b 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,6 +18,7 @@
//= 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,{
@@ -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?";
@@ -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;
+ set Zeny, 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;
@@ -893,7 +892,7 @@ job_duncer,95,93,4 script Bijou#da 101,{
}
// Waiting Room
-//============================================================
+//============================================================
job_duncer,32,154,1 script Waiting Room#dance 66,{
end;
@@ -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,19 +1321,19 @@ OnDisable:
}
// Backup Dancers
-//============================================================
-job_duncer,63,110,4 script Backdancer#1::BackDancer 724,{
+//============================================================
+job_duncer,63,110,4 script Backdancer#1 724,{
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";
@@ -1345,11 +1344,11 @@ job_duncer,66,113,4 script Backdancer#2 724,{
end;
OnSmile:
- Emotion e_no1;
+ emotion e_no1;
end;
OnOmg:
- Emotion e_omg;
+ emotion e_omg;
end;
}
@@ -1357,11 +1356,11 @@ job_duncer,72,113,4 script Backdancer#3 724,{
end;
OnSmile:
- Emotion e_no1;
+ emotion e_no1;
end;
OnOmg:
- Emotion e_omg;
+ emotion e_omg;
end;
}
@@ -1369,17 +1368,17 @@ job_duncer,75,110,4 script Backdancer#4 724,{
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
//= Improved Concentration and arrow shower, people could get away with it
//= [Fredzilla]
@@ -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..ddcce606c 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -1,22 +1,20 @@
-//===== 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,{
if (Upper == 1) {
@@ -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..4c7b5ac4f 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -1,27 +1,25 @@
-//===== 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]
+//= 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,{
mes "[Thug]";
@@ -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";
}
@@ -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;
+ set Zeny, 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;
+ set Zeny, Zeny-10000;
delitem getarg(0),getarg(1);
delitem getarg(2),getarg(3);
delitem getarg(4),getarg(5);
@@ -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..a425495b3 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,13 +19,13 @@
//= 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,{
cutin "job_sage_kayron",2;
@@ -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;
+ set Zeny, 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;
+ set Zeny, Zeny-70000;
mes "[Metheus Sylphe]";
mes "Well done. Let me proceed with your application request.";
set SAGE_Q,4;
@@ -545,7 +545,7 @@ yuno_in03,154,35,4 script Staff of the Academy#a 742,{
if (Zeny > 29999) {
for (set .@i, 0; .@i < .@size ; set .@i, .@i+1)
delitem .@item[.@i], .@count[.@i];
- set zeny,zeny-30000;
+ set Zeny, Zeny-30000;
mes "[Metheus Sylphe]";
mes "Well done. Let me proceed with your application request.";
set .@SAGE_Q_T,SAGE_Q;
@@ -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-11-01 20:37:53 +0000