* Added Rafflesia into Dead Branch monsters list, removen all MVPs from there

DBs never supposed to call MVPs!!! Only Sages Hocus Pocus could make a MVP from Alchemyst's Floras. (eA Hocus implementation doesn't support it yet)

fixed Cannibalize skill
according to http://guide.ragnarok.co.kr/jobalcskill.asp

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

5 files changed, 62 insertions, 41 deletions

diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index a1ae1576a..f9eb4276c 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+03/22
+	* Fixed Alchemist's CANNIBALIZE, now it summons correct # of plants. With their real HP [Lupus]
 03/21
         * Moved /tool and /webserver to under /src and added 'make tools' and 'make
           web-server' [celest]
diff --git a/db/Changelog.txt b/db/Changelog.txt
index cd3b27a7f..8268eb262 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -5,6 +5,11 @@
 	Ayathoya items == Added but no effect ( all are "etc" itens)
 	Skill databases == celest working on them i believe.
 
+03/22
+	* skill CANNIBALIZE: fixed its upkeep time [Lupus]
+        * Added Rafflesia into Dead Branch monsters list, removen all MVPs from there [Lupus]
+	  DBs never supposed to call MVPs!!! Only Sages Hocus Pocus could make
+	  a MVP from Alchemyst's Floras. (eA Hocus implementation doesn't support it yet)
 03/21
         * Corrected exp table entries for Super Novice, thanks to Dino9021 [celest]
 
diff --git a/db/mob_branch.txt b/db/mob_branch.txt
index ba5c8721a..b0b60ece2 100644
--- a/db/mob_branch.txt
+++ b/db/mob_branch.txt
@@ -5,6 +5,8 @@
 // クライアント側で未実装のものを書くとクライアントが重力エラー
 // そしてその敵がキャラクターの付近にいる間ログインできないので注意。
 
+// Never add an MVP Monster in the DB (Only SAGE's Hocus Pocus on Alchemyst's Flora can make MVP)
+
 0,SCORPION,Scorpion,1001
 1001,Scorpion,1000000
 1002,Poring,1000000
@@ -37,14 +39,14 @@
 1035,Hunter Fly,1000000
 1036,Ghoul,1000000
 1037,Sidewinder,1000000
-1038,Osiris,1000000
-1039,Baphomet,1000000
+//1038,Osiris,1000000
+//1039,Baphomet,1000000
 1040,Golem,1000000
 1041,Mummy,1000000
 1042,Steel ChonChon,1000000
 1044,Obeaune,1000000
 1045,Marc,1000000
-1046,Doppelganger,1000000
+//1046,Doppelganger,1000000
 1047,PecoPeco Egg,1000000
 1048,Thief Bug Egg,1000000
 1049,Picky,1000000
@@ -57,7 +59,7 @@
 1056,Smokie,1000000
 1057,Yoyo,1000000
 1058,Metaller,1000000
-1059,Mistress,1000000
+//1059,Mistress,1000000
 1060,Bigfoot,1000000
 1061,Nightmare,1000000
 1062,Santa Poring,1000000
@@ -79,8 +81,8 @@
 1083,Shining Plant,1000000
 1084,Black Mushroom,1000000
 1085,Red Mushroom,1000000
-1086,Golden Thief Bug,1000000
-1087,Orc Hero,1000000
+//1086,Golden Thief Bug,1000000
+//1087,Orc Hero,1000000
 1088,Vocal,1000000
 1089,Toad,1000000
 1090,Mastering,1000000
@@ -104,30 +106,30 @@
 1109,Deviruchi,1000000
 1110,Dokebi,1000000
 1111,Drainliar,1000000
-1112,Drake,1000000
+//1112,Drake,1000000
 1113,Drops,1000000
 1114,Dustiness,1000000
-1115,Eddga,1000000
+//1115,Eddga,1000000
 1116,Eggyra,1000000
 1117,Evil Druid,1000000
 1118,Flora,1000000
 1119,Frilldora,1000000
 1120,Ghostring,1000000
 1121,Giearth,1000000
