summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/guildrelay.txt16
-rw-r--r--npc/quests/kiel_hyre_quest.txt2
-rw-r--r--npc/quests/okolnir.txt36
-rw-r--r--npc/quests/partyrelay.txt2
-rw-r--r--npc/quests/quests_13_1.txt10
-rw-r--r--npc/quests/quests_13_2.txt88
-rw-r--r--npc/quests/quests_morocc.txt4
-rw-r--r--npc/quests/quests_moscovia.txt34
-rw-r--r--npc/quests/seals/god_weapon_creation.txt2
-rw-r--r--npc/quests/skills/rogue_skills.txt2
-rw-r--r--npc/quests/thana_quest.txt26
11 files changed, 111 insertions, 111 deletions
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index 3d3358005..81e38b299 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -38,30 +38,30 @@
//== Floating NPCs to duplicate from. ======================
- script RelayDummy1::GuildRelay1 4_M_SAGE_A,{
- .@name$ = strnpcinfo(1);
+ .@name$ = strnpcinfo(NPC_NAME_VISIBLE);
if (.@name$ == "Buzz") {
.@name2$ = "Lenya";
.@name3$ = "Gealuve";
.@name4$ = "Pariz";
- .@GID = getcastledata("aldeg_cas"+strnpcinfo(2),1);
+ .@GID = getcastledata("aldeg_cas"+strnpcinfo(NPC_NAME_HIDDEN),1);
}
else if (.@name$ == "Jody") {
.@name2$ = "Ron Haware";
.@name3$ = "Vers";
.@name4$ = "Gen Garish";
- .@GID = getcastledata("gefg_cas"+strnpcinfo(2),1);
+ .@GID = getcastledata("gefg_cas"+strnpcinfo(NPC_NAME_HIDDEN),1);
}
else if (.@name$ == "Chungye") {
.@name2$ = "Dosuhlji";
.@name3$ = "Yayula";
.@name4$ = "Ashin";
- .@GID = getcastledata("payg_cas"+strnpcinfo(2),1);
+ .@GID = getcastledata("payg_cas"+strnpcinfo(NPC_NAME_HIDDEN),1);
}
else if (.@name$ == "Hermod") {
.@name2$ = "Atila";
.@name3$ = "Cecil";
.@name4$ = "Diligo";
- .@GID = getcastledata("prtg_cas"+strnpcinfo(2),1);
+ .@GID = getcastledata("prtg_cas"+strnpcinfo(NPC_NAME_HIDDEN),1);
}
if (checkweight(Spawn,630) == 0) {
mes "^3355FFWait a minute! You're";
@@ -1239,7 +1239,7 @@
}
- script RelayDummy2::GuildRelay2 4_M_SAGE_A,{
- .@name$ = strnpcinfo(1);
+ .@name$ = strnpcinfo(NPC_NAME_VISIBLE);
getmapxy(.@m$, .@x, .@x, UNITTYPE_NPC);
.@GID = getcastledata(.@m$,1);
if (checkweight(Knife,1) == 0) {
@@ -1748,7 +1748,7 @@
}
- script RelayDummy3::GuildRelay3 4_M_SAGE_A,{
- .@name$ = strnpcinfo(1);
+ .@name$ = strnpcinfo(NPC_NAME_VISIBLE);
getmapxy(.@m$, .@x, .@x, UNITTYPE_NPC);
.@GID = getcastledata(.@m$,1);
if (checkweight(Knife,1) == 0) {
@@ -2432,7 +2432,7 @@
}
- script GuildDummy4::GuildRelay4 4_M_SAGE_A,{
- .@name$ = strnpcinfo(1);
+ .@name$ = strnpcinfo(NPC_NAME_VISIBLE);
getmapxy(.@m$, .@x, .@x, UNITTYPE_NPC);
.@GID = getcastledata(.@m$,1);
if (checkweight(Knife,1) == 0) {
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt
index f1bb67223..80e193f86 100644
--- a/npc/quests/kiel_hyre_quest.txt
+++ b/npc/quests/kiel_hyre_quest.txt
@@ -6768,7 +6768,7 @@ OnReset:
kh_kiehl02,49,55,6 script Mitchell#KiehlRoom 4_F_JOB_HUNTER,{
end;
OnInit:
- hideonnpc strnpcinfo(0);
+ hideonnpc strnpcinfo(NPC_NAME);
end;
}
kh_kiehl02,53,52,4 duplicate(Mitchell#KiehlRoom) Agent#KHAgent1 4_M_MASKMAN
diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt
index 920c8b8ce..a9772ed5a 100644
--- a/npc/quests/okolnir.txt
+++ b/npc/quests/okolnir.txt
@@ -36,14 +36,14 @@
//=========================================================================
function script F_Okolnir {
- if (compare(strnpcinfo(0),"main")) end;
- .@sub$ = (compare(strnpcinfo(4),"cas"))?(substr(strnpcinfo(4),0,2))+(substr(strnpcinfo(4),8,9)):substr(strnpcinfo(4),5,9);
+ if (compare(strnpcinfo(NPC_NAME),"main")) end;
+ .@sub$ = (compare(strnpcinfo(NPC_MAP),"cas"))?(substr(strnpcinfo(NPC_MAP),0,2))+(substr(strnpcinfo(NPC_MAP),8,9)):substr(strnpcinfo(NPC_MAP),5,9);
return .@sub$;
}
- script Guide#gq_main FAKE_NPC,{
.@sub$ = callfunc("F_Okolnir");
- .@GID = getcastledata(strnpcinfo(4),1);
+ .@GID = getcastledata(strnpcinfo(NPC_MAP),1);
if (getcharid(2) == .@GID) {
if (getd("$siz_"+.@sub$+"_on") == 0) {
mes "[Guide]";
@@ -80,8 +80,8 @@ function script F_Okolnir {
mes "Would you like to try to enter here?";
close;
case 2:
- .@defence = getcastledata(strnpcinfo(4),3);
- .@Economy = getcastledata(strnpcinfo(4),2);
+ .@defence = getcastledata(strnpcinfo(NPC_MAP),3);
+ .@Economy = getcastledata(strnpcinfo(NPC_MAP),2);
if ((.@Economy > 64) && (.@defence > 29)) {
mes "[Guide]";
mes "Great! Economy and Defense are OK.";
@@ -190,7 +190,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306
- script Wish Maiden#gq_main FAKE_NPC,{
.@sub$ = callfunc("F_Okolnir");
- .@t$ = ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
+ .@t$ = ((compare(strnpcinfo(NPC_MAP),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(NPC_MAP),getstrlen(strnpcinfo(NPC_MAP))-1));
.@GID = getcastledata(.@t$,1);
if (getcharid(2) == .@GID) {
cutin "wish_maiden31",1;
@@ -735,7 +735,7 @@ OnTimer3610000:
setd "$@gqse_"+.@sub$+"_pcc",0;
setd "$@gqse_"+.@sub$+"_gd",0;
setd "$@gqse_"+.@sub$+"_nm",0;
- mapwarp "que_q"+.@sub$,strnpcinfo(4),157,369;
+ mapwarp "que_q"+.@sub$,strnpcinfo(NPC_MAP),157,369;
end;
OnTimer3611000:
@@ -1283,14 +1283,14 @@ que_qsch05,1,4,0 duplicate(#piamette_main) #piamette_sch05 CLEAR_NPC
OnEnable:
.@sub$ = callfunc("F_Okolnir");
- .@c = charat(strnpcinfo(2),9);
+ .@c = charat(strnpcinfo(NPC_NAME_HIDDEN),9);
enablenpc "#getspell0"+.@c+"_"+.@sub$;
specialeffect EF_LOCKON;
end;
OnDisable:
.@sub$ = callfunc("F_Okolnir");
- .@c = charat(strnpcinfo(2),9);
+ .@c = charat(strnpcinfo(NPC_NAME_HIDDEN),9);
disablenpc "#getspell0"+.@c+"_"+.@sub$;
end;
@@ -1533,7 +1533,7 @@ que_qsch05,1,8,0 duplicate(#gd_main_mobctrl) #gd_sch05_mobctrl CLEAR_NPC
OnTouch:
.@sub$ = callfunc("F_Okolnir");
- if (compare(strnpcinfo(0),"windpath03")) {
+ if (compare(strnpcinfo(NPC_NAME),"windpath03")) {
warp "que_q"+.@sub$,119,103;
} else {
warp "que_q"+.@sub$,146,109;
@@ -1904,7 +1904,7 @@ que_qsch05,2,10,0 duplicate(#main_stone03) #sch05_stone03 CLEAR_NPC
end;
OnTouch:
.@sub$ = callfunc("F_Okolnir");
- .@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+ .@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@in;
switch (.@in) {
case 1: setarray .@n, 234,284,235,285,236,286; break;
@@ -1918,7 +1918,7 @@ OnTouch:
OnDisable:
.@sub$ = callfunc("F_Okolnir");
- .@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+ .@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
killmonster "que_q"+.@sub$,"Guard of Shadow#"+.@sub$+"_0"+.@in+"::OnMyMobDead";
disablenpc "Guard of Shadow#"+.@sub$+"_0"+.@in;
end;
@@ -1978,7 +1978,7 @@ que_qsch05,225,303,5 duplicate(Guard of Shadow#main_all) Guard of Shadow#sch05_0
OnTouch:
.@sub$ = callfunc("F_Okolnir");
- .@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+ .@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@in;
switch (.@in) {
case 1: setarray .@n, 265,297,266,296,267,295;
@@ -1992,7 +1992,7 @@ OnTouch:
OnDisable:
.@sub$ = callfunc("F_Okolnir");
- .@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+ .@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
killmonster "que_q"+.@sub$,"Bloody Hunter#"+.@sub$+"_ac0"+.@in+"::OnMyMobDead";
disablenpc "Bloody Hunter#"+.@sub$+"_ac0"+.@in;
end;
@@ -2052,7 +2052,7 @@ que_qsch05,279,300,3 duplicate(Bloody Hunter#main_all) Bloody Hunter#sch05_ac04
OnTouch:
.@sub$ = callfunc("F_Okolnir");
- .@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+ .@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
disablenpc "Temple Keeper#"+.@sub$+"_ac0"+.@in;
switch (.@in) {
case 1: setarray .@n, 246,330,247,330,248,330; break;
@@ -2064,7 +2064,7 @@ OnTouch:
OnDisable:
.@sub$ = callfunc("F_Okolnir");
- .@in = charat(strnpcinfo(2),getstrlen(strnpcinfo(2))-1);
+ .@in = charat(strnpcinfo(NPC_NAME_HIDDEN),getstrlen(strnpcinfo(NPC_NAME_HIDDEN))-1);
killmonster "que_q"+.@sub$,"Temple Keeper#"+.@sub$+"_ac0"+.@in+"::OnMyMobDead";
disablenpc "Temple Keeper#"+.@sub$+"_ac0"+.@in;
end;
@@ -2159,7 +2159,7 @@ que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss WIS
- script Wish Maiden#main_gift FAKE_NPC,{
.@sub$ = callfunc("F_Okolnir");
- .@t$ = ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
+ .@t$ = ((compare(strnpcinfo(NPC_MAP),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(NPC_MAP),getstrlen(strnpcinfo(NPC_MAP))-1));
.@GID = getcastledata(.@t$,1);
if (getcharid(2) == .@GID) {
if (strcharinfo(0) == getguildmaster(.@GID)) {
@@ -2290,7 +2290,7 @@ que_qsch05,252,340,3 duplicate(Wish Maiden#main_gift) Wish Maiden#sch05_gift 4_F
end;
OnTouch:
- .@t$ = ((compare(strnpcinfo(4),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(4),getstrlen(strnpcinfo(4))-1));
+ .@t$ = ((compare(strnpcinfo(NPC_MAP),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(NPC_MAP),getstrlen(strnpcinfo(NPC_MAP))-1));
warp .@t$,157,369;
end;
diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt
index 6b9014938..54d78bec6 100644
--- a/npc/quests/partyrelay.txt
+++ b/npc/quests/partyrelay.txt
@@ -2492,7 +2492,7 @@ payon,168,314,3 script Lospii#payon::RelayLospii 4_M_KID1,{
close;
}
.@relaytime = gettime(GETTIME_HOUR);
- getmapxy(.@m$, .@x, .@y, UNITTYPE_NPC, strnpcinfo(3));
+ getmapxy(.@m$, .@x, .@y, UNITTYPE_NPC, strnpcinfo(NPC_NAME_UNIQUE));
.@juwi = getareausers(.@m$,.@x-8,.@y-8,.@x+8,.@y+8);
if (party_relay == 32) {
mes "[Lospii]";
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 3eb88470c..9b0a5ad7e 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -4640,7 +4640,7 @@ mid_camp,336,171,1 script Camp Guard#man1 4_M_EIN_SOLDIER,{
mes "Please be careful out there.";
mes "If you encounter any threats or strange phenomenon, then please don't hesitate to report to us at the garrison.";
close2;
- switch(atoi(charat(strnpcinfo(2),3))) {
+ switch(atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),3))) {
case 1:
if (ep13_animal == 1)
ep13_animal = 2;
@@ -8444,7 +8444,7 @@ mid_camp,88,100,7 script Cat Hand Mining Agent 4_CAT,{
else if (.@rhea_ran == 16) getitem Yellow_Live,1;
else getitem Unidentified_Mineral,1;
initnpctimer;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
}
else {
@@ -8455,7 +8455,7 @@ mid_camp,88,100,7 script Cat Hand Mining Agent 4_CAT,{
end;
OnTimer120000:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
end;
}
@@ -13710,11 +13710,11 @@ OnTimer11000:
OnInit:
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
}
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 6ba10b8d6..83ce8419f 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -67,7 +67,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{
next;
switch(select("Save your location", "Cancel")) {
case 1:
- if (strnpcinfo(2) == "spl") savepoint "spl_fild02",32,225;
+ if (strnpcinfo(NPC_NAME_HIDDEN) == "spl") savepoint "spl_fild02",32,225;
else savepoint "man_fild02",129,61;
mes "[Cat Hand Agent]";
mes "Thank you.";
@@ -87,7 +87,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{
next;
switch(select("Save your location", "Use Storage", "Cancel")) {
case 1:
- if (strnpcinfo(2) == "spl") savepoint "spl_fild02",32,225;
+ if (strnpcinfo(NPC_NAME_HIDDEN) == "spl") savepoint "spl_fild02",32,225;
else savepoint "man_fild02",129,61;
mes "[Cat Hand Agent]";
mes "Thank you.";
@@ -134,7 +134,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{
next;
switch(select("Save your location", "Use Storage", "Use Cat Warp (Midgard)", "Cancel")) {
case 1:
- if (strnpcinfo(2) == "spl") savepoint "spl_fild02",32,225;
+ if (strnpcinfo(NPC_NAME_HIDDEN) == "spl") savepoint "spl_fild02",32,225;
else savepoint "man_fild02",129,61;
mes "[Cat Hand Agent]";
mes "Thank you.";
@@ -255,7 +255,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{
next;
switch(select("Save your location", "Use Storage", "Use Cat Warp (Midgard)", "Use Cat Warp (Jottunheim)", "Cancel")) {
case 1:
- if (strnpcinfo(2) == "spl") savepoint "spl_fild02",32,225;
+ if (strnpcinfo(NPC_NAME_HIDDEN) == "spl") savepoint "spl_fild02",32,225;
else savepoint "man_fild02",129,61;
mes "[Cat Hand Agent]";
mes "Thank you.";
@@ -358,7 +358,7 @@ spl_fild02,25,211,4 script Cat Hand Agent#spl 4_M_BOSSCAT,{
close;
}
case 4:
- if (strnpcinfo(2) == "spl") switch(select("Alliance Forces Post -> 5500z", "Manuk Camp -> 7500z", "Cancel")) {
+ if (strnpcinfo(NPC_NAME_HIDDEN) == "spl") switch(select("Alliance Forces Post -> 5500z", "Manuk Camp -> 7500z", "Cancel")) {
case 1: Catwarp(5500,13);
case 2: Catwarp(5500,12);
case 3:
@@ -426,7 +426,7 @@ man_fild02,132,47,4 duplicate(Cat Hand Agent#spl) Cat Hand Agent#man 4_M_BOSSCAT
else if (.@rhea_ran == 17) getitem Manuk_Coin,1;
else getitem Unidentified_Mineral,1;
initnpctimer;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
}
else {
@@ -437,7 +437,7 @@ man_fild02,132,47,4 duplicate(Cat Hand Agent#spl) Cat Hand Agent#man 4_M_BOSSCAT
end;
OnTimer120000:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
end;
}
@@ -2463,7 +2463,7 @@ spl_in02,236,92,5 script Arc#ep13md_l02 4_M_FAIRYSOLDIER,{
close;
}
else if (ep13_mdrama == 27) {
- if (strnpcinfo(1) == "Arc") {
+ if (strnpcinfo(NPC_NAME_VISIBLE) == "Arc") {
mes "[Arc]";
mes "Terra. Get some rest...";
mes "Rest easy...";
@@ -2475,18 +2475,18 @@ spl_in02,236,92,5 script Arc#ep13md_l02 4_M_FAIRYSOLDIER,{
mes "I'm sorry... And. You...";
}
next;
- mes "["+strnpcinfo(1)+"]";
+ mes "["+strnpcinfo(NPC_NAME_VISIBLE)+"]";
mes "Originally... we Laphine were extremely reluctant to have others in our area.";
mes strcharinfo(0) + ", you will be a special exception.";
next;
- mes "["+strnpcinfo(1)+"]";
- if (strnpcinfo(1) == "Arc") mes "That's what Terra wants too.";
+ mes "["+strnpcinfo(NPC_NAME_VISIBLE)+"]";
+ if (strnpcinfo(NPC_NAME_VISIBLE) == "Arc") mes "That's what Terra wants too.";
mes "It might be cramped, but you are always welcome to visit us.";
ep13_mdrama = 28;
close;
}
else if (ep13_mdrama > 27) {
- if (strnpcinfo(1) == "Arc") {
+ if (strnpcinfo(NPC_NAME_VISIBLE) == "Arc") {
mes "[Arc]";
mes "How are you adapting to Splendide?";
mes "Terra's still not fully recovered yet, so keep that in mind.";
@@ -2500,7 +2500,7 @@ spl_in02,236,92,5 script Arc#ep13md_l02 4_M_FAIRYSOLDIER,{
}
else {
// custom translation
- if (strnpcinfo(1) == "Arc") {
+ if (strnpcinfo(NPC_NAME_VISIBLE) == "Arc") {
mes "[Arc]";
mes "The back of the right ... ";
mes "......";
@@ -2514,7 +2514,7 @@ spl_in02,236,92,5 script Arc#ep13md_l02 4_M_FAIRYSOLDIER,{
}
}
else {
- if (strnpcinfo(1) == "Arc") {
+ if (strnpcinfo(NPC_NAME_VISIBLE) == "Arc") {
mes "[Arc]";
mes "HirWosWeh. Yee DiebVilFar U manTalVil.";
mes "LarsNeiser...??";
@@ -3270,23 +3270,23 @@ mid_camp,192,239,4 script Wanted Sign#ep13_2ect01 4_BOARD3,{
if ((ep13_2_dayegg == 1) && (countitem(Egg_Of_Draco) < 10)) {
mes "We just got fresh eggs from the dragon nest.";
getitem Egg_Of_Draco,1;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
initnpctimer;
close;
}
end;
OnTimer420000:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
}
@@ -3305,23 +3305,23 @@ nyd_dun02,68,256,0 script Dragon Egg#ep13_degg_1 4_DRAGON_EGG,{
if ((ep13_2_dayegg == 1) && (countitem(Egg_Of_Draco) < 10)) {
mes "We just got fresh eggs from the dragon nest.";
getitem Egg_Of_Draco,1;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
initnpctimer;
close;
}
end;
OnTimer240000:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
}
nyd_dun02,68,256,0 duplicate(Dragon Egg#ep13_degg_1) Dragon Egg#ep13_degg11 4_DRAGON_EGG
@@ -3336,23 +3336,23 @@ nyd_dun02,201,166,0 script Dragon Egg#ep13_degg_2 4_DRAGON_EGG,{
if ((ep13_2_dayegg == 1) && (countitem(Egg_Of_Draco) < 10)) {
mes "We just got fresh eggs from the dragon nest.";
getitem Egg_Of_Draco,1;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
initnpctimer;
close;
}
end;
OnTimer120000:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
}
nyd_dun02,201,166,0 duplicate(Dragon Egg#ep13_degg_2) Dragon Egg#ep13_degg16 4_DRAGON_EGG
@@ -4876,8 +4876,8 @@ mjolnir_12,220,37,0 duplicate(mjo_no_find) #mj12_find_3 FAKE_NPC,5,5
else if (.@stst == 1) getitem Rough_Mineral,1;
else getitem Rough_Mineral,2;
close2;
- donpcevent strnpcinfo(0)+"_t::OnEnable";
- disablenpc strnpcinfo(0);
+ donpcevent strnpcinfo(NPC_NAME)+"_t::OnEnable";
+ disablenpc strnpcinfo(NPC_NAME);
end;
}
case 2:
@@ -4893,7 +4893,7 @@ mjolnir_12,220,37,0 duplicate(mjo_no_find) #mj12_find_3 FAKE_NPC,5,5
end;
OnInit:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
OnTouch:
@@ -5226,8 +5226,8 @@ OnTouch:
if (.@stst == 5) getitem Rough_Mineral,5;
else if (.@stst == 1) getitem Rough_Mineral,2;
else getitem Rough_Mineral,1;
- donpcevent strnpcinfo(0)+"_t::OnEnable";
- disablenpc strnpcinfo(0);
+ donpcevent strnpcinfo(NPC_NAME)+"_t::OnEnable";
+ disablenpc strnpcinfo(NPC_NAME);
close;
}
case 2:
@@ -5243,7 +5243,7 @@ OnTouch:
end;
OnInit:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
OnTouch:
@@ -5359,8 +5359,8 @@ OnTouch:
if (.@stst == 5) getitem Rough_Mineral,5;
else if (.@stst == 1) getitem Rough_Mineral,2;
else getitem Rough_Mineral,1;
- donpcevent strnpcinfo(0)+"_t::OnEnable";
- disablenpc strnpcinfo(0);
+ donpcevent strnpcinfo(NPC_NAME)+"_t::OnEnable";
+ disablenpc strnpcinfo(NPC_NAME);
close;
}
case 2:
@@ -5376,7 +5376,7 @@ OnTouch:
end;
OnInit:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
OnTouch:
@@ -6940,7 +6940,7 @@ OnTouch:
- script ep13_warp_s_0 FAKE_NPC,{
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
initnpctimer;
OnTimer2000:
OnTimer4000:
@@ -6954,18 +6954,18 @@ OnTimer8000:
OnTimer10000:
specialeffect EF_STEAL;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnDisable:
specialeffect EF_WIND;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
}
- script ep13_warp_s_1 FAKE_NPC,{
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
initnpctimer;
OnTimer2000:
OnTimer4000:
@@ -6980,18 +6980,18 @@ OnTimer10000:
OnTimer12000:
specialeffect EF_STEAL;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnDisable:
specialeffect EF_WIND;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
}
- script ep13_warp_s_2 FAKE_NPC,{
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
initnpctimer;
OnTimer2000:
OnTimer4000:
@@ -7007,12 +7007,12 @@ OnTimer12000:
OnTimer15000:
specialeffect EF_STEAL;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnDisable:
specialeffect EF_WIND;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
}
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 8cb418508..6d5ab7325 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -1110,7 +1110,7 @@ moc_fild20,203,336,5 duplicate(MocConGuard) Continental Guard#07 4_M_MOC_SOLDIER
moc_fild20,215,336,3 duplicate(MocConGuard) Continental Guard#08 4_M_MOC_SOLDIER,3,3
- script Continental Messenger#00::ConMessenger 4_M_MOCASS1,3,3,{
- .@area$ = strnpcinfo(2);
+ .@area$ = strnpcinfo(NPC_NAME_HIDDEN);
if (.@area$ == "01") { .@area$ = "Prontera"; }
else if (.@area$ == "02") { .@area$ = "Geffen"; }
else if (.@area$ == "03") { .@area$ = "Payon"; }
@@ -2074,7 +2074,7 @@ sec_in02,14,43,5 script Morroc GlobalVar Admin::MorrocAdmin_sec 4_F_RUSGREEN,{
mes "Alright.";
close;
case 2:
- if (strnpcinfo(4) == "sec_in02")
+ if (strnpcinfo(NPC_MAP) == "sec_in02")
mes "You can reset at moc_fild21 5 5.";
else {
mes "Reset starts.";
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index ed15fb7e9..4a03c03c6 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -2569,14 +2569,14 @@ OnTimer300000:
- script Baehideun#main FAKE_NPC,{
OnInit:
- if (compare(strnpcinfo(0),"main")) end;
- disablenpc strnpcinfo(0);
+ if (compare(strnpcinfo(NPC_NAME),"main")) end;
+ disablenpc strnpcinfo(NPC_NAME);
stopnpctimer;
end;
OnEnable:
- enablenpc strnpcinfo(0);
- .@c = charat(strnpcinfo(0),9);
+ enablenpc strnpcinfo(NPC_NAME);
+ .@c = charat(strnpcinfo(NPC_NAME),9);
switch (.@c) {
case 1: setarray .@m, 89,112,1425,85,110,1425; break;
case 2: setarray .@m, 89,112,1425,80,110,1426,83,114,1426,85,110,1425; break;
@@ -2584,39 +2584,39 @@ OnEnable:
case 4: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
}
for (.@i = 0; .@i < getarraysize(.@m); .@i += 3)
- monster "mosk_ship",.@m[.@i],.@m[.@i+1],"Sea Monster",.@m[.@i+2],1,strnpcinfo(0)+"::OnMyMobDead";
+ monster "mosk_ship",.@m[.@i],.@m[.@i+1],"Sea Monster",.@m[.@i+2],1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
initnpctimer;
end;
OnDisable:
$@mos1_edq = 0;
stopnpctimer;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnMyMobDead:
- if (!mobcount("mosk_ship",strnpcinfo(0)+"::OnMyMobDead")) {
+ if (!mobcount("mosk_ship",strnpcinfo(NPC_NAME)+"::OnMyMobDead")) {
$@mos1_edq = 0;
mes "[Mr. Ibanoff]";
mes "Now that all the monsters are gone,";
mes "we can start sailing again";
mes "normally.";
- .@c = charat(strnpcinfo(0),9);
+ .@c = charat(strnpcinfo(NPC_NAME),9);
switch (.@c) {
case 1: break;
case 2: break;
case 3: mos_whale_edq = 11; break;
case 4: mos_whale_edq = 26; break;
}
- donpcevent strnpcinfo(0)+"::OnDisable";
+ donpcevent strnpcinfo(NPC_NAME)+"::OnDisable";
close;
}
end;
OnTimer300000:
- killmonster "mosk_ship",strnpcinfo(0)+"::OnMyMobDead";
+ killmonster "mosk_ship",strnpcinfo(NPC_NAME)+"::OnMyMobDead";
$@mos1_edq = 0;
- donpcevent strnpcinfo(0)+"::OnDisable";
+ donpcevent strnpcinfo(NPC_NAME)+"::OnDisable";
end;
}
mosk_ship,2,2,4 duplicate(Baehideun#main) Baehideun1#ship FAKE_NPC
@@ -3992,7 +3992,7 @@ moscovia,208,182,7 script Acorn Dealer#mos 4_M_RUSMAN1,{
//- Big Squirrel - Trade Acorns for Gems -
- script Squirrel#mos_main FAKE_NPC,{
- if (compare(strnpcinfo(0),"mos_sq")) end;
+ if (compare(strnpcinfo(NPC_NAME),"mos_sq")) end;
OnTouch:
if ((MaxWeight-Weight) < 2000) {
mes "- Please stop here!! -";
@@ -7371,23 +7371,23 @@ OnTimer300000:
- script mos_rus#main FAKE_NPC,{
end;
OnInit:
- if (compare(strnpcinfo(0),"main")) end;
- disablenpc strnpcinfo(0);
+ if (compare(strnpcinfo(NPC_NAME),"main")) end;
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnEnable:
initnpctimer;
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
OnDisable:
stopnpctimer;
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnTimer120000:
stopnpctimer;
- donpcevent strnpcinfo(0)+"::OnDisable";
+ donpcevent strnpcinfo(NPC_NAME)+"::OnDisable";
end;
}
mosk_dun01,50,256,3 duplicate(mos_rus#main) Gray Wolf#rus05 4_RUS_DWOLF
diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt
index baacf17c2..87a6ca7c8 100644
--- a/npc/quests/seals/god_weapon_creation.txt
+++ b/npc/quests/seals/god_weapon_creation.txt
@@ -830,7 +830,7 @@ OnDisable:
que_god01,154,67,0 script god_failwarp#1 FAKE_NPC,4,7,{
OnInit:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnTouch:
warp "prontera",156,324;
diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt
index 166f01c84..a1c64b09f 100644
--- a/npc/quests/skills/rogue_skills.txt
+++ b/npc/quests/skills/rogue_skills.txt
@@ -1174,7 +1174,7 @@ OnDisable:
prt_are01,149,162,0 script Kienna#1st 8_F_GIRL,1,1,{
end;
OnTouch:
- callfunc "F_Kienna",strnpcinfo(2);
+ callfunc "F_Kienna",strnpcinfo(NPC_NAME_HIDDEN);
end;
}
prt_are01,136,150,0 duplicate(Kienna#1st) Kienna#2nd 8_F_GIRL,1,1
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index c535253d7..f72d48f42 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -1699,10 +1699,10 @@ tha_t08,90,153,0 script Shining Crystal#tt_r1 CLEAR_NPC,{
OnInit:
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
}
tha_t08,90,62,0 duplicate(Shining Crystal#tt_r1) Shining Crystal#tt_r2 CLEAR_NPC
@@ -1733,10 +1733,10 @@ tha_t08,49,153,0 script Shining Crystal#tt_y1 CLEAR_NPC,{
OnInit:
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
}
tha_t08,90,150,0 duplicate(Shining Crystal#tt_y1) Shining Crystal#tt_y2 CLEAR_NPC
@@ -1767,10 +1767,10 @@ tha_t08,49,65,0 script Shining Crystal#tt_b1 CLEAR_NPC,{
OnInit:
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
}
tha_t08,49,150,0 duplicate(Shining Crystal#tt_b1) Shining Crystal#tt_b2 CLEAR_NPC
@@ -1801,10 +1801,10 @@ tha_t08,90,65,0 script Shining Crystal#tt_g1 CLEAR_NPC,{
OnInit:
OnDisable:
- disablenpc strnpcinfo(0);
+ disablenpc strnpcinfo(NPC_NAME);
end;
OnEnable:
- enablenpc strnpcinfo(0);
+ enablenpc strnpcinfo(NPC_NAME);
end;
}
tha_t08,49,62,0 duplicate(Shining Crystal#tt_g1) Shining Crystal#tt_g2 CLEAR_NPC
@@ -2102,15 +2102,15 @@ OnTimer3000:
thana_boss,217,167,3 script Memory Seal#tt1 G_THA_MAERO,3,3,{
end;
OnEnable:
- hideoffnpc strnpcinfo(0);
+ hideoffnpc strnpcinfo(NPC_NAME);
.hide = 0;
end;
OnDisable:
- hideonnpc strnpcinfo(0);
+ hideonnpc strnpcinfo(NPC_NAME);
.hide = 0;
end;
OnTouch:
- .@seal = atoi(charat(strnpcinfo(2),2));
+ .@seal = atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),2));
if (.hide & (1<<.@seal)) end;
// .@i: ItemID,MobID,MapX,MapY,EffectNum
@@ -2153,11 +2153,11 @@ OnTouch:
mes "into the crest, causing";
mes "its glow to intensify.^000000";
close2;
- hideonnpc strnpcinfo(0);
+ hideonnpc strnpcinfo(NPC_NAME);
.hide |= (1<<.@seal);
delitem .@i[0],1;
specialeffect .@i[4];
- monster "thana_boss",.@i[2],.@i[3],.@j$,.@i[1],1,strnpcinfo(0)+"::OnMyMobDead";
+ monster "thana_boss",.@i[2],.@i[3],.@j$,.@i[1],1,strnpcinfo(NPC_NAME)+"::OnMyMobDead";
switch($@thana_summon2) {
case 0: .@str$ = "... who... released... the... Memory... of... "+.@j$+"...?"; break;
case 1: .@str$ = "... why... did you... release... the... Memory... of... "+.@j$+"...?"; break;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-23 12:39:15 +0000