Fixed Thanatos Tower spawns + small fix to mob db

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

3 files changed, 60 insertions, 66 deletions

diff --git a/db/mob_db.txt b/db/mob_db.txt
index 16ff94c69..71d4db4ce 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -264,7 +264,7 @@
 1260,DARK_FRAME,Dark Frame,Dark Frame,59,7500,0,3652,3271,1,960,1210,10,45,1,72,42,45,85,25,10,12,1,6,67,1173,200,920,720,200,0,0,0,0,0,0,0,0,7054,4656,734,1000,2505,30,0,0,0,0,1000,80,747,3,0,0,0,0,4170,1

 1261,WILD_ROSE,Wild Rose,Wild Rose,38,2980,0,1113,688,1,315,360,0,15,1,85,15,35,65,80,10,12,0,2,24,131,100,964,864,288,0,0,0,0,0,0,0,0,7053,5335,748,50,5037,120,1767,3000,624,35,528,600,2244,2,0,0,0,0,4257,1

 1262,MUTANT_DRAGON,Mutant Dragon,Mutant Dragonoid,65,62600,0,4730,3536,4,2400,3400,15,20,1,47,30,68,45,35,10,12,2,9,43,1205,250,1280,1080,240,0,0,0,0,0,0,0,0,7054,4850,1035,500,1036,500,930,500,1559,400,7296,1500,505,150,0,0,0,0,4203,1

-1263,WIND_GHOST,Wind Ghost,Wind Ghost,51,4820,0,2118,1488,2,489,639,0,45,1,89,15,90,85,25,10,12,1,6,64,1173,150,1056,1056,336,0,0,0,0,0,0,0,0,912,4559,932,6000,7005,500,693,100,1611,8,996,100,1615,1,0,0,0,0,4264,1

+1263,WIND_GHOST,Wind Ghost,Wind Ghost,51,4820,0,2424,1488,2,489,639,0,45,1,89,15,90,85,25,10,12,1,6,64,1173,150,1056,1056,336,0,0,0,0,0,0,0,0,912,4559,932,6000,7005,500,693,100,1611,8,996,100,1615,1,0,0,0,0,4264,1

 1264,MERMAN,Merman,Merman,53,12300,0,4500,2054,2,482,603,10,35,1,45,46,15,85,55,10,12,1,7,41,1173,200,916,816,336,0,0,0,0,0,0,0,0,1054,1300,523,300,568,200,720,40,995,35,1460,3,756,203,0,0,0,0,4199,1

 1265,COOKIE,Cookie,Cookie,25,950,0,310,188,1,130,153,0,25,1,35,20,53,37,90,10,12,0,7,60,137,200,1036,936,240,0,0,0,0,0,0,0,0,538,1000,530,150,979,1,645,280,2402,30,12001,100,529,320,0,0,0,0,4293,1

 1266,ASTER,Aster,Aster,18,1452,0,122,78,1,56,64,0,10,1,19,15,1,34,5,10,12,0,5,22,145,400,1264,864,216,0,0,0,0,0,0,0,0,938,500,7013,40,1052,1200,508,200,912,60,512,100,0,0,0,0,0,0,4247,1

@@ -705,7 +705,7 @@
 1678,VENATU_3,Venatu,Venatu,78,9500,0,4500,2000,3,800,1400,30,20,1,26,68,5,95,30,10,12,1,0,42,157,150,1272,672,480,0,0,0,0,0,0,0,0,7317,2000,7358,400,999,500,7094,500,999,500,985,10,0,0,0,0,12127,1,0,0

 1679,VENATU_4,Venatu,Venatu,75,12300,0,4000,2000,3,800,1400,30,20,1,26,24,5,100,30,10,12,1,0,41,157,150,1272,672,480,0,0,0,0,0,0,0,0,7317,2000,7359,300,999,500,7094,500,999,500,985,10,0,0,0,0,12127,1,0,0

 1680,HILL_WIND_1,Hill Wind,Hill Wind,45,4233,0,2132,1722,1,320,510,10,15,1,42,31,50,67,23,10,12,1,2,64,157,200,1272,672,480,0,0,0,0,0,0,0,0,7115,4000,7116,3000,528,1000,510,10,0,0,0,0,0,0,0,0,0,0,0,0

-1681,GEMINI,Gemini-S58,Gemini-S58,72,57870,0,22024,9442,1,2150,3030,60,45,1,75,70,77,105,55,10,12,1,0,61,189,200,1272,672,480,0,0,0,0,0,0,0,0,7005,3000,603,1000,7005,3000,546,500,547,400,971,100,972,100,7224,1,7479,1,0,0