-1122,Goblin 1,1000000
-1123,Goblin 2,1000000
-1124,Goblin 3,1000000
-1125,Goblin 4,1000000
-1126,Goblin 5,1000000
+1122,Goblin,1000000
+1123,Goblin,1000000
+1124,Goblin,1000000
+1125,Goblin,1000000
+1126,Goblin,1000000
 1127,Hode,1000000
 1128,Horn,1000000
 1129,Horong,1000000
 1130,Jakk,1000000
 1131,Joker,1000000
 1132,Khalitzburg,1000000
-1133,Kobold 1,1000000
-1134,Kobold 2,1000000
-1135,Kobold 3,1000000
+1133,Kobold,1000000
+1134,Kobold,1000000
+1135,Kobold,1000000
 1138,Magnolia,1000000
 1139,Mantis,1000000
 1140,Marduk,1000000
@@ -137,21 +139,22 @@
 1144,Marse,1000000
 1145,Martin,1000000
 1146,Matyr,1000000
-1147,Maya,1000000
+//1147,Maya,1000000
 1148,Medusa,1000000
 1149,Minorous,1000000
-1150,Moonlight Flower,1000000
+//1150,Moonlight Flower,1000000
 1151,Myst,1000000
 1152,Orc Skeleton,1000000
 1153,Orc Zombie,1000000
 1154,Pasana,1000000
 1155,Earth Petite,1000000
 1156,Sky Petite,1000000
-1157,Pharaoh,1000000
+//1157,Pharaoh,1000000
 1158,Phen,1000000
-1159,Phreeoni,1000000
+//1159,Phreeoni,1000000
 1160,Piere,1000000
 1161,Plankton,1000000
+1162,Rafflesia,1000000
 1163,Raydric,1000000
 1164,Requiem,1000000
 1165,Sandman,1000000
@@ -173,7 +176,7 @@
 1186,Giant Whisper,1000000
 1188,Bon Gun,1000000
 1189,Orc Archer,1000000
-1190,Orc Lord,1000000
+//1190,Orc Lord,1000000
 1191,Mimic,1000000
 1192,Wraith,1000000
 1193,Alarm,1000000
@@ -206,8 +209,8 @@
 1248,Cruiser,1000000
 1249,Myst Case,1000000
 1250,Chepet,1000000
-1251,Stormy Knight,1000000
-1252,Garm,1000000
+//1251,Stormy Knight,1000000
+//1252,Garm,1000000
 1253,Gargoyle,1000000
 1254,Raggler,1000000
 1255,Neraid,1000000
@@ -227,7 +230,7 @@
 1269,Clock,1000000
 1270,Tower Keeper,1000000
 1271,Alligator,1000000
-1272,Dark Lord,1000000
+//1272,Dark Lord,1000000
 1273,Orc Lady,1000000
 1274,Megalith,1000000
 1275,Alice,1000000
@@ -261,7 +264,7 @@
 1309,Gajomart,1000000
 1310,Majoruros,1000000
 1311,Gullinbursti,1000000
-1312,Turtle General,1000000
+//1312,Turtle General,1000000
 1313,Mobster,1000000
 1314,Perimeter,1000000
 1315,Assaulter,1000000
@@ -282,7 +285,7 @@
 1370,Succubus,1000000
 1371,Fake Angel,1000000
 1372,Goat,1000000
-1373,Lord of Death,1000000
+//1373,Lord of Death,1000000
 1374,Incubus,1000000
 1375,The Paper,1000000
 1376,Harpy,1000000
@@ -298,7 +301,7 @@
 1386,Sleeper,1000000
 1387,Gig,1000000
 1388,Archangeling,1000000
-1389,Dracula,1000000
+//1389,Dracula,1000000
 1390,Violy,1000000
 1391,Galapago,1000000
 1392,Rotar Zairo,1000000
@@ -317,8 +320,8 @@
 1415,Baby Leopard,1000000
 1416,Evil Nymph,1000000
 1417,Zipper Bear,1000000
-1418,Evil Snake Lord,1000000
-1492,Incantation Samurai,1000000
+//1418,Evil Snake Lord,1000000
+//1492,Incantation Samurai,1000000
 1493,Dryad,1000000
 1494,Kind of Beetle,1000000
 1495,Stone Shooter,1000000
