diff options
Diffstat (limited to 'world/map/db/mob_skill_db.txt')
| -rw-r--r-- | world/map/db/mob_skill_db.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/world/map/db/mob_skill_db.txt b/world/map/db/mob_skill_db.txt index b11980d7..b8368fc9 100644 --- a/world/map/db/mob_skill_db.txt +++ b/world/map/db/mob_skill_db.txt @@ -124,7 +124,6 @@ // Rotter Skills 1176,Rotter@NPC_SUMMONSLAVE_rotX6,any,198,1,8000,1000,5000,no,self,slavelt,6,1177,0,0,0,0, 1176,Rotter@NPC_POISON,attack,178,10,8000,0,2222,yes,target,always,0,0,10,0,0,0, -<<<<<<< HEAD 1177,Rot@NPC_SELFDESTRUCTION,attack,175,1,10000,100,500,yes,self,always,0,30,0,0,0,0, 1177,Rot@NPC_POISON,attack,178,10,3000,0,500,yes,target,always,0,0,10,0,0,0, @@ -132,7 +131,3 @@ 1196,RickLime@NPC_SUMMONSLAVE_brblowX2,any,198,1,10000,1000,5000,no,self,slavelt,2,1195,0,0,0,0, 1196,RickLime@NPC_SUMMONSLAVE_cloverX1,any,198,1,5000,5000,15000,no,self,slavelt,1,1037,0,0,0,0, 1195,Brainblow@NPC_SELFDESTRUCTION,attack,175,1,10000,100,300,yes,target,always,0,30,0,0,0,0, -======= -1177,Rot@NPC_SELFDESTRUCTION,attack,175,1,10000,100,500,yes,self,notintown,0,30,0,0,0,0, -1177,Rot@NPC_POISON,attack,178,10,3000,0,500,yes,target,always,0,0,10,0,0,0, ->>>>>>> c9522c04 (added some trailing new lines) |