* Updated Thanatos Tower quest to official.

- Moved some NPC in proper quest file and updated warps.
- Removed old Thanatos custom warps.
* Fixed drops of Thanatos Dolor & Thanatos Odium regarding the quest.

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

2 files changed, 24 insertions, 253 deletions

diff --git a/npc/warps/dungeons/thana_custom.txt b/npc/warps/dungeons/thana_custom.txt
deleted file mode 100644
index 2b53a9e01..000000000
--- a/npc/warps/dungeons/thana_custom.txt
+++ /dev/null
@@ -1,159 +0,0 @@
-//===== Athena Script ========================================
-//= Thanatos Tower Warp Script
-//===== By: ==================================================
-//= Bibilol & Moryagorn  (1.0)
-//===== Current Version: =====================================
-//= 1.6
-//===== Compatible With: =====================================
-//= Any Athena Version; RO Episode 10+
-//===== Description: =========================================
-//= Warp Points for Thanatos Tower
-//===== Additional Comments: =================================
-//= It's just Temp warps [Lupus]
-//= 1.2 Updated to level tha_t12
-//= 1.3 Some warps changes due to official info [Justin84]
-//= 1.4 Fixed 2 warps [Justin84]
-//= 1.5 Added Thanatos entrance warp. Now you can go in [Justin84]
-//= 1.6 Fixed warps: tha_t06,tha_t06a,tha_t06b,tha_t05a
-//=	Added Temp Keys solution [Justin84]
-//============================================================
-
-// Affiliated Files : tha_statues.txt
-// ^^^^ it's in the custom quests
-
-//Hugel Field 01 -> Thanatos Scene 01
-hu_fild01,139,164,0	script	Thanatos Tower Warper	111,{
-	mes "[Thanatos Tower Warper]";
-	mes "There is no turning back.";
-	mes "Are you sure want to go Thanatos Tower?";
-	next;
-	menu "Yes",-,"No",T_CLOSE;
-
-	warp "tha_scene01",131,224;
-	end;
-
-T_CLOSE:
-	close;
-}
-
-//Thanatos Scene 01 -> Thantos Tower F1
-tha_scene01,144,200,0	warp	tha_scene01	1,1,tha_t01,150,39
-tha_t01,150,32,0	warp	tha_scene02	1,1,tha_scene01,142,200
-
-//Thanatos Tower
-tha_scene01,144,200,0	warp	tha_scene03	1,1,tha_t01,150,39
-tha_t01,150,32,0	warp	tha_scene04	1,1,tha_scene01,142,200
-tha_t01,150,149,0	warp	tha_t02	1,1,tha_t02,150,136
-tha_t02,150,129,0	warp	tha_t01	1,1,tha_t01,150,142
-tha_t02,226,161,0	warp	tha_t03	1,1,tha_t03,220,158
-tha_t03,220,165,0	warp	tha_t02a	1,1,tha_t02,226,149
-tha_t03,60,134,0	warp	tha_t04	1,1,tha_t04,59,143
-tha_t04,59,136,0	warp	tha_t03a	1,1,tha_t03,59,126
-tha_t04,83,36,0	warp	tha_t05	1,1,tha_t05,62,11
-//According to official info, 5F it is not possible to return to the 4F, so we disable this warp:
-//tha_t05,62,4,0	warp	tha_t04a	1,1,tha_t04,90,34
-tha_t05,208,96,0	warp	tha_t06	1,1,tha_t06,206,8
-tha_t05,185,232,0	warp	tha_t06a	1,1,tha_t06,206,8
-tha_t05,61,157,0	warp	tha_t06b	1,1,tha_t06,206,8
-tha_t06,206,5,0	warp	tha_t05a	1,1,tha_t05,61,164
-
-//tha_t06,119,120,0	warp	tha_t07	1,1,tha_t07,35,166
-//Thanatos 6F to 7F
-tha_t06,119,120,4	script	tha_t07warp	45,2,2,{
-	mes "You have to gather 4 types of keys to enter the 7th Floor.";
-	mes "Give me the key of red, yellow, blue & green.";
-	next;
-	menu "Give the keys",-,"Leave",T_CLOSE;
-
-	if(countitem(7421) < 1 || countitem(7422) < 1 || countitem(7423) < 1 || countitem(7424) < 1) goto T_1;
-	delitem 7421,1;
-	delitem 7422,1;
-	delitem 7423,1;
-	delitem 7424,1;
-	warp "tha_t07",35,166;
-	end;
-
-T_1:
-	mes "You don't have enough keys.";
-T_CLOSE:
-	close;
-}
-
-
-tha_t07,28,166,0	warp	tha_t06c	1,1,tha_t06,119,127
-tha_t07,112,166,0	warp	tha_t08	1,1,tha_t08,105,44
-tha_t08,112,44,0	warp	tha_t07b	1,1,tha_t07,105,166
-tha_t08,26,44,0	warp	tha_t09	1,1,tha_t09,88,145
-tha_t09,93,145,0	warp	tha_t08	1,1,tha_t08,30,44
-tha_t10,171,138,0	warp	tha_t09	1,1,tha_t09,18,97
-tha_t11,93,36,0	warp	tha_t10	1,1,tha_t10,91,130
-tha_t12,129,51,0	warp	tha_t11	1,1,tha_t11,13,38
-
-//Thana_step
-thana_step,12,73,0	warp	thana_step1	1,1,tha_t12,128,58
-thana_step,16,16,0	warp	thana_step2	1,1,thana_step,32,224
-thana_step,30,224,0	warp	thana_step3	1,1,thana_step,19,16
-thana_step,32,166,0	warp	thana_step4	1,1,thana_step,184,74
-thana_step,180,74,0	warp	thana_step5	1,1,thana_step,36,166
-thana_step,182,16,0	warp	thana_step6	1,1,thana_step,184,224
-thana_step,180,224,0	warp	thana_step7	1,1,thana_step,185,16
-thana_step,182,166,0	warp	thana_step8	1,1,thana_step,73,287
-thana_step,69,287,0	warp	thana_step9	1,1,thana_step,186,166
-thana_step,70,371,0	warp	thana_step10	1,1,thana_step,170,287
-thana_step,174,287,0	warp	thana_step11	1,1,thana_step,74,371
-
-//Thana_boss
-thana_step,169,371,0	warp	thana_boss	1,1,thana_boss,85,76
-thana_boss,80,76,0	warp	thana_step9	1,1,thana_step,163,371
-thana_boss,62,171,0	warp	thana_step10	1,1,thana_step,163,371
-thana_boss,141,217,0	warp	thana_step11	1,1,thana_step,163,371
-thana_boss,202,75,0	warp	thana_step12	1,1,thana_step,163,371
-
-//Temp Plug for KEYS
-tha_t03,139,46,0	script	#TanKey1	111,{
-	if(countitem(7421) < 1) getitem 7421,1;
-	end;
-}
-
-tha_t03,67,70,0	script	#TanKey2	111,{
-	if(countitem(7421) < 1) end;
-	delitem 7421,1;
-	getitem 7426,1;
-	end;
-}
-
-tha_t03,48,143,0	script	#TanKey3	111,{
-	if(countitem(7422) < 1) getitem 7422,1;
-	end;
-}
-
-tha_t03,66,208,0	script	#TanKey4	111,{
-	if(countitem(7422) < 1) end;
-	delitem 7422,1;
-	getitem 7427,1;
-	end;
-}
-
-tha_t03,139,230,0	script	#TanKey5	111,{
-	if(countitem(7423) < 1) getitem 7423,1;
-	end;
-}
-
-tha_t03,208,208,0	script	#TanKey6	111,{
-	if(countitem(7423) < 1) end;
-	delitem 7423,1;
-	getitem 7428,1;
-	end;
-}
-
-tha_t03,230,143,0	script	#TanKey7	111,{
-	if(countitem(7424) < 1) getitem 7424,1;
-	end;
-}
-
-tha_t03,207,70,0	script	#TanKey8	111,{
-	if(countitem(7424) < 1) end;
-	delitem 7424,1;
-	getitem 7429,1;
-	end;
-}
diff --git a/npc/warps/dungeons/thana_dun.txt b/npc/warps/dungeons/thana_dun.txt
index 346f1e3a1..de237b5d1 100644
--- a/npc/warps/dungeons/thana_dun.txt
+++ b/npc/warps/dungeons/thana_dun.txt
@@ -11,120 +11,50 @@
 //===== Additional Comments: =================================
 //= 1.0 - First Release [Ishizu-chan]
 //= 1.1 - Added Entrance Warp Guard
