summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-07 16:38:22 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-05-07 16:38:22 +0000
commitf215e96049cc2e7398f4cea954ad52d9c04f57f6 (patch)
treee398bf2cd12ac19722823ac0bb1dd0e4d07a42f9 /db
parent8a2839bcc9547e6e1239f87c6901a1fe46dc06a8 (diff)
downloadhercules-f215e96049cc2e7398f4cea954ad52d9c04f57f6.tar.gz
hercules-f215e96049cc2e7398f4cea954ad52d9c04f57f6.tar.bz2
hercules-f215e96049cc2e7398f4cea954ad52d9c04f57f6.tar.xz
hercules-f215e96049cc2e7398f4cea954ad52d9c04f57f6.zip
Fixed Satan Morroc resummoning normal mobs instead of slaves (bugreport:3056)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13739 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt2
-rw-r--r--db/mob_skill_db.txt8
2 files changed, 6 insertions, 4 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index c1f321712..e3bb522e2 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -37,6 +37,8 @@
2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well.
=======================
+2009/05/07
+ * Fixed Satan Morroc resummoning normal mobs instead of slaves (bugreport:3056) [Playtester]
2009/05/04
* Added cast time and sp cost for Waterball Lvl 5 - 10 [Inkfish]
2009/05/03
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 4a124ed15..78bdf57b7 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -4763,8 +4763,8 @@
1916,Satan Morroc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,
1916,Satan Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,
//1916,Satan Morroc@NPC_TALK,chase,682,1,10000,0,600000,yes,self,always,0,,,,,,
-1916,Satan Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1918,1919,1920,1921,,
-1916,Satan Morroc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1918,1919,1920,1921,,
+1916,Satan Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,
+1916,Satan Morroc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,
1916,Satan Morroc@NPC_SUMMONSLAVE,idle,196,4,10000,0,30000,yes,self,onspawn,0,1922,1923,1924,1925,,
1916,Satan Morroc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,
1916,Satan Morroc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,
@@ -4812,8 +4812,8 @@
1917,Wounded Morroc@NPC_CALLSLAVE,chase,352,1,10000,0,30000,yes,self,always,0,,,,,,
1917,Wounded Morroc@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,
//1917,Wounded Morroc@NPC_TALK,chase,682,1,10000,0,600000,yes,target,always,0,,,,,,
-1917,Wounded Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1918,1919,1920,1921,,
-1917,Wounded Morroc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1918,1919,1920,1921,,
+1917,Wounded Morroc@NPC_SUMMONSLAVE,attack,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,
+1917,Wounded Morroc@NPC_SUMMONSLAVE,chase,196,4,10000,0,30000,yes,self,slavele,1,1922,1923,1924,1925,,
1917,Wounded Morroc@NPC_SUMMONSLAVE,idle,196,4,10000,0,30000,yes,self,onspawn,0,1922,1923,1924,1925,,
1917,Wounded Morroc@SA_LANDPROTECTOR,attack,288,1,10000,0,15000,yes,target,always,0,,,,,,
1917,Wounded Morroc@NPC_SHIELDBRAKE,attack,346,10,10000,0,15000,yes,target,always,0,,,,,,