- Fire Pillar will now do 200%MATK damage per hit when level is >10.

- Blood Drain always hits now.
- Fixed Mob Area Skills not updating their use-time (rendering their skill delay useless)
- Search free cell will now skip picking the center-tile as target location. Will prevent slaves from walking on top of their master, or mobs placing stuff right under themselves with the "around" target conditions.


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

1 files changed, 10 insertions, 1 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index 02194d081..6b36c631d 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -825,7 +825,7 @@ int skillnotok(int skillid, struct map_session_data *sd)
 		if(!battle_config.pk_mode && skill_get_nocast (skillid) & 2)

 			return 1;

 		if(battle_config.pk_mode && skill_get_nocast (skillid) & 16)

-		return 1;

+			return 1;

 	}

 	if(map_flag_gvg(sd->bl.m) && skill_get_nocast (skillid) & 4)

 		return 1;

@@ -5793,6 +5793,15 @@ int skill_castend_pos( int tid, unsigned int tick, int id,int data )
 		if(sd && !skill_check_condition(sd,ud->skillid, ud->skilllv, 1))	/* 使用条件チェック */

 			break;

 

+		if(md) {

+			md->last_thinktime=tick + (tid==-1?status_get_adelay(src):status_get_amotion(src));

+			if(md->skillidx >= 0) {

+				md->skilldelay[md->skillidx]=tick;

+				if (md->db->skill[md->skillidx].emotion >= 0)

+					clif_emotion(src, md->db->skill[md->skillidx].emotion);

+			}

+		}

+

 		if(battle_config.skill_log && battle_config.skill_log&src->type)

 			ShowInfo("Type %d, ID %d skill castend pos [id =%d, lv=%d, (%d,%d)]\n",

 				src->type, src->id, ud->skillid, ud->skilllv, ud->skillx, ud->skilly);