More fixes on Amon Ra

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

4 files changed, 17 insertions, 11 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 1b45a2e89..f902e06a5 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -27,6 +27,7 @@
 

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

 05/19

+	* More fixes on Amon Ra [Playtester]

 	* Fixed Bascojin's mob summoning [Playtester]

 	* Fixed some SPRITE names of mobs [Playtester]

 	* Fixed item names of new items thanks to Haplo [Playtester]

diff --git a/db/mob_db.txt b/db/mob_db.txt
index b3e1b4b4e..77c54ea94 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -517,7 +517,7 @@
 1509,LUDE,Lude,Lude,36,3214,0,392,247,1,287,469,14,10,1,59,60,18,36,21,10,12,0,1,29,2181,150,1152,960,752,0,0,0,0,0,0,0,0,1059,1000,7220,5723,7225,3200,2282,10,757,10,12001,100,0,0,0,0,0,0,4193,1

 1510,HYLOZOIST,Hylozoist,Heirozoist,51,7186,0,2314,1297,1,317,498,16,51,1,28,26,47,66,14,10,12,0,6,47,2181,155,1152,1536,969,0,0,0,0,0,0,0,0,7217,5335,7215,4365,7213,2000,7220,300,740,80,757,10,5113,1,0,0,0,0,4321,1

 

-1511,AMON_RA,Amon Ra,Amon Ra,88,1214138,0,87264,35891,3,1647,2576,26,52,1,1,90,124,74,45,10,12,2,7,62,2212,100,1152,672,480,8000,3000,7114,10,617,100,0,0,5053,150,2615,50,7211,7760,985,3880,616,400,1552,10,607,3000,0,0,0,0,4236,1

+1511,AMON_RA,Amon Ra,Amon Ra,88,1214138,0,87264,35891,3,1647,2576,26,52,1,1,90,124,74,45,10,12,2,7,62,164,100,1152,672,480,8000,3000,7114,10,617,100,0,0,5053,150,2615,50,7211,7760,985,3880,616,400,1552,10,607,3000,0,0,0,0,4236,1

 

 //Louyang

 1512,HYEGUN,Hyegun,Yao Jun,56,9981,0,2199,1032,1,710,1128,12,10,60,40,36,10,73,15,10,12,1,1,49,2181,200,1152,1152,384,0,0,0,0,0,0,0,0,7054,3880,609,100,985,10,2406,1,7277,300,0,0,0,0,0,0,0,0,4328,1

diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 3e9ae6326..98b209cf3 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -2441,15 +2441,20 @@
 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,any,199,1,2000,0,5000,yes,target,always,0,,,,,,29

-1511,Amon Ra@NPC_BLOODDRAIN,any,199,1,2000,0,5000,yes,target,always,0,,,,,,29

-1511,Amon Ra@NPC_DARKBLESSING,any,203,1,5000,0,2000,no,target,always,0,,,,,,

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

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

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

-1511,Amon Ra@WZ_FIREPILLAR,angry,80,11,10000,0,1000,yes,around2,always,0,,,,,,

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

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

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

+1511,Amon Ra@NPC_BLOODDRAIN,idle,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_BLOODDRAIN,attack,199,1,2000,0,5000,yes,target,always,0,,,,,,29

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

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

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

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

+1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,target,casttargeted,,,,,,,9

+1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,0,yes,target,longrangeattacked,,,,,,,9

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

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

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

+1511,Amon Ra@WZ_METEOR,idle,83,11,10000,0,5000,yes,target,always,0,,,,,,9

 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/db/skill_db.txt b/db/skill_db.txt
index ef40b99e1..f19c6c407 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -102,7 +102,7 @@
 80,9,8,2,3,0,1:1:1:1:1:2:2:2:2:2:2,10,3:4:5:6:7:8:9:10:11:12:12,yes,0,128,5,magic,0	//WZ_FIREPILLAR#Fire Pillar#

 81,0,6,4,3,0,3,10,1,yes,0,0,0,magic,5	//WZ_SIGHTRASHER#Sightrasher#

 //82,9,6,2,3,0,0,10,1,yes,0,0,0,magic,0	//WZ_FIREIVY#Fire Ivy#

-83,9,8,2,3,0,3:3:3:3:3:3:3:3:3:3:15,10,1:1:2:2:3:3:4:4:5:5:15,yes,0,0,0,magic,0	//WZ_METEOR#Meteor Storm#

+83,9,8,2,3,0,3:3:3:3:3:3:3:3:3:3:14,10,1:1:2:2:3:3:4:4:5:5:15,yes,0,0,0,magic,0	//WZ_METEOR#Meteor Storm#

 84,9,8,1,4,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0,0,magic,2:3:3:4:4:5:5:6:6:7	//WZ_JUPITEL#Jupiter Thunder#

 85,9,8,2,4,0,0,10,-10,yes,0,0,0,magic,0	//WZ_VERMILION#Lord of Vermilion#

 86,9,8,1,1,0,0,5,1,yes,0,0,0,magic,0	//WZ_WATERBALL#Water Ball#