diff options
Diffstat (limited to 'npc/re/jobs/3-1/warlock.txt')
| -rw-r--r-- | npc/re/jobs/3-1/warlock.txt | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt index d08d7395d..0efc323c8 100644 --- a/npc/re/jobs/3-1/warlock.txt +++ b/npc/re/jobs/3-1/warlock.txt @@ -1,15 +1,13 @@ //===== Hercules Script ====================================== //= Warlock Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Muad_Dib, Gepard & L0ne_W0lf -//===== Current Version: ===================================== -//= 1.3a -//===== Compatible With: ===================================== -//= Hercules -//===== Description: ========================================= +//===== Current Version: ===================================== +//= 1.4 +//===== Description: ========================================= //= [Official Conversion] //= Job change Quest from Wizard / High Wizard -> Warlock. -//===== Additional Comments: ================================= +//===== Additional Comments: ================================= //= 1.0 First version. [Masao] //= 1.1 Fixed some conversion mistakes, replaced numbers with //= constants, added item names in comments. @@ -18,6 +16,8 @@ //= 1.2a Fixed a typo. [Euphy] //= 1.3 Updated script, optimized. [Euphy] //= 1.3a Added temporary coordinate fix #distorted_space_1-1. [Euphy] +//= 1.3b Added official coordinates. [Euphy] +//= 1.4 Added GM management function. [Euphy] //============================================================ - script #distorted_space_ -1,{ @@ -66,11 +66,9 @@ OnTouch: } end; } -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 +//morocc,103,144,0 duplicate(#distorted_space_) #distorted_space_1 HIDDEN_WARP_NPC,1,1 +morocc,95,132,0 duplicate(#distorted_space_) #distorted_space_1 HIDDEN_WARP_NPC,1,1 +splendide,141,284,0 duplicate(#distorted_space_) #distorted_space_2 HIDDEN_WARP_NPC,1,1 function script F_Warlock { mes "[Assistant]"; @@ -205,7 +203,7 @@ function script F_Warlock { end; } -spl_in02,77,107,5 script Assistant#Warlock1 446,{ +spl_in02,77,107,5 script Assistant#Warlock1 4_M_FAIRYKID5,{ if (job_wl == 0) { callfunc "F_Warlock"; end; @@ -323,7 +321,7 @@ L_Quest: return; } -spl_in02,60,231,5 script Yoop#Warlock 446,{ +spl_in02,60,231,5 script Yoop#Warlock 4_M_FAIRYKID5,{ mes "[Yoop]"; if (job_wl < 4) { mes "Who are you?"; @@ -452,7 +450,7 @@ spl_in02,60,231,5 script Yoop#Warlock 446,{ } } -spl_in02,84,103,3 script Assistant#Warlock2 439,{ +spl_in02,84,103,3 script Assistant#Warlock2 4_F_FAIRYKID4,{ if (job_wl == 0) { callfunc "F_Warlock"; end; @@ -543,7 +541,7 @@ spl_in02,84,103,3 script Assistant#Warlock2 439,{ } } -spl_in02,78,110,5 script Assistant#Warlock3 437,{ +spl_in02,78,110,5 script Assistant#Warlock3 4_F_FAIRYKID2,{ if (job_wl == 0) { callfunc "F_Warlock"; end; @@ -570,7 +568,7 @@ spl_in02,78,110,5 script Assistant#Warlock3 437,{ } } -spl_in02,80,108,5 script Guild Master#Warlock 465,{ +spl_in02,80,108,5 script Guild Master#Warlock 4_F_FAIRY1,{ if (job_wl == 0) { callfunc "F_Warlock"; end; @@ -712,14 +710,14 @@ spl_in02,80,108,5 script Guild Master#Warlock 465,{ } } -job3_war01,22,22,7 script Yoop#WRR 439,{ +job3_war01,22,22,7 script Yoop#WRR 4_F_FAIRYKID4,{ mes "[Yoop]"; mes "If you ask Ebein to be sent to the magical room, he would send you there."; mes "Wait in the queue to enter the Chamber of Magic."; close; } -job3_war01,29,25,0 script Ebein#WRR 437,{ +job3_war01,29,25,0 script Ebein#WRR 4_F_FAIRYKID2,{ mes "[Ebein]"; mes "Would you like to take a test?"; mes "If you stand by in the waiting room, you'll be able to go into the Chamber of Magic."; @@ -744,7 +742,7 @@ job3_war01,29,25,0 script Ebein#WRR 437,{ } } -job3_war01,29,25,5 script The chamber of magic#1 437,{ +job3_war01,29,25,5 script The chamber of magic#1 4_F_FAIRYKID2,{ end; OnInit: disablenpc "The chamber of magic#1"; @@ -1056,8 +1054,8 @@ OnTimer6000: end; } -/* -job3_war01,1,2,0 script Button Girl 66,{ +job3_war01,1,2,0 script Button Girl#wl 1_F_01,{ + callfunc "F_GM_NPC"; switch(select("Open Arena:Close Arena:Open the Chamber of Magic:Close the Chamber of Magic:Hollow Stone On:Hollow Stone Off:Cancel")) { case 1: mes "Opening the Arena."; @@ -1093,7 +1091,6 @@ job3_war01,1,2,0 script Button Girl 66,{ close; } } -*/ spl_fild02,0,0,0,0 monster Bradium Golem 2049,20,5000,0,0 -spl_fild02,0,0,0,0 monster Naga 2047,20,5000,0,0 +spl_fild02,0,0,0,0 monster Naga 2047,20,5000,0,0
\ No newline at end of file |