diff options
| author | Haru <haru@dotalux.com> | 2015-12-18 05:48:23 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2015-12-18 05:53:48 +0100 |
| commit | a782aa1540b63d5fffd55d835f6f30ee0c53d0f1 (patch) | |
| tree | 4d20c27f191e91adabb029342683687bce5ca4d5 /npc/re | |
| parent | dbe5f2237cada6a261e297b60857dc305860a88d (diff) | |
| download | hercules-a782aa1540b63d5fffd55d835f6f30ee0c53d0f1.tar.gz hercules-a782aa1540b63d5fffd55d835f6f30ee0c53d0f1.tar.bz2 hercules-a782aa1540b63d5fffd55d835f6f30ee0c53d0f1.tar.xz hercules-a782aa1540b63d5fffd55d835f6f30ee0c53d0f1.zip | |
Replaced numeric values with UNITTYPE_ constants in getmapxy
Follow-up to dbe5f2237cada6a261e297b60857dc305860a88d
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/re')
| -rw-r--r-- | npc/re/instances/MalangdoCulvert.txt | 2 | ||||
| -rw-r--r-- | npc/re/instances/OldGlastHeim.txt | 4 | ||||
| -rw-r--r-- | npc/re/jobs/3-1/guillotine_cross.txt | 2 | ||||
| -rw-r--r-- | npc/re/jobs/3-1/ranger.txt | 2 | ||||
| -rw-r--r-- | npc/re/quests/quests_malangdo.txt | 2 |
5 files changed, 6 insertions, 6 deletions
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; |