summaryrefslogtreecommitdiff
path: root/npc/re/jobs
diff options
context:
space:
mode:
Diffstat (limited to 'npc/re/jobs')
-rw-r--r--npc/re/jobs/2e/kagerou_oboro.txt20
-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
-rw-r--r--npc/re/jobs/3-2/genetic.txt4
-rw-r--r--npc/re/jobs/3-2/minstrel.txt8
-rw-r--r--npc/re/jobs/3-2/royal_guard.txt4
-rw-r--r--npc/re/jobs/3-2/sorcerer.txt8
-rw-r--r--npc/re/jobs/3-2/sura.txt2
-rw-r--r--npc/re/jobs/3-2/wanderer.txt6
-rw-r--r--npc/re/jobs/novice/academy.txt178
-rw-r--r--npc/re/jobs/novice/novice.txt38
14 files changed, 177 insertions, 177 deletions
diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt
index 7d166b75a..c239e4a0e 100644
--- a/npc/re/jobs/2e/kagerou_oboro.txt
+++ b/npc/re/jobs/2e/kagerou_oboro.txt
@@ -1140,12 +1140,12 @@ function script F_KO_Survival_rps {
//- Templates -
- script Sight#ko_trap FAKE_NPC,{
- callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4));
+ callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4));
end;
OnTouch:
mes "There are tiny letters on the sign.";
next;
- switch (atoi(substr(strnpcinfo(2),3,4))) {
+ switch (atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4))) {
case 2: set .@id,0; break;
case 7: set .@id,5; break;
case 11: set .@id,9; break;
@@ -1161,10 +1161,10 @@ OnTouch:
}
- script Sight#ko_trap2 FAKE_NPC,{
- callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4));
+ callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4));
end;
OnTouch:
- set .@id, atoi(substr(strnpcinfo(2),3,4));
+ set .@id, atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4));
switch (.@id) {
case 10: set .@var$, "$20110808_vko01"; break;
case 28: set .@var$, "$20110808_vko03"; break;
@@ -1206,10 +1206,10 @@ OnTouch:
}
- script Sight#ko_heal FAKE_NPC,{
- callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4));
+ callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4));
end;
OnTouch:
- set .@id, atoi(substr(strnpcinfo(2),3,4));
+ set .@id, atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4));
mes "There are tiny letters on the sign.";
next;
mes "This block is blessed.";
@@ -1224,10 +1224,10 @@ OnTouch:
}
- script Sight#ko_curse FAKE_NPC,{
- callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4));
+ callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4));
end;
OnTouch:
- set .@id, atoi(substr(strnpcinfo(2),3,4));
+ set .@id, atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4));
set .@playtime, questprogress(5141,PLAYTIME);
if (!.@playtime) {
mes "There are tiny letters on the sign.";
@@ -1269,10 +1269,10 @@ OnTouch:
}
- script Sight#ko_gravity FAKE_NPC,{
- callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(2),3,4));
+ callfunc "F_KO_Survival_mes", atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4));
end;
OnTouch:
- set .@id, atoi(substr(strnpcinfo(2),3,4));
+ set .@id, atoi(substr(strnpcinfo(NPC_NAME_HIDDEN),3,4));
mes "There are tiny letters on the sign.";
next;
mes "Area cursed with 10 times the normal gravity. You will need 10 ^FD0260LP^000000 to roll the dice.";
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:
diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index f2c1ded47..ea926b0b1 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -970,7 +970,7 @@ job3_gen01,91,48,3 script Demi Calberine#gen 4_F_SCIENCE,{
mes "- You found a little metal fragment. -";
job_gen = job_gen+1;
specialeffect EF_BASH;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
initnpctimer;
close;
} else if (job_gen == 74) {
@@ -979,7 +979,7 @@ job3_gen01,91,48,3 script Demi Calberine#gen 4_F_SCIENCE,{
}
end;
OnTimer7000:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
end;
}
diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt
index a8cb2d61d..ca5b7e261 100644
--- a/npc/re/jobs/3-2/minstrel.txt
+++ b/npc/re/jobs/3-2/minstrel.txt
@@ -828,18 +828,18 @@ OnTimer300000:
yuno,146,168,0 script Karian#cmd2 4_M_BARD,{
end;
OnInit:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
initnpctimer;
end;
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
end;
OnTimer100000:
- donpcevent strnpcinfo(0)+"::OnDisable";
+ donpcevent strnpcinfo(NPC_NAME)+"::OnDisable";
stopnpctimer;
end;
}
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index a1dff376d..0d87db5d2 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -465,7 +465,7 @@ gl_church,173,88,0 script Delicate trace#01 CLEAR_NPC,{
getitem Stone,1;
else {
mes "While investigating, the topography breaks. It would be better to dig other places for a while.";
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
initnpctimer;
close;
}
@@ -473,7 +473,7 @@ gl_church,173,88,0 script Delicate trace#01 CLEAR_NPC,{
mes "There is a trace that someone has already dug here.";
close;
OnTimer60000:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
OnTimer1000:
OnTimer20000:
diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt
index ff9faf500..a75480f24 100644
--- a/npc/re/jobs/3-2/sorcerer.txt
+++ b/npc/re/jobs/3-2/sorcerer.txt
@@ -392,10 +392,10 @@ gef_tower,113,161,5 script Karacas 4_M_SAGE_A,{
}
- script Spirit Detecting Staff#0 FAKE_NPC,{
- if (strnpcinfo(4) == "thor_v01") setarray .@id[0],990,994,6276,6278;
- else if (strnpcinfo(4) == "ice_dun01") setarray .@id[0],991,995,6278,6276;
- else if (strnpcinfo(4) == "mjo_dun03") setarray .@id[0],993,997,6277,6276;
- else if (strnpcinfo(4) == "gon_dun02") setarray .@id[0],992,996,6277,6278;
+ if (strnpcinfo(NPC_MAP) == "thor_v01") setarray .@id[0],990,994,6276,6278;
+ else if (strnpcinfo(NPC_MAP) == "ice_dun01") setarray .@id[0],991,995,6278,6276;
+ else if (strnpcinfo(NPC_MAP) == "mjo_dun03") setarray .@id[0],993,997,6277,6276;
+ else if (strnpcinfo(NPC_MAP) == "gon_dun02") setarray .@id[0],992,996,6277,6278;
if (job_soc == 4 && countitem(.@id[0]) > 2) {
progressbar "ffff00",5;
diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index b28cb6fdd..f1353e282 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -166,7 +166,7 @@ ve_in,237,125,0 script King Crab#job_shu 1_M_PAY_ELDER,{
setquest 11155;
close;
} else {
- if (strnpcinfo(0) == "King Crab#job_shu") {
+ if (strnpcinfo(NPC_NAME) == "King Crab#job_shu") {
mes "[King Crab]";
mes "How come a little rookie knocked me out! Me! The great King Crab...";
} else {
diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt
index baad4b65a..6f131f2bc 100644
--- a/npc/re/jobs/3-2/wanderer.txt
+++ b/npc/re/jobs/3-2/wanderer.txt
@@ -102,7 +102,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 4_F_06,{
close;
}
} else if (job_wan == 1) {
- if (strnpcinfo(0) == "Aspiring Wanderer, Soy") {
+ if (strnpcinfo(NPC_NAME) == "Aspiring Wanderer, Soy") {
mes "[Soy]";
mes "The performance will be held in front of the Christmas tree here in Lutie.";
mes "I can't wait! Ah~ I'm losing my senses, Mimi.";
@@ -120,7 +120,7 @@ xmas,162,209,5 script Aspiring Wanderer, Soy 4_F_06,{
mes "<Nollio> is the best!!";
close;
} else {
- if (strnpcinfo(0) == "Aspiring Wanderer, Soy") {
+ if (strnpcinfo(NPC_NAME) == "Aspiring Wanderer, Soy") {
mes "[Soy]";
mes "I want to become an famous Wanderer too, Mimi.";
} else {
@@ -1044,7 +1044,7 @@ OnInit:
- script #wander_xmas FAKE_NPC,{
end;
OnInit:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
}
xmas,149,135,3 duplicate(#wander_xmas) Guitar Song#xmas 4_M_MINSTREL
diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt
index 4b970a86c..0d8f3a7e2 100644
--- a/npc/re/jobs/novice/academy.txt
+++ b/npc/re/jobs/novice/academy.txt
@@ -776,7 +776,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "<NAVI>[the Academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
mes "Anybody can enroll, so take advantage of it.";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Information Staff]";
mes "Sorry to interrupt.";
mes "But ^4d4dff if you need location info, please ask me.^000000";
@@ -798,7 +798,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "If there are more adventurers like you, the future will be brighter.";
mes "Hahahaha.";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Information Staff]";
mes "Sorry to interrupt.";
mes "But ^4d4dff if you need location info, please ask me.^000000";
@@ -817,7 +817,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
mes "What is well, is well- isn't it?";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Information Staff]";
mes "You are correct.";
mes "Preperation is the key.";
@@ -852,7 +852,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "<NAVI>[the Academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
mes "Anybody can enroll, so take advantage of it.";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Information Staff]";
mes "Sorry to interrupt.";
mes "But ^4d4dff if you need location info, please ask me.^000000";
@@ -874,7 +874,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "If there are more adventurers like you, the future will be brighter.";
mes "Hahahaha.";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Information Staff]";
mes "Sorry to interrupt.";
mes "But ^4d4dff if you need location info, please ask me.^000000";
@@ -893,7 +893,7 @@ izlude,122,207,3 script Criatura Academy Staff#0 4_M_KHKYEL,3,3,{
mes "<NAVI>[the academy building]<INFO>iz_ac01,100,39</INFO></NAVI>.";
mes "What is well, is well- isn't it?";
next;
- emotion e_gasp, 0, "Information Staff#"+strnpcinfo(2);
+ emotion e_gasp, 0, "Information Staff#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Information Staff]";
mes "You are correct.";
mes "Preperation is the key.";
@@ -2108,19 +2108,19 @@ izlude,141,251,0 script Cultivated Red Plant#0 RED_PLANT,3,3,{
OnTouch:
if (questprogress(7478) == 1 && !questprogress(7479))
- donpcevent "Cultivated Red Plant#"+strnpcinfo(2)+"::OnDisable";
+ donpcevent "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnDisable";
end;
OnDisable:
specialeffect EF_STEAL;
- disablenpc "Cultivated Red Plant#"+strnpcinfo(2);
+ disablenpc "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN);
emotion e_gasp, 1;
- emotion e_heh, 0, "Academy Student#"+strnpcinfo(2);
+ emotion e_heh, 0, "Academy Student#"+strnpcinfo(NPC_NAME_HIDDEN);
initnpctimer;
end;
OnTimer30000:
- enablenpc "Cultivated Red Plant#"+strnpcinfo(2);
+ enablenpc "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN);
stopnpctimer;
end;
}
@@ -2138,8 +2138,8 @@ izlude,140,249,7 script Academy Student#0 4_M_NOV_RUMIN,{
close;
}
if (questprogress(7478) == 1 && !questprogress(7479)) {
- specialeffect EF_STEAL, AREA, "Cultivated Red Plant#"+strnpcinfo(2);
- donpcevent "Cultivated Red Plant#"+strnpcinfo(2)+"::OnDisable";
+ specialeffect EF_STEAL, AREA, "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN);
+ donpcevent "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnDisable";
emotion e_gasp, 1;
emotion e_heh;
mes "[Lumin]";
@@ -2200,7 +2200,7 @@ izlude,140,249,7 script Academy Student#0 4_M_NOV_RUMIN,{
next;
mes "[Lumin]";
mes "Ah... see it's growing back.";
- enablenpc "Cultivated Red Plant#"+strnpcinfo(2);
+ enablenpc "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN);
close2;
} else {
if (Class == Job_Novice) {
@@ -3738,11 +3738,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000.";
next;
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Eclaire]";
mes "And we are also club members of Sir Orleans' ^0000cdfan club- Loverleans^000000.";
next;
- emotion e_lv,"Mille Feuille#"+strnpcinfo(2);
+ emotion e_lv,"Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Mille Feuille]";
mes "Orlean belongs to all of us!";
next;
@@ -3765,7 +3765,7 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Eclaire]";
mes "You, do you want to know more about cooking?";
next;
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Mille Feuille]";
mes "Will you exeprience the various spectrums of cooking?";
next;
@@ -3784,11 +3784,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "Ok, we will be kind guides to the journey of cooking!!";
next;
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Eclaire]";
mes "It's ok with me, asking me everthing you want to know.";
next;
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Mille Feuille]";
mes "Kindness is our spice~";
next;
@@ -3848,18 +3848,18 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "Right, cooking needs some preparation. This can also be divided into two catagories.";
next;
- emotion e_gasp,"Dacquoise#"+strnpcinfo(2);
+ emotion e_gasp,"Dacquoise#"+strnpcinfo(NPC_NAME_HIDDEN);
break;
case 3:
emotion e_an;
mes "[Dacquoise]";
mes "What is this? What a waste of time!";
next;
- emotion e_ag, 0, "Eclaire#"+strnpcinfo(2);
+ emotion e_ag, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Eclaire]";
mes "I thought we were going to get more members!";
next;
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Mille Feuille]";
mes "Never show up again!!";
close;
@@ -3924,11 +3924,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
next;
mes "[Eclaire]";
mes "You have insulted us!";
- emotion e_ag, 0, "Eclaire#"+strnpcinfo(2);
+ emotion e_ag, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
next;
mes "[Mille Feuille]";
mes "Come back again, if you want to learn later~ I guess...";
- emotion e_dots, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion e_dots, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
close2;
if(questprogress(14154) == 1)
erasequest 14154;
@@ -3951,12 +3951,12 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
next;
mes "[Eclaire]";
mes "Go hunting after eating this. You will feel your power enhanced.";
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
next;
mes "[Mille Feuille]";
mes "If you really want to cook, go and see ^0000ffSir. Charles Orleans at the basement of Prontera castle^000000!!";
mes "Kya... Sir Orleans!!";
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
close2;
delitem Clover, 1; // Clover
delitem Green_Herb, 1; // Green_Herb
@@ -3973,11 +3973,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
next;
mes "[Eclaire]";
mes "Try this. It will make you run like you are a flying bee.";
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
next;
mes "[Mille Feuille]";
mes "If you really want to cook, go and see ^0000ffSir. Charles Orleans at the basement of Prontera castle^000000!! You must be attracted by him!!";
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
close2;
delitem Apple, 1; // Apple
delitem Carrot, 2; // Carrot
@@ -3993,11 +3993,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
next;
mes "[Eclaire]";
mes "Can you feel unknown power coursing through your veins? You're eating it!";
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
next;
mes "[Mille Feuille]";
mes "If you are really curious about the cooking, go seek Sir. Charles Orleans at the basement of Prontera Castle.";
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
close2;
delitem Jellopy, 1; // Jellopy
delitem Fluff, 1; // Fluff
@@ -4015,12 +4015,12 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Eclaire]";
mes "If you eat this. You will never miss your target!";
mes "In fact, never miss the target for level 1!";
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
next;
mes "[Mille Feuille]";
mes "Go and see Sir. Charles Orleans at the basement of Prontera castle!!";
mes "You can learn real cooking from him!";
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
close2;
delitem Apple, 1; // Apple
delitem Clover, 1; // Clover
@@ -4056,14 +4056,14 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "Why are you saying you will make them?";
next;
- emotion e_hmm, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion e_hmm, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Mille Feuille]";
mes "Ah, Why not?";
next;
mes "[Dacquoise]";
mes "I am the leader of this flame cooking trio chefs!";
next;
- emotion e_omg, 0, "Eclaire#"+strnpcinfo(2);
+ emotion e_omg, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Eclaire]";
mes "What?!! When was that decided?";
next;
@@ -4071,11 +4071,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "Is there anyone who is older than me?";
next;
- emotion e_omg, 0, "Eclaire#"+strnpcinfo(2);
+ emotion e_omg, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Eclaire]";
mes "Age! There is nothing I can do with it.";
next;
- emotion e_ok,"Mille Feuille#"+strnpcinfo(2);
+ emotion e_ok,"Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Mille Feuille]";
mes "Just because you're one year older, you want to automatically be rejected. Anyone have an objection?";
next;
@@ -4202,11 +4202,11 @@ iz_ac01,147,50,3 script Dacquoise#ac 4_COOK,{
mes "[Dacquoise]";
mes "I am Dacquoise, the pupil of the legendary chef of Rune Midgard, ^0000cdCharles Orleans^000000.";
next;
- emotion e_no1, 0, "Eclaire#"+strnpcinfo(2);
+ emotion e_no1, 0, "Eclaire#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Eclaire]";
mes "Steaks not only increase stats but also recover both your HP and SP.";
next;
- emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(2);
+ emotion e_lv, 0, "Mille Feuille#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Mille Feuille]";
mes "If you really want to cook, go and see^0000cd Sir. Charles Orleans at the basement of Prontera castle^000000!! You must be attracted by him!!";
close;
@@ -4474,7 +4474,7 @@ iz_ac01,59,83,3 script Battle Instructor#08 4_M_NOV_HUNT,{
mes "Ok, I'll send you to the West field of Izlude.";
mes "Be sure you know how to get back.";
close2;
- warp "prt_fild"+strnpcinfo(2), 344, 213;
+ warp "prt_fild"+strnpcinfo(NPC_NAME_HIDDEN), 344, 213;
end;
case 3:
mes "[Battle Instructor Subino]";
@@ -5484,15 +5484,15 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{
mes "[Mom]";
mes "^0000cd[Come to me, honey~]^000000";
next;
- enablenpc "Etinifni#"+strnpcinfo(2);
- specialeffect EF_PORTAL, AREA, "Etinifni#"+strnpcinfo(2);
+ enablenpc "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
+ specialeffect EF_PORTAL, AREA, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Etinifni]";
mes "What's up? Where am I?";
next;
mes "[Mom]";
mes "Here!";
next;
- emotion e_ag, 0, "Etinifni#"+strnpcinfo(2);
+ emotion e_ag, 0, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Etinifni]";
mes "Ah... Again!! I have been out hunting Orcs.";
next;
@@ -5505,12 +5505,12 @@ izlude,95,146,5 script Mom#iz 4_F_CAVE1,{
mes "[Mom]";
mes "What? This moron?!";
next;
- emotion e_sigh, 0, "Etinifni#"+strnpcinfo(2);
+ emotion e_sigh, 0, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Etinifni]";
mes "OK. I will do it.";
next;
- disablenpc "Etinifni#"+strnpcinfo(2);
- emotion e_sob, 0, "Dad#"+strnpcinfo(2);
+ disablenpc "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
+ emotion e_sob, 0, "Dad#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Dad]";
mes "I am sorry... Dad has no power over your mom.";
close;
@@ -5549,7 +5549,7 @@ izlude,97,144,1 script Etinifni#iz 4_M_DEWBOY,{
close;
OnInit:
- disablenpc "Etinifni#"+strnpcinfo(2);
+ disablenpc "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN);
end;
}
@@ -5571,8 +5571,8 @@ izlude,99,138,3 script Romantic Male#iz 4_M_SITDOWN,{
mes "[Romantic Male]";
mes "Are you lifting up our good old memories renting my wedding dress and your tuxedo!! It will strenghthen our relationship, won't it?";
next;
- specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(2);
- emotion e_kis, 0, "Romantic Female#"+strnpcinfo(2);
+ specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
+ emotion e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Romantic Male]";
mes "Honey~~ I love you!! Sweetheart~";
next;
@@ -5592,7 +5592,7 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{
mes "[Romantic Female]";
mes "Shout like this when I miss you, honey!!";
next;
- emotion e_lv, 0, "Romantic Female#"+strnpcinfo(2);
+ emotion e_lv, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Romantic Female]";
mes "^0000cd[I miss you.]^000000";
next;
@@ -5605,20 +5605,20 @@ izlude,97,138,5 script Romantic Female#iz 4_F_SITDOWN,{
mes "[Romantic Female]";
mes "You are tired of sitting, aren't you?";
next;
- specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(2);
- emotion e_kis, 0, "Romantic Female#"+strnpcinfo(2);
+ specialeffect EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
+ emotion e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Romantic Female]";
mes "My sweetheart!!! I love you!!!";
next;
mes "[Romantic Male]";
mes "Yes, thank you for sharing your SP! You are also tired, aren't you?";
next;
- specialeffect EF_HEARTCASTING, AREA, "Romantic Male#"+strnpcinfo(2);
- emotion e_kis2, 0, "Romantic Male#"+strnpcinfo(2);
+ specialeffect EF_HEARTCASTING, AREA, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN);
+ emotion e_kis2, 0, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Romantic Male]";
mes "My sweetheart!! I love you!!!";
next;
- emotion e_lv, 0, "Romantic Female#"+strnpcinfo(2);
+ emotion e_lv, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Romantic Female]";
mes "Kia~ You are Coolest!!!";
close;
@@ -6151,7 +6151,7 @@ iz_ac01,159,32,3 script Hungry Trainee#ac 4_M_SIT_NOVICE,{
mes "Wonder when my order will get taken... it's already been an hour...";
mes "Look at the helpers lingering on the side...";
next;
- emotion e_an, 0, "Scholarship Trainee#"+strnpcinfo(2);
+ emotion e_an, 0, "Scholarship Trainee#"+strnpcinfo(NPC_NAME_HIDDEN);
mes "[Scholarship Trainee]";
mes "Ugh... this guy...";
mes "I already told you eight hundred times! It's buffet style! Ah!";
@@ -11750,7 +11750,7 @@ iz_ac02,62,139,3 script Lumin#ac 4_M_NOV_RUMIN,{
mes "Lumin changing clothes piece by piece.";
specialeffect2 EF_SPHERE;
specialeffect2 EF_SPHERE;
- classchange "Lumin#"+strnpcinfo(2), 4_M_THIEF_RUMIN;
+ classchange "Lumin#"+strnpcinfo(NPC_NAME_HIDDEN), 4_M_THIEF_RUMIN;
next;
cutin "thf_lumin01.bmp", 2;
mes "[Lumin]";
@@ -11764,7 +11764,7 @@ iz_ac02,62,139,3 script Lumin#ac 4_M_NOV_RUMIN,{
close2;
specialeffect2 EF_SPHERE;
specialeffect2 EF_SPHERE;
- classchange "Lumin#"+strnpcinfo(2), 4_M_NOV_RUMIN;
+ classchange "Lumin#"+strnpcinfo(NPC_NAME_HIDDEN), 4_M_NOV_RUMIN;
cutin "", 255;
end;
}
@@ -11786,25 +11786,25 @@ iz_ac02,1,1,0 script #nbacStone01 CLEAR_NPC,{
end;
OnInit:
- donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+ donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
end;
OnReset:
- killmonster strnpcinfo(4),"#"+strnpcinfo(2)+"::OnMyMobDead";
- donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+ killmonster strnpcinfo(NPC_MAP),"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
end;
OnMyMobDead:
- .@dead_num = mobcount(""+strnpcinfo(4)+"", "#"+strnpcinfo(2)+"::OnMyMobDead");
+ .@dead_num = mobcount(""+strnpcinfo(NPC_MAP)+"", "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead");
if (.@dead_num < 1)
- donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+ donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
end;
OnSpawn:
- monster strnpcinfo(4),59,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
- monster strnpcinfo(4),60,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
- monster strnpcinfo(4),61,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
- monster strnpcinfo(4),62,143,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),59,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),60,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),61,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),62,143,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
end;
}
@@ -11818,25 +11818,25 @@ iz_ac02,1,1,0 script #nbacStone02 CLEAR_NPC,{
end;
OnInit:
- donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+ donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
end;
OnReset:
- killmonster strnpcinfo(4),"#"+strnpcinfo(2)+"::OnMyMobDead";
- donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+ killmonster strnpcinfo(NPC_MAP),"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
end;
OnMyMobDead:
- .@dead_num = mobcount(""+strnpcinfo(4)+"", "#"+strnpcinfo(2)+"::OnMyMobDead");
+ .@dead_num = mobcount(""+strnpcinfo(NPC_MAP)+"", "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead");
if (.@dead_num < 1)
- donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+ donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
end;
OnSpawn:
- monster strnpcinfo(4),59,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
- monster strnpcinfo(4),60,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
- monster strnpcinfo(4),61,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
- monster strnpcinfo(4),62,137,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),59,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),60,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),61,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),62,137,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
end;
}
@@ -11850,25 +11850,25 @@ iz_ac02,1,1,0 script #nbacStone03 CLEAR_NPC,{
end;
OnInit:
- donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+ donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
end;
OnReset:
- killmonster strnpcinfo(4),"#"+strnpcinfo(2)+"::OnMyMobDead";
- donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+ killmonster strnpcinfo(NPC_MAP),"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
end;
OnMyMobDead:
- .@dead_num = mobcount(""+strnpcinfo(4)+"", "#"+strnpcinfo(2)+"::OnMyMobDead");
+ .@dead_num = mobcount(""+strnpcinfo(NPC_MAP)+"", "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead");
if (.@dead_num < 1)
- donpcevent "#"+strnpcinfo(2)+"::OnSpawn";
+ donpcevent "#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnSpawn";
end;
OnSpawn:
- monster strnpcinfo(4),59,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
- monster strnpcinfo(4),60,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
- monster strnpcinfo(4),61,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
- monster strnpcinfo(4),62,131,"Poring",R_PORING,1,"#"+strnpcinfo(2)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),59,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),60,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),61,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
+ monster strnpcinfo(NPC_MAP),62,131,"Poring",R_PORING,1,"#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnMyMobDead";
end;
}
@@ -12008,7 +12008,7 @@ iz_ac02,156,169,5 script Acolyte Leader Alice#2 4_F_ACOLYTE,{
mes "[Alice Yisha]";
mes "Ask ^ff0000if you want to experience skills of an Acolyte, ask the sister next to you^000000.";
mes "Now I am reading an introductory skill.";
- emotion e_omg, 0, "A Nun#"+strnpcinfo(2);
+ emotion e_omg, 0, "A Nun#"+strnpcinfo(NPC_NAME_HIDDEN);
close2;
cutin "", 255;
end;
@@ -14080,15 +14080,15 @@ new_1-1,53,114,3 script Training Instructor#1a 4_F_03,{
mes "I will send you to Izlude.";
close2;
erasequest 7117, 7127;
- if (strnpcinfo(4) == "new_1-1" || strnpcinfo(4) == "new_1-2" || strnpcinfo(4) == "new_1-3" || strnpcinfo(4) == "new_1-4") {
+ if (strnpcinfo(NPC_MAP) == "new_1-1" || strnpcinfo(NPC_MAP) == "new_1-2" || strnpcinfo(NPC_MAP) == "new_1-3" || strnpcinfo(NPC_MAP) == "new_1-4") {
.@warp$ = "iz_int";
- } else if (strnpcinfo(4) == "new_2-1" || strnpcinfo(4) == "new_2-2" || strnpcinfo(4) == "new_2-3" || strnpcinfo(4) == "new_2-4") {
+ } else if (strnpcinfo(NPC_MAP) == "new_2-1" || strnpcinfo(NPC_MAP) == "new_2-2" || strnpcinfo(NPC_MAP) == "new_2-3" || strnpcinfo(NPC_MAP) == "new_2-4") {
.@warp$ = "iz_int01";
- } else if (strnpcinfo(4) == "new_3-1" || strnpcinfo(4) == "new_3-2" || strnpcinfo(4) == "new_3-3" || strnpcinfo(4) == "new_3-4") {
+ } else if (strnpcinfo(NPC_MAP) == "new_3-1" || strnpcinfo(NPC_MAP) == "new_3-2" || strnpcinfo(NPC_MAP) == "new_3-3" || strnpcinfo(NPC_MAP) == "new_3-4") {
.@warp$ = "iz_int02";
- } else if (strnpcinfo(4) == "new_4-1" || strnpcinfo(4) == "new_4-2" || strnpcinfo(4) == "new_4-3" || strnpcinfo(4) == "new_4-4") {
+ } else if (strnpcinfo(NPC_MAP) == "new_4-1" || strnpcinfo(NPC_MAP) == "new_4-2" || strnpcinfo(NPC_MAP) == "new_4-3" || strnpcinfo(NPC_MAP) == "new_4-4") {
.@warp$ = "iz_int03";
- } else if (strnpcinfo(4) == "new_5-1" || strnpcinfo(4) == "new_5-2" || strnpcinfo(4) == "new_5-3" || strnpcinfo(4) == "new_5-4") {
+ } else if (strnpcinfo(NPC_MAP) == "new_5-1" || strnpcinfo(NPC_MAP) == "new_5-2" || strnpcinfo(NPC_MAP) == "new_5-3" || strnpcinfo(NPC_MAP) == "new_5-4") {
.@warp$ = "iz_int04";
}
savepoint .@warp$, 98, 88;
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index fff0dbb13..a20bb81f8 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -163,8 +163,8 @@ new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 4_F_01
mes "^4d4dff- You received a quest 'Novice Training Ground -1' from Sprakki.";
mes "Please check the Quest Info Window. -^000000";
close2;
- savepoint strnpcinfo(4),100,100;
- warp strnpcinfo(4),100,100;
+ savepoint strnpcinfo(NPC_MAP),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
case 2:
nov_1st_cos = 0;
@@ -218,8 +218,8 @@ new_5-1,53,114,3 duplicate(NvSprakkiA) Sprakki#nv5a 4_F_01
mes "These are the Novice Training Grounds.";
mes "I will guide you to the Novice Training Center.";
close2;
- savepoint strnpcinfo(4),100,100;
- warp strnpcinfo(4),100,100;
+ savepoint strnpcinfo(NPC_MAP),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
}
}
@@ -466,7 +466,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01
mes "I think it's better than seeing you lost and wandering about.";
mes "Hahahaha...";
close2;
- warp strnpcinfo(4),41,172;
+ warp strnpcinfo(NPC_MAP),41,172;
end;
}
} else {
@@ -480,7 +480,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01
mes "Sure.";
mes "Be careful not to be lost again.";
close2;
- warp "new_"+charat(strnpcinfo(4),4)+"-3",96,21;
+ warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3",96,21;
end;
case 2:
mes "[Instructor Brade]";
@@ -488,7 +488,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01
mes "In that case, I will send you to where the Kafra Employee is at.";
mes "Use ^4d4dffKafra's Warp Service^000000 to go to town.";
close2;
- warp strnpcinfo(4),41,172;
+ warp strnpcinfo(NPC_MAP),41,172;
end;
}
}
@@ -508,7 +508,7 @@ new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 4_M_JOB_KNIGHT1
mes "[Jinha]";
mes "You have to see Instructor Brade first before me. I will send you to Instructor Brade.";
close2;
- warp strnpcinfo(4),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
} else if (job_novice_q == 5) {
if (getskilllv("NV_FIRSTAID") > 0) {
@@ -577,7 +577,7 @@ new_5-2,100,105,3 duplicate(NvBradeA) Brade#nv5a 4_M_JOB_KNIGHT1
mes "[Jinha]";
mes "I will send you to Instructor Brade.";
close2;
- warp strnpcinfo(4),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
}
} else {
@@ -622,7 +622,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01
mes "I will send you to Instructor Brade.";
mes "Instructor Brade will start your basic training.";
close2;
- warp strnpcinfo(4),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
case 2:
mes "[Chocolat]";
@@ -664,7 +664,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01
mes "Sure.";
mes "I will see you later.";
close2;
- warp strnpcinfo(4),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
}
}
@@ -746,7 +746,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01
mes "Real Combat Training will be given by Instructor Brade. You met him earlier.";
mes "I will send you to the Real Combat Training Field.";
close2;
- .@map$ = "new_"+charat(strnpcinfo(4),4)+"-3";
+ .@map$ = "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3";
savepoint .@map$,96,21;
warp .@map$,96,21;
end;
@@ -764,7 +764,7 @@ new_5-2,115,120,3 duplicate(NvJinha) Jinha#nv5 1_M_ORIENT01
mes "[Chocolat]";
mes "I will send you to the Real Combat Training Field.";
close2;
- .@map$ = "new_"+charat(strnpcinfo(4),4)+"-3";
+ .@map$ = "new_"+charat(strnpcinfo(NPC_MAP),4)+"-3";
savepoint .@map$,96,21;
warp .@map$,96,21;
end;
@@ -1132,7 +1132,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER
mes "[Brade]";
mes "Ok. I'll send you to the basic course.";
close2;
- warp "new_"+charat(strnpcinfo(4),4)+"-2",100,100;
+ warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-2",100,100;
end;
case 2:
mes "[Brade]";
@@ -1151,7 +1151,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER
mes "[Brade]";
mes "Ok. I'll send you to Chocolat.";
close2;
- warp "new_"+charat(strnpcinfo(4),4)+"-2",41,172;
+ warp "new_"+charat(strnpcinfo(NPC_MAP),4)+"-2",41,172;
end;
case 2:
mes "[Brade]";
@@ -1184,7 +1184,7 @@ new_5-2,36,176,4 duplicate(NvGuide) Guide#nv5 8W_SOLDIER
job_novice_q = 13;
setquest 7122;
getitem Novice_Potion,100;
- savepoint strnpcinfo(4),96,21;
+ savepoint strnpcinfo(NPC_MAP),96,21;
next;
mes "^4d4dff- You've received a quest from Instructor Brade.";
mes "Please check the quest information window. -^000000";
@@ -2308,7 +2308,7 @@ new_5-3,97,50,4 duplicate(NvEden) Eden Group Officer#nv5 4_F_NOVICE,5,5
mes "I see, then let me guide you to another level. Which level do you want to go to?";
next;
for(.@i = 1; .@i<6; ++.@i) {
- if (!compare(strnpcinfo(2),"nv"+.@i))
+ if (!compare(strnpcinfo(NPC_NAME_HIDDEN),"nv"+.@i))
.@menu$ += "Send me to Level "+.@i;
.@menu$ += ":";
}
@@ -2439,8 +2439,8 @@ new_5-1,144,107,2 duplicate(NvGuardB) Guard#nv5b 8W_SOLDIER
mes "Well, I will let you out of here.";
mes "Go find the instructor, Brade.";
close2;
- savepoint strnpcinfo(4),100,100;
- warp strnpcinfo(4),100,100;
+ savepoint strnpcinfo(NPC_MAP),100,100;
+ warp strnpcinfo(NPC_MAP),100,100;
end;
}
new_1-2,161,182,5 duplicate(NvEdwin) Instructor#nv1 4_F_03
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 19:51:47 +0000