summaryrefslogtreecommitdiff
path: root/npc/re/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/jobs')
-rw-r--r--npc/re/jobs/1-1/acolyte.txt17
-rw-r--r--npc/re/jobs/1-1/archer.txt14
-rw-r--r--npc/re/jobs/1-1/mage.txt9
-rw-r--r--npc/re/jobs/1-1/merchant.txt8
-rw-r--r--npc/re/jobs/1-1/swordman.txt8
-rw-r--r--npc/re/jobs/1-1/thief.txt28
-rw-r--r--npc/re/jobs/3-1/archbishop.txt4
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt157
-rw-r--r--npc/re/jobs/3-1/rune_knight.txt4
-rw-r--r--npc/re/jobs/3-1/warlock.txt13
10 files changed, 134 insertions, 128 deletions
diff --git a/npc/re/jobs/1-1/acolyte.txt b/npc/re/jobs/1-1/acolyte.txt
index 40562a418..4ab8837d3 100644
--- a/npc/re/jobs/1-1/acolyte.txt
+++ b/npc/re/jobs/1-1/acolyte.txt
@@ -1,16 +1,16 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Renewal Acolyte Job Quest
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= rAthena SVN
+//= 1.3
//===== Description: =========================================
//= Job Change to Acolyte Class
//===== Additional Comments: =================================
//= 1.0 First Version. [Kisuka]
//= 1.1 Added back the npcs used for the priest quest.
+//= 1.2 Added Baby Job compatibility [Streusel]
+//= 1.3 Rewrote bits [Euphy]
//============================================================
prt_church,184,41,4 script Cleric#aco 60,{
if (Upper == 1) {
@@ -63,13 +63,12 @@ prt_church,184,41,4 script Cleric#aco 60,{
next;
switch(select("Change your job to acolyte.:Ask the requirements to be an acolyte.:Quit it.")) {
case 1:
- if(Class != Job_Novice) {
+ if(BaseJob != Job_Novice) {
mes "[Father Mareusis]";
- if(Class == Job_Acolyte) {
+ if(BaseJob == Job_Acolyte)
mes "Are you feeling okay today? I can tell by your attire that you are already an Acolyte. You're not joking around, are you?";
- }else{
+ else
mes "I'm sorry but it seems you already have your own job, aren't you?";
- }
close;
}else{
mes "[Father Mareusis]";
@@ -87,7 +86,7 @@ prt_church,184,41,4 script Cleric#aco 60,{
next;
mes "[Father Mareusis]";
mes "Always remember to be thankful to God, who takes care of us all the time. In chaos and times of difficulty, face your hardships with unwavering faith.";
- jobchange Job_Acolyte;
+ callfunc "Job_Change",Job_Acolyte;
getitem 1545,1; // N_Mace
next;
mes "[Father Mareusis]";
diff --git a/npc/re/jobs/1-1/archer.txt b/npc/re/jobs/1-1/archer.txt
index 3740058cb..8e8bedc5f 100644
--- a/npc/re/jobs/1-1/archer.txt
+++ b/npc/re/jobs/1-1/archer.txt
@@ -1,15 +1,15 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Renewal Archer Job Quest
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena SVN
+//= 1.2
//===== Description: =========================================
//= Job Change to Archer Class
//===== Additional Comments: =================================
//= 1.0 First Version. [Kisuka]
+//= 1.1 Added Baby Job compatibility [Streusel]
+//= 1.2 Rewrote bits [Euphy]
//============================================================
payon_in02,64,71,4 script Archer Guildsman#archer 85,{
if (Upper == 1) {
@@ -63,9 +63,9 @@ payon_in02,64,71,4 script Archer Guildsman#archer 85,{
next;
switch(select("I want to be an Archer.:I need the requirements, please.:Nothing, thanks.")) {
case 1:
- if(Class != Job_Novice) {
+ if(BaseJob != Job_Novice) {
mes "[Archer Guildsman]";
- if(Class == Job_Archer) {
+ if(BaseJob == Job_Archer) {
mes "Haha, you are kidding me..";
}else{
mes "I feel sorry but only Novices can change their job.";
@@ -92,7 +92,7 @@ payon_in02,64,71,4 script Archer Guildsman#archer 85,{
mes "[Archer Guildsman]";
mes "Congratulations! You are now an Archer! Also, we hope that you actively participate in many programs for the revival of the Archer Guild.";
mes "Ah, items have arrived from the Production Department. Here, take these! These are all yours!";
- jobchange Job_Archer;
+ callfunc "Job_Change",Job_Archer;
getitem 1742,1; // N_Composite_Bow
getitem 12004,1; // Arrow_Container
getitem 12009,1; // Silver_Arrow_Container
diff --git a/npc/re/jobs/1-1/mage.txt b/npc/re/jobs/1-1/mage.txt
index ee5eba7fd..b6cc20f2c 100644
--- a/npc/re/jobs/1-1/mage.txt
+++ b/npc/re/jobs/1-1/mage.txt
@@ -3,13 +3,15 @@
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= 1.0
+//= 1.2
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Job Change to Mage Class
//===== Additional Comments: =================================
//= 1.0 First Version. [Kisuka]
+//= 1.1 Added Baby Job compatibility [Streusel]
+//= 1.2 Rewrote bits [Euphy]
//============================================================
geffen_in,164,124,4 script Mage Guildsman#mage 123,{
if (Upper == 1) {
@@ -52,9 +54,9 @@ geffen_in,164,124,4 script Mage Guildsman#mage 123,{
close;
}
}
- if(Class != Job_Novice) {
+ if(BaseJob != Job_Novice) {
mes "[Mage Guildsman]";
- if(Class == Job_Mage) {
+ if(BaseJob == Job_Mage) {
mes "Hey, haven't you realized? You're already a Mage, silly!";
mes "One of these days you'll realize the power inside of you when you can make Fire with your mind!";
}else{
@@ -62,7 +64,6 @@ geffen_in,164,124,4 script Mage Guildsman#mage 123,{
}
close;
}else{
- mes "[Mage Guildsman]";
mes "Hey?";
next;
switch(select("I want to be a Mage:What are the requirements to be a Mage?:Nothing, thanks.")) {
diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt
index a010af556..b08cf1a40 100644
--- a/npc/re/jobs/1-1/merchant.txt
+++ b/npc/re/jobs/1-1/merchant.txt
@@ -3,13 +3,15 @@
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= 1.0
+//= 1.2
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Job Change to Merchant Class
//===== Additional Comments: =================================
//= 1.0 First Version. [Kisuka]
+//= 1.1 Added Baby Job compatibility [Streusel]
+//= 1.2 Rewrote bits [Euphy]
//============================================================
alberta_in,53,43,6 script Merchant#mer 86,{
if (Upper == 1) {
@@ -57,9 +59,9 @@ alberta_in,53,43,6 script Merchant#mer 86,{
next;
switch(select("I want to be a merchant.:I want to know more about merchants.:Ask him the requirements to be a merchant.:Nothing.")) {
case 1:
- if(Class != Job_Novice) {
+ if(BaseJob != Job_Novice) {
mes "[Guildsman Mahnsoo]";
- if(Class == Job_Merchant) {
+ if(BaseJob == Job_Merchant) {
mes ".....? Sorry? What are you saying?";
mes "You are already a merchant. Oh my..";
mes "Huh?! ...Do I need to laugh right now?!";
diff --git a/npc/re/jobs/1-1/swordman.txt b/npc/re/jobs/1-1/swordman.txt
index cd01ecb28..db7b62d41 100644
--- a/npc/re/jobs/1-1/swordman.txt
+++ b/npc/re/jobs/1-1/swordman.txt
@@ -3,13 +3,15 @@
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= 1.0
+//= 1.2
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Job Change to Swordman Class
//===== Additional Comments: =================================
//= 1.0 First Version. [Kisuka]
+//= 1.1 Added Baby Job compatibility [Streusel]
+//= 1.2 Rewrote bits [Euphy]
//============================================================
izlude_in,74,172,4 script Swordman#swd 119,{
if (Upper == 1) {
@@ -80,9 +82,9 @@ izlude_in,74,172,4 script Swordman#swd 119,{
mes "In my opinion, Swordman is the best job ever!";
close;
case 2:
- if(Class != Job_Novice) {
+ if(BaseJob != Job_Novice) {
mes "[Swordman Guildsman]";
- if(Class == Job_Swordman) {
+ if(BaseJob == Job_Swordman) {
mes "You are already an excellent Swordman, aren't you?";
mes "Just devote yourself to be a great Swordman.";
}else{
diff --git a/npc/re/jobs/1-1/thief.txt b/npc/re/jobs/1-1/thief.txt
index 5bf41fa87..e0ea4d5a9 100644
--- a/npc/re/jobs/1-1/thief.txt
+++ b/npc/re/jobs/1-1/thief.txt
@@ -3,13 +3,15 @@
//===== By: ==================================================
//= Kisuka
//===== Current Version: =====================================
-//= 1.0
+//= 1.2
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
//= Job Change to Thief Class
//===== Additional Comments: =================================
//= 1.0 First Version. [Kisuka]
+//= 1.1 Added Baby Job compatibility [Streusel]
+//= 1.2 Rewrote bits [Euphy]
//============================================================
moc_prydb1,39,129,2 script Thief Guide#thief 69,{
if (Upper == 1) {
@@ -65,30 +67,26 @@ moc_prydb1,39,129,2 script Thief Guide#thief 69,{
mes "If you want to become a Thief, ask the sharp-eyed guy next to me.";
close;
}
- if(Class != Job_Novice) {
- if(Class == Job_Thief) {
+ if(BaseJob != Job_Novice) {
+ if(BaseJob == Job_Thief) {
mes "[Thief Guildsman]";
mes "Hey~ if you have any trouble, get it out to me anytime, huh?";
close;
}else{
+ mes "[Thief Guildsman]";
+ mes "What the heck...?";
if(Sex) {
- mes "[Thief Guildsman]";
- mes "What the heck...?";
- mes "Huh.. you are a "+jobname(Class)+" blockhead...!";
+ mes "Huh.. you are a "+jobname(Class)+" you blockhead...!";
next;
mes "[Thief Guildsman]";
mes "Hey, brother.";
- mes "Why are you here? Go back to your place~ go back~~";
- close;
}else{
- mes "[Thief Guildsman]";
- mes "What the heck...?";
next;
mes "[Thief Guildsman]";
mes "Hey, lady.";
- mes "Why are you here? Go back to your place~ go back~~";
- close;
}
+ mes "Why are you here? Go back to your place~ go back~~";
+ close;
}
}
mes "[Thief Guildsman]";
@@ -169,7 +167,7 @@ moc_prydb1,42,133,2 script Thief Guildsman#thief 118,{
mes "[Commander of Thief Guild]";
mes "'"+strcharinfo(0)+".'";
mes "'For those who are ready, the moonlight shall open the way. Now you are fully ready, I now officially allow you to become a member of the Thief Guild.'";
- jobchange Job_Thief;
+ callfunc "Job_Change",Job_Thief;
set q_job_thief,0;
getitem 13041,1; // N_Main_Gauche
next;
@@ -189,8 +187,8 @@ moc_prydb1,42,133,2 script Thief Guildsman#thief 118,{
mes "See you again.";
close;
}
- if(Class != Job_Novice) {
- if(Class == Job_Thief) {
+ if(BaseJob != Job_Novice) {
+ if(BaseJob == Job_Thief) {
mes "[Brad]";
mes "I don't have any special events now. So go on your way and come back later.";
}else{
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index 0da34bbe8..c71e2abd3 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -1,12 +1,10 @@
-//===== rAthena Script =======================================
+//===== Hercules Script =======================================
//= Arch Bishop Job Quest
//===== By: ==================================================
//= L0ne_W0lf
//= Credits: Gepard
//===== Current Version: =====================================
//= 1.7a
-//===== Compatible With: =====================================
-//= rAthena SVN
//===== Description: =========================================
//= [Official Conversion]
//= Job change Quest from Priest / High Priest -> Arch Bishop.
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 4f350460a..f8ba5b50e 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib
//===== Current Version: =====================================
-//= 1.1
+//= 1.3
//===== Compatible With: =====================================
//= rAthena SVN r16945+
//===== Description: =========================================
@@ -14,6 +14,8 @@
//= 1.0a Added 'npcskill' command. [Euphy]
//= 1.0b Moved warps to separate file. [Euphy]
//= 1.1 Fixed some minor bugs. [Euphy]
+//= 1.2 Moved "Girl" NPC off ve_fild05. [Euphy]
+//= 1.3 Added missing OnMyMobDead labels. [Euphy]
//============================================================
que_job01,75,96,3 script Guild Member#3rdgc01 997,{
@@ -2646,7 +2648,8 @@ ra_in01,175,196,3 script Oresa Rava#3rdgc13 866,{
}
}
-ve_fild05,327,308,3 script Girl#3rdgc14 466,{
+//Pre-RE: ve_fild05 (327,308)
+ve_fild02,330,384,3 script Girl#3rdgc14 466,{
if (job_3rd_gc > 14 && job_3rd_gc < 18) {
mes "[Renzak]";
if (job_3rd_gc == 15) {
@@ -2744,7 +2747,7 @@ OnTouch:
} else {
mes "You don't have to come here.";
close2;
- warp "ve_fild05",341,303;
+ warp "ve_fild02",330,379; //Pre-RE: ve_fild05 (341,303)
set $@3rdgc_room02, 0;
}
end;
@@ -2752,7 +2755,7 @@ OnTimer900000:
mapannounce "job3_guil03","Renzak : Withdraw!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
end;
OnTimer901000:
- mapwarp "job3_guil03","ve_fild05",341,303;
+ mapwarp "job3_guil03","ve_fild02",330,379; //Pre-RE: ve_fild05 (341,303)
end;
OnTimer902000:
donpcevent "#3rdgc_event_master::OnReset";
@@ -3047,12 +3050,12 @@ OnTouch:
disablenpc "Front Gate Guard#g03";
disablenpc "Front Gate Guard#g04";
disablenpc "Front Gate Guard#g05";
- monster "job3_guil03",93,37,"Guard Dog",1866,1;
- monster "job3_guil03",93,36,"Front Gate Guard",1985,1;
- monster "job3_guil03",93,35,"Front Gate Guard",1985,1;
- monster "job3_guil03",93,34,"Front Gate Guard",1985,1;
- monster "job3_guil03",93,33,"Front Gate Guard",1985,1;
- monster "job3_guil03",93,32,"Guard Dog",1866,1;
+ monster "job3_guil03",93,37,"Guard Dog",1866,1,"Front Gate Guard#g01::OnMyMobDead";
+ monster "job3_guil03",93,36,"Front Gate Guard",1985,1,"Front Gate Guard#g01::OnMyMobDead";
+ monster "job3_guil03",93,35,"Front Gate Guard",1985,1,"Front Gate Guard#g01::OnMyMobDead";
+ monster "job3_guil03",93,34,"Front Gate Guard",1985,1,"Front Gate Guard#g01::OnMyMobDead";
+ monster "job3_guil03",93,33,"Front Gate Guard",1985,1,"Front Gate Guard#g01::OnMyMobDead";
+ monster "job3_guil03",93,32,"Guard Dog",1866,1,"Front Gate Guard#g01::OnMyMobDead";
end;
}
job3_guil03,93,36,3 duplicate(#3rdgc_guard00) Front Gate Guard#g03 456
@@ -3076,12 +3079,12 @@ OnTouch:
disablenpc "Back Gate Guard#g03";
disablenpc "Back Gate Guard#g04";
disablenpc "Back Gate Guard#g05";
- monster "job3_guil03",133,54,"Guard Dog",1866,1;
- monster "job3_guil03",133,53,"Back Gate Guard",1985,1;
- monster "job3_guil03",133,52,"Back Gate Guard",1985,1;
- monster "job3_guil03",133,51,"Back Gate Guard",1985,1;
- monster "job3_guil03",133,50,"Back Gate Guard",1985,1;
- monster "job3_guil03",133,49,"Guard Dog",1866,1;
+ monster "job3_guil03",133,54,"Guard Dog",1866,1,"Back Gate Guard#g01::OnMyMobDead";
+ monster "job3_guil03",133,53,"Back Gate Guard",1985,1,"Back Gate Guard#g01::OnMyMobDead";
+ monster "job3_guil03",133,52,"Back Gate Guard",1985,1,"Back Gate Guard#g01::OnMyMobDead";
+ monster "job3_guil03",133,51,"Back Gate Guard",1985,1,"Back Gate Guard#g01::OnMyMobDead";
+ monster "job3_guil03",133,50,"Back Gate Guard",1985,1,"Back Gate Guard#g01::OnMyMobDead";
+ monster "job3_guil03",133,49,"Guard Dog",1866,1,"Back Gate Guard#g01::OnMyMobDead";
end;
}
job3_guil03,133,53,5 duplicate(#3rdgc_guard00) Back Gate Guard#g03 456
@@ -3105,12 +3108,12 @@ OnTouch:
disablenpc "Interior Guard#g03";
disablenpc "Interior Guard#g04";
disablenpc "Interior Guard#g05";
- monster "job3_guil03",117,53,"Guard Dog",1866,1;
- monster "job3_guil03",117,52,"Interior Guard",1985,1;
- monster "job3_guil03",117,51,"Interior Guard",1985,1;
- monster "job3_guil03",117,50,"Interior Guard",1985,1;
- monster "job3_guil03",117,49,"Interior Guard",1985,1;
- monster "job3_guil03",117,48,"Guard Dog",1866,1;
+ monster "job3_guil03",117,53,"Guard Dog",1866,1,"Interior Guard#g01::OnMyMobDead";
+ monster "job3_guil03",117,52,"Interior Guard",1985,1,"Interior Guard#g01::OnMyMobDead";
+ monster "job3_guil03",117,51,"Interior Guard",1985,1,"Interior Guard#g01::OnMyMobDead";
+ monster "job3_guil03",117,50,"Interior Guard",1985,1,"Interior Guard#g01::OnMyMobDead";
+ monster "job3_guil03",117,49,"Interior Guard",1985,1,"Interior Guard#g01::OnMyMobDead";
+ monster "job3_guil03",117,48,"Guard Dog",1866,1,"Interior Guard#g01::OnMyMobDead";
end;
}
job3_guil03,117,52,4 duplicate(#3rdgc_guard00) Interior Guard#g03 456
@@ -3132,9 +3135,9 @@ OnReset:
OnTouch:
mapannounce "job3_guil03","Guards : Who are you?!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
disablenpc "Exterior Guard#g01";
- monster "job3_guil03",88,44,"Exterior Guard",1985,1;
- monster "job3_guil03",88,43,"Exterior Guard",1985,1;
- monster "job3_guil03",88,45,"Guard Dog",1866,1;
+ monster "job3_guil03",88,44,"Exterior Guard",1985,1,"Exterior Guard#g01::OnMyMobDead";
+ monster "job3_guil03",88,43,"Exterior Guard",1985,1,"Exterior Guard#g01::OnMyMobDead";
+ monster "job3_guil03",88,45,"Guard Dog",1866,1,"Exterior Guard#g01::OnMyMobDead";
end;
}
@@ -3153,9 +3156,9 @@ OnReset:
OnTouch:
mapannounce "job3_guil03","Guards : Enemy?!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
disablenpc "Exterior Guard#g02";
- monster "job3_guil03",88,55,"Exterior Guard",1985,1;
- monster "job3_guil03",88,54,"Exterior Guard",1985,1;
- monster "job3_guil03",88,56,"Guard Dog",1866,1;
+ monster "job3_guil03",88,55,"Exterior Guard",1985,1,"Exterior Guard#g02::OnMyMobDead";
+ monster "job3_guil03",88,54,"Exterior Guard",1985,1,"Exterior Guard#g02::OnMyMobDead";
+ monster "job3_guil03",88,56,"Guard Dog",1866,1,"Exterior Guard#g02::OnMyMobDead";
end;
}
@@ -3174,9 +3177,9 @@ OnReset:
OnTouch:
mapannounce "job3_guil03","Guards : An invader, remove!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
disablenpc "Exterior Guard#g03";
- monster "job3_guil03",88,64,"Exterior Guard",1985,1;
- monster "job3_guil03",88,63,"Exterior Guard",1985,1;
- monster "job3_guil03",88,65,"Guard Dog",1866,1;
+ monster "job3_guil03",88,64,"Exterior Guard",1985,1,"Exterior Guard#g03::OnMyMobDead";
+ monster "job3_guil03",88,63,"Exterior Guard",1985,1,"Exterior Guard#g03::OnMyMobDead";
+ monster "job3_guil03",88,65,"Guard Dog",1866,1,"Exterior Guard#g03::OnMyMobDead";
end;
}
@@ -3195,9 +3198,9 @@ OnReset:
OnTouch:
mapannounce "job3_guil03","Guards : Who are you?!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
disablenpc "Exterior Guard#g04";
- monster "job3_guil03",73,62,"Exterior Guard",1985,1;
- monster "job3_guil03",73,61,"Exterior Guard",1985,1;
- monster "job3_guil03",73,63,"Guard Dog",1866,1;
+ monster "job3_guil03",73,62,"Exterior Guard",1985,1,"Exterior Guard#g04::OnMyMobDead";
+ monster "job3_guil03",73,61,"Exterior Guard",1985,1,"Exterior Guard#g04::OnMyMobDead";
+ monster "job3_guil03",73,63,"Guard Dog",1866,1,"Exterior Guard#g04::OnMyMobDead";
end;
}
@@ -3216,9 +3219,9 @@ OnReset:
OnTouch:
mapannounce "job3_guil03","Guards : Who are you?!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
disablenpc "Exterior Guard#g05";
- monster "job3_guil03",77,51,"Exterior Guards",1985,1;
- monster "job3_guil03",77,50,"Exterior Guards",1985,1;
- monster "job3_guil03",77,49,"Guard Dog",1866,1;
+ monster "job3_guil03",77,51,"Exterior Guards",1985,1,"Exterior Guard#g05::OnMyMobDead";
+ monster "job3_guil03",77,50,"Exterior Guards",1985,1,"Exterior Guard#g05::OnMyMobDead";
+ monster "job3_guil03",77,49,"Guard Dog",1866,1,"Exterior Guard#g05::OnMyMobDead";
end;
}
@@ -3237,9 +3240,9 @@ OnReset:
OnTouch:
mapannounce "job3_guil03","Guard : Who are you?!",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
disablenpc "Exterior Guard#g06";
- monster "job3_guil03",73,34,"Exterior Guards",1985,1;
- monster "job3_guil03",73,33,"Exterior guards",1985,1;
- monster "job3_guil03",73,32,"Guard Dog",1866,1;
+ monster "job3_guil03",73,34,"Exterior Guards",1985,1,"Exterior Guard#g06::OnMyMobDead";
+ monster "job3_guil03",73,33,"Exterior guards",1985,1,"Exterior Guard#g06::OnMyMobDead";
+ monster "job3_guil03",73,32,"Guard Dog",1866,1,"Exterior Guard#g06::OnMyMobDead";
end;
}
@@ -3257,10 +3260,10 @@ OnReset:
OnTouch:
mapannounce "job3_guil03","You have been detected by the guard dog.",bc_map,"0x00ff00"; //FW_NORMAL 12 0 0
disablenpc "Guard Dog#dog01";
- monster "job3_guil03",110,27,"Guard Dog",1866,1;
- monster "job3_guil03",103,27,"Dog Trainer",1985,1;
- monster "job3_guil03",104,27,"Dog Trainer's Assistant",1985,1;
- monster "job3_guil03",98,27,"Guard",1985,1;
+ monster "job3_guil03",110,27,"Guard Dog",1866,1,"Guard Dog#dog01::OnMyMobDead";
+ monster "job3_guil03",103,27,"Dog Trainer",1985,1,"Guard Dog#dog01::OnMyMobDead";
+ monster "job3_guil03",104,27,"Dog Trainer's Assistant",1985,1,"Guard Dog#dog01::OnMyMobDead";
+ monster "job3_guil03",98,27,"Guard",1985,1,"Guard Dog#dog01::OnMyMobDead";
end;
}
@@ -3278,42 +3281,42 @@ OnReset:
OnTouch:
mapannounce "job3_guil03","You have been detected by the guard dog.",bc_map,"0x00ff00"; //FW_NORMAL 12 0 0
disablenpc "Guard Dog#dog02";
- monster "job3_guil03",124,27,"Guard Dog",1866,1;
- monster "job3_guil03",126,27,"Dog Trainer",1985,1;
- monster "job3_guil03",104,27,"Trainer's Assistant",1985,1;
- monster "job3_guil03",131,27,"Guard",1985,1;
+ monster "job3_guil03",124,27,"Guard Dog",1866,1,"Guard Dog#dog02::OnMyMobDead";
+ monster "job3_guil03",126,27,"Dog Trainer",1985,1,"Guard Dog#dog02::OnMyMobDead";
+ monster "job3_guil03",104,27,"Trainer's Assistant",1985,1,"Guard Dog#dog02::OnMyMobDead";
+ monster "job3_guil03",131,27,"Guard",1985,1,"Guard Dog#dog02::OnMyMobDead";
end;
}
job3_guil03,2,1,0 script #3rdgc_sunchal_nomal 844,{
end;
OnEnable:
- monster "job3_guil03",62,35,"Guard",1985,1;
- monster "job3_guil03",108,78,"Guard",1985,1;
- monster "job3_guil03",133,77,"Guard",1985,1;
- monster "job3_guil03",79,69,"Guard",1985,1;
- monster "job3_guil03",117,27,"Guard",1985,1;
- monster "job3_guil03",62,48,"Guard",1985,1;
- monster "job3_guil03",116,24,"Guard Dog",1866,1;
- monster "job3_guil03",137,24,"Guard Dog",1866,1;
- monster "job3_guil03",49,74,"Guard Dog",1866,1;
- monster "job3_guil03",48,50,"Guard Dog",1866,1;
- monster "job3_guil03",62,48,"Guard Dog",1866,1;
- monster "job3_guil03",61,38,"Guard Dog",1866,1;
- monster "job3_guil03",74,47,"Guard Dog",1866,1;
- monster "job3_guil03",90,34,"Guard Dog",1866,1;
- monster "job3_guil03",91,51,"Guard Dog",1866,1;
- monster "job3_guil03",155,77,"Guard Dog",1866,1;
- monster "job3_guil03",127,67,"Guard Dog",1866,1;
- monster "job3_guil03",131,43,"Guard Dog",1866,1;
- monster "job3_guil03",103,27,"Guard Dog",1866,1;
- monster "job3_guil03",63,74,"Guard Dog",1866,1;
- monster "job3_guil03",79,69,"Guard Dog",1866,1;
- monster "job3_guil03",0,0,"Watch Light",1129,1;
- monster "job3_guil03",0,0,"Watch Light",1129,1;
- monster "job3_guil03",0,0,"Watch Light",1129,1;
- monster "job3_guil03",0,0,"Watch Light",1129,1;
- monster "job3_guil03",0,0,"Watch Light",1129,1;
+ monster "job3_guil03",62,35,"Guard",1985,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",108,78,"Guard",1985,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",133,77,"Guard",1985,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",79,69,"Guard",1985,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",117,27,"Guard",1985,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",62,48,"Guard",1985,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",116,24,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",137,24,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",49,74,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",48,50,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",62,48,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",61,38,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",74,47,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",90,34,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",91,51,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",155,77,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",127,67,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",131,43,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",103,27,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",63,74,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",79,69,"Guard Dog",1866,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",0,0,"Watch Light",1129,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",0,0,"Watch Light",1129,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",0,0,"Watch Light",1129,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",0,0,"Watch Light",1129,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
+ monster "job3_guil03",0,0,"Watch Light",1129,1,"#3rdgc_sunchal_nomal::OnMyMobDead";
end;
OnReset:
killmonster "job3_guil03","#3rdgc_sunchal_nomal::OnMyMobDead";
@@ -3444,7 +3447,7 @@ job3_guil03,111,51,7 script Priest from Rachel 928,{
mes "Who are you?";
mes "Get out of here.";
close2;
- warp "ve_fild05",341,303;
+ warp "ve_fild02",330,379; //Pre-RE: ve_fild05 (341,303)
end;
OnInit:
OnDisable:
@@ -3471,7 +3474,7 @@ OnTimer40000:
mapannounce "job3_guil03","Renzak : Don't lag!",bc_map,"0x4d4dff"; //FW_NORMAL 12 0 0
end;
OnTimer60000:
- mapwarp "job3_guil03","ve_fild05",341,303;
+ mapwarp "job3_guil03","ve_fild02",330,379; //Pre-RE: ve_fild05 (341,303)
end;
OnTimer61000:
donpcevent "#3rdgc_guard::OnStop";
@@ -3902,7 +3905,7 @@ job3_guil03,1,8,0 script #GMhelper02_gc 844,{
donpcevent "#3rdgc_event01::OnEnable";
set $@3rdgc_room02, 0;
close2;
- mapwarp "job3_guil03","ve_fild05",341,303;
+ mapwarp "job3_guil03","ve_fild02",330,379; //Pre-RE: ve_fild05 (341,303)
end;
}
case 2:
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index f6638bbc3..6dbfdaa3a 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -1,11 +1,9 @@
-//===== rAthena Script =======================================
+//===== Hercules Script ======================================
//= Rune Knight Job Quest
//===== By: ==================================================
//= L0ne_W0lf, Muad_Dib
//===== Current Version: =====================================
//= 1.4
-//===== Compatible With: =====================================
-//= rAthena SVN
//===== Description: =========================================
//= Job change Quest from Knight / Lord Knight -> Rune Knight.
//===== Additional Comments: =================================
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index 363597c10..8a8e1f0ce 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib, Gepard & L0ne_W0lf
//===== Current Version: =====================================
-//= 1.3
+//= 1.3a
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -14,12 +14,13 @@
//= 1.1 Fixed some conversion mistakes, replaced numbers with
//= constants, added item names in comments.
//= 1.2 Fixed the problem where NPC are not enabled and chamber
-//= will never open for the second try or use.
+//= will never open for the second try or use.
//= 1.2a Fixed a typo. [Euphy]
//= 1.3 Updated script, optimized. [Euphy]
+//= 1.3a Added temporary coordinate fix #distorted_space_1-1. [Euphy]
//============================================================
-morocc,103,144,0 script #distorted_space_1 139,1,1,{
+- script #distorted_space_ -1,{
OnTouch:
if (job_wl > 1) {
mes " - There is a strange distortion here - ";
@@ -65,7 +66,11 @@ OnTouch:
}
end;
}
-splendide,141,284,0 duplicate(#distorted_space_1) #distorted_space_2 139,1,1
+morocc,103,144,0 duplicate(#distorted_space_) #distorted_space_1 139,1,1
+splendide,141,284,0 duplicate(#distorted_space_) #distorted_space_2 139,1,1
+
+// This is a temporary fix until new official coordinates are found.
+morocc,98,144,0 duplicate(#distorted_space_) #distorted_space_1-1 139,1,1
function script F_Warlock {
mes "[Assistant]";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-23 09:33:00 +0000