+1681,GEMINI,Gemini-S58,Gemini-S58,72,57870,0,22024,9442,1,2150,3030,60,45,1,75,70,77,105,55,10,12,1,0,61,189,200,1272,672,480,0,0,0,0,0,0,0,0,7005,3000,603,1000,7005,3000,546,500,547,400,971,100,972,100,0,0,7479,1,0,0

 1682,REMOVAL,Removal,Remover,55,10289,0,3831,1278,1,558,797,5,20,1,20,56,35,57,20,10,12,1,1,49,157,250,1272,672,480,0,0,0,0,0,0,0,0,713,5000,7319,5000,5005,10,549,500,971,50,972,100,5120,10,0,0,0,0,0,0

 1683,POTON_CANON_5,Photon Cannon,Photon Cannon,46,7000,0,2,1,1,560,570,5,10,1,1,1,1,1,1,10,12,1,0,43,669,200,1272,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

 1684,G_ARCHDAM,Archdam,Archdam,57,11000,0,0,0,1,600,700,15,15,1,65,35,75,75,15,10,12,2,8,60,157,200,1272,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 68f634136..6939be36b 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -31,6 +31,7 @@ Evera
 Date		Added

 ======

 05/25

+	* Fixed Thanatos Tower spawns [Playtester]

 	* Added a custom Market Place to clear Prontera streets from annoying shops. [Lupus]

 		'novending' mapflag sample: Try it and adjust the script as you want. 

 	* Optimized a bit scripted warps, got rid of 'anthell' perm var [Lupus]

diff --git a/npc/mobs/dungeons/thanatos.txt b/npc/mobs/dungeons/thanatos.txt
index dbd62d127..ce366b8e7 100644
--- a/npc/mobs/dungeons/thanatos.txt
+++ b/npc/mobs/dungeons/thanatos.txt
@@ -3,30 +3,31 @@
 //===== By: ==================================================

 //= Athena (1.0)

 //===== Current Version: =====================================

-//= 1.0

+//= 1.1

 //===== Compatible With: =====================================

 //= Any Athena Version

 //===== Additional Comments: =================================

 //= 1.0 Real spawns by Poki#3 [Nexon]

+//= 1.1 More official spawns [Playtester]

 //============================================================

 

 //==================================================

 // tha_t01 - Thanatos Tower F1

 //==================================================

-tha_t01.gat,0,0,0,0	monster	Mimic	1191,30,0,0,0

-tha_t01.gat,0,0,0,0	monster	Rideword	1195,20,0,0,0

-tha_t01.gat,0,0,0,0	monster	Plasma	1695,10,0,0,0

+tha_t01.gat,0,0,0,0	monster	Rideword	1195,40,0,0,0

+tha_t01.gat,0,0,0,0	monster	Mimic	1191,40,0,0,0

+tha_t01.gat,0,0,0,0	monster	Plasma	1695,20,0,0,0

 tha_t01.gat,0,0,0,0	monster	Solace	1703,10,0,0,0

 tha_t01.gat,0,0,0,0	monster	Alice	1275,1,0,0,0

 

 //==================================================

 // tha_t02 - Thanatos Tower F2

 //==================================================

-tha_t02.gat,0,0,0,0	monster	Rideword	1195,20,0,0,0

-tha_t02.gat,0,0,0,0	monster	Deathword	1698,20,0,0,0

+tha_t02.gat,0,0,0,0	monster	Rideword	1195,30,0,0,0

+tha_t02.gat,0,0,0,0	monster	Deathword	1698,10,0,0,0

 tha_t02.gat,0,0,0,0	monster	Mimic	1191,30,0,0,0

 tha_t02.gat,0,0,0,0	monster	Ancient Mimic	1699,20,0,0,0

-tha_t02.gat,0,0,0,0	monster	Plasma	1697,10,0,0,0

+tha_t02.gat,0,0,0,0	monster	Plasma	1697,20,0,0,0

 tha_t02.gat,0,0,0,0	monster	Retribution	1702,10,0,0,0

 tha_t02.gat,0,0,0,0	monster	Alice	1275,1,0,0,0

 

@@ -34,131 +35,123 @@ tha_t02.gat,0,0,0,0	monster	Alice	1275,1,0,0,0
 // tha_t03 - Thanatos Tower F3

 //==================================================

 tha_t03.gat,0,0,0,0	monster	Rideword	1195,20,0,0,0

-tha_t03.gat,0,0,0,0	monster	Deathword	1698,20,0,0,0

-tha_t03.gat,0,0,0,0	monster	Mimic	1191,30,0,0,0

