summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-12-12 09:02:22 -0600
committerwushin <pasekei@gmail.com>2014-12-12 09:02:22 -0600
commitdcd03b785360417e58c468e43b0029e28142bd6c (patch)
tree9758e640f04e20d94fd0b04127a56a4e5419ce59 /world/map/npc
parente335bb592b54d511cd526007089ff9247f6e531e (diff)
parent35ff987e1ab048c0421bc055119a8213da566e8f (diff)
downloadserverdata-dcd03b785360417e58c468e43b0029e28142bd6c.tar.gz
serverdata-dcd03b785360417e58c468e43b0029e28142bd6c.tar.bz2
serverdata-dcd03b785360417e58c468e43b0029e28142bd6c.tar.xz
serverdata-dcd03b785360417e58c468e43b0029e28142bd6c.zip
Merge branch 'illia-spawn-fix'
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/052-2/lobby.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index fb9dd41e..7b39233c 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -343,6 +343,9 @@ L_ChaseLuvia:
S_GetHeroRect:
if (!(attachrid($@ILLIA_HERO_ID)))
goto L_Clear;
+ if(!(isin("052-2.gat", 20, 21, 47, 43)))
+ goto L_Clear;
+
set $@illia_lobby_x, getx();
set $@illia_lobby_y, gety();
@@ -364,10 +367,10 @@ S_GetHeroRect:
return;
S_ClearHeroRect:
- set $@illia_lobby_x1, 0;
- set $@illia_lobby_y1, 0;
- set $@illia_lobby_x2, 0;
- set $@illia_lobby_y2, 0;
+ set $@illia_lobby_x1, 20;
+ set $@illia_lobby_y1, 19;
+ set $@illia_lobby_x2, 47;
+ set $@illia_lobby_y2, 42;
return;
OnDSDeath: