summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/battleground/bg_common.txt2
-rw-r--r--npc/custom/quests/hunting_missions.txt4
-rw-r--r--npc/events/halloween_2009.txt2
-rw-r--r--npc/other/CashShop_Functions.txt4
-rw-r--r--npc/other/gm_npcs.txt2
-rw-r--r--npc/other/monster_race.txt4
-rw-r--r--npc/other/poring_war.txt6
-rw-r--r--npc/quests/guildrelay.txt6
-rw-r--r--npc/quests/partyrelay.txt2
-rw-r--r--npc/re/instances/MalangdoCulvert.txt2
-rw-r--r--npc/re/instances/OldGlastHeim.txt4
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt2
-rw-r--r--npc/re/jobs/3-1/ranger.txt2
-rw-r--r--npc/re/quests/quests_malangdo.txt2
14 files changed, 22 insertions, 22 deletions
diff --git a/npc/battleground/bg_common.txt b/npc/battleground/bg_common.txt
index 74bc26430..78ec8e6d0 100644
--- a/npc/battleground/bg_common.txt
+++ b/npc/battleground/bg_common.txt
@@ -258,7 +258,7 @@ bat_room,148,150,5 script Teleporter#Battlefield 4_F_TELEPORTER,{
mes "[Maroll Battle Recruiter]";
mes "May the war god bless you.";
close2;
- getmapxy(.@mapname$,.@x,.@y,1);
+ getmapxy(.@mapname$, .@x, .@y, UNITTYPE_NPC);
if (.@mapname$ == "prontera")
bat_return = 1;
else if (.@mapname$ == "moc_ruins")
diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index d4999648f..2b6057a51 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -270,14 +270,14 @@ OnNPCKillEvent:
}
} else if (.Party) {
set .@mob, killedrid;
- getmapxy(.@map1$,.@x1,.@y1,0);
+ getmapxy(.@map1$, .@x1, .@y1, UNITTYPE_PC);
getpartymember getcharid(1),1;
getpartymember getcharid(1),2;
for(set .@i,0; .@i<$@partymembercount; set .@i,.@i+1) {
if (isloggedin($@partymemberaid[.@i], $@partymembercid[.@i])) {
attachrid $@partymemberaid[.@i];
if (#Mission_Count && Mission0 && Hp > 0) {
- getmapxy(.@map2$,.@x2,.@y2,0);
+ getmapxy(.@map2$, .@x2, .@y2, UNITTYPE_PC);
if ((.@map1$ == .@map2$ || .Party == 1) && (distance(.@x1,.@y1,.@x2,.@y2) <= 30 || .Party < 3)) {
for(set .@j,0; .@j<.Quests; set .@j,.@j+1) {
if (strmobinfo(1,.@mob) == strmobinfo(1,getd("Mission"+.@j))) {
diff --git a/npc/events/halloween_2009.txt b/npc/events/halloween_2009.txt
index a35c98859..6337b8606 100644
--- a/npc/events/halloween_2009.txt
+++ b/npc/events/halloween_2009.txt
@@ -261,7 +261,7 @@ prontera,220,72,5 duplicate(09Treats) Trick or Treater#iRO8 4_M_KID1,2,2
mes "[Halloween Wizard]";
mes "Which town do you want to play a trick on?";
next;
- getmapxy(.@mapname$,.@mapx,.@mapy,0,""+strcharinfo(0)+"");
+ getmapxy(.@mapname$, .@mapx, .@mapy, UNITTYPE_PC, strcharinfo(0));
if (.@mapname$ == "prontera") {
switch(select("Geffen:Payon:Alberta:Aldebaran")) {
case 1:
diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt
index ef53ef858..17ce48173 100644
--- a/npc/other/CashShop_Functions.txt
+++ b/npc/other/CashShop_Functions.txt
@@ -57,8 +57,8 @@ function script F_CashStore {
// - No arguments.
function script F_CashPartyCall {
warp "Random",0,0;
- if(getpartyleader(getcharid(1),2) == getcharid(0)) {
- getmapxy .@mapl$, .@xl, .@yl, 0;
+ if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+ getmapxy(.@mapl$, .@xl, .@yl, UNITTYPE_PC);
warpparty .@mapl$, .@xl, .@yl, getcharid(1), .@mapl$;
}
return;
diff --git a/npc/other/gm_npcs.txt b/npc/other/gm_npcs.txt
index 9bc79ca77..54e37a2bd 100644
--- a/npc/other/gm_npcs.txt
+++ b/npc/other/gm_npcs.txt
@@ -41,7 +41,7 @@ function script F_GM_NPC {
// To set a minimum GM level to access the NPCs, edit the line below.
if (getgmlevel() < 99) {/* TODO: perhaps better to just add a group permission? [Ind] */
// Log the event.
- getmapxy(.@map$,.@x,.@y,1);
+ getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC);
logmes strcharinfo(0)+" attempted to access GM NPC "+strnpcinfo(0)+" ("+.@map$+","+.@x+","+.@y+").";
end;
}
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index 24de8a1f8..eec6593e5 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -241,7 +241,7 @@ OnInit:
OnEnable:
emotion e_gasp;
enablenpc strnpcinfo(0);
- getmapxy(.@m$,.@x,.@y,1);
+ getmapxy(.@m$, .@x, .@y, UNITTYPE_NPC);
setarray .@mob[1], R_PORING,R_LUNATIC,R_SAVAGE_BABE,R_DESERT_WOLF_B,R_DEVIRUCHI,R_BAPHOMET_;
monster "p_track01",58,.@y,"The "+ F_Ord() +" Racer", .@mob[F_Num()],1,strnpcinfo(0)+"::OnMyMobDead";
end;
@@ -1750,7 +1750,7 @@ p_track02,76,38,1 script Exit Guide#double 4_M_NFMAN,{
OnEnable:
enablenpc strnpcinfo(0);
setarray .@mob[1], R_PORING,R_LUNATIC,R_SAVAGE_BABE,R_DESERT_WOLF_B,R_DEVIRUCHI,R_BAPHOMET_;
- getmapxy(.@m$,.@x,.@y,1);
+ getmapxy(.@m$, .@x, .@y, UNITTYPE_NPC);
.@num = MN();
monster "p_track02",58,.@y,"Monster "+.@num,.@mob[.@num],1,strnpcinfo(0)+"::OnMyMobDead";
end;
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt
index f3a1df913..b3b6466ad 100644
--- a/npc/other/poring_war.txt
+++ b/npc/other/poring_war.txt
@@ -318,7 +318,7 @@ poring_w01,96,97,3 script Sweet Devi#wop 4_DEVIRUCHI,{
}
OnPCLogoutEvent:
- getmapxy .@map$,.@x,.@y,0;
+ getmapxy(.@map$, .@x, .@y, UNITTYPE_PC);
if (.@map$ == "poring_w02") {
if (WoP_SaveMap$ != "") {
savepoint WoP_SaveMap$,WoP_SaveMap_X,WoP_SaveMap_Y;
@@ -332,7 +332,7 @@ OnPCLogoutEvent:
end;
OnPCDieEvent:
- getmapxy .@map$,.@x,.@y,0;
+ getmapxy(.@map$, .@x, .@y, UNITTYPE_PC);
if (.@map$ == "poring_w02" && wop_team) {
if (getsavepoint(0) != "poring_w02" && WoP_SaveMap$ == "") {
WoP_SaveMap$ = getsavepoint(0);
@@ -349,7 +349,7 @@ OnPCDieEvent:
end;
OnPCKillEvent:
- getmapxy .@map$,.@x,.@y,0;
+ getmapxy(.@map$, .@x, .@y, UNITTYPE_PC);
if (.@map$ == "poring_w02" && wop_team) {
getnameditem War_Badge,rid2name(killedrid);
}
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index 79a6e99e5..0968c9ae0 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -1240,7 +1240,7 @@
- script RelayDummy2::GuildRelay2 4_M_SAGE_A,{
.@name$ = strnpcinfo(1);
- getmapxy(.@m$,.@x,.@x,1);
+ getmapxy(.@m$, .@x, .@x, UNITTYPE_NPC);
.@GID = getcastledata(.@m$,1);
if (checkweight(Knife,1) == 0) {
mes "^3355FFWait a minute! You're";
@@ -1749,7 +1749,7 @@
- script RelayDummy3::GuildRelay3 4_M_SAGE_A,{
.@name$ = strnpcinfo(1);
- getmapxy(.@m$,.@x,.@x,1);
+ getmapxy(.@m$, .@x, .@x, UNITTYPE_NPC);
.@GID = getcastledata(.@m$,1);
if (checkweight(Knife,1) == 0) {
mes "^3355FFWait a minute! You're";
@@ -2433,7 +2433,7 @@
- script GuildDummy4::GuildRelay4 4_M_SAGE_A,{
.@name$ = strnpcinfo(1);
- getmapxy(.@m$,.@x,.@x,1);
+ getmapxy(.@m$, .@x, .@x, UNITTYPE_NPC);
.@GID = getcastledata(.@m$,1);
if (checkweight(Knife,1) == 0) {
mes "^3355FFWait a minute! You're";
diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt
index e4e9d0d49..da3fe5d0a 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,1,strnpcinfo(3));
+ getmapxy(.@m$, .@x, .@y, UNITTYPE_NPC, strnpcinfo(3));
.@juwi = getareausers(.@m$,.@x-8,.@y-8,.@x+8,.@y+8);
if (party_relay == 32) {
mes "[Lospii]";
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index c67647615..bdf5c6776 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -756,7 +756,7 @@ OnEnable:
areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Ancient Kukre",2179,rand(1,3),.@label$;
areamonster .@map$,.@c[0],.@c[1],.@c[2],.@c[3],"Abysmal Cornutus",2177,rand(1,3),.@label$;
specialeffect EF_MAPPILLAR2,ALL_SAMEMAP; //currently broken
- getmapxy(.@map$,.@x,.@y,1);
+ getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC);
getpartymember 'party_id,2;
copyarray .@partymemberaid[0],$@partymemberaid[0],$@partymembercount;
for(.@i = 0; .@i<$@partymembercount; ++.@i) {
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 936053d36..b59d6ca36 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -988,7 +988,7 @@ OnTouch:
else if (.@i == 3) .@mobs = 5;
else if (.@i < 7) .@mobs = 6;
else .@mobs = 7;
- getmapxy(.@map$,.@x,.@y,1);
+ getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC);
specialeffect EF_VENOMDUST;
monster .@map$,.@x,.@y,"Muck Worm",2467,.@mobs,instance_npcname(strnpcinfo(0))+"::OnMyMobDead";
disablenpc instance_npcname(strnpcinfo(0));
@@ -1961,7 +1961,7 @@ OnTimer80000:
mes "Now, I may erase your memory again. Perhaps you will have a different fate next time.";
specialeffect2 EF_FREEZE;
close2;
- getmapxy(.@map$,.@x,.@y,0);
+ getmapxy(.@map$, .@x, .@y, UNITTYPE_PC);
warp .@map$,.@x,.@y;
end;
} else {
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 3d2996a28..88d7b9f9f 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -3461,7 +3461,7 @@ OnTouch:
OnTimer:
//FIXME: This is a workaround for...
//var pccount_tt = GetNeighborPcNumber 2
- getmapxy(.@map$,.@x,.@y,1);
+ getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC);
setarray .@x[1],.@x-2,.@x+2;
setarray .@y[1],.@y-2,.@y+2;
sleep 1000;
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index 35a2683ed..dd26786d2 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -1589,7 +1589,7 @@ OnInit:
OnEnable:
enablenpc strnpcinfo(0);
initnpctimer;
- getmapxy(.@map$,.@x,.@y,1);
+ getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC);
monster "job3_rang02",.@x,.@y,"Egg Bomb",1047,1,strnpcinfo(0)+"::OnMyMobDead";
switch(atoi(strnpcinfo(2))%3) {
case 0: .@str$ = "Hey, I am going to explode. What are you going to do?"; break;
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index 28c99962c..54883bed7 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -4196,7 +4196,7 @@ malangdo,133,134,0 script Strange Pile of Sand#7 4_SOIL,{
setquest .@quest;
if (!rand(3)) {
emotion e_omg;
- getmapxy(.@map$,.@x,.@y,1);
+ getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC);
monster .@map$,.@x,.@y,"Quick Dark Shadow",2209,1;
} else
getitem Cat_Hard_Biscuit,1;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 14:50:51 +0000