summaryrefslogtreecommitdiff
path: root/world/map/npc/052-2/partyroom.txt
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2014-07-24 14:37:48 -0500
committerWushin <pasekei@gmail.com>2014-07-24 14:37:48 -0500
commit9c1da03676312a2673ae943ba8d79e2dcc490d5c (patch)
treeafa881fe82c200266e35f30dc514bf96d7559026 /world/map/npc/052-2/partyroom.txt
parent8be037b321c53686ce24df4403c0b048597ade1a (diff)
parent461af7da143051fbc6d1cb6949e051ab80724d2c (diff)
downloadserverdata-9c1da03676312a2673ae943ba8d79e2dcc490d5c.tar.gz
serverdata-9c1da03676312a2673ae943ba8d79e2dcc490d5c.tar.bz2
serverdata-9c1da03676312a2673ae943ba8d79e2dcc490d5c.tar.xz
serverdata-9c1da03676312a2673ae943ba8d79e2dcc490d5c.zip
Merge pull request #148 from wushin/attachrid-fix
Fixed Attachrid calls
Diffstat (limited to 'world/map/npc/052-2/partyroom.txt')
-rw-r--r--world/map/npc/052-2/partyroom.txt6
1 files changed, 2 insertions, 4 deletions
diff --git a/world/map/npc/052-2/partyroom.txt b/world/map/npc/052-2/partyroom.txt
index 663c2dec..ef04a667 100644
--- a/world/map/npc/052-2/partyroom.txt
+++ b/world/map/npc/052-2/partyroom.txt
@@ -123,9 +123,8 @@ OnTimer5000:
if ($@illia_level_7_progress != 1)
end;
// Warp to the place to spawn luvia once the teleport sequence is finished
- if (isloggedin($@ILLIA_HERO_ID) == 0)
+ if (!(attachrid($@ILLIA_HERO_ID)))
end;
- attachrid($@ILLIA_HERO_ID);
set $@illia_luvia_x, getx();
set $@illia_luvia_y, gety();
npcwarp $@illia_luvia_x, $@illia_luvia_y, "#LuviaDaemon";
@@ -176,9 +175,8 @@ OnTimer26000:
end;
S_SpawnWitchGuard:
- if (isloggedin($@ILLIA_HERO_ID) == 0)
+ if (!(attachrid($@ILLIA_HERO_ID)))
end;
- attachrid($@ILLIA_HERO_ID);
npcwarp getx(), gety(), "#LuviaDaemon";
misceffect FX_EVIL_SUMMON;
misceffect FX_GROUND_SPAWN;