3 files changed, 11 insertions, 28 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 2923a7bb2..56573d0c2 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -27,6 +27,8 @@
 
 =========================
 05/13
+	* Added a hopefully better implementation of Amon Ra thanks to Tharis [Playtester]
+	- also fixed name of Apocalypse
 	* Uncommented Summon skill of Katrinn and Shecil [Playtester]  
 	* Some more drop updates [Playtester]
 	- progress 40%
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 6faff4100..25a029a04 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -366,7 +366,7 @@
 1362,TREASURE_BOX39,Treasure Chest,Treasure Chest,99,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,20,0,1,1,1,1,0,0,0,0,0,0,0,0,732,7760,608,3000,607,2500,2504,800,2404,800,2315,800,2104,800,616,1000,0,0,0,0
 1363,TREASURE_BOX40,Treasure Chest,Treasure Chest,99,1,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,20,0,1,1,1,1,0,0,0,0,0,0,0,0,7092,80,658,500,604,10000,984,4850,985,7275,2506,43,2254,43,1529,38,0,0,0,0
 1364,G_ASSAULTER,Assaulter,Assaulter,59,18251,0,0,0,2,195,227,35,36,85,55,10,35,145,100,10,12,1,7,44,1173,155,1000,900,432,0,0,0,0,0,0,0,0,1019,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1365,APOCALYPSE,Apocalypse,Apocalipse,66,22680,0,6540,4935,2,1030,1370,62,49,1,48,120,108,66,85,10,12,2,0,60,149,400,1564,864,576,0,0,0,0,0,0,0,0,7095,5335,7094,2400,7093,2200,985,5,757,15,2506,20,999,2500,0,0,0,0,4242,1
+1365,APOCALIPS,Apocalypse,Apocalypse,66,22680,0,6540,4935,2,1030,1370,62,49,1,48,120,108,66,85,10,12,2,0,60,149,400,1564,864,576,0,0,0,0,0,0,0,0,7095,5335,7094,2400,7093,2200,985,5,757,15,2506,20,999,2500,0,0,0,0,4242,1
 1366,LAVA_GOLEM,Lava Golem,Lava Golem,77,24324,0,6470,3879,1,1541,2049,65,50,1,57,115,70,76,68,10,12,2,0,83,149,400,1564,864,576,0,0,0,0,0,0,0,0,7096,4559,7097,3686,2317,1,2316,2,509,2500,0,0,0,0,0,0,0,0,4184,1
 1367,BLAZZER,Blazer,Blazer,43,8252,0,3173,1871,2,533,709,50,40,1,52,50,39,69,40,10,12,0,6,43,149,180,1564,864,576,0,0,0,0,0,0,0,0,7097,4850,7098,3400,509,3000,0,0,0,0,0,0,0,0,0,0,0,0,4215,1
 1368,GEOGRAPHER,Geographer,Geographer,56,8071,0,2715,2000,3,467,621,28,26,1,67,47,60,68,44,10,12,0,3,62,132,2000,1564,864,576,0,0,0,0,0,0,0,0,1032,6200,1033,5500,2253,30,2207,50,12002,100,0,0,0,0,0,0,0,0,4280,1
@@ -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,5500,7220,5500,7225,1000,2282,2,2274,1,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,5500,7215,2000,7213,1000,7220,1000,740,200,757,100,5113,1,0,0,0,0,4321,1
 
-1511,AMON_RA,Amon Ra,Amon Ra,88,1214138,0,87264,35891,1,1647,2576,26,52,1,1,90,124,74,45,10,12,2,7,62,2213,200,1872,672,480,8000,3000,7114,10,617,100,0,0,7211,8000,984,2000,0,0,607,3000,616,450,5053,250,1552,5,2615,100,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,2212,100,1152,672,480,8000,3000,7114,10,617,100,0,0,7211,8000,984,2000,0,0,607,3000,616,450,5053,250,1552,5,2615,100,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,3200,609,50,985,200,7277,20,2406,1,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 591ca1a01..b270228fc 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -2441,32 +2441,13 @@
 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,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_BLOODDRAIN,idle,199,1,2000,0,5000,yes,self,always,0,,,,,,29
-1511,Amon Ra@NPC_BLOODDRAIN,idle,199,1,2000,0,5000,yes,self,always,0,,,,,,29
-1511,Amon Ra@NPC_DARKBLESSING,attack,203,1,5000,0,2000,no,target,always,0,,,,,,
-1511,Amon Ra@NPC_SUMMONMONSTER,attack,209,1,5000,0,10000,yes,self,casttargeted,,1132,,,,,9
-1511,Amon Ra@NPC_SUMMONMONSTER,attack,209,1,5000,0,10000,yes,self,longrangeattacked,,1195,,,,,9
-1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,1,5000,0,10000,yes,self,casttargeted,,1132,,,,,9
-1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,1,5000,0,10000,yes,self,longrangeattacked,,1195,,,,,9
-1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,1,5000,0,10000,yes,self,skillused,18,1195,,,,,9
-1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,1,5000,0,10000,yes,self,skillused,21,1195,,,,,9
-1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,1,5000,0,10000,yes,self,skillused,28,1132,,,,,9
-1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,1,5000,0,10000,yes,self,skillused,79,1195,,,,,9
-1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,1,5000,0,10000,yes,self,skillused,83,1132,,,,,9
-1511,Amon Ra@NPC_SUMMONMONSTER,idle,209,1,5000,0,10000,yes,self,skillused,89,1132,,,,,9
-1511,Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,self,always,0,,,,,,
-1511,Amon Ra@WZ_FIREPILLAR,idle,80,10,10000,0,2000,yes,self,always,0,,,,,,
-1511,Amon Ra@WZ_METEOR,idle,83,10,10000,0,0,yes,self,casttargeted,,,,,,,9
-1511,Amon Ra@WZ_METEOR,idle,83,10,10000,0,0,yes,self,longrangeattacked,,,,,,,9
-1511,Amon Ra@WZ_METEOR,idle,83,10,10000,0,0,yes,self,skillused,18,,,,,,9
-1511,Amon Ra@WZ_METEOR,idle,83,10,10000,0,0,yes,self,skillused,21,,,,,,9
-1511,Amon Ra@WZ_METEOR,idle,83,10,10000,0,0,yes,self,skillused,28,,,,,,9
-1511,Amon Ra@WZ_METEOR,idle,83,10,10000,0,0,yes,self,skillused,79,,,,,,9
-1511,Amon Ra@WZ_METEOR,idle,83,10,10000,0,0,yes,self,skillused,83,,,,,,9
-1511,Amon Ra@WZ_METEOR,idle,83,10,10000,0,0,yes,self,skillused,89,,,,,,9
-1511,Amon Ra@WZ_METEOR,idle,83,10,10000,0,5000,yes,self,always,0,,,,,,9
+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,,,,,,,
 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,,,,,,