More fixed on Amon Ra, it works quite well now, mostly code fixes are needed...

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

5 files changed, 14 insertions, 9 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 1021f6557..b11c99205 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -26,6 +26,8 @@
 	-----

 

 =========================

+05/15

+	* Improved some skills of Amon Ra [Playtester]

 05/14

 	* More Aegis X.2 drop updates [Playtester]

 	- progress 45%

diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index d7bdb47e3..1bfa42be0 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -2441,13 +2441,15 @@
 1510,Hylozoist@NPC_HALLUCINATION,chase,207,1,500,500,5000,yes,target,always,0,,,,,,9

 1511,Amon Ra@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,

 1511,Amon Ra@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,

-1511,Amon Ra@NPC_BLOODDRAIN,anytarget,199,5,2000,0,5000,yes,target,always,0,,,,,,29

-1511,Amon Ra@SA_COMA,anytarget,303,1,10000,0,8000,no,target,always,0,,,,,,

-1511,Amon Ra@NPC_SUMMONMONSTER,any,209,5,10000,0,10000,no,self,casttargeted,0,1474,1474,1477,1477,1438,9

-1511,Amon Ra@NPC_SUMMONMONSTER,any,209,5,10000,0,10000,no,self,longrangeattacked,0,1474,1474,1477,1477,1438,9

-1511,Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,1000,yes,around2,always,0,,,,,,

-1511,Amon Ra@WZ_METEOR,any,83,11,10000,0,10000,yes,target,casttargeted,,,,,,,

-1511,Amon Ra@WZ_METEOR,any,83,11,10000,0,10000,yes,target,longrangeattacked,,,,,,,

+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29

+1511,Amon Ra@NPC_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29

+1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,target,always,0,,,,,,

+1511,Amon Ra@NPC_SUMMONMONSTER,any,209,6,5000,0,10000,no,self,casttargeted,0,1474,1477,1438,,,9

+1511,Amon Ra@NPC_SUMMONMONSTER,any,209,6,5000,0,10000,no,self,longrangeattacked,0,1474,1477,1438,,,9

+1511,Amon Ra@WZ_FIREPILLAR,idle,80,30,10000,0,2000,yes,around2,always,0,,,,,,

+1511,Amon Ra@WZ_FIREPILLAR,idle,80,30,10000,0,2000,yes,around2,always,0,,,,,,

+1511,Amon Ra@WZ_METEOR,any,83,30,10000,0,0,yes,self,casttargeted,,,,,,,

+1511,Amon Ra@WZ_METEOR,any,83,30,10000,0,0,yes,self,longrangeattacked,,,,,,,

 1512,Hyegun@AS_SONICBLOW,attack,136,5,500,1000,30000,no,target,always,0,,,,,,

 1512,Hyegun@MO_BODYRELOCATION,chase,264,1,2000,500,5000,no,target,always,0,,,,,,

 1512,Hyegun@NPC_CRITICALSLASH,attack,170,1,500,0,5000,yes,target,always,0,,,,,,

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 1ab661f9e..01e8f9475 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -28,6 +28,7 @@ Nexon
 Date		Added

 ======

 05/15

+	* Fixed Amon Ra's spawning location [Playtester]

 	* Corrected 10 Geminis spawning in Lhz1 rather than 2. [Skotlex]

 05/14

 	* Fixed the quiz in the Wizard Job quest a bit [Playtester]

diff --git a/npc/eamobs/dungeons/moc_pyramid.txt b/npc/eamobs/dungeons/moc_pyramid.txt
index 690a83fb4..d2d39e05d 100644
--- a/npc/eamobs/dungeons/moc_pyramid.txt
+++ b/npc/eamobs/dungeons/moc_pyramid.txt
@@ -62,7 +62,7 @@ moc_pryd06.gat,0,0,0,0	monster	Arclouse	1194,20,0,0,0
 moc_pryd06.gat,100,90,80,50	monster	Mimic	1191,10,600000,300000,0

 moc_pryd06.gat,100,90,80,50	monster	Ancient Mummy	1297,10,600000,300000,0

 moc_pryd06.gat,0,0,0,0	monster	Verit	1032,15,0,0,0

-moc_pryd06.gat,102,166,1,1	monster	Amon Ra	1511,1,3600000,1600000,0

+moc_pryd06.gat,102,86,0,0	monster	Amon Ra	1511,1,3600000,1600000,0

 moc_pryd06.gat,0,0,0,0	monster	Ghoul	1036,10,0,0,0

 moc_pryd06.gat,0,0,0,0	monster	Mummy	1041,10,0,0,0

 moc_pryd06.gat,0,0,0,0	monster	Isis	1029,10,0,0,0

diff --git a/npc/mobs/dungeons/moc_pyramid.txt b/npc/mobs/dungeons/moc_pyramid.txt
index 533f4a090..19d4e8377 100644
--- a/npc/mobs/dungeons/moc_pyramid.txt
+++ b/npc/mobs/dungeons/moc_pyramid.txt
@@ -59,4 +59,4 @@ moc_pryd06.gat,0,0,0,0	monster	Arclouse	1194,20,0,0,0
 moc_pryd06.gat,100,90,80,50	monster	Mimic	1191,20,0,0,0

 moc_pryd06.gat,100,90,80,50	monster	Ancient Mummy	1297,20,0,0,0

 moc_pryd06.gat,0,0,0,0	monster	Verit	1032,10,0,0,0

-moc_pryd06.gat,102,166,0,0	monster	Amon Ra	1511,1,3600000,1800000,1

+moc_pryd06.gat,102,86,0,0	monster	Amon Ra	1511,1,3600000,1800000,1