diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-03-14 09:44:51 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-03-14 09:44:51 -0600 |
commit | c15fc7f17019cc720ec6f888c56bec7935282d10 (patch) | |
tree | 03c9626c58a7e5f195fc00528317e925865be400 /db/mob_db.txt | |
parent | b3b0c23b5a34920eba669f7e81beaadb057b3421 (diff) | |
parent | 8406c3965b6605f48a8f63f2342532259f0b97f5 (diff) | |
download | serverdata-c15fc7f17019cc720ec6f888c56bec7935282d10.tar.gz serverdata-c15fc7f17019cc720ec6f888c56bec7935282d10.tar.bz2 serverdata-c15fc7f17019cc720ec6f888c56bec7935282d10.tar.xz serverdata-c15fc7f17019cc720ec6f888c56bec7935282d10.zip |
Merge commit 'mainline/master'
Conflicts:
db/item_db.txt
db/mob_db.txt
Diffstat (limited to 'db/mob_db.txt')
-rw-r--r-- | db/mob_db.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/db/mob_db.txt b/db/mob_db.txt index f8d17d12..cc2abb82 100644 --- a/db/mob_db.txt +++ b/db/mob_db.txt @@ -32,4 +32,7 @@ 1032,AlizarinPlant,Alizarin Plant,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,683,3000,683,3000,683,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0 1033,SeaSlime,Sea Slime,70,600,0,0,9,1,30,50,3,7,1,25,1,0,30,30,1,1,1,0,41,131,1500,1872,672,480,535,800,657,800,518,500,510,1000,700,100,1199,5000,568,100,541,50,0,0,0,0,,,,,,,0,0 1034,GrassSnake,Grass Snake,140,1000,0,0,100,1,80,120,2,10,20,40,10,10,40,50,1,1,1,0,20,133,500,1100,672,480,716,400,716,400,712,500,676,500,660,350,0,0,0,0,0,0,0,0,0,0,,,,,,,1,40 -1035,Silkworm,Silkworm,20,1,0,0,1,1,0,0,2,0,0,0,0,0,0,0,1,1,1,0,20,129,1300,1100,672,480,718,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,2,40 +1035,Silkworm,Silkworm,20,1,0,0,1,1,0,0,2,10,20,11,10,10,40,10,1,1,1,0,20,129,1300,1100,672,480,718,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,2,40 +// ,Zombie,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +1037,CloverPatch,Clover Patch,1,1,0,0,1,1,0,0,0,5,0,0,0,0,0,0,1,1,1,3,22,0,800,800,672,480,742,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0 +1038,Squirrel,Squirrel,15,160,1,0,1,1,15,25,1,6,1,3,1,0,15,40,1,1,1,3,20,129,800,800,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,,,,,,0,0 |