summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-11 14:26:32 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-11 14:26:32 +0000
commit7732674c21858267c2911415f2e52c36d7f30b1b (patch)
tree9287ecdf1291fe803f7e2274060983a9e8d5fcbd /db
parentbbe48afda4dd5dac5fd63e94484e7277e7216a55 (diff)
downloadhercules-7732674c21858267c2911415f2e52c36d7f30b1b.tar.gz
hercules-7732674c21858267c2911415f2e52c36d7f30b1b.tar.bz2
hercules-7732674c21858267c2911415f2e52c36d7f30b1b.tar.xz
hercules-7732674c21858267c2911415f2e52c36d7f30b1b.zip
Marionette now drops "Marionette Doll"
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7611 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt3
-rw-r--r--db/mob_db.txt2
2 files changed, 3 insertions, 2 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index ab77686ab..c08317228 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -24,7 +24,8 @@
-----
=========================
-
+07/11
+ * Marionette now drops "Marionette Doll" [Playtester]
07/10
* Corrected Frost Nova's splash range and Land Protector's cast range.
Thanks to Haplo. [Skotlex]
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 1bfba1323..cf68e87c3 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -146,7 +146,7 @@
1140,MARDUK,Marduk,Marduk,40,4214,0,1238,752,1,315,382,0,60,1,40,20,79,78,20,10,12,2,7,23,149,300,1540,840,504,0,0,0,0,0,0,0,0,994,35,1045,4365,1608,10,2617,1,1614,3,691,100,642,20,0,0,0,0,4112,1
1141,MARINA,Marina,Marina,21,2087,0,218,140,1,84,106,0,5,1,21,21,1,36,10,10,12,0,3,41,129,400,2280,1080,864,0,0,0,0,0,0,0,0,1052,5000,938,1500,991,45,995,2,717,200,631,20,0,0,0,0,0,0,4055,1
1142,MARINE_SPHERE,Marine Sphere,Marine Sphere,28,3518,0,461,284,1,120,320,0,40,1,28,28,1,33,50,10,12,0,3,21,0,800,1201,1,1,0,0,0,0,0,0,0,0,1050,5000,1051,2500,1520,10,720,10,717,150,10003,10,0,0,0,0,0,0,4084,1
-1143,MARIONETTE,Marionette,Marionette,41,3222,0,1078,1276,1,355,422,0,25,1,62,36,44,69,45,10,12,0,6,68,149,300,1480,480,1056,0,0,0,0,0,0,0,0,1060,4850,2294,5,2605,1,699,100,1520,15,2407,1,514,200,0,0,0,0,4113,1
+1143,MARIONETTE,Marionette,Marionette,41,3222,0,1078,1276,1,355,422,0,25,1,62,36,44,69,45,10,12,0,6,68,149,300,1480,480,1056,0,0,0,0,0,0,0,0,1060,4850,2294,5,2605,1,699,100,1520,15,2407,1,514,200,5141,1,0,0,4113,1
1144,MARSE,Marse,Marse,31,5034,0,586,370,1,211,252,0,5,1,31,25,5,52,30,10,12,0,5,41,145,300,1956,756,528,0,0,0,0,0,0,0,0,1024,5000,962,3000,717,200,720,10,995,12,1007,5,514,200,0,0,0,0,4095,1
1145,MARTIN,Martin,Martin,18,1109,0,134,86,1,52,63,0,5,1,18,30,15,15,5,10,12,0,2,42,129,300,1480,480,480,0,0,0,0,0,0,0,0,1017,6100,1018,500,1251,10,2225,5,5009,1,10010,10,2224,15,0,0,0,0,4046,1
1146,MATYR,Matyr,Matyr,31,2585,0,967,407,1,134,160,0,0,1,47,38,5,64,5,10,12,1,2,27,149,150,432,432,360,0,0,0,0,0,0,0,0,2618,10,528,5000,919,5500,537,400,757,100,514,200,0,0,0,0,0,0,4097,1