+//= 1.2 - Updated warps to official and moved Entrance Guard
+//= to proper quest file. [SinSloth]
 //============================================================
 
-
-// Tour Guide - Thanatos Tower
-hu_fild01,140,163,5	script	Thanatos Tower Guard	852,{
-
-  mes "[Thanatos Tower Guard]";
-  mes "Are you sure you want to go to the Thanatos Tower?";
-  mes "You can't go back, and I'll have to charge 5000 Zeny.";
-  next;
-  menu "Yes.",-,
-       "No.",L_End;
-
-  if (Zeny < 5000) goto L_Zeny;
-  set Zeny, Zeny - 5000;
-  warp "tha_scene01",131,224;
-  end;
-
-  L_Zeny:
-  mes "[Thanatos Tower Guard]";
-  mes "You don't have enough Zeny.";
-  close;
-
-  L_End:
-  mes "[Thanatos Tower Guard]";
-  mes "Goodbye.";
-  close;
-
-}
-
 // Thanatos Scene (tha_scene01)
-tha_scene01,144,200,0	warp	WarpThana0a	1,1,tha_t01,150,39
-tha_t01,150,32,0	warp	WarpThana0b	1,1,tha_scene01,142,200
+tha_scene01,144,198,0	warp	WarpThana0a	1,1,tha_t01,149,38
+tha_t01,149,33,0	warp	WarpThana0b	1,1,hu_fild01,140,158
 
 // Thanatos Tower Level 1 (tha_t01)
