summaryrefslogtreecommitdiff
path: root/npc/re/warps/cities/malaya.txt
diff options
context:
space:
mode:
authorKisuka <kisuka@kisuka.com>2013-10-28 00:42:23 -0700
committerKisuka <kisuka@kisuka.com>2013-10-28 00:42:23 -0700
commit124ab2a1cdb344f24170a4d91f7000ebabf39b40 (patch)
treeebc5aeee49da96f88e55358c184d69d90eae9289 /npc/re/warps/cities/malaya.txt
parente7efdfe96e1b4c288bca845c03512da6842d6425 (diff)
downloadhercules-124ab2a1cdb344f24170a4d91f7000ebabf39b40.tar.gz
hercules-124ab2a1cdb344f24170a4d91f7000ebabf39b40.tar.bz2
hercules-124ab2a1cdb344f24170a4d91f7000ebabf39b40.tar.xz
hercules-124ab2a1cdb344f24170a4d91f7000ebabf39b40.zip
Added ability to use constants instead of sprite IDs for NPCs. Converted all npcs to use this.
Diffstat (limited to 'npc/re/warps/cities/malaya.txt')
-rw-r--r--npc/re/warps/cities/malaya.txt28
1 files changed, 14 insertions, 14 deletions
diff --git a/npc/re/warps/cities/malaya.txt b/npc/re/warps/cities/malaya.txt
index b18a1f52d..190f1831a 100644
--- a/npc/re/warps/cities/malaya.txt
+++ b/npc/re/warps/cities/malaya.txt
@@ -32,7 +32,7 @@ ma_in01,105,160,0 warp mf_in_minga_mf_minga 1,1,ma_fild01,248,190
// Locked Warps
//============================================================
-malaya,178,211,0 script malaya_inn 45,1,1,{
+malaya,178,211,0 script malaya_inn WARPNPC,1,1,{
end;
OnTouch:
if (malaya_hi < 10) {
@@ -43,7 +43,7 @@ OnTouch:
end;
}
-malaya,112,212,0 script malaya_ws 45,1,1,{
+malaya,112,212,0 script malaya_ws WARPNPC,1,1,{
end;
OnTouch:
if (malaya_hi < 20) {
@@ -54,7 +54,7 @@ OnTouch:
end;
}
-malaya,299,167,0 script malaya_ts 45,1,1,{
+malaya,299,167,0 script malaya_ts WARPNPC,1,1,{
end;
OnTouch:
if (malaya_hi < 20) {
@@ -65,7 +65,7 @@ OnTouch:
end;
}
-malaya,261,240,0 script malaya_shop 45,1,1,{
+malaya,261,240,0 script malaya_shop WARPNPC,1,1,{
end;
OnTouch:
if (malaya_hi < 20) {
@@ -76,7 +76,7 @@ OnTouch:
end;
}
-malaya,300,211,0 script malaya_house01 45,1,1,{
+malaya,300,211,0 script malaya_house01 WARPNPC,1,1,{
end;
OnTouch:
if (malaya_hi < 10) {
@@ -123,17 +123,17 @@ function script F_Malaya_Warp {
end;
}
-ma_zif01,30,22,0 script Town Warp#zif01 45,1,1,{ callfunc "F_Malaya_Warp","Center","Southwest","Southeast",1; }
-ma_zif02,30,22,0 script Town Warp#zif02 45,1,1,{ callfunc "F_Malaya_Warp","Southwest","Center","Southeast",1; }
-ma_zif03,30,22,0 script Town Warp#zif03 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Southwest",1; }
+ma_zif01,30,22,0 script Town Warp#zif01 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Center","Southwest","Southeast",1; }
+ma_zif02,30,22,0 script Town Warp#zif02 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southwest","Center","Southeast",1; }
+ma_zif03,30,22,0 script Town Warp#zif03 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Southwest",1; }
-ma_zif04,30,22,0 script Town Warp#zif04 45,1,1,{ callfunc "F_Malaya_Warp","Northwest","Southeast","Northeast",2; }
-ma_zif05,30,22,0 script Town Warp#zif05 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Northwest","Northeast",2; }
-ma_zif06,30,22,0 script Town Warp#zif06 45,1,1,{ callfunc "F_Malaya_Warp","Northeast","Northwest","Southeast",2; }
+ma_zif04,30,22,0 script Town Warp#zif04 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northwest","Southeast","Northeast",2; }
+ma_zif05,30,22,0 script Town Warp#zif05 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Northwest","Northeast",2; }
+ma_zif06,30,22,0 script Town Warp#zif06 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northeast","Northwest","Southeast",2; }
-ma_zif07,30,22,0 script Town Warp#zif07 45,1,1,{ callfunc "F_Malaya_Warp","Center","Northwest","Southeast",3; }
-ma_zif08,30,22,0 script Town Warp#zif08 45,1,1,{ callfunc "F_Malaya_Warp","Northwest","Center","Southeast",3; }
-ma_zif09,30,22,0 script Town Warp#zif09 45,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Northwest",3; }
+ma_zif07,30,22,0 script Town Warp#zif07 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Center","Northwest","Southeast",3; }
+ma_zif08,30,22,0 script Town Warp#zif08 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Northwest","Center","Southeast",3; }
+ma_zif09,30,22,0 script Town Warp#zif09 WARPNPC,1,1,{ callfunc "F_Malaya_Warp","Southeast","Center","Northwest",3; }
//ma_zif01,30,22,0 warp malaya_car0001 1,1,malaya,241,238
//ma_zif02,30,22,0 warp malaya_car0002 1,1,malaya,71,43