summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorVincent Petithory <vincent.petithory@gmail.com>2013-01-28 02:10:38 +0100
committerVincent Petithory <vincent.petithory@gmail.com>2013-01-28 11:54:11 +0100
commit4b28b4d05647e2846e1260bb221c6de80a675cfa (patch)
treedbef75ce6a70cd61979a0d55a502de622fdd1ee3 /world/map/npc
parentddb2a2750117aa9f476f88ce133372bd2f0ed798 (diff)
downloadserverdata-4b28b4d05647e2846e1260bb221c6de80a675cfa.tar.gz
serverdata-4b28b4d05647e2846e1260bb221c6de80a675cfa.tar.bz2
serverdata-4b28b4d05647e2846e1260bb221c6de80a675cfa.tar.xz
serverdata-4b28b4d05647e2846e1260bb221c6de80a675cfa.zip
Illia Lobby: prevent exploit where players could hide in a corner away from spawns
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/052-2/lobby.txt47
1 files changed, 43 insertions, 4 deletions
diff --git a/world/map/npc/052-2/lobby.txt b/world/map/npc/052-2/lobby.txt
index 53de723c..8c6e98e9 100644
--- a/world/map/npc/052-2/lobby.txt
+++ b/world/map/npc/052-2/lobby.txt
@@ -229,7 +229,9 @@ OnTimer24500:
end;
npctalk "Demonotis!";
misceffect FX_EVIL_SUMMON;
- areamonster "052-2.gat", 20, 23, 47, 41, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+ callsub S_GetHeroRect;
+ areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 20 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+ callsub S_ClearHeroRect;
end;
OnTimer44000:
@@ -237,7 +239,9 @@ OnTimer44000:
end;
npctalk "Demonotis!";
misceffect FX_EVIL_SUMMON;
- areamonster "052-2.gat", 20, 23, 47, 41, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+ callsub S_GetHeroRect;
+ areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 28 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+ callsub S_ClearHeroRect;
end;
OnTimer77000:
@@ -245,7 +249,9 @@ OnTimer77000:
end;
npctalk "Demonotis!";
misceffect FX_EVIL_SUMMON;
- areamonster "052-2.gat", 20, 23, 47, 41, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+ callsub S_GetHeroRect;
+ areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1101, 42 + 16 - 480/(30+$Illia_Luvia_Harvest), "Luvia?::onDSDeath";
+ callsub S_ClearHeroRect;
// That was the last spawn: reset the timer to start the CheckInvoke loop.
set $@illia_level_5_progress, 5;
setnpctimer 0;
@@ -276,7 +282,9 @@ OnTimer18500:
npctalk "Demonotis Major!";
misceffect FX_EVIL_SUMMON;
misceffect FX_MAGIC_DARK_EXPLOSION;
- areamonster "052-2.gat", 20, 23, 47, 41, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::onWGDeath";
+ callsub S_GetHeroRect;
+ areamonster "052-2.gat", $@illia_lobby_x1, $@illia_lobby_y1, $@illia_lobby_x2, $@illia_lobby_y2, "", 1103, 8 + (16 - 480/(30+$Illia_Luvia_Harvest))/3, "Luvia?::onWGDeath";
+ callsub S_ClearHeroRect;
end;
OnTimer20000:
@@ -327,6 +335,37 @@ L_ChaseLuvia:
areatimer "052-2.gat", 19, 18, 48, 43, 2000, "#LuviaShadow::OnNN";
end;
+S_GetHeroRect:
+ if (isloggedin($@ILLIA_HERO_ID) == 0)
+ goto L_Clear;
+ attachrid($@ILLIA_HERO_ID);
+ set $@illia_lobby_x, getx();
+ set $@illia_lobby_y, gety();
+
+ set $@illia_lobby_x1, $@illia_lobby_x - 18;
+ set $@illia_lobby_y1, $@illia_lobby_y - 11;
+ set $@illia_lobby_x2, $@illia_lobby_x + 18;
+ set $@illia_lobby_y2, $@illia_lobby_y + 11;
+
+ if ($@illia_lobby_x1 < 20)
+ set $@illia_lobby_x1, 20;
+ if ($@illia_lobby_y1 < 19)
+ set $@illia_lobby_y1, 19;
+ if ($@illia_lobby_x2 > 47)
+ set $@illia_lobby_x2, 47;
+ if ($@illia_lobby_y2 > 42)
+ set $@illia_lobby_y2, 42;
+
+ detachrid;
+ return;
+
+S_ClearHeroRect:
+ set $@illia_lobby_x1, 0;
+ set $@illia_lobby_y1, 0;
+ set $@illia_lobby_x2, 0;
+ set $@illia_lobby_y2, 0;
+ return;
+
onDSDeath:
end;