-tha_t01,150,149,0	warp	WarpThana1a	1,1,tha_t02,150,129
-tha_t02,150,126,0	warp	WarpThana1b	1,1,tha_t01,150,146
+tha_t01,150,150,0	warp	WarpThana1a	1,1,tha_t02,149,130
+tha_t02,149,125,0	warp	WarpThana1b	1,1,tha_t01,150,145
 
 // Thanatos Tower Level 2 (tha_t02)
-tha_t03,218,167,0	warp	WarpThana2a	1,1,tha_t02,227,159
+tha_t03,217,165,0	warp	WarpThana2a	1,1,tha_t02,227,157
 
 // Thanatos Tower Level 3 (tha_t03)
-tha_t03,60,141,0	warp	WarpThana3a	1,1,tha_t04,60,141
-tha_t04,60,138,0	warp	WarpThana3b	1,1,tha_t03,60,138
+tha_t03,59,140,0	warp	WarpThana3a	1,1,tha_t04,60,142
+tha_t04,60,137,0	warp	WarpThana3b	1,1,tha_t03,59,135
 
 // Thanatos Tower Level 4 (tha_t04)
-tha_t04,82,36,0	warp	WarpThana4a	1,1,tha_t05,62,6
+tha_t04,81,36,0		warp	WarpThana4a	1,1,tha_t05,62,8
 
 // Thanatos Tower Level 5 (tha_t05)
