Browse Source

* Alchemist skill "AM_CANNIBALIZE" ("Summon_Flora") now summons the proper monsters.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10870 54d463be-8e91-2dee-dedb-b68131a5f0ec
L0ne_W0lf 18 years ago
parent
commit
a1aaed67da
2 changed files with 8 additions and 3 deletions
  1. 3 0
      Changelog-Trunk.txt
  2. 5 3
      src/map/skill.c

+ 3 - 0
Changelog-Trunk.txt

@@ -3,6 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 
+2007/07/09
+	* Rev. 10870 Alchemist skill "AM_CANNIBALIZE" ("Summon_Flora") now [L0ne_W0lf]
+	  summons the proper monsters.
 2007/07/07
 2007/07/07
 	* Fixed typo in 'deletearray' messing up the script engine
 	* Fixed typo in 'deletearray' messing up the script engine
 	* Added a check to pc_skill() to prevent crashes on unknown skill ids
 	* Added a check to pc_skill() to prevent crashes on unknown skill ids

+ 5 - 3
src/map/skill.c

@@ -6146,7 +6146,8 @@ int skill_castend_pos2 (struct block_list *src, int x, int y, int skillid, int s
 	case AM_SPHEREMINE:
 	case AM_SPHEREMINE:
 	case AM_CANNIBALIZE:
 	case AM_CANNIBALIZE:
 		{
 		{
-			int summons[5] = { 1020, 1068, 1118, 1500, 1368 };
+			int summons[5] = { 1589, 1579, 1575, 1555, 1590 };
+			//int summons[5] = { 1020, 1068, 1118, 1500, 1368 };
 			int class_ = skillid==AM_SPHEREMINE?1142:summons[skilllv-1];
 			int class_ = skillid==AM_SPHEREMINE?1142:summons[skilllv-1];
 			struct mob_data *md;
 			struct mob_data *md;
 
 
@@ -6875,7 +6876,7 @@ struct skill_unit_group *skill_unitsetting (struct block_list *src, int skillid,
 					alive=0;
 					alive=0;
 				else
 				else
 					clif_changemapcell(src->m,ux,uy,5,0);
 					clif_changemapcell(src->m,ux,uy,5,0);
-			}
+			//}
 		}
 		}
 
 
 		if(alive){
 		if(alive){
@@ -8255,7 +8256,8 @@ int skill_check_condition (struct map_session_data *sd, int skill, int lv, int t
 	case AM_SPHEREMINE:
 	case AM_SPHEREMINE:
 		if(type&1){
 		if(type&1){
 			int c=0;
 			int c=0;
-			int summons[5] = { 1020, 1068, 1118, 1500, 1368 };
+			int summons[5] = { 1589, 1579, 1575, 1555, 1590 };
+			//int summons[5] = { 1020, 1068, 1118, 1500, 1368 };
 			int maxcount = (skill==AM_CANNIBALIZE)? 6-lv : skill_get_maxcount(skill);
 			int maxcount = (skill==AM_CANNIBALIZE)? 6-lv : skill_get_maxcount(skill);
 			int mob_class = (skill==AM_CANNIBALIZE)? summons[lv-1] :1142;
 			int mob_class = (skill==AM_CANNIBALIZE)? summons[lv-1] :1142;
 			if(battle_config.land_skill_limit && maxcount>0 && (battle_config.land_skill_limit&BL_PC)) {
 			if(battle_config.land_skill_limit && maxcount>0 && (battle_config.land_skill_limit&BL_PC)) {