summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorkenpachi2k11 <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-07 22:08:53 +0000
committerkenpachi2k11 <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-02-07 22:08:53 +0000
commita5a50d59bade8e712ab765ce2e65342f8bc6e002 (patch)
treec267631dca4b81d4d8cbf681aa946274af90a9ad /db
parentb658028b8f527cc57d9f2013e4439df49db86f0e (diff)
downloadhercules-a5a50d59bade8e712ab765ce2e65342f8bc6e002.tar.gz
hercules-a5a50d59bade8e712ab765ce2e65342f8bc6e002.tar.bz2
hercules-a5a50d59bade8e712ab765ce2e65342f8bc6e002.tar.xz
hercules-a5a50d59bade8e712ab765ce2e65342f8bc6e002.zip
Updated some monster slaves. (bugreport:4689)
Added description for monster spawn event in monster() script command. (bugreport:5251) Removed some items from db/item_trade.txt. (bugreport:5301) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15545 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/item_trade.txt18
-rw-r--r--db/pre-re/mob_skill_db.txt14
-rw-r--r--db/re/mob_skill_db.txt14
3 files changed, 16 insertions, 30 deletions
diff --git a/db/item_trade.txt b/db/item_trade.txt
index bd9c5c0ff..8758ae1cc 100644
--- a/db/item_trade.txt
+++ b/db/item_trade.txt
@@ -1276,24 +1276,6 @@
//14488,73,100 // Blue_Pajamas_Hat_
//14489,73,100 // Blue_Pajamas_Hat_
-// Episode 13.1
-6027,123,100 // Crystal_Of_Feardoom
-6028,123,100 // Seal_Scroll
-6029,123,100 // Morocc_Tracing_Log
-6035,123,100 // Decaying_Stem
-6036,123,100 // Invite_To_Meeting
-6037,123,100 // Rough_File
-6038,123,100 // Neat_Report
-6039,91,100 // Piece_Of_Fish
-6040,123,100 // Some_Of_Report
-6041,91,100 // Strong_Bine
-6042,91,100 // Ordinary_Branch
-6043,123,100 // Letter_From_Lugen
-6044,123,100 // Letter_From_Otto
-6045,123,100 // Supply_Box
-6048,91,100 // Unidentified_Mineral
-6051,115,100 // Gray_Hollow
-
// Battleground Rewards (Krieger Von Midgard)
13416,83,100 // Krieger_Onehand_Sword1
13417,83,100 // Krieger_Onehand_Sword2
diff --git a/db/pre-re/mob_skill_db.txt b/db/pre-re/mob_skill_db.txt
index d1e801739..1f27c47e2 100644
--- a/db/pre-re/mob_skill_db.txt
+++ b/db/pre-re/mob_skill_db.txt
@@ -1147,6 +1147,7 @@
1251,Stormy Knight@NPC_HALLUCINATION,chase,207,1,500,0,5000,no,target,always,0,,,,,,,
1251,Stormy Knight@NPC_SUMMONSLAVE,attack,196,6,10000,700,10000,no,self,slavele,3,1607,,,,,27,
1251,Stormy Knight@NPC_SUMMONSLAVE,idle,196,6,10000,700,10000,no,self,slavele,3,1607,,,,,27,
+1251,Stormy Knight@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1515,,,,,,
1251,Stormy Knight@WZ_STORMGUST,attack,89,10,2000,500,5000,no,target,always,0,,,,,,21,
1251,Stormy Knight@WZ_STORMGUST,chase,89,10,2000,500,5000,no,target,always,0,,,,,,21,
1251,Stormy Knight@WZ_STORMGUST,chase,89,10,10000,500,5000,no,target,skillused,18,,,,,,21,
@@ -5226,8 +5227,9 @@
1956,Naght Sieger@WZ_STORMGUST,chase,89,10,2000,500,5000,no,target,always,0,,,,,,,
1956,Naght Sieger@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
1956,Naght Sieger@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-1956,Naght Sieger@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,1605,,,,,,
-1956,Naght Sieger@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,1605,,,,,,
+1956,Naght Sieger@NPC_SUMMONSLAVE,attack,196,4,10000,700,10000,no,self,slavele,3,1605,,,,,,
+1956,Naght Sieger@NPC_SUMMONSLAVE,idle,196,4,10000,700,10000,no,self,slavele,3,1605,,,,,,
+1956,Naght Sieger@NPC_SUMMONSLAVE,idle,196,4,10000,0,30000,yes,self,onspawn,0,1605,,,,,,
1956,Naght Sieger@NPC_ALLHEAL,idle,687,1,3000,10000,10000,no,self,rudeattacked,,,,,,,,
1956,Naght Sieger@NPC_ALLHEAL,walk,687,1,3000,10000,10000,no,self,rudeattacked,,,,,,,,
1957,Entweihen Crothen@NPC_ALLHEAL,idle,687,1,3000,10000,10000,no,self,rudeattacked,,,,,,,,
@@ -5289,7 +5291,7 @@
1974,Banshee Master@NPC_EVILLAND,attack,670,1,500,0,5000,yes,target,always,0,,,,,,,
1974,Banshee Master@NPC_EMOTION,chase,197,1,1000,0,5000,yes,self,always,0,7,0x81,,,,,
1974,Banshee Master@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,,0x3795,,,,,
-1974,Banshee Master@NPC_SUMMONSLAVE,idle,196,2,10000,2000,60000,no,self,slavele,0,1867,,,,,,
+1974,Banshee Master@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1868,,,,,,
1975,Beholder Master@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1975,Beholder Master@MO_BODYRELOCATION,chase,264,1,2000,500,5000,no,target,always,0,,,,,,52,
1975,Beholder Master@WZ_JUPITEL,chase,84,4,2000,0,5000,yes,target,always,0,,,,,,,
@@ -5298,7 +5300,7 @@
1975,Beholder Master@NPC_PETRIFYATTACK,attack,180,3,200,500,10000,no,target,always,0,,,,,,,
1975,Beholder Master@NPC_PETRIFYATTACK,chase,180,3,200,500,10000,no,target,always,0,,,,,,,
1975,Beholder Master@SA_DISPELL,attack,289,1,100,1000,100000,yes,target,myhpltmaxrate,50,,,,,,18,
-1975,Beholder Master@NPC_SUMMONSLAVE,idle,196,2,10000,2000,60000,no,self,slavele,0,1633,,,,,,
+1975,Beholder Master@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1774,,,,,,
1976,Cobalt Mineral@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1976,Cobalt Mineral@CR_REFLECTSHIELD,attack,252,2,1000,1000,5000,no,self,always,0,,,,,,,
1976,Cobalt Mineral@NPC_RANDOMATTACK,attack,183,2,500,500,5000,yes,target,always,0,,,,,,,
@@ -5320,14 +5322,14 @@
1978,Hell Apocalips@NPC_SELFDESTRUCTION,attack,173,1,1000,2000,5000,no,self,myhpltmaxrate,10,,,,,,9,
1978,Hell Apocalips@CR_AUTOGUARD,chase,249,5,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
1978,Hell Apocalips@CR_AUTOGUARD,attack,249,5,500,0,300000,yes,self,always,0,,,,,,,
-1978,Hell Apocalips@NPC_SUMMONSLAVE,idle,196,3,10000,2000,60000,no,self,slavele,0,1365,,,,,,
+1978,Hell Apocalips@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1365,,,,,,
1979,Zukadam@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1979,Zukadam@NPC_PIERCINGATT,attack,158,5,1000,0,5000,yes,target,always,0,,,,,,,
1979,Zukadam@NPC_GUIDEDATTACK,attack,172,2,500,1000,20000,no,target,always,0,,,,,,29,
1979,Zukadam@KN_SPEARSTAB,attack,58,5,500,800,5000,no,target,always,0,,,,,,,
1979,Zukadam@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1979,Zukadam@NPC_RANDOMATTACK,attack,183,5,1000,500,5000,no,target,always,0,,,,,,,
-1979,Zukadam@NPC_SUMMONSLAVE,idle,196,2,10000,2000,60000,no,self,slavele,0,1668,,,,,,
+1979,Zukadam@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1668,,,,,,
// Memory of Orc Dungeon (13.1)
1981,Safeguard Chief@SM_BASH,attack,5,10,500,1000,5000,no,target,always,0,,,,,,,
diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt
index 6315d8fdf..53a148829 100644
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -1147,6 +1147,7 @@
1251,Stormy Knight@NPC_HALLUCINATION,chase,207,1,500,0,5000,no,target,always,0,,,,,,,
1251,Stormy Knight@NPC_SUMMONSLAVE,attack,196,6,10000,700,10000,no,self,slavele,3,1607,,,,,27,
1251,Stormy Knight@NPC_SUMMONSLAVE,idle,196,6,10000,700,10000,no,self,slavele,3,1607,,,,,27,
+1251,Stormy Knight@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1515,,,,,,
1251,Stormy Knight@WZ_STORMGUST,attack,89,10,2000,500,5000,no,target,always,0,,,,,,21,
1251,Stormy Knight@WZ_STORMGUST,chase,89,10,2000,500,5000,no,target,always,0,,,,,,21,
1251,Stormy Knight@WZ_STORMGUST,chase,89,10,10000,500,5000,no,target,skillused,18,,,,,,21,
@@ -5226,8 +5227,9 @@
1956,Naght Sieger@WZ_STORMGUST,chase,89,10,2000,500,5000,no,target,always,0,,,,,,,
1956,Naght Sieger@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,,
1956,Naght Sieger@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,,
-1956,Naght Sieger@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,1605,,,,,,
-1956,Naght Sieger@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,1605,,,,,,
+1956,Naght Sieger@NPC_SUMMONSLAVE,attack,196,4,10000,700,10000,no,self,slavele,3,1605,,,,,,
+1956,Naght Sieger@NPC_SUMMONSLAVE,idle,196,4,10000,700,10000,no,self,slavele,3,1605,,,,,,
+1956,Naght Sieger@NPC_SUMMONSLAVE,idle,196,4,10000,0,30000,yes,self,onspawn,0,1605,,,,,,
1956,Naght Sieger@NPC_ALLHEAL,idle,687,1,3000,10000,10000,no,self,rudeattacked,,,,,,,,
1956,Naght Sieger@NPC_ALLHEAL,walk,687,1,3000,10000,10000,no,self,rudeattacked,,,,,,,,
1957,Entweihen Crothen@NPC_ALLHEAL,idle,687,1,3000,10000,10000,no,self,rudeattacked,,,,,,,,
@@ -5289,7 +5291,7 @@
1974,Banshee Master@NPC_EVILLAND,attack,670,1,500,0,5000,yes,target,always,0,,,,,,,
1974,Banshee Master@NPC_EMOTION,chase,197,1,1000,0,5000,yes,self,always,0,7,0x81,,,,,
1974,Banshee Master@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,,0x3795,,,,,
-1974,Banshee Master@NPC_SUMMONSLAVE,idle,196,2,10000,2000,60000,no,self,slavele,0,1867,,,,,,
+1974,Banshee Master@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1868,,,,,,
1975,Beholder Master@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1975,Beholder Master@MO_BODYRELOCATION,chase,264,1,2000,500,5000,no,target,always,0,,,,,,52,
1975,Beholder Master@WZ_JUPITEL,chase,84,4,2000,0,5000,yes,target,always,0,,,,,,,
@@ -5298,7 +5300,7 @@
1975,Beholder Master@NPC_PETRIFYATTACK,attack,180,3,200,500,10000,no,target,always,0,,,,,,,
1975,Beholder Master@NPC_PETRIFYATTACK,chase,180,3,200,500,10000,no,target,always,0,,,,,,,
1975,Beholder Master@SA_DISPELL,attack,289,1,100,1000,100000,yes,target,myhpltmaxrate,50,,,,,,18,
-1975,Beholder Master@NPC_SUMMONSLAVE,idle,196,2,10000,2000,60000,no,self,slavele,0,1633,,,,,,
+1975,Beholder Master@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1774,,,,,,
1976,Cobalt Mineral@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1976,Cobalt Mineral@CR_REFLECTSHIELD,attack,252,2,1000,1000,5000,no,self,always,0,,,,,,,
1976,Cobalt Mineral@NPC_RANDOMATTACK,attack,183,2,500,500,5000,yes,target,always,0,,,,,,,
@@ -5320,14 +5322,14 @@
1978,Hell Apocalips@NPC_SELFDESTRUCTION,attack,173,1,1000,2000,5000,no,self,myhpltmaxrate,10,,,,,,9,
1978,Hell Apocalips@CR_AUTOGUARD,chase,249,5,2000,0,300000,yes,self,longrangeattacked,,,,,,,,
1978,Hell Apocalips@CR_AUTOGUARD,attack,249,5,500,0,300000,yes,self,always,0,,,,,,,
-1978,Hell Apocalips@NPC_SUMMONSLAVE,idle,196,3,10000,2000,60000,no,self,slavele,0,1365,,,,,,
+1978,Hell Apocalips@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1365,,,,,,
1979,Zukadam@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1979,Zukadam@NPC_PIERCINGATT,attack,158,5,1000,0,5000,yes,target,always,0,,,,,,,
1979,Zukadam@NPC_GUIDEDATTACK,attack,172,2,500,1000,20000,no,target,always,0,,,,,,29,
1979,Zukadam@KN_SPEARSTAB,attack,58,5,500,800,5000,no,target,always,0,,,,,,,
1979,Zukadam@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
1979,Zukadam@NPC_RANDOMATTACK,attack,183,5,1000,500,5000,no,target,always,0,,,,,,,
-1979,Zukadam@NPC_SUMMONSLAVE,idle,196,2,10000,2000,60000,no,self,slavele,0,1668,,,,,,
+1979,Zukadam@NPC_SUMMONSLAVE,idle,196,2,10000,0,0,no,self,onspawn,0,1668,,,,,,
// Memory of Orc Dungeon (13.1)
1981,Safeguard Chief@SM_BASH,attack,5,10,500,1000,5000,no,target,always,0,,,,,,,