diff options
| author | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-14 16:49:17 +0000 |
|---|---|---|
| committer | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-14 16:49:17 +0000 |
| commit | f3bc6581829e1b0111110c4bd42626cd0886593d (patch) | |
| tree | 05df7386930445979b410d1aacae2c3a4a198d22 /db | |
| parent | f989edbc2eef439d33e19c890566ff96b2a941c4 (diff) | |
| download | hercules-f3bc6581829e1b0111110c4bd42626cd0886593d.tar.gz hercules-f3bc6581829e1b0111110c4bd42626cd0886593d.tar.bz2 hercules-f3bc6581829e1b0111110c4bd42626cd0886593d.tar.xz hercules-f3bc6581829e1b0111110c4bd42626cd0886593d.zip | |
- Made some NPC's into duplicates and fixed some && / || checks in the Arch Bishop Job change Quest. bugreport:5437
- Bomb poring is now aggressive and explodes right away after it has been summoned. bugreport:5575
- Added some more checks tot he Pile Bunker NPC.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16113 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
| -rw-r--r-- | db/pre-re/mob_db.txt | 2 | ||||
| -rw-r--r-- | db/pre-re/mob_skill_db.txt | 4 | ||||
| -rw-r--r-- | db/re/mob_db.txt | 2 | ||||
| -rw-r--r-- | db/re/mob_skill_db.txt | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/db/pre-re/mob_db.txt b/db/pre-re/mob_db.txt index 8ecc81115..24b06b444 100644 --- a/db/pre-re/mob_db.txt +++ b/db/pre-re/mob_db.txt @@ -944,7 +944,7 @@ 1901,E_CONDOR,Condor,Condor,5,8000,0,100,100,1,200,400,10,15,1,13,10,25,95,10,10,12,0,8,26,0x1089,150,1148,648,480,0,0,0,0,0,0,0,7781,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1902,E_TREASURE1,Treasure Box,Treasure Box,99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7782,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1903,E_TREASURE2,Treasure Box,Treasure Box,99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7783,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1904,BOMBPORING,Bomb Poring,Bomb Poring,28,1000000,0,461,284,1,120,320,100,99,1,28,28,0,33,50,10,12,0,0,20,0x11AB,300,1672,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1904,BOMBPORING,Bomb Poring,Bomb Poring,28,1000000,0,461,284,1,120,320,100,99,1,28,28,0,33,50,10,12,0,0,20,0x308D,300,1672,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 // WoE Second Edition; Battle Fields 1905,BARRICADE,Barricade,Barricade,98,120000,0,0,0,1,0,0,0,0,1,17,1,80,126,20,10,12,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/db/pre-re/mob_skill_db.txt b/db/pre-re/mob_skill_db.txt index 1f27c47e2..9d3586846 100644 --- a/db/pre-re/mob_skill_db.txt +++ b/db/pre-re/mob_skill_db.txt @@ -4860,9 +4860,7 @@ 1894,Pouring@WZ_WATERBALL,attack,86,10,10000,500,5000,no,target,always,0,,,,,,, 1894,Pouring@WZ_WATERBALL,chase,86,10,10000,500,5000,no,target,always,0,,,,,,, -1904,Bomb Poring@NPC_SELFDESTRUCTION,idle,173,1,1000,3000,0,no,self,always,0,,,,,,, -1904,Bomb Poring@NPC_SELFDESTRUCTION,attack,173,1,1000,3000,0,no,self,always,0,,,,,,, -1904,Bomb Poring@NPC_SELFDESTRUCTION,chase,173,1,1000,3000,0,no,self,always,0,,,,,,, +1904,Bomb Poring@NPC_SELFDESTRUCTION,any,173,1,10000,3000,0,no,self,always,0,,,,,,, // Satan Morroc (12.1) //5% HP - Dragon Fear diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt index 352251c71..cd4108da1 100644 --- a/db/re/mob_db.txt +++ b/db/re/mob_db.txt @@ -979,7 +979,7 @@ 1901,E_CONDOR,Condor,Condor,10,15,0,90,90,1,13,20,10,15,1,1,1,50,100,100,10,12,0,2,26,0x1089,150,1148,648,480,0,0,0,0,0,0,0,7973,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1902,E_TREASURE1,Treasure Box,Treasure Box,99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7782,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1903,E_TREASURE2,Treasure Box,Treasure Box,99,49,0,0,0,0,0,0,100,0,0,0,0,0,999,0,0,0,0,0,26,0x120,0,0,0,0,0,0,0,0,0,0,0,7783,1000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -1904,BOMBPORING,Bomb Poring,Bomb Poring,28,1000000,1,415,256,1,120,320,160,99,1,28,28,0,33,50,10,12,0,0,20,0x108B,300,1672,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +1904,BOMBPORING,Bomb Poring,Bomb Poring,28,1000000,1,415,256,1,120,320,160,99,1,28,28,0,33,50,10,12,0,0,20,0x308D,300,1672,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1905,BARRICADE,Barricade,Barricade,98,600500,1,0,0,1,0,0,0,0,1,17,1,80,126,20,10,12,2,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1906,BARRICADE_,Barricade,Barricade,98,600,1,0,0,1,0,0,160,99,1,17,1,80,126,20,10,12,2,0,20,0x160,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 1907,S_EMPEL_1,Guardian Stone,Guardian Stone,90,120500,1,0,0,0,1,2,64,50,1,1,1,1,1,1,0,0,0,0,20,0x120,300,1288,288,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt index 53a148829..38131b324 100644 --- a/db/re/mob_skill_db.txt +++ b/db/re/mob_skill_db.txt @@ -4860,9 +4860,7 @@ 1894,Pouring@WZ_WATERBALL,attack,86,10,10000,500,5000,no,target,always,0,,,,,,, 1894,Pouring@WZ_WATERBALL,chase,86,10,10000,500,5000,no,target,always,0,,,,,,, -1904,Bomb Poring@NPC_SELFDESTRUCTION,idle,173,1,1000,3000,0,no,self,always,0,,,,,,, -1904,Bomb Poring@NPC_SELFDESTRUCTION,attack,173,1,1000,3000,0,no,self,always,0,,,,,,, -1904,Bomb Poring@NPC_SELFDESTRUCTION,chase,173,1,1000,3000,0,no,self,always,0,,,,,,, +1904,Bomb Poring@NPC_SELFDESTRUCTION,any,173,1,10000,3000,0,no,self,always,0,,,,,,, // Satan Morroc (12.1) //5% HP - Dragon Fear |