summaryrefslogtreecommitdiff
path: root/npc/pre-re/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'npc/pre-re/jobs')
-rw-r--r--npc/pre-re/jobs/1-1/acolyte.txt22
-rw-r--r--npc/pre-re/jobs/1-1/archer.txt16
-rw-r--r--npc/pre-re/jobs/1-1/mage.txt36
-rw-r--r--npc/pre-re/jobs/1-1/merchant.txt38
-rw-r--r--npc/pre-re/jobs/1-1/swordman.txt62
-rw-r--r--npc/pre-re/jobs/1-1/thief.txt20
-rw-r--r--npc/pre-re/jobs/novice/novice.txt79
7 files changed, 135 insertions, 138 deletions
diff --git a/npc/pre-re/jobs/1-1/acolyte.txt b/npc/pre-re/jobs/1-1/acolyte.txt
index 7b46a6029..2faef7c87 100644
--- a/npc/pre-re/jobs/1-1/acolyte.txt
+++ b/npc/pre-re/jobs/1-1/acolyte.txt
@@ -1,13 +1,13 @@
//===== Hercules Script ======================================
//= Acolyte Job Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 2.2
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Acolyte classes
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Fully working.
//= 1.1 Added function calls for Priest Quest.
//= 1.2 Fixed Marthilda, Yosuke bugs. [Lupus]
@@ -17,8 +17,8 @@
//= 1.5 Now saves/restores all quest skills [Lupus]
//= 1.6 Merged back JFunc [Lupus]
//= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//= No longer uses function "F_ToHigh"
-//= Proper dialog for Priest job quest is unused (for now.)
+//= No longer uses function "F_ToHigh"
+//= Proper dialog for Priest job quest is unused (for now.)
//= 1.7a Functions now make use of proper priest quest dialog [L0ne_W0lf]
//= 1.8 Removed an Unnecessary "set job_acolyte_q,0;" [Samuray22]
//= 1.8a More bug fixes care of Crashy. [L0ne_W0lf]
@@ -26,9 +26,9 @@
//= 2.0 Fixed High Acolytesnot being given holy light. [L0ne_W0lf]
//= 2.1 Added Quest Log commands. [L0ne_W0lf]
//= 2.2 Fixed an issue with completequest by adding checkquest. [Kisuka]
-//============================================================
+//============================================================
-prt_church,184,41,4 script Cleric#aco 60,{
+prt_church,184,41,4 script Cleric#aco 1_M_PASTOR,{
if (Upper == 1) {
if (ADVJOB == Job_High_Priest || ADVJOB == Job_Champion) {
if (Class == Job_Novice_High) {
@@ -245,7 +245,7 @@ prt_church,184,41,4 script Cleric#aco 60,{
}
}
-prt_fild03,365,255,2 script Ascetic#aco 89,{
+prt_fild03,365,255,2 script Ascetic#aco 4_M_ORIENT02,{
mes "[Father Rubalkabara]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 6) {
@@ -322,7 +322,7 @@ prt_fild03,365,255,2 script Ascetic#aco 89,{
}
}
-moc_fild07,41,355,4 script Ascetic#2aco 95,{
+moc_fild07,41,355,4 script Ascetic#2aco 4_F_SISTER,{
mes "[Mother Mathilda]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 7) {
@@ -391,7 +391,7 @@ moc_fild07,41,355,4 script Ascetic#2aco 95,{
}
}
-prt_fild00,208,218,6 script Ascetic#3aco 98,{
+prt_fild00,208,218,6 script Ascetic#3aco 4W_M_02,{
mes "[Father Yosuke]";
if (BaseJob == Job_Novice) {
if (job_acolyte_q == 8) {
diff --git a/npc/pre-re/jobs/1-1/archer.txt b/npc/pre-re/jobs/1-1/archer.txt
index 5018bc48f..d8bb041f9 100644
--- a/npc/pre-re/jobs/1-1/archer.txt
+++ b/npc/pre-re/jobs/1-1/archer.txt
@@ -1,13 +1,13 @@
//===== Hercules Script ======================================
//= Archer Job Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.9
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Archer classes
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Fully working.
//= 1.1 Added instant job change for High Novice [Lupus]
//= 1.3 Added Baby Class support [Lupus]
@@ -15,14 +15,14 @@
//= 1.5 Now saves/restores all quest skills [Lupus]
//= 1.6 Merged back JFunc [Lupus]
//= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//= Arrow reward is now equal to the type sof trunks brought.
-//= No longer uses function "F_ToHigh"
+//= Arrow reward is now equal to the type sof trunks brought.
+//= No longer uses function "F_ToHigh"
//= 1.7a Fixed minor dialogue bug at Grade==25 [Lupus]
//= 1.8 Fixed mistake in condition check. [L0ne_W0lf]
//= 1.9 Added Quest Log commands. [L0ne_W0lf]
-//============================================================
+//============================================================
-payon_in02,64,71,4 script Archer Guildsman#archer 85,{
+payon_in02,64,71,4 script Archer Guildsman#archer 4_M_03,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Sniper || ADVJOB == Job_Clown || ADVJOB == Job_Gypsy)) {
mes "[Archer Guildsman]";
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 22aab9052..e5f80bd3d 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Mage Job Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
-//===== Current Version: =====================================
-//= 1.9
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
+//===== Current Version: =====================================
+//= 2.0
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Mage classes
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Fully working.
//= 1.1 Fixed input ingridients bug [Lupus]
//= 1.2 Added instant job change for High Novice [Lupus]
@@ -18,13 +16,14 @@
//= 1.5 Now saves/restores all quest skills [Lupus]
//= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus]
//= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//= No longer uses function "F_ToHigh"
+//= No longer uses function "F_ToHigh"
//= 1.7a Fixed a "If" in the quest. (bugreport:489) [Samuray22]
//= 1.8 Added Quest Log commands. [L0ne_W0lf]
//= 1.9 Fixed an issue with completequest by adding checkquest. [Kisuka]
-//============================================================
+//= 2.0 Moved "Dollshoi" and "Ponka-Hontas" NPCs. [Euphy]
+//============================================================
-geffen_in,164,124,4 script Mage Guildsman 123,{
+geffen_in,164,124,4 script Mage Guildsman 2_F_MAGICMASTER,{
if (Upper == 1) {
if (ADVJOB == Job_High_Wizard || ADVJOB == Job_Professor) {
if (Class == Job_Novice_High) {
@@ -86,7 +85,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{
}
if (job_magician_q == 0) {
mes "Wanna be a Mage, eh...?";
- if (sex)
+ if (Sex)
mes "Hey, look at you! You're kinda cute~! Not my type though...";
else {
mes "Oooh, you're such a hot babe~!";
@@ -231,7 +230,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{
case 2:
mes "[Mage Guildsman]";
mes "Wanna be a Mage, eh?";
- if (sex)
+ if (Sex)
mes "For a cutie like you, I'd be happy to explain the requirements!";
else
mes "I'd be happy to explain the requirements for a pretty girl like you!";
@@ -286,7 +285,7 @@ geffen_in,164,124,4 script Mage Guildsman 123,{
}
}
-geffen_in,164,112,4 script Mixing Machine 111,{
+geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
mes "[Mixing Machine]";
mes "This machine is the property of the Geffen Mage Guild and is used only for mixing solutions for magic purposes.";
next;
@@ -596,7 +595,14 @@ geffen_in,164,112,4 script Mixing Machine 111,{
close;
}
-geffen_in,177,112,4 script Bookshelf 111,{
+// The Morroc Solution and Payon Solution traders
+// are also used in the Sage skill quests, and have
+// been moved to npc/quests/mage_solution.txt.
+//
+// pay_arche,122,100,0 script Dollshoi 4_M_ORIENT01,{}
+// moc_ruins,91,150,0 script Ponka-Hontas 4_F_04,{}
+
+geffen_in,177,112,4 script Bookshelf HIDDEN_NPC,{
mes "[Guide Book]";
mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care.";
next;
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 93d502794..631e29516 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Merchant Job Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 2.3
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Merchant classes
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Fully working.
//= 1.1 Added instant job change for High Novice [Lupus]
//= 1.3 Added Baby Class support [Lupus]
@@ -20,7 +18,7 @@
//= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus]
//= 1.7 Updated to use Free Ticket for Kafra [Lupus]
//= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//= No longer uses function "F_ToHigh"
+//= No longer uses function "F_ToHigh"
//= 1.9 Bugfixes, thanks to Barron-Monster. [L0ne_W0lf]
//= 1.9a Added a missing next; (Barron-Monster) [L0ne_W0lf]
//= 1.9b Typo. "nextl" -> "next;" (Barron-Monster) [L0ne_W0lf]
@@ -28,9 +26,9 @@
//= 2.1 Fixed mistake in condition check. [L0ne_W0lf]
//= 2.2 Added Quest Log commands. [L0ne_W0lf]
//= 2.3 Fixed an issue with completequest by adding checkquest. [Kisuka]
-//============================================================
+//============================================================
-alberta_in,53,43,6 script Merchant#mer 86,{
+alberta_in,53,43,6 script Merchant#mer 4_M_04,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) {
mes "[Chief Mahnsoo]";
@@ -135,7 +133,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{
mes "Please return when you have earned the 500 zeny that you need to become a Merchant.";
close;
}
- set zeny,zeny-500;
+ set Zeny, Zeny-500;
mes "Ah yes...!";
mes "Now your";
mes "membership";
@@ -171,7 +169,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{
mes "[Chief Mahnsoo]";
mes "*Ahem* Aaaaand let me give you a little bit of money for delivering that message to Blossom for me.";
mes "I hope you'll help me again next time~";
- set zeny,zeny+200;
+ set Zeny, Zeny+200;
set quest_alb_01,2;
}
else {
@@ -343,7 +341,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{
mes "[Chief Mahnsoo]";
if (Zeny >= 1000) {
set job_merchant_q,2;
- set zeny,zeny-1000;
+ set Zeny, Zeny-1000;
mes "Alright~";
mes "That's 1,000 zeny.";
mes "Excellent, excellent.";
@@ -357,7 +355,7 @@ alberta_in,53,43,6 script Merchant#mer 86,{
mes "[Chief Mahnsoo]";
if (Zeny >= 500) {
set job_merchant_q,1;
- set zeny,zeny-500;
+ set Zeny, Zeny-500;
mes "Let's see...";
mes "That's 500 Zeny. Although I don't think splitting payment is a good idea for any Merchant, it's alright since you're still learning.";
}
@@ -511,7 +509,7 @@ S_GiveSerial:
return;
}
-alberta_in,28,29,2 script Merchant Guildsman#mer 83,{
+alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
if (BaseJob == Job_Merchant) {
mes "[Union Staff Kay]";
mes "Heya pal.";
@@ -788,7 +786,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 83,{
}
}
-morocc_in,140,102,4 script Student#mer 86,{
+morocc_in,140,102,4 script Student#mer 4_M_04,{
if ((job_merchant_q == 4) || (job_merchant_q == 3)) {
mes "[Dyer's Student]";
mes "You're from";
@@ -873,7 +871,7 @@ morocc_in,140,102,4 script Student#mer 86,{
}
}
-geffen_in,155,122,4 script Guild Staff#mer 47,{
+geffen_in,155,122,4 script Guild Staff#mer 1_M_01,{
if (job_merchant_q == 4 || job_merchant_q == 3) {
mes "[Guild Staff]";
mes "Ah, you must be with the Merchant Guild. Finally, my package has arrived! Alright...!";
@@ -954,7 +952,7 @@ geffen_in,155,122,4 script Guild Staff#mer 47,{
}
}
-prontera,248,42,0 script Kafra Employee#mer 116,{
+prontera,248,42,0 script Kafra Employee#mer 4_F_KAFRA2,{
cutin "kafra_02",2;
if (job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 2 || job_merchant_q2 == 1) {
mes "[Kafra Employee]";
@@ -1060,7 +1058,7 @@ prontera,248,42,0 script Kafra Employee#mer 116,{
cutin "",255;
end;
}
- set zeny,zeny-600;
+ set Zeny, Zeny-600;
set RESRVPTS, RESRVPTS + 37;
cutin "",255;
warp "izlude",94,103;
@@ -1072,7 +1070,7 @@ prontera,248,42,0 script Kafra Employee#mer 116,{
}
}
-//izlu2dun,106,58,4 script Kafra Employee#mer 116,{
+//izlu2dun,106,58,4 script Kafra Employee#mer 4_F_KAFRA2,{
function script F_MercKafra {
if ((job_merchant_q == 6 || job_merchant_q == 5) && (job_merchant_q2 == 8 || job_merchant_q2 == 7)) {
mes "[Kafra Employee]";
diff --git a/npc/pre-re/jobs/1-1/swordman.txt b/npc/pre-re/jobs/1-1/swordman.txt
index 36ddc9d21..8b4a9f974 100644
--- a/npc/pre-re/jobs/1-1/swordman.txt
+++ b/npc/pre-re/jobs/1-1/swordman.txt
@@ -1,19 +1,17 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Swordsman Job Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 2.3
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Swordman classes
//= Uses Job_sword1 as opposed to sword_1-1 -> sword_3-1.
//= EXPLOITABLE in a sense because while the sword_x-1 maps
//= are marked as "inside" by the client, job_sword1 is not.
//= giving players FREE camera rotation while doing the job quest.
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.0 Fully working.
//= 1.1 Added instant job change for High Novice [Lupus]
//= 1.3 Added Baby Class support [Lupus]
@@ -27,17 +25,17 @@
//= 1.7 changed location from its clone to the original [Lupus]
//= 1.7.1 Fixed warp on timeout [KarLaeda]
//= 1.8 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//= Removed "green" traps, quest is no longer timed.
-//= No longer uses function "F_ToHigh"
+//= Removed "green" traps, quest is no longer timed.
+//= No longer uses function "F_ToHigh"
//= 1.9 Dialog is official, but the Script is now custom as far as maps go. [L0ne_W0lf]
//= 1.9b Fixed usage of wrong jobchange func messing up baby classes [ultramage]
//= 2.0 Corrected NPC names to fall within proper resctrictions. [L0ne_W0lf]
//= 2.1 Fixed mistake in condition check. [L0ne_W0lf]
//= 2.2 Warp portals dont end with ; [Yommy]
//= 2.3 Added Quest Log commands. [L0ne_W0lf]
-//============================================================
+//============================================================
-izlude_in,74,172,4 script Swordman#swd_1 119,{
+izlude_in,74,172,4 script Swordman#swd_1 2_M_SWORDMASTER,{
if (Upper == 1) {
if (Class == Job_Novice_High && (ADVJOB == Job_Lord_Knight || ADVJOB == Job_Paladin)) {
mes "[Swordman]";
@@ -203,7 +201,7 @@ izlude_in,74,172,4 script Swordman#swd_1 119,{
}
}
-izlude_in,62,170,6 script Swordman#swd_2 85,{
+izlude_in,62,170,6 script Swordman#swd_2 4_M_03,{
mes "[Swordman]";
if (BaseJob == Job_Swordman) {
mes "Sorry guy, but I can only allow Novices to enter the Test Hall.";
@@ -235,7 +233,7 @@ izlude_in,62,170,6 script Swordman#swd_2 85,{
}
}
-izlude_in,30,175,4 script Swordman#swd_3 92,{
+izlude_in,30,175,4 script Swordman#swd_3 4_F_03,{
mes "[Swordman]";
mes "I will tell you about the Test! Listen carefully, I won't repeat myself.";
next;
@@ -262,7 +260,7 @@ izlude_in,30,175,4 script Swordman#swd_3 92,{
close;
}
-izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{
+izlude_in,30,163,0 script Test Hall Staff#swd_1 8W_SOLDIER,{
mes "[Test Hall Staff]";
if (BaseJob == Job_Swordman) {
mes "Hm? How did you get inside? You're not supposed to be in here, so please leave now.";
@@ -296,21 +294,21 @@ izlude_in,30,163,0 script Test Hall Staff#swd_1 105,{
}
// Examination Courses NPCs
-//============================================================
+//============================================================
// 1-1
-job_sword1,230,245,2 script Medic#swd_1 105,{
+job_sword1,230,245,2 script Medic#swd_1 8W_SOLDIER,{
callfunc "F_JobSwdMedic","1st";
}
-job_sword1,230,242,2 script Test Hall Staff#swd_2 105,{
+job_sword1,230,242,2 script Test Hall Staff#swd_2 8W_SOLDIER,{
callfunc "F_JobSwdStaff",1;
}
-job_sword1,230,207,2 script Medic#2swd_2 105,{
+job_sword1,230,207,2 script Medic#2swd_2 8W_SOLDIER,{
callfunc "F_JobSwdMedic","2nd";
}
-job_sword1,230,204,2 script Test Hall Staff#2swd_3 105,{
+job_sword1,230,204,2 script Test Hall Staff#2swd_3 8W_SOLDIER,{
callfunc "F_JobSwdStaff",1;
}
-job_sword1,223,167,2 script Mae#swd_1_success 92,{
+job_sword1,223,167,2 script Mae#swd_1_success 4_F_03,{
mapannounce "job_sword1","Applicant " + strcharinfo(0) + ". You successfully passed the test.",bc_map;
set job_sword_q,4;
mes "[Mae]";
@@ -322,7 +320,7 @@ job_sword1,223,167,2 script Mae#swd_1_success 92,{
}
// Examination Course Functions
-//============================================================
+//============================================================
function script F_JobSwdMedic {
percentheal 100,0;
mes "[Medic]";
@@ -366,37 +364,37 @@ OnTouch:
}
// Examination Course 1
-//============================================================
+//============================================================
job_sword1,223,243,0 warp checkp1-2#swd_1 1,1,job_sword1,11,206
job_sword1,223,205,0 warp checkp2-3#swd_1 1,1,job_sword1,11,168
-job_sword1,7,245,0 script Test Hall Staff#swd_4 45,1,3,{
+job_sword1,7,245,0 script Test Hall Staff#swd_4 WARPNPC,1,3,{
callfunc "F_JobSwdTestStaff",10,245;
}
-job_sword1,8,207,0 script Test Hall Staff#swd_5 45,1,6,{
+job_sword1,8,207,0 script Test Hall Staff#swd_5 WARPNPC,1,6,{
callfunc "F_JobSwdTestStaff",11,207;
}
-job_sword1,8,169,0 script Test Hall Staff#swd_6 45,1,6,{
+job_sword1,8,169,0 script Test Hall Staff#swd_6 WARPNPC,1,6,{
callfunc "F_JobSwdTestStaff",11,169;
}
-job_sword1,192,244,0 script Test Hall Staff#swd_7 45,1,3,{
+job_sword1,192,244,0 script Test Hall Staff#swd_7 WARPNPC,1,3,{
callfunc "F_JobSwdTestStaff2","1st",215,244;
}
-job_sword1,193,207,0 script Test Hall Staff#swd_8 45,1,3,{
+job_sword1,193,207,0 script Test Hall Staff#swd_8 WARPNPC,1,3,{
callfunc "F_JobSwdTestStaff2","2nd",215,205;
warp "job_sword1",215,205;
}
-job_sword1,193,168,0 script Test Hall Staff#swd_9 45,1,3,{
+job_sword1,193,168,0 script Test Hall Staff#swd_9 WARPNPC,1,3,{
callfunc "F_JobSwdTestStaff2","3rd",215,167;
}
// Pitfalls (Set 1)
-//============================================================
+//============================================================
job_sword1,65,117,0 warp pitfall01-01 1,1,job_sword1,10,245
job_sword1,98,27,0 warp pitfall02-01 1,1,job_sword1,11,207
job_sword1,161,27,0 warp pitfall02-02 1,1,job_sword1,11,207
@@ -463,7 +461,7 @@ job_sword1,181,239,0 duplicate(SwdTrap1) 1_blank_14_c -1,1,0
job_sword1,193,245,0 warp 1_rest 1,3,job_sword1,215,244
// Pitfalls (Set 2)
-//============================================================
+//============================================================
job_sword1,56,212,0 script 2_blank_1_a::SwdTrap2 -1,40,0,{
OnTouch:
switch(rand(1,5)) {
@@ -508,7 +506,7 @@ job_sword1,155,201,0 duplicate(SwdTrap2) 2_blank_9_a -1,40,0
job_sword1,181,201,0 duplicate(SwdTrap2) 2_blank_9_b -1,2,0
// Pitfalls (Set 3)
-//============================================================
+//============================================================
job_sword1,17,174,0 script 3_blank_1_a::SwdTrap3 -1,2,0,{
OnTouch:
switch(rand(1,5)) {
@@ -621,7 +619,7 @@ job_sword1,177,163,0 duplicate(SwdTrap3) 3_blank_30_b -1,0,2
job_sword1,181,163,0 duplicate(SwdTrap3) 3_blank_30_c -1,2,0
// Monsters (all three courses)
-//============================================================
+//============================================================
job_sword1,0,0,0,0 monster Chonchon 1183,20,0,0,0
job_sword1,35,79,0,0 monster Fabre 1184,3,60000,30000,0
job_sword1,50,108,0,0 monster Fabre 1184,3,60000,30000,0
diff --git a/npc/pre-re/jobs/1-1/thief.txt b/npc/pre-re/jobs/1-1/thief.txt
index aa5c6a108..389c257f5 100644
--- a/npc/pre-re/jobs/1-1/thief.txt
+++ b/npc/pre-re/jobs/1-1/thief.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Thief Job Quest
//===== By: ==================================================
//= rAthena Dev Team
//===== Current Version: =====================================
//= 1.8
-//===== Compatible With: =====================================
-//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= Job quest for Thief classes
@@ -14,15 +12,15 @@
//= 1.1 Added instant job change for High Novice [Lupus]
//= 1.3 Added Baby Class support [Lupus]
//= 1.4 Optimised and moved first checker to Jfunc1-1 [massdriller]
-//= Fixed possible EXP abuse [Lupus]
+//= Fixed possible EXP abuse [Lupus]
//= 1.5 Now saves/restores all quest skills [Lupus]
//= 1.6 Merged back JFunc [Lupus] 1.6a typos
//= 1.7 Rescripted to Aegis 10.3 stadards. [L0ne_W0lf]
-//= No longer uses function "F_ToHigh"
+//= No longer uses function "F_ToHigh"
//= 1.8 Added Quest Log commands. [L0ne_W0lf]
//============================================================
-moc_prydb1,39,129,2 script Thief Guide 69,{
+moc_prydb1,39,129,2 script Thief Guide 1_F_04,{
if (Upper == 1) {
if (ADVJOB == Job_Assassin_Cross || ADVJOB == Job_Stalker) {
if (Class == Job_Novice_High) {
@@ -52,7 +50,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{
}
else {
mes "[Thief Guide]";
- if (sex)
+ if (Sex)
mes "Hey, dude.";
else
mes "Hey, baby~";
@@ -61,7 +59,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{
}
else {
mes "[Thief Guide]";
- if (sex)
+ if (Sex)
mes "Hey, dude.";
else
mes "Hey, baby.";
@@ -348,7 +346,7 @@ moc_prydb1,39,129,2 script Thief Guide 69,{
close;
}
-moc_prydb1,42,133,2 script Comrade 118,{
+moc_prydb1,42,133,2 script Comrade 2_M_THIEFMASTER,{
if (BaseJob == Job_Thief) {
mes "[Brad]";
mes "We don't have any special events yet. Come some other time when there's news, alright?";
@@ -445,12 +443,12 @@ moc_prydb1,42,133,2 script Comrade 118,{
next;
mes "[Brad]";
mes "Here is a small subsidy for a Newbie like you. Spend it whereever you want. Alright then, I'll see you around~";
- set zeny,zeny+.@money_thief;
+ set Zeny, Zeny+.@money_thief;
close;
}
}
-moc_ruins,141,125,3 script Mr. Irrelevant 83,{
+moc_ruins,141,125,3 script Mr. Irrelevant 4_M_01,{
if (BaseJob == Job_Thief) {
mes "[Mr. Irrelevant]";
mes "Ah, I see that you are now a Thief. I always knew you'd join us.";
diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt
index c88795463..2f15fa995 100644
--- a/npc/pre-re/jobs/novice/novice.txt
+++ b/npc/pre-re/jobs/novice/novice.txt
@@ -1,15 +1,13 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Ep 10+ Novice Training Grounds
-//===== By: ==================================================
+//===== By: ==================================================
//= Dr.Evil & MasterOfMuppets
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 2.4
-//===== Compatible With: =====================================
-//= rAthena SVN 3422+(Requires jA Script System)
-//===== Description: =========================================
+//===== Description: =========================================
//= [Official Conversion]
//= Novice Training Grounds
-//===== Additional Comments: =================================
+//===== Additional Comments: =================================
//= 1.7D Added confirm character name thing on receptionist. [Kisuka]
//= 1.8 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
//= NPCs are not backwards compatable, and will remove
@@ -23,24 +21,24 @@
//= 2.3 Added fix to Hanson from GM-windsor- and Saithis. [L0ne_W0lf]
//= 2.3a Correct a wrong variable name. (bugreport:2293) [Samuray22]
//= 2.4 Corrected an error in Hanson. (bugreport:2374) [L0ne_W0lf]
-//============================================================
+//============================================================
// Bulletin Board
-new_1-1,66,114,4 script Bulletin Board#nv 111,{
+new_1-1,66,114,4 script Bulletin Board#nv HIDDEN_NPC,{
mes "^FF0000=================================^000000";
mes "^FF0000 ^000000 ^E40CAA[Welcome]^CC0000 to ^FF9000Novice^7FFF00 Training ^00FF00Grounds ^E40CAA[Welcome]^FF0000^000000";
mes "^FF0000=================================^000000";
close;
}
-new_1-1,144,116,2 script Guard#nv1 105,{
+new_1-1,144,116,2 script Guard#nv1 8W_SOLDIER,{
mes "[Training Grounds Guard]";
mes "Welcome to the Training Grounds.";
mes "You are now in the outer court yard. Please go inside the castle to begin your training.";
close;
}
-new_1-1,144,107,2 script Guard#nv2 105,{
+new_1-1,144,107,2 script Guard#nv2 8W_SOLDIER,{
mes "[Training Grounds Guard]";
if(rand(2)) {
mes "Come in!";
@@ -62,7 +60,7 @@ new_1-1,144,107,2 script Guard#nv2 105,{
}
// Receptionist
-new_1-2,100,29,4 script Receptionist#nv1 86,{
+new_1-2,100,29,4 script Receptionist#nv1 4_M_04,{
mes "[Training Grounds Receptionist]";
mes "Hello, you look to be new here.";
mes "What is your name?";
@@ -179,7 +177,7 @@ new_1-2,100,29,4 script Receptionist#nv1 86,{
}
}
-new_1-1,53,114,4 script Shion#nv1 727,{
+new_1-1,53,114,4 script Shion#nv1 4_F_JOB_HUNTER,{
if (nov_get_item04 > 9 || nov_get_item05 > 9) {
mes "[Shion]";
mes "Hm...?";
@@ -351,7 +349,7 @@ new_1-1,53,114,4 script Shion#nv1 727,{
}
// Interfaces Tutor
-new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{
+new_1-2,99,105,3 script Interfaces Tutor#nv1 4_M_CRU,{
if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
mes "[Kris]";
mes "You've completed all the essential courses. Have you spoken to the assistant tutors already? The field combat training will be your next course. Would you like to proceed?";
@@ -628,7 +626,7 @@ new_1-2,99,105,3 script Interfaces Tutor#nv1 751,{
}
}
-new_1-2,83,111,3 script Skill Tutor#nv 753,{
+new_1-2,83,111,3 script Skill Tutor#nv 4_M_MONK,{
if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
mes "[Cecil]";
mes "Huh...?";
@@ -885,7 +883,7 @@ new_1-2,83,111,3 script Skill Tutor#nv 753,{
}
}
-new_1-2,115,111,3 script Item Tutor#nv 726,{
+new_1-2,115,111,3 script Item Tutor#nv 4_F_JOB_BLACKSMITH,{
if (nov_get_item02 > 9 && nov_get_item03 > 9 && nov_get_item04 > 9) {
mes "[Alice]";
mes "Huh...?";
@@ -924,7 +922,6 @@ new_1-2,115,111,3 script Item Tutor#nv 726,{
}
}
else if (nov_get_item04 < 10) {
- enable_items;
mes "[Alice]";
mes "^666666*Yawn~*^000000";
mes "This is so boring.";
@@ -1234,7 +1231,7 @@ new_1-2,115,111,3 script Item Tutor#nv 726,{
}
}
-new_1-2,118,108,3 script Kafra Employee#nv1 117,{
+new_1-2,118,108,3 script Kafra Employee#nv1 4_F_KAFRA1,{
mes "[Kafra Employee]";
mes "Welcome to";
mes "Kafra Corporation.";
@@ -1533,7 +1530,7 @@ new_1-2,118,108,3 script Kafra Employee#nv1 117,{
}
//Interface Assistant
-new_1-2,161,182,5 script Instructor#nv 92,{
+new_1-2,161,182,5 script Instructor#nv 4_F_03,{
mes "[Edwin]";
mes "Welcome to my class.";
mes "Choose the subject you";
@@ -1702,7 +1699,7 @@ new_1-2,161,182,5 script Instructor#nv 92,{
}
}
-new_1-2,182,182,3 script Somatology Instructor 754,{
+new_1-2,182,182,3 script Somatology Instructor 4_M_SAGE_A,{
mes "[Jare Riotte]";
mes "Welcome, new adventurer.";
mes "I, Jare Riotte will help you to learn about the fundamental";
@@ -1893,7 +1890,7 @@ new_1-2,182,182,3 script Somatology Instructor 754,{
}
}
-new_1-2,184,172,1 script Understandings of Skills 47,{
+new_1-2,184,172,1 script Understandings of Skills 1_M_01,{
mes "[Leo Handerson]";
mes "Welcome~";
mes "Oh look at this";
@@ -2153,7 +2150,7 @@ new_1-2,184,172,1 script Understandings of Skills 47,{
}
}
-new_1-2,121,101,2 script Guide Soldier#nv1 105,{
+new_1-2,121,101,2 script Guide Soldier#nv1 8W_SOLDIER,{
mes "[Guide Soldier]";
mes "We Guide Soldiers provide location information at the entrance of every town. You can easily find us by our special uniforms.";
next;
@@ -2166,7 +2163,7 @@ new_1-2,121,101,2 script Guide Soldier#nv1 105,{
close;
}
-new_1-2,17,182,5 script Helper#nv 84,{
+new_1-2,17,182,5 script Helper#nv 4_M_02,{
if (nov_2nd_cos < 11) {
mes "[Elmeen]";
mes "Congratulations!";
@@ -2452,7 +2449,7 @@ new_1-2,17,182,5 script Helper#nv 84,{
}
}
-new_1-2,38,182,3 script Entrance Guard#nv 92,{
+new_1-2,38,182,3 script Entrance Guard#nv 4_F_03,{
if (nov_2nd_cos == 0) {
mes "[Muriel]";
mes "I'm sorry, but I can't let anybody who hasn't been instructed on fighting enter the Field Combat Training Grounds.";
@@ -2620,7 +2617,7 @@ new_1-2,38,182,3 script Entrance Guard#nv 92,{
}
//Teleport NPC
-new_1-3,95,30,4 script Trainer#nv1::NovHoffman 84,{
+new_1-3,95,30,4 script Trainer#nv1::NovHoffman 4_M_02,{
mes "[Hoffman]";
mes "Hey there~";
mes "I'm here to provide";
@@ -2693,12 +2690,12 @@ new_1-3,95,30,4 script Trainer#nv1::NovHoffman 84,{
}
}
-new_2-3,95,30,4 duplicate(NovHoffman) Trainer#nv2 84
-new_3-3,95,30,4 duplicate(NovHoffman) Trainer#nv3 84
-new_4-3,95,30,4 duplicate(NovHoffman) Trainer#nv4 84
-new_5-3,95,30,4 duplicate(NovHoffman) Trainer#nv5 84
+new_2-3,95,30,4 duplicate(NovHoffman) Trainer#nv2 4_M_02
+new_3-3,95,30,4 duplicate(NovHoffman) Trainer#nv3 4_M_02
+new_4-3,95,30,4 duplicate(NovHoffman) Trainer#nv4 4_M_02
+new_5-3,95,30,4 duplicate(NovHoffman) Trainer#nv5 4_M_02
-new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 85,{
+new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 4_M_03,{
mes "[Keyman]";
mes "Good!!";
mes "Now you know how to fight";
@@ -2724,15 +2721,15 @@ new_1-3,96,174,3 script Test Examiner#nv1::NovKeyman 85,{
}
}
-new_2-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv2 85
-new_3-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv3 85
-new_4-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv4 85
-new_5-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv5 85
+new_2-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv2 4_M_03
+new_3-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv3 4_M_03
+new_4-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv4 4_M_03
+new_5-3,96,174,3 duplicate(NovKeyman) Test Examiner#nv5 4_M_03
//Potato Merchant
-new_1-2,28,185,4 shop Potato Merchant 90,516:15
+new_1-2,28,185,4 shop Potato Merchant 4_F_01,516:15
-new_1-4,100,29,1 script Hanson#nv 46,{
+new_1-4,100,29,1 script Hanson#nv 1_ETC_01,{
if (checkweight(909,400) == 0) {
mes "[Hanson]";
mes "All of the items you are carrying must be quite a burden. Where did you get so much things? Please lighten your weight by getting rid of things you don't need.";
@@ -3964,7 +3961,7 @@ S_UserJobchoice:
}
//Novice Instructor
-new_1-4,91,22,4 script Bruce#nv 57,{
+new_1-4,91,22,4 script Bruce#nv 1_M_LIBRARYMASTER,{
if (Class == Job_Novice) {
if (nov_3_swordman == 20) {
mes "[Bruce]";
@@ -4281,11 +4278,11 @@ new_3-3,0,0,0,0 monster Fabre 1184,5,0,0,0
new_4-3,0,0,0,0 monster Fabre 1184,5,0,0,0
new_5-3,0,0,0,0 monster Fabre 1184,5,0,0,0
-//============================================================
+//============================================================
// Old changelog
-//============================================================
+//============================================================
//= 1.0 Added the New Novice Training Grounds, a big thanks [MasterOfMuppets]
-//= to Dr.Evil who did 90% of the work =)
+//= to Dr.Evil who did 90% of the work =)
//= 1.0b Temp measure to stop exploits. [Vicious]
//= 1.2 Removed Duplicates [Silent]
//= 1.3 Removed Duplicates [Toms]
@@ -4296,4 +4293,4 @@ new_5-3,0,0,0,0 monster Fabre 1184,5,0,0,0
//= 1.7a a bit of optimization [Lupus]
//= 1.7b Corrected a little Typo Error. (bugreport:728) [Samuray22]
//= 1.7C Corrected another Typo Error. (bugreport:740) [Samuray22]
-//============================================================
+//============================================================
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-04 16:10:23 +0000