-tha_t03.gat,0,0,0,0	monster	Plasma	1696,10,0,0,0

-tha_t03.gat,0,0,0,0	monster	Shelter	1701,10,0,0,0

+tha_t03.gat,0,0,0,0	monster	Deathword	1698,40,0,0,0

+tha_t03.gat,0,0,0,0	monster	Mimic	1191,20,0,0,0

 tha_t03.gat,0,0,0,0	monster	Ancient Mimic	1699,20,0,0,0

-tha_t03.gat,0,0,0,0	monster	Owl Duke	1320,10,0,0,0

+tha_t03.gat,0,0,0,0	monster	Plasma	1696,20,0,0,0

+tha_t03.gat,0,0,0,0	monster	Shelter	1701,10,0,0,0

 tha_t03.gat,0,0,0,0	monster	Elder	1377,10,0,0,0

 

 //==================================================

 // tha_t04 - Thanatos Tower F4

 //==================================================

-tha_t04.gat,0,0,0,0	monster	Rideword	1195,20,0,0,0

+tha_t04.gat,0,0,0,0	monster	Rideword	1195,10,0,0,0

 tha_t04.gat,0,0,0,0	monster	Deathword	1698,20,0,0,0

-tha_t04.gat,0,0,0,0	monster	Mimic	1191,30,0,0,0

+tha_t04.gat,0,0,0,0	monster	Mimic	1191,10,0,0,0

 tha_t04.gat,0,0,0,0	monster	Ancient Mimic	1699,20,0,0,0

-tha_t04.gat,0,0,0,0	monster	Plasma	1694,10,0,0,0

+tha_t04.gat,0,0,0,0	monster	Plasma	1694,20,0,0,0

 tha_t04.gat,0,0,0,0	monster	Owl Duke	1320,10,0,0,0

 tha_t04.gat,0,0,0,0	monster	Owl Baron	1295,10,0,0,0

-tha_t04.gat,0,0,0,0	monster	Elder	1377,10,0,0,0

+tha_t04.gat,0,0,0,0	monster	Elder	1377,40,0,0,0

 tha_t04.gat,0,0,0,0	monster	Observation	1700,10,0,0,0

 

 //==================================================

 // tha_t05 - Thanatos Tower F5

 //==================================================

-tha_t05.gat,0,0,0,0	monster	Rideword	1195,20,0,0,0

 tha_t05.gat,0,0,0,0	monster	Deathword	1698,20,0,0,0

-tha_t05.gat,0,0,0,0	monster	Mimic	1191,20,0,0,0

-tha_t05.gat,0,0,0,0	monster	Ancient Mimic	1699,15,0,0,0

+tha_t05.gat,0,0,0,0	monster	Ancient Mimic	1699,20,0,0,0

 tha_t05.gat,0,0,0,0	monster	Plasma	1694,5,0,0,0

 tha_t05.gat,0,0,0,0	monster	Plasma	1697,5,0,0,0

 tha_t05.gat,0,0,0,0	monster	Plasma	1695,5,0,0,0

 tha_t05.gat,0,0,0,0	monster	Plasma	1696,5,0,0,0

-tha_t05.gat,0,0,0,0	monster	Owl Duke	1320,10,0,0,0

-tha_t05.gat,0,0,0,0	monster	Elder	1377,10,0,0,0

+tha_t05.gat,0,0,0,0	monster	Owl Duke	1320,40,0,0,0

+tha_t05.gat,0,0,0,0	monster	Owl Baron	1295,40,0,0,0

+tha_t05.gat,0,0,0,0	monster	Elder	1377,20,0,0,0

 tha_t05.gat,0,0,0,0	monster	Thanatos Dolor	1707,10,0,0,0

 

 //==================================================

 // tha_t06 - Thanatos Tower F6

 //==================================================

-tha_t06.gat,0,0,0,0	monster	Rideword	1195,20,0,0,0

-tha_t06.gat,0,0,0,0	monster	Deathword	1698,20,0,0,0

-tha_t06.gat,0,0,0,0	monster	Mimic	1191,20,0,0,0

-tha_t06.gat,0,0,0,0	monster	Ancient Mimic	1699,20,0,0,0

+tha_t06.gat,0,0,0,0	monster	Deathword	1698,30,0,0,0

+tha_t06.gat,0,0,0,0	monster	Ancient Mimic	1699,30,0,0,0

 tha_t06.gat,0,0,0,0	monster	Plasma	1694,5,0,0,0

 tha_t06.gat,0,0,0,0	monster	Plasma	1697,5,0,0,0

 tha_t06.gat,0,0,0,0	monster	Plasma	1695,5,0,0,0