@@ -335,14 +338,14 @@
 1508,Quve,1000000
 1509,Lude,1000000
 1510,Hylozoist,1000000
-1511,Amon Ra,1000000
+//1511,Amon Ra,1000000
 1512,Hyegun,1000000
 1513,Civil Servant,1000000
 1514,Dancing Dragon,1000000
 1515,Hatii Baby,1000000
 1516,Increase Soil,1000000
 1517,Li Me Mang Ryang,1000000
-1518,Bacsojin,1000000
+//1518,Bacsojin,1000000
 1519,Chung E,1000000
 1520,Boiled Rice,1000000
 1582,Deviling,1000000
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index aacc0b9eb..247c77a25 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -143,7 +143,7 @@
 229,1000,0,40000:45000:50000:55000:60000,0	//AM_DEMONSTRATION#デモンストレーション#
 230,1000,0,3:7:10:12:13,60000	//AM_ACIDTERROR#アシッドテラー#
 
-232,2000,500,40000:50000:60000:70000:80000,0	//AM_CANNIBALIZE#バイオプラント#
+232,2000,500,300000:240000:180000:120000:60000,0	//AM_CANNIBALIZE#バイオプラント#
 233,2000,500,40000:50000:60000:70000:80000,0	//AM_SPHEREMINE#スフィアーマイン#
 234,2000,0,120000:240000:360000:480000:600000,0	//AM_CP_WEAPON#ケミカルウェポンチャージ#
 235,2000,0,120000:240000:360000:480000:600000,0	//AM_CP_SHIELD#ケミカルシールドチャージ#
diff --git a/src/map/skill.c b/src/map/skill.c
index 5310618b3..b233f9c78 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -4921,21 +4921,32 @@ int skill_castend_pos2( struct block_list *src, int x,int y,int skillid,int skil
 		break;
 	case AM_CANNIBALIZE:	// バイオプラント
 		if(sd){
-			int mx,my,id=0;
+			int mx,my,amount=6-skilllv,id=0;
 			int summons[5] = { 1020, 1068, 1118, 1500, 1368 };
 
 			struct mob_data *md;
 
-			mx = x;// + (rand()%10 - 5);
-			my = y;// + (rand()%10 - 5);
+			for (i=0; i<amount; i++) { //Amount: 1 lev = 1 mob, 2=2, 3, 4, 5 [Lupus]
+				mx = x;
+				my = y;
+				while  (i && mx == x ) {
+					mx += (rand()%(1+amount) - (1+amount)/2);
+				}
+				while  (i && my == y) {
+					my += (rand()%(1+amount) - (1+amount)/2);
+				}
+				id=mob_once_spawn(sd,"this",mx,my,"--ja--", summons[skilllv-1] ,1,"");
 
-			id=mob_once_spawn(sd,"this",mx,my,"--ja--", summons[skilllv-1] ,1,"");
-			if( (md=(struct mob_data *)map_id2bl(id)) !=NULL ){
-				md->master_id=sd->bl.id;
-				md->hp=2210+skilllv*200;
-				md->state.special_mob_ai=1;
-				md->deletetimer=add_timer(gettick()+skill_get_time(skillid,skilllv),mob_timer_delete,id,0);
+				if( (md=(struct mob_data *)map_id2bl(id)) !=NULL ){
+					md->master_id=sd->bl.id;
+					//md->hp=2210+skilllv*200; commented out, we use REAL hp of the mobs [Lupus]
+					md->state.special_mob_ai=1;
+					md->deletetimer=add_timer(gettick()+skill_get_time(skillid,skilllv),mob_timer_delete,id,0);
+				}
 			}
+			//block skill
+			//i can't check if the summoned mobs are dead.. to be able summon next... so i just disable skill [Lupus]
+			pc_blockskill_start (sd, AM_CANNIBALIZE, skill_get_time(skillid,skilllv));
 			clif_skill_poseffect(src,skillid,skilllv,x,y,tick);
 		}
 		break;