summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-10 23:51:45 +0000
committerdaegaladh <daegaladh@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-07-10 23:51:45 +0000
commit6618bd95645797c453e10bac3eca8523efdda2ae (patch)
tree3ff16771f7e55850ad6622b194faffeafe3fa10f
parent2acbd492f36bce01a724a586b6847fb50f4a8a6b (diff)
downloadhercules-6618bd95645797c453e10bac3eca8523efdda2ae.tar.gz
hercules-6618bd95645797c453e10bac3eca8523efdda2ae.tar.bz2
hercules-6618bd95645797c453e10bac3eca8523efdda2ae.tar.xz
hercules-6618bd95645797c453e10bac3eca8523efdda2ae.zip
Follow up r15680 & r15679. Fixed a couple of missed Garm Baby/Baby Hatii names.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16390 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/pre-re/mob_db.txt4
-rw-r--r--db/re/mob_db.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/db/pre-re/mob_db.txt b/db/pre-re/mob_db.txt
index 4ceb4823d..db0bcf384 100644
--- a/db/pre-re/mob_db.txt
+++ b/db/pre-re/mob_db.txt
@@ -858,7 +858,7 @@
1821,EVENT_DESERT_WOLF,Desert Wolf,Desert Wolf,27,1716,0,0,0,1,169,208,0,10,56,27,45,15,56,10,10,12,1,2,23,0x308D,200,1120,420,288,0,0,0,0,0,0,0,7850,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1822,EVENT_DEVIRUCHI,Deviruchi,Deviruchi,46,6666,0,0,0,1,475,560,10,25,1,69,40,55,70,30,10,12,0,6,27,0x3795,150,980,600,384,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1823,EVENT_FREEZER,Freezer,Freezer,72,8636,0,0,0,2,671,983,55,43,69,41,59,5,67,100,10,12,1,2,41,0x3695,250,1452,483,528,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1824,EVENT_GARM_BABY,Garm Baby,Garm Baby,61,20199,0,0,0,1,680,1179,34,13,45,30,56,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,7850,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1824,EVENT_GARM_BABY,Garm Baby,Baby Hatii,61,20199,0,0,0,1,680,1179,34,13,45,30,56,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,7850,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1825,EVENT_GOBLINE_XMAS,Christmas Goblin,Christmas Goblin,25,1176,0,0,0,1,118,140,10,5,1,53,25,20,38,45,10,12,1,7,24,0x3695,100,1120,620,240,0,0,0,0,0,0,0,7850,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1826,EVENT_MYST,Myst,Myst,38,3745,0,0,0,1,365,445,0,40,1,38,18,0,53,10,10,12,2,0,25,0x3695,200,1576,576,384,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1827,EVENT_SASQUATCH,Sasquatch,Sasquatch,30,3163,0,0,0,1,250,280,5,0,75,25,60,10,34,20,10,12,2,2,60,0x3695,300,1260,192,192,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -928,7 +928,7 @@
// Additional Monsters
1887,FREEZER_R,Freezer,Freezer,72,8636,0,0,0,2,671,983,55,43,69,41,59,5,67,100,10,12,1,2,41,0x3695,250,1452,483,528,0,0,0,0,0,0,0,7053,2000,7066,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1888,GARM_BABY_R,Hatii Baby,Hatii Baby,61,15199,0,100,100,1,680,1580,24,13,45,30,36,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,0,7066,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1888,GARM_BABY_R,Garm Baby,Baby Hatii,61,15199,0,100,100,1,680,1580,24,13,45,30,36,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,0,7066,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1889,GARM_R,Marozka's Guard,Marozka's Guard,73,100000,0,1000,1000,3,900,2200,20,23,85,126,10,50,95,60,10,12,2,2,81,0x37B5,400,608,408,336,0,0,0,0,0,0,0,7053,2000,7066,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1890,GOPINICH_R,The Immortal Koshei,The Immortal Koshei,85,299321,0,1000,1000,3,1868,6124,20,42,50,65,55,50,152,35,10,12,2,2,62,0x3295,150,1536,864,432,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
1891,G_RANDGRIS_,Valkyrie,Valkyrie,99,1567200,0,0,0,3,5560,9980,25,42,100,120,80,120,220,210,10,12,2,8,86,0x37B5,100,576,576,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
diff --git a/db/re/mob_db.txt b/db/re/mob_db.txt
index 9dbef8b86..ccd17a50d 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -887,7 +887,7 @@
1821,EVENT_DESERT_WOLF,Desert Wolf,Desert Wolf,103,9447,1,0,0,1,520,579,114,47,93,69,63,61,82,42,10,12,1,2,23,0x308D,200,1120,420,288,0,0,0,0,0,0,0,7850,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1822,EVENT_DEVIRUCHI,Deviruchi,Deviruchi,64,2300,1,0,0,1,210,283,62,30,61,17,30,35,52,5,10,12,0,6,27,0x3795,150,980,600,384,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1823,EVENT_FREEZER,Freezer,Freezer,94,9990,1,0,0,2,188,238,68,38,68,47,50,45,49,25,10,12,1,2,41,0x3695,250,1452,483,528,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1824,EVENT_GARM_BABY,Garm Baby,Garm Baby,94,10016,1,0,0,1,183,244,62,43,69,61,55,61,53,45,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,7850,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1824,EVENT_GARM_BABY,Garm Baby,Baby Hatii,94,10016,1,0,0,1,183,244,62,43,69,61,55,61,53,45,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,7850,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1825,EVENT_GOBLINE_XMAS,Christmas Goblin,Christmas Goblin,25,1176,0,0,0,1,118,140,16,5,1,53,25,20,38,45,10,12,1,7,24,0x3695,100,1120,620,240,0,0,0,0,0,0,0,7850,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1826,EVENT_MYST,Myst,Myst,39,879,1,0,0,1,68,89,50,11,26,19,40,35,31,25,10,12,2,0,25,0x3695,200,1576,576,384,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1827,EVENT_SASQUATCH,Sasquatch,Sasquatch,30,3163,0,0,0,1,250,280,8,0,75,25,60,10,34,20,10,12,2,2,60,0x3695,300,1260,192,192,0,0,0,0,0,0,0,7850,3000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -961,7 +961,7 @@
// Additional Monsters
1887,FREEZER_R,Freezer,Freezer,94,9990,1,0,0,2,388,438,68,38,68,47,50,45,49,25,10,12,1,2,41,0x3695,250,1452,483,528,0,0,0,0,0,0,0,7053,2000,7066,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1888,GARM_BABY_R,Hatii Baby,Hatii Baby,61,15199,0,90,90,1,680,1580,24,13,45,30,36,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,0,7066,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1888,GARM_BABY_R,Garm Baby,Baby Hatii,61,15199,0,90,90,1,680,1580,24,13,45,30,36,55,85,30,10,12,1,2,41,0x3885,450,879,672,576,0,0,0,0,0,0,0,0,0,7066,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1889,GARM_R,Marozka's Guard,Marozka's Guard,73,100000,0,900,900,3,900,2200,20,23,85,126,10,50,95,60,10,12,2,2,81,0x37B5,400,608,408,336,0,0,0,0,0,0,0,7053,2000,7066,2000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1890,GOPINICH_R,The Immortal Koshei,The Immortal Koshei,85,299321,0,900,900,3,1868,6124,20,42,50,65,55,50,152,35,10,12,2,2,62,0x3295,150,1536,864,432,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
1891,G_RANDGRIS_,Valkyrie,Valkyrie,99,1567200,1,0,0,3,5560,9980,40,42,100,120,80,120,220,210,10,12,2,8,86,0x37B5,100,576,576,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