summaryrefslogtreecommitdiff
path: root/npc/re/jobs/3-1/warlock.txt
diff options
context:
space:
mode:
authorshennetsind <shennetsind@users.noreply.github.com>2013-10-30 14:48:26 -0700
committershennetsind <shennetsind@users.noreply.github.com>2013-10-30 14:48:26 -0700
commit566529c819bcf9aeb1bd3a4a691c443c2b88d076 (patch)
tree5d3448afe67329cc9d650732425f0152ef242e7b /npc/re/jobs/3-1/warlock.txt
parent8039bd169886a4b0583cd1a794fcf61c79626e86 (diff)
parente9b4aec5eae2bc3454636a71953dcb1e1abb5ee7 (diff)
downloadhercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.gz
hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.bz2
hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.tar.xz
hercules-566529c819bcf9aeb1bd3a4a691c443c2b88d076.zip
Merge pull request #210 from kisuka/npc-constants
NPC Constants
Diffstat (limited to 'npc/re/jobs/3-1/warlock.txt')
-rw-r--r--npc/re/jobs/3-1/warlock.txt24
1 files changed, 12 insertions, 12 deletions
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index 263ccd9b0..0efc323c8 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -66,9 +66,9 @@ OnTouch:
}
end;
}
-//morocc,103,144,0 duplicate(#distorted_space_) #distorted_space_1 139,1,1
-morocc,95,132,0 duplicate(#distorted_space_) #distorted_space_1 139,1,1
-splendide,141,284,0 duplicate(#distorted_space_) #distorted_space_2 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]";
@@ -203,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;
@@ -321,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?";
@@ -450,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;
@@ -541,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;
@@ -568,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;
@@ -710,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.";
@@ -742,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";
@@ -1054,7 +1054,7 @@ OnTimer6000:
end;
}
-job3_war01,1,2,0 script Button Girl#wl 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: