summaryrefslogtreecommitdiff
path: root/npc/warps/cities
diff options
context:
space:
mode:
Diffstat (limited to 'npc/warps/cities')
-rw-r--r--npc/warps/cities/umbala.txt2
-rw-r--r--npc/warps/cities/yuno.txt26
2 files changed, 14 insertions, 14 deletions
diff --git a/npc/warps/cities/umbala.txt b/npc/warps/cities/umbala.txt
index 1d9058ffa..f86c90d2c 100644
--- a/npc/warps/cities/umbala.txt
+++ b/npc/warps/cities/umbala.txt
@@ -26,7 +26,7 @@ umbala,100,203,0 warp um_houseA2-1 1,1,um_in,163,69
um_in,166,69,0 warp um_houseA2-2 1,1,umbala,102,205
umbala,107,130,0 warp um_houseB1-1 1,1,um_in,99,66
um_in,99,63,0 warp um_houseB1-2 1,1,umbala,108,127
-umbala,220,189,0 script um_shaman1-1 45,1,1,{
+umbala,220,189,0 script um_shaman1-1 WARPNPC,1,1,{
OnTouch:
if (event_umbala == 7) {
warp "um_in",32,71;
diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
index 3b3e51fc8..4d6ebee86 100644
--- a/npc/warps/cities/yuno.txt
+++ b/npc/warps/cities/yuno.txt
@@ -88,7 +88,7 @@ yuno,245,147,0 warp yun65 1,1,yuno_in01,101,88
yuno_in01,101,85,0 warp yun66 1,1,yuno,245,144
// Yuno In05 (Entering Random Warps) -------------------------------------------
-yuno_in05,153,141,0 script #yun63 45,1,1,{
+yuno_in05,153,141,0 script #yun63 WARPNPC,1,1,{
if (rand(2))
warp "yuno_in05",192,102;
else
@@ -96,28 +96,28 @@ yuno_in05,153,141,0 script #yun63 45,1,1,{
end;
}
// Yuno In05 (Random Warps - Cross Shaped) -------------------------------------
-yuno_in05,196,102,0 script #yun64 45,1,1,{
+yuno_in05,196,102,0 script #yun64 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",169,102; end;
case 1: warp "yuno_in05",128,82; end;
case 2: warp "yuno_in05",156,141; end;
}
}
-yuno_in05,181,116,0 script #yun65 45,1,1,{
+yuno_in05,181,116,0 script #yun65 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,94; end;
case 1: warp "yuno_in05",176,13; end;
case 2: warp "yuno_in05",136,75; end;
}
}
-yuno_in05,165,102,0 script #yun66 45,1,1,{
+yuno_in05,165,102,0 script #yun66 WARPNPC,1,1,{
if (rand(2))
warp "yuno_in05",192,102;
else
warp "yuno_in05",145,82;
end;
}
-yuno_in05,181,91,0 script #yun67 45,1,1,{
+yuno_in05,181,91,0 script #yun67 WARPNPC,1,1,{
if (rand(2))
warp "yuno_in05",181,112;
else
@@ -125,21 +125,21 @@ yuno_in05,181,91,0 script #yun67 45,1,1,{
end;
}
// Yuno In05 (Random Warps - T-Shaped) -----------------------------------------
-yuno_in05,148,82,0 script #yun68 45,1,1,{
+yuno_in05,148,82,0 script #yun68 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",169,102; end;
case 1: warp "yuno_in05",128,82; end;
case 2: warp "yuno_in05",156,141; end;
}
}
-yuno_in05,125,82,0 script #yun69 45,1,1,{
+yuno_in05,125,82,0 script #yun69 WARPNPC,1,1,{
if (rand(2))
warp "yuno_in05",192,102;
else
warp "yuno_in05",145,82;
end;
}
-yuno_in05,136,71,0 script #yun70 45,1,1,{
+yuno_in05,136,71,0 script #yun70 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,112; end;
case 1: warp "yuno_in05",16,185; end;
@@ -147,21 +147,21 @@ yuno_in05,136,71,0 script #yun70 45,1,1,{
}
}
// Yuno In05 (Random Warps - Other) --------------------------------------------
-yuno_in05,16,188,0 script #yun71 45,1,1,{
+yuno_in05,16,188,0 script #yun71 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,94; end;
case 1: warp "yuno_in05",176,13; end;
case 2: warp "yuno_in05",136,75; end;
}
}
-yuno_in05,176,9,0 script #yun72 45,1,1,{
+yuno_in05,176,9,0 script #yun72 WARPNPC,1,1,{
if (rand(2))
warp "yuno_in05",181,112;
else
warp "yuno_in05",176,48;
end;
}
-yuno_in05,176,52,0 script #yun73 45,1,1,{
+yuno_in05,176,52,0 script #yun73 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,94; end;
case 1: warp "yuno_in05",176,13; end;
@@ -169,14 +169,14 @@ yuno_in05,176,52,0 script #yun73 45,1,1,{
}
}
// Yuno In05 (Destination - Room) ----------------------------------------------
-yuno_in05,40,178,0 script #yun74 45,1,1,{
+yuno_in05,40,178,0 script #yun74 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,94; end;
case 1: warp "yuno_in05",176,13; end;
case 2: warp "yuno_in05",136,75; end;
}
}
-yuno_in05,47,186,0 script #yun75 45,1,1,{
+yuno_in05,47,186,0 script #yun75 WARPNPC,1,1,{
switch(rand(3)) {
case 0: warp "yuno_in05",181,94; end;
case 1: warp "yuno_in05",176,13; end;