-tha_t06.gat,0,0,0,0	monster	Plasma	1696,5,0,0,0

-tha_t06.gat,0,0,0,0	monster	Owl Duke	1320,10,0,0,0

-tha_t06.gat,0,0,0,0	monster	Elder	1377,15,0,0,0

-tha_t06.gat,0,0,0,0	monster	Thanatos Maero	1706,2,0,0,0

-tha_t06.gat,0,0,0,0	monster	Thanatos Dolor	1707,10,0,0,0

+tha_t06.gat,0,0,0,0	monster	Plasma	1696,10,0,0,0

+tha_t06.gat,0,0,0,0	monster	Owl Duke	1320,20,0,0,0

+tha_t06.gat,0,0,0,0	monster	Owl Baron	1295,20,0,0,0

+tha_t06.gat,0,0,0,0	monster	Elder	1377,20,0,0,0

+tha_t06.gat,0,0,0,0	monster	Thanatos Dolor	1707,20,0,0,0

 

 //==================================================

 // tha_t07 - Thanatos Tower F7

 //==================================================

-tha_t07.gat,0,0,0,0	monster	Rideword	1195,10,0,0,0

 tha_t07.gat,0,0,0,0	monster	Deathword	1698,20,0,0,0

-tha_t07.gat,0,0,0,0	monster	Mimic	1191,10,0,0,0

 tha_t07.gat,0,0,0,0	monster	Ancient Mimic	1699,20,0,0,0

-tha_t07.gat,0,0,0,0	monster	Observation	1700,10,0,0,0

-tha_t07.gat,0,0,0,0	monster	Retribution	1702,20,0,0,0

-tha_t07.gat,0,0,0,0	monster	Elder	1377,20,0,0,0

+tha_t07.gat,0,0,0,0	monster	Solace	1703,10,0,0,0

+tha_t07.gat,0,0,0,0	monster	Retribution	1702,10,0,0,0

 tha_t07.gat,0,0,0,0	monster	Shelter	1701,10,0,0,0

-tha_t07.gat,0,0,0,0	monster	Thanatos Odium	1704,2,0,0,0

+tha_t07.gat,0,0,0,0	monster	Observation	1700,10,0,0,0

+tha_t07.gat,0,0,0,0	monster	Thanatos Maero	1706,10,0,0,0

 

 //==================================================

 // tha_t08 - Thanatos Tower F8

 //==================================================

-tha_t08.gat,0,0,0,0	monster	Rideword	1195,20,0,0,0

 tha_t08.gat,0,0,0,0	monster	Deathword	1698,20,0,0,0

-tha_t08.gat,0,0,0,0	monster	Mimic	1191,20,0,0,0

-tha_t08.gat,0,0,0,0	monster	Ancient Mimic	1699,10,0,0,0

-tha_t08.gat,0,0,0,0	monster	Observation	1700,10,0,0,0

+tha_t08.gat,0,0,0,0	monster	Ancient Mimic	1699,20,0,0,0

+tha_t08.gat,0,0,0,0	monster	Solace	1703,10,0,0,0

 tha_t08.gat,0,0,0,0	monster	Retribution	1702,10,0,0,0

-tha_t08.gat,0,0,0,0	monster	Elder	1377,10,0,0,0

 tha_t08.gat,0,0,0,0	monster	Shelter	1701,10,0,0,0

-tha_t08.gat,0,0,0,0	monster	Thanatos Odium	1704,5,1800000,0,0

+tha_t08.gat,0,0,0,0	monster	Observation	1700,10,0,0,0

+tha_t08.gat,0,0,0,0	monster	Thanatos Maero	1706,20,0,0,0

 

 //==================================================

 // tha_t09 - Thanatos Tower F9

 //==================================================

+tha_t09.gat,0,0,0,0	monster	Ancient Mimic	1699,10,0,0,0

+tha_t09.gat,0,0,0,0	monster	Solace	1703,10,0,0,0

+tha_t09.gat,0,0,0,0	monster	Retribution	1702,10,0,0,0

+tha_t09.gat,0,0,0,0	monster	Shelter	1701,10,0,0,0

 tha_t09.gat,0,0,0,0	monster	Observation	1700,10,0,0,0

-tha_t09.gat,0,0,0,0	monster	Retribution	1702,20,0,0,0

 tha_t09.gat,0,0,0,0	monster	Plasma	1694,10,0,0,0

-tha_t09.gat,0,0,0,0	monster	Elder	1377,20,0,0,0

-tha_t09.gat,0,0,0,0	monster	Shelter	1701,10,0,0,0

