summaryrefslogtreecommitdiff
path: root/npc/instances
diff options
context:
space:
mode:
authorscript-z3r0 <script-z3r0@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-12 18:55:26 +0000
committerscript-z3r0 <script-z3r0@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-12 18:55:26 +0000
commitc43672882c5097fc460ff13fd506d04ba49ccbfb (patch)
tree01b507dc78884abd195590b2e4bb217be9869aea /npc/instances
parent9c4eb44b1b8f064da546c39349f1f5de31f655b7 (diff)
downloadhercules-c43672882c5097fc460ff13fd506d04ba49ccbfb.tar.gz
hercules-c43672882c5097fc460ff13fd506d04ba49ccbfb.tar.bz2
hercules-c43672882c5097fc460ff13fd506d04ba49ccbfb.tar.xz
hercules-c43672882c5097fc460ff13fd506d04ba49ccbfb.zip
Fixed (bugreport:4983)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15077 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/instances')
-rw-r--r--npc/instances/EndlessTower.txt18
1 files changed, 10 insertions, 8 deletions
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index f7d1b4632..672a2b19c 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -28,6 +28,9 @@
//= Added missing end's to prevent infinite mobspawn (bugreport:4540)
//= Commented out remaining GM-only NPCs. [Gepard]
//============================================================
+//= 1.8 Adjusted Instance Attach Map to Validate ALL Maps, instead of
+//= only 1@tower -> 5@tower (bugreport:4983)
+//============================================================
alberta,214,77,6 script Captain Janssen 709,{
if (checkweight(1201,1) == 0) {
@@ -238,14 +241,13 @@ e_tower,81,105,0 script Tower Protection Stone 406,{
else {
mes "^0000ff"+.@md_name$+"^000000 - Try to reserve";
mes "After making a reservation, you have to talk to NPC behind and select the menu 'Enter the Dungeon' to enter the dungeon.";
+ // 1,2,3,4,5,6
for( set .@i, 1; .@i <= 6; set .@i, .@i + 1 ) {
- if( instance_attachmap(.@i + "@tower", .@instance) == "" )
- break;
- }
- if( .@i < 6 ) {
- mes "^0000ff"+.@md_name$+" ^000000- Reservation Failed!";
- instance_destroy(.@instance);
- close;
+ if( instance_attachmap(.@i + "@tower", .@instance) == "" ) {
+ mes "^0000ff"+.@md_name$+" ^000000- Reservation Failed!";
+ instance_destroy(.@instance);
+ close;
+ }
}
instance_attach(.@instance);
instance_set_timeout 14400,300,.@instance;