diff options
| author | Kisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-09 12:50:24 +0000 |
|---|---|---|
| committer | Kisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-09 12:50:24 +0000 |
| commit | 5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0 (patch) | |
| tree | 1f546bf12a99017b41ae2fd90e0ac452f97b0282 /npc/instances | |
| parent | b4208257ea0906e375024f811d8e51208d539d35 (diff) | |
| download | hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.gz hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.bz2 hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.xz hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.zip | |
* Merged changes from trunk [14688:14739/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14740 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/instances')
| -rw-r--r-- | npc/instances/EndlessTower.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index b1dc002b9..495b367d2 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -21,6 +21,8 @@ //= You may need to update your questid2display. //= Changed White lady spawn to MVP White Lady. (bugreport:4601) //= 1.5 Corrected some grammar and typos. +//= 1.6 Corrected the tower re-entry blocked condition. (bugreport:4677) [L0ne_W0lf] +//= Corrected floor 75 warp disabling the wrong NPC. (bugreport:4711) //============================================================ alberta,214,77,6 script Captain Janssen 709,{ @@ -352,7 +354,7 @@ e_tower,81,105,0 script Tower Protection Stone 406,{ } close; } - else if ((.@etower_timer >= 0) && (.@etower_timer2 == 2)) { + else if ((.@etower_timer >= 0) && (.@etower_timer < 2) && (.@etower_timer2 == 2)) { mes "Due to the tower's aftereffects, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon."; next; mes "It is dangerous here. Let me move you to Alberta."; @@ -2807,11 +2809,11 @@ OnTimer120000: 3@tower,355,51,0 script 75FGate102tower-2 45,2,2,{ OnInstanceInit: - disablenpc instance_npcname("75FGate102tower", instance_id()); + disablenpc instance_npcname("75FGate102tower-2", instance_id()); end; OnEnable: - enablenpc instance_npcname("75FGate102tower", instance_id()); + enablenpc instance_npcname("75FGate102tower-2", instance_id()); end; OnTouch_: |