-tha_t09.gat,0,0,0,0	monster	Thanatos Dolor	1707,5,0,0,0

+tha_t09.gat,0,0,0,0	monster	Thanatos Despero	1705,10,0,0,0

 

 //==================================================

 // tha_t10 - Thanatos Tower F10

 //==================================================

-tha_t10.gat,0,0,0,0	monster	Observation	1700,10,0,0,0

+tha_t10.gat,0,0,0,0	monster	Ancient Mimic	1699,10,0,0,0

+tha_t10.gat,0,0,0,0	monster	Solace	1703,10,0,0,0

 tha_t10.gat,0,0,0,0	monster	Retribution	1702,10,0,0,0

-tha_t10.gat,0,0,0,0	monster	Plasma	1697,5,0,0,0

-tha_t10.gat,0,0,0,0	monster	Elder	1377,20,0,0,0

 tha_t10.gat,0,0,0,0	monster	Shelter	1701,10,0,0,0

-tha_t10.gat,0,0,0,0	monster	Thanatos Dolor	1707,5,0,0,0

+tha_t10.gat,0,0,0,0	monster	Observation	1700,10,0,0,0

+tha_t10.gat,0,0,0,0	monster	Plasma	1697,10,0,0,0

+tha_t10.gat,0,0,0,0	monster	Thanatos Despero	1705,20,0,0,0

 

 //==================================================

 // tha_t11 - Thanatos Tower F11

 //==================================================

-tha_t11.gat,0,0,0,0	monster	Observation	1700,20,0,0,0

-tha_t11.gat,0,0,0,0	monster	Retribution	1702,20,0,0,0

+tha_t11.gat,0,0,0,0	monster	Ancient Mimic	1699,10,0,0,0

+tha_t11.gat,0,0,0,0	monster	Solace	1703,10,0,0,0

+tha_t11.gat,0,0,0,0	monster	Retribution	1702,10,0,0,0

+tha_t11.gat,0,0,0,0	monster	Shelter	1701,10,0,0,0

+tha_t11.gat,0,0,0,0	monster	Observation	1700,10,0,0,0

 tha_t11.gat,0,0,0,0	monster	Plasma	1695,10,0,0,0

-tha_t11.gat,0,0,0,0	monster	Elder	1377,20,0,0,0

-tha_t11.gat,0,0,0,0	monster	Shelter	1701,20,0,0,0

-tha_t11.gat,0,0,0,0	monster	Thanatos Odium	1704,2,0,0,0

-tha_t11.gat,0,0,0,0	monster	Thanatos Despero	1705,5,1800000,0,0

+tha_t11.gat,0,0,0,0	monster	Thanatos Odium	1704,10,0,0,0

 

 //==================================================

 // tha_t12 - Thanatos Tower F12

 //==================================================

-tha_t12.gat,0,0,0,0	monster	Observation	1700,10,0,0,0

-tha_t12.gat,0,0,0,0	monster	Retribution	1702,30,0,0,0

+tha_t12.gat,0,0,0,0	monster	Ancient Mimic	1699,10,0,0,0

+tha_t12.gat,0,0,0,0	monster	Solace	1703,10,0,0,0

+tha_t12.gat,0,0,0,0	monster	Retribution	1702,10,0,0,0

 tha_t12.gat,0,0,0,0	monster	Shelter	1701,10,0,0,0

+tha_t12.gat,0,0,0,0	monster	Observation	1700,10,0,0,0

 tha_t12.gat,0,0,0,0	monster	Plasma	1693,10,0,0,0

-tha_t12.gat,0,0,0,0	monster	Elder	1377,20,0,0,0

-tha_t12.gat,0,0,0,0	monster	Thanatos Odium	1704,2,0,0,0

-tha_t12.gat,0,0,0,0	monster	Thanatos Despero	1705,2,0,0,0

-tha_t12.gat,0,0,0,0	monster	Thanatos Maero	1706,2,0,0,0

-tha_t12.gat,0,0,0,0	monster	Thanatos Dolor	1707,5,0,0,0

+tha_t12.gat,0,0,0,0	monster	Thanatos Odium	1704,20,0,0,0

 

 //==================================================

 // thana_boss - Top of Thanatos Tower

 //==================================================

 // Note - Thanatos spawn should be removed later.

 // He should be summoned by finishing the Thanatos Tower Quest (At least from the info I have ^^; )

-thana_boss.gat,135,119,0,0	monster	Thanatos	1708,1,3600000,7200000,0

+thana_boss.gat,135,119,0,0	monster	Thanatos	1708,1,7200000,3600000,0