summaryrefslogtreecommitdiff
path: root/npc/re/jobs/3-1
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/jobs/3-1')
-rw-r--r--npc/re/jobs/3-1/archbishop.txt2
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt28
-rw-r--r--npc/re/jobs/3-1/ranger.txt18
-rw-r--r--npc/re/jobs/3-1/rune_knight.txt4
-rw-r--r--npc/re/jobs/3-1/warlock.txt34
5 files changed, 43 insertions, 43 deletions
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index addcc0346..9caa1f538 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -1007,7 +1007,7 @@ OnTouch:
delitem ValkyrieA_Scroll,1;
// fall through
} else if (getmercinfo(1) == 2037) {
- if (strnpcinfo(0) == "#arch_1_10")
+ if (strnpcinfo(NPC_NAME) == "#arch_1_10")
viewpoint 1,113,327,1,0xFF9900;
.@randht = rand(1,10);
if (.@randht < 8)
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index a29961eca..3f34e03f7 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -3062,10 +3062,10 @@ OnTimer5000:
end;
OnInit:
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
}
@@ -3386,17 +3386,17 @@ OnMyMobDead:
job3_guil03,2,2,0 script #3rdgc_sunchal_kill01 CLEAR_NPC,{
end;
OnEnable:
- .@i = atoi(charat(strnpcinfo(0),20));
+ .@i = atoi(charat(strnpcinfo(NPC_NAME),20));
setarray .@x[1],74,124,103;
setarray .@y[1],63, 78, 24;
- monster "job3_guil03",.@x[.@i],.@y[.@i],"Guard",1985,1,strnpcinfo(0)+"::OnMyMobDead";
+ monster "job3_guil03",.@x[.@i],.@y[.@i],"Guard",1985,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
end;
OnStop:
mapannounce "job3_guil03","Guard : Am I imagining things? I just heard something...",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
stopnpctimer;
end;
OnReset:
- killmonster "job3_guil03",strnpcinfo(0)+"::OnMyMobDead";
+ killmonster "job3_guil03",strnpcinfo(NPC_NAME)+"::OnMyMobDead";
end;
OnMyMobDead:
initnpctimer;
@@ -3419,32 +3419,32 @@ job3_guil03,2,4,0 duplicate(#3rdgc_sunchal_kill01) #3rdgc_sunchal_kill03 CLEAR_N
job3_guil03,64,68,3 script #3rdgc_gojung_kill01 4_M_DSTMAN,7,7,{
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnStop:
mapannounce "job3_guil03","Guard : Am I imagining things? I just heard something.",bc_map,"0xA8A8A8"; //FW_NORMAL 12 0 0
stopnpctimer;
end;
OnReset:
- killmonster "job3_guil03",strnpcinfo(0)+"::OnMyMobDead";
+ killmonster "job3_guil03",strnpcinfo(NPC_NAME)+"::OnMyMobDead";
end;
OnTouch:
- .@i = atoi(charat(strnpcinfo(0),19));
+ .@i = atoi(charat(strnpcinfo(NPC_NAME),19));
setarray .@x[1],64,86,83;
setarray .@y[1],68,63,36;
mapannounce "job3_guil03","Guard : Who are you?!",bc_map,"0x7b68ee"; //FW_NORMAL 12 0 0
- disablenpc strnpcinfo(0);
- monster "job3_guil03",.@x[.@i],.@y[.@i],"Guard",1985,1,strnpcinfo(0)+"::OnMyMobDead";
+ disablenpc strnpcinfo(NPC_NAME);
+ monster "job3_guil03",.@x[.@i],.@y[.@i],"Guard",1985,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
initnpctimer;
end;
OnMyMobDead:
stopnpctimer;
end;
OnTimer5000:
- if (strnpcinfo(0) == "#3rdgc_gojung_kill03") end;
+ if (strnpcinfo(NPC_NAME) == "#3rdgc_gojung_kill03") end;
OnTimer10000:
mapannounce "job3_guil03","Guard : I need support! Take caution!",bc_map,"0x7b68ee"; //FW_NORMAL 12 0 0
donpcevent "#3rdgc_guard::OnEnable";
@@ -3458,7 +3458,7 @@ job3_guil03,88,71,0 script #3rdgc_safezone01 HIDDEN_WARP_NPC,1,1,{
end;
OnTouch:
mes "It's a good bush to hide yourself.";
- donpcevent strnpcinfo(0)+"::OnTimer";
+ donpcevent strnpcinfo(NPC_NAME)+"::OnTimer";
close;
OnTimer:
//FIXME: This is a workaround for...
@@ -3491,7 +3491,7 @@ job3_guil03,111,51,7 script Priest from Rachel 4_M_MIDDLE1,{
next;
mes "[Priest from Rachel]";
mes "Because of you, you ruined everything!";
- setnpcdisplay(strnpcinfo(0), HIDEN_PRIEST);
+ setnpcdisplay(strnpcinfo(NPC_NAME), HIDEN_PRIEST);
next;
mes "[Priest from Rachel]";
mes "You want to destroy us forever!";
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index 1e7b40c98..91adb9b49 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -1584,14 +1584,14 @@ OnTimer133000:
- script Egg Bomb#0 FAKE_NPC,{
OnInit:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
initnpctimer;
getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC);
- monster "job3_rang02",.@x,.@y,"Egg Bomb",1047,1,strnpcinfo(0)+"::OnMyMobDead";
- switch(atoi(strnpcinfo(2))%3) {
+ monster "job3_rang02",.@x,.@y,"Egg Bomb",1047,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
+ switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))%3) {
case 0: .@str$ = "Hey, I am going to explode. What are you going to do?"; break;
case 1: .@str$ = "I... no, I can't stand anymore!!"; break;
case 2: .@str$ = "I am almost done now... Don't stop me."; break;
@@ -1600,22 +1600,22 @@ OnEnable:
end;
OnDisable:
stopnpctimer;
- killmonster "job3_rang02",strnpcinfo(0)+"::OnMyMobDead";
- disablenpc strnpcinfo(0);
+ killmonster "job3_rang02",strnpcinfo(NPC_NAME)+"::OnMyMobDead";
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnMyMobDead:
++$@job_rang_point03;
- switch(atoi(strnpcinfo(2))%3) {
+ switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))%3) {
case 0: .@str$ = "The world is meaningless and my dream is so far away..."; break;
case 1: .@str$ = "Don't be relieved. Misery always comes from carelessness."; break;
case 2: .@str$ = "Alas, it was only a dream for a short time..."; break;
}
mapannounce "job3_rang02","Egg Bomb : "+.@str$,bc_map,"0x87ceeb"; //FW_NORMAL 12 0 0
- donpcevent strnpcinfo(0)+"::OnDisable";
+ donpcevent strnpcinfo(NPC_NAME)+"::OnDisable";
end;
OnTimer10000:
mapannounce "job3_rang02","Egg Bomb : Ughhhhhhhhhhhhhh!!! So what did I say!!",bc_map,"0xFF9900"; //FW_NORMAL 12 0 0
- donpcevent strnpcinfo(0)+"::OnDisable";
+ donpcevent strnpcinfo(NPC_NAME)+"::OnDisable";
end;
}
job3_rang02,246,42,0 duplicate(Egg Bomb#0) Egg Bomb#14 HIDDEN_WARP_NPC
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index 237c1f33e..fb875278d 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -1236,13 +1236,13 @@ mid_camp,13,138,3 script Dispatched Rune Knight#1 4_M_01,2,2,{
mes "I've been waiting for you Rune Knight candidate. I'm helping the candidates as a favor to Ms. Serpeone.";
next;
mes "[Dispatched Rune Knight]";
- if (strnpcinfo(0) == "Dispatched Rune Knight#1") {
+ if (strnpcinfo(NPC_NAME) == "Dispatched Rune Knight#1") {
mes "Do you want to go out to the Splendide field?";
next;
if(select("Move to Splendide field", "Cancel.") == 1)
warp "spl_fild01",355,325;
close;
- } else if (strnpcinfo(0) == "Dispatched Rune Knight#2") {
+ } else if (strnpcinfo(NPC_NAME) == "Dispatched Rune Knight#2") {
mes "Do you want to go back to the expeditionary team's post?";
next;
if(select("Yes please.", "Not yet.") == 1)
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index adbdf2d6a..137eefd40 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -40,7 +40,7 @@
OnTouch:
if (job_wl > 1) {
mes " - There is a strange distortion here - ";
- if (strnpcinfo(0) == "#distorted_space_1" && (Class == Job_Warlock || Class == Job_Warlock_T || Class == Job_Baby_Warlock)) {
+ if (strnpcinfo(NPC_NAME) == "#distorted_space_1" && (Class == Job_Warlock || Class == Job_Warlock_T || Class == Job_Baby_Warlock)) {
close2;
if (countitem(Special_Exchange_Coupon) > 0)
warp "spl_in02",79,102;
@@ -58,7 +58,7 @@ OnTouch:
close;
}
}
- if (BaseLevel > 94 && (strnpcinfo(0) == "#distorted_space_2" || BaseJob == Job_Wizard)) {
+ if (BaseLevel > 94 && (strnpcinfo(NPC_NAME) == "#distorted_space_2" || BaseJob == Job_Wizard)) {
mes " - There is a strange distortion here - ";
next;
switch(select("Search the area.", "Ignore it.")) {
@@ -801,36 +801,36 @@ OnDisable:
- script The chamber of magic#2 FAKE_NPC,{
OnInit:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnEnable:
- enablenpc strnpcinfo(0);
- monster "job3_war02",23,32,"Magic Monster",2047,1,strnpcinfo(0)+"::OnMyMobDead";
- monster "job3_war02",23,21,"Magic Monster",2048,1,strnpcinfo(0)+"::OnMyMobDead";
- monster "job3_war02",34,32,"Magic Monster",2049,1,strnpcinfo(0)+"::OnMyMobDead";
- monster "job3_war02",34,21,"Magic Monster",2050,1,strnpcinfo(0)+"::OnMyMobDead";
- monster "job3_war02",23,32,"Magic Monster",2047,1,strnpcinfo(0)+"::OnMyMobDead";
- monster "job3_war02",23,21,"Magic Monster",2048,1,strnpcinfo(0)+"::OnMyMobDead";
- monster "job3_war02",34,32,"Magic Monster",2049,1,strnpcinfo(0)+"::OnMyMobDead";
- monster "job3_war02",34,21,"Magic Monster",2050,1,strnpcinfo(0)+"::OnMyMobDead";
+ enablenpc strnpcinfo(NPC_NAME);
+ monster "job3_war02",23,32,"Magic Monster",2047,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
+ monster "job3_war02",23,21,"Magic Monster",2048,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
+ monster "job3_war02",34,32,"Magic Monster",2049,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
+ monster "job3_war02",34,21,"Magic Monster",2050,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
+ monster "job3_war02",23,32,"Magic Monster",2047,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
+ monster "job3_war02",23,21,"Magic Monster",2048,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
+ monster "job3_war02",34,32,"Magic Monster",2049,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
+ monster "job3_war02",34,21,"Magic Monster",2050,1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
initnpctimer;
end;
OnReset:
- killmonster "job3_war02",strnpcinfo(0)+"::OnMyMobDead";
+ killmonster "job3_war02",strnpcinfo(NPC_NAME)+"::OnMyMobDead";
end;
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnMyMobDead:
- if (mobcount("job3_war02",strnpcinfo(0)+"::OnMyMobDead") < 1) {
+ if (mobcount("job3_war02",strnpcinfo(NPC_NAME)+"::OnMyMobDead") < 1) {
stopnpctimer;
mapannounce "job3_war02","The Monster Invasion has been stopped.",bc_map;
- .@str$ = "The chamber of magic#"+((strnpcinfo(0) == "The chamber of magic#2")?"3":"4");
+ .@str$ = "The chamber of magic#"+((strnpcinfo(NPC_NAME) == "The chamber of magic#2")?"3":"4");
donpcevent .@str$+"::OnEnable";
}
end;
OnTimer3000:
- if (strnpcinfo(0) != "The chamber of magic#2") end;
+ if (strnpcinfo(NPC_NAME) != "The chamber of magic#2") end;
mapannounce "job3_war02","A Magical Power fragment has been created in the Magic Chamber Room.",bc_map;
end;
OnTimer4000:
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-04 05:27:30 +0000