- Changed some duplicates so they use a floating NPC as their original. (bugreport:1395)

- Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654)
- Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677)
- Removed level requirement for the Viens Stone gathering quest. (bugreport:4678)
- Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707)
  It's worth noting how much I hate the system for restricting skills per zone.
- Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709)
- Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711)
- Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719)
- Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736)


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14697 54d463be-8e91-2dee-dedb-b68131a5f0ec

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_: