* Fixed some mob skills that where missing an [Enter]... (Windows format... AGAIN!) [Poki#3]

  ...why co we have uncommented Attack skills under an iddle state? Oo
* Added a lot of G_Mobs and changed some slave spawns to them. Please use the newest exe release. [Poki#3]

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6219 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 69 insertions, 35 deletions

diff --git a/db/mob_branch.txt b/db/mob_branch.txt
index b1056df4d..e33e56a73 100644
--- a/db/mob_branch.txt
+++ b/db/mob_branch.txt
@@ -12,23 +12,23 @@
 1008,Pupa,1000000

 1009,Condor,1000000

 1010,Willow,1000000

-1011,ChonChon,1000000

+1011,Chonchon,1000000

 1012,Roda Frog,1000000

 1013,Wolf,1000000

 1014,Spore,1000000

 1015,Zombie,1000000

-1016,Skeleton Archer,1000000

+1016,Archer Skeleton,1000000

 1017,Thief Bug Female,1000000

 1018,Creamy,1000000

-1019,PecoPeco,1000000

+1019,Peco Peco,1000000

 1020,Mandragora,1000000

 1021,Thief Bug Male,1000000

 1023,Orc Warrior,1000000

-1024,Worm Tail,1000000

-1025,Boa,1000000

+1024,Wormtail,1000000

+1025,Snake,1000000

 1026,Munak,1000000

 1027,Raptice,1000000

-1028,Skeleton Soldier,1000000

+1028,Soldier Skeleton,1000000

 1029,Isis,1000000

 1030,Anacondaq,1000000

 1031,Poporing,1000000

@@ -37,17 +37,18 @@
 1034,Thara Frog,1000000

 1035,Hunter Fly,1000000

 1036,Ghoul,1000000

-1037,Sidewinder,1000000

+1037,Side Winder,1000000

 1040,Golem,1000000

 1041,Mummy,1000000

-1042,Steel ChonChon,1000000

+1042,Steel Chonchon,1000000

+1043,Seahorse,1000000

 1044,Obeaune,1000000

 1045,Marc,1000000

-1047,PecoPeco Egg,1000000

+1047,Peco Peco Egg,1000000

 1048,Thief Bug Egg,1000000

 1049,Picky,1000000

-1050,Shell Picky,1000000

-1051,Thief Bug Larva,1000000

+1050,Picky,1000000

+1051,Thief Bug,1000000

 1052,Rocker,1000000

 1055,Muka,1000000

 1056,Smokie,1000000

@@ -65,19 +66,21 @@
 1069,Swordfish,1000000

 1070,Kukre,1000000

 1071,Pirate Skeleton,1000000

+1072,Kaho,1000000

 1076,Skeleton,1000000

 1077,Poison Spore,1000000

 1078,Red Plant,1000000

 1079,Blue Plant,1000000

 1080,Green Plant,1000000

 1081,Yellow Plant,1000000

+1082,White Plant,1000000

 1083,Shining Plant,1000000

 1084,Black Mushroom,1000000

 1085,Red Mushroom,1000000

 1088,Vocal,1000000

 1089,Toad,1000000

 1090,Mastering,1000000

-1091,Dragonfly,1000000

+1091,Dragon Fly,1000000

 1092,Vagabond Wolf,1000000

 1093,Eclipse,1000000

 1094,Ambernite,1000000

@@ -92,7 +95,7 @@
 1104,Coco,1000000

 1105,Deniro,1000000

 1106,Desert Wolf,1000000

-1107,Desert Wolf Puppy,1000000

+1107,Baby Desert Wolf,1000000

 1108,Deviace,1000000

 1109,Deviruchi,1000000

 1110,Dokebi,1000000

@@ -134,8 +137,8 @@
 1152,Orc Skeleton,1000000

 1153,Orc Zombie,1000000

 1154,Pasana,1000000

-1155,Earth Petite,1000000

-1156,Sky Petite,1000000

+1155,Petite,1000000

+1156,Petite,1000000

 1158,Phen,1000000

 1160,Piere,1000000

 1161,Plankton,1000000

@@ -153,13 +156,10 @@
 1177,Zenorc,1000000

 1178,Zerom,1000000

 1179,Whisper,1000000

-1180,Nine-Tail,1000000

-1182,Thief Mushroom,1000000

-1183,Angry ChonChon,1000000

-1184,Angry Fabre,1000000

+1180,Nine Tail,1000000

 1185,Whisper,1000000

 1186,Giant Whisper,1000000

-1188,Bon Gun,1000000

+1188,Bongun,1000000

 1189,Orc Archer,1000000

 1191,Mimic,1000000

 1192,Wraith,1000000

@@ -172,6 +172,7 @@
 1200,Zherlthsh,1000000

 1201,Rybio,1000000

 1202,Phendark,1000000

+1203,Mysteltainn,1000000

 1204,Tyrfing,1000000

 1205,Executioner,1000000

 1206,Anolian,1000000

@@ -184,9 +185,10 @@
 1214,Choco,1000000

 1215,Stem Worm,1000000

 1216,Penomena,1000000

-1219,Knight of Abyss,1000000

+1219,Abysmal Knight,1000000

 1242,Marin,1000000

 1243,Sasquatch,1000000

+1244,Christmas Jakk,1000000

 1245,Christmas Goblin,1000000

 1246,Christmas Cookie,1000000

 1247,Antonio,1000000

@@ -210,7 +212,7 @@
 1267,Carat,1000000

 1268,Blood Knight,1000000

 1269,Clock,1000000

-1270,Tower Keeper,1000000

+1270,Clock Tower Manager,1000000

 1271,Alligator,1000000

 1273,Orc Lady,1000000

 1274,Megalith,1000000

@@ -218,8 +220,9 @@
 1276,Raydric Archer,1000000

 1277,Greatest General,1000000

 1278,Stalactite Golem,1000000

-1280,Steam Goblin,1000000

-1281,Sageworm,1000000

+1279,Tri Joint,1000000

+1280,Goblin Steamrider,1000000

+1281,Sage Worm,1000000

 1282,Kobold Archer,1000000

 1283,Chimera,1000000

 1289,Maya Purple,1000000

@@ -240,13 +243,13 @@
 1304,Giant Spider,1000000

 1305,Ancient Worm,1000000

 1306,Leib Olmai,1000000

-1307,Cat'o'Nine Tails,1000000

+1307,Cat o' Nine Tails,1000000

 1308,Panzer Goblin,1000000

 1309,Gajomart,1000000

 1310,Majoruros,1000000

 1311,Gullinbursti,1000000

 1313,Mobster,1000000

-1314,Perimeter,1000000

+1314,Permeter,1000000

 1315,Assaulter,1000000

 1316,Solider,1000000

 1317,Seal,1000000

@@ -269,24 +272,24 @@
 1375,The Paper,1000000

 1376,Harpy,1000000

 1377,Elder,1000000

-1378,Demon Pungus,1000000

+1378,Demon Fungus,1000000

 1379,Nightmare Terror,1000000

 1380,Driller,1000000

 1381,Grizzly,1000000

 1382,Diabolic,1000000

 1383,Explosion,1000000

-1384,Sky Deleter,1000000

-1385,Earth Deleter,1000000

+1384,Deleter,1000000

+1385,Deleter,1000000

 1386,Sleeper,1000000

 1387,Gig,1000000

-1388,Archangeling,1000000

+1388,Arc Angeling,1000000

 1390,Violy,1000000

 1391,Galapago,1000000

 1392,Rotar Zairo,1000000

 1400,Karakasa,1000000

 1401,Shinobi,1000000

 1402,Poison Toad,1000000

-1403,Antique Firelock,1000000

+1403,Firelock Soldier,1000000

 1404,Miyabi Doll,1000000

 1405,Tengu,1000000

 1406,Kapha,1000000

@@ -316,7 +319,7 @@
 1512,Hyegun,1000000

 1513,Civil Servant,1000000

 1514,Dancing Dragon,1000000

-1515,Hatii Baby,1000000

+1515,Garm Baby,1000000

 1516,Increase Soil,1000000

 1517,Li Me Mang Ryang,1000000

 1519,Chung E,1000000

@@ -326,6 +329,7 @@
 1585,Mime Monkey,1000000

 1586,Leaf Cat,1000000

 1587,Kraben,1000000

+1588,Christmas Orc,1000000

 1613,Metaling,1000000

 1614,Mineral,1000000

 1615,Obsidian,1000000

@@ -337,11 +341,35 @@
 1621,Venomous,1000000

 1622,Teddy Bear,1000000

 1627,Anopheles,1000000

-1628,Mole,1000000

+1628,Holden,1000000

 1629,Hill Wind,1000000

+1631,Chung E,1000000

+1632,Gremlin,1000000

+1633,Beholder,1000000

+//1634,Seyren Windsor,1000000

+//1635,Eremes Guile,1000000

+//1636,Howard Alt-Eisen,1000000

+//1637,Margaretha Solin,1000000

+//1638,Cecil Damon,1000000

+//1639,Kathryne Keyron,1000000

+//1652,Egnigem Cenia,1000000

+//1653,Wikebine Tres,1000000

+//1654,Armeyer Dinze,1000000

+//1655,Errende Ebecee,1000000

+//1656,Kavach Icarus,1000000

+//1657,Laurell Weinder,1000000

+1668,Archdam,1000000

+1670,Dimik,1000000

+1671,Dimik,1000000

+1672,Dimik,1000000

+1673,Dimik,1000000

+1675,Venatu,1000000

+1676,Venatu,1000000

+1677,Venatu,1000000

+1678,Venatu,1000000

 1680,Hill Wind,1000000

-1681,Gemini S58,1000000

-1682,Removal,1000000

+1681,Gemini-S58,1000000

+1682,Remover,1000000

 1686,Orc Baby,1000000

 1687,Green Iguana,1000000

 1692,Breeze,1000000

@@ -356,6 +384,10 @@
 1701,Shelter,1000000

 1702,Retribution,1000000

 1703,Solace,1000000

+//1704,Thanatos Odium,1000000

+//1705,Thanatos Despero,1000000

+//1706,Thanatos Maero,1000000

+//1707,Thanatos Dolor,1000000

 1713,Acidus,1000000

 1714,Ferus,1000000

 1715,Novus,1000000

@@ -370,3 +402,5 @@
 1738,Constant,1000000

 1752,Skogul,1000000

 1753,Frus,1000000

+1754,Skeggiold,1000000

+1755,Skeggiold,1000000