-tha_t05,61,157,0	warp	WarpThana5a	1,1,tha_t05,211,97
-tha_t05,208,97,0	warp	WarpThana5b	1,1,tha_t05,61,162
-tha_t05,186,236,0	warp	WarpThana5c	1,1,tha_t06,207,6
-
-// Thanatos Tower Level 6 (tha_t06)
-tha_t06,119,120,4	script	WarpThana6a	45,2,2,{
-
-  if (ThanaQuest < 31) {
-
-    mes "[Seal]";
-    mes "It seems this portal will only open when 4 Keys are placed in the Keyholes around it.";
-    close;
-
-  }
-
-  warp "thana_step",73,372;
-  end;
-
-}
-thana_step,70,372,0	warp	WarpThana6b	1,1,tha_t06,236,120
-thana_step,173,372,0	warp	WarpThana6c	1,1,tha_t07,28,166
-tha_t07,25,166,0	warp	WarpThana6d	1,1,thana_step,170,372
-
-// Thanatos Tower Level 7 (tha_t07)
-tha_t07,114,166,0	warp	WarpThana7a	1,1,tha_t08,28,44
-tha_t08,25,44,0	warp	WarpThana7b	1,1,tha_t07,111,166
+tha_t05,62,157,0	warp	WarpThana5a	1,1,tha_t05,213,97
+tha_t05,208,97,0	warp	WarpThana5b	1,1,tha_t05,62,162
+tha_t05,185,235,0	warp	WarpThana5c	1,1,tha_t06,206,11
+thana_step,174,288,0	warp	WarpThana6b	1,1,tha_t08,28,43
+thana_step,173,372,0	warp	WarpThana6c	1,1,tha_t07,30,166
+tha_t07,114,166,0	warp	WarpThana6d	1,1,thana_step,69,287
 
 // Thanatos Tower Level 8 (tha_t08)
-tha_t08,114,44,0	warp	WarpThana8a	1,1,thana_step,33,223
-thana_step,30,223,0	warp	WarpThana8b	1,1,tha_t08,111,44
+tha_t08,114,43,0	warp	WarpThana8a	1,1,thana_step,30,223
+thana_step,32,166,0	warp	WarpThana8b	1,1,tha_t09,20,96
 
 // Thanatos Tower Level 9 (tha_t09)
-thana_step,32,165,0	warp	WarpThana9a	1,1,tha_t09,89,146
-tha_t09,92,146,0	script	WarpThana9b	45,1,1,{
-
-  if (ThanaSteps & 1) warp "thana_step",183,223;
-  else warp "thana_step",35,165;
-  end;
-
-}
-thana_step,180,223,0	warp	WarpThana9c	1,1,tha_t09,89,146
+tha_t09,92,146,0	warp	WarpThana9b	1,1,thana_step,180,223
 
 // Thanatos Tower Level 10 (tha_t10)
-thana_step,182,165,0	warp	WarpThana10a	1,1,tha_t10,167,138
-tha_t10,170,138,0	script	WarpThana10b	45,1,1,{
-
-  if (ThanaSteps & 4) warp "thana_step",17,73;
-  else warp "thana_step",185,165;
-  end;
-
-}
-thana_step,14,73,0	warp	WarpThana10c	1,1,tha_t10,167,138
+thana_step,182,166,0	warp	WarpThana10a	1,1,tha_t10,155,100
+tha_t10,170,138,0	warp	WarpThana10b	1,1,thana_step,14,73
 
 // Thanatos Tower Level 11 (tha_t11)
-thana_step,16,15,0	warp	WarpThana11a	1,1,tha_t11,89,36
-tha_t11,92,36,0	script	WarpThana11b	45,1,1,{
-
-  if (ThanaSteps & 64) warp "thana_step",183,73;
-  else warp "thana_step",19,15;
-  end;
-
-}
-thana_step,180,73,0	warp	WarpThana11c	1,1,tha_t11,89,36
+thana_step,15,15,0	warp	WarpThana11a	1,1,tha_t11,50,17
+tha_t11,92,36,0		warp	WarpThana11b	1,1,thana_step,180,73
 
 // Thanatos Tower Level 12 (tha_t12)
-thana_step,182,15,0	warp	WarpThana12a	1,1,tha_t12,129,51
-thana_step,70,288,0	warp	WarpThana12b	1,1,tha_t12,129,51
-thana_step,173,288,0	warp	WarpThana12c	1,1,thana_boss,135,128
+thana_step,181,15,0	warp	WarpThana12a	1,1,tha_t12,115,16
\ No newline at end of file