* Changed the way the Thanatos Portal works.

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

2 files changed, 6 insertions, 28 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 50e11e382..e6149c833 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2007/05/25
+	* Changed the way the Thanatos Portal works. [SinSloth]
 2007/05/23
 	* Fixed Bug in Bard Quest (not the Job Quest), optimized: 50kb less [Lupus]
 		Not a final version yet
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 68e7532b7..521404c2d 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= [Ishizu-chan]
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //= Any eAthena Version i guess?
 //===== Description: =========================================
@@ -13,6 +13,8 @@
 //= 1.1 - Updated Thanatos Tower Quest to official. [SinSloth]
 //= 1.2 - Fixed a bug where Reward NPC didn't give you Zeny and Exp. [SinSloth]
 //= 1.3 - Added a checking in boss map to reset event if there's no player. [SinSloth]
+//= 1.4 - Changed the way the Thanatos Portal works to allow people to enter
+//= as long as Thanatos is alive. [SinSloth]
 //============================================================
 
 hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
@@ -2506,7 +2508,6 @@ thana_boss,5,5,0	script	#thanasummon	-1,{
 
 OnSummon:
 	monster "thana_boss",139,129,"Thanatos Phantom",1708,1,"#Death::OnThanaDead";
-	donpcevent "thanareset::OnCheck";
 	end;
 
 }
@@ -2568,41 +2569,16 @@ OnWave:
 	set $@thana_wave,$@thana_wave -1;
 	if($@thana_wave < 1)
 	{
-		set $@thana_summon,6;
 		donpcevent "#thanasummon::OnSummon";
 	}
 	end;
 	
 OnThanaDead:
 	donpcevent "#thanatimer::OnActive";
+	set $@thana_summon,6;
 	end;
-
 }
 
-thana_boss,2,2,0	script	thanareset	-1,{
-
-OnCheck:
-	initnpctimer;
-	end;
-
-OnTimer300000:
-	if(!getmapusers("thana_boss"))
-	{
-		killmonsterall "thana_boss";
-		enablenpc "Crest#1";
-		enablenpc "Crest#2";
-		enablenpc "Crest#3";
-		enablenpc "Crest#4";
-		enablenpc "Crest#5";
-		set $@thana_summon,0;
-		stopnpctimer;
-		end;
-	}
-	stopnpctimer;
-	goto OnCheck;
-}
-		
-
 tha_t06,119,120,0	script	thana6-7	45,1,1,{
 
 	if((Class == Job_Lord_Knight) || (Class == Job_High_Priest) || (Class == Job_High_Wizard) || (Class == Job_Whitesmith) || (Class == Job_Sniper) || (Class == Job_Assassin_Cross) || (Class == Job_High_Wizard) || (Class == Job_Lord_Knight2) || (Class == Job_Paladin) || (Class == Job_Champion) || (Class == Job_Professor) || (Class == Job_Stalker) || (Class == Job_Creator) || (Class == Job_Clown) || (Class == Job_Gypsy) || (Class == Job_Paladin2)) warp "thana_step",69,369;