* Homunculi now reset their can-act delay on call/resurrect/mapchange (allows bypassing delays by doing rest/call instead of relog) [ultramage]

* Changed Lif's Emergency Avoid to just get a normal skill delay (blocks all skills, cancelled by mapchange / re-summon) instead of getting a persistent block on only this one skill (bugreport:13)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11766 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -3,6 +3,12 @@ Date	Added
 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.
 
+2007/11/21
+	* Changed Lif's Emergency Avoid to just get a normal skill delay
+	  (blocks all skills, cancelled by mapchange / re-summon) instead of
+	  getting a persistent block on only this one skill (bugreport:13)
+	* Homunculi now reset their can-act delay on call/resurrect/mapchange
+	  (allows bypassing delays by doing rest/call instead of relog) [ultramage]
 2007/11/20
 	* Implemented SL_SUPERNOVICE erasing the death record 1% of the casts.
 	* Implemented current exp being capped to the exp required to level up from

db/skill_cast_db.txt

@@ -1007,7 +1007,7 @@
 //-- HLIF_HEAL
 8001,0,1000,0,0,1000
 //-- HLIF_AVOID
-8002,0,0,0,40000:35000:30000:25000:20000,40000:45000:50000:55000:60000
+8002,0,40000:35000:30000:25000:20000,0,0,40000:45000:50000:55000:60000
 //-- HLIF_CHANGE
 8004,0,600000:900000:1200000,0,60000:180000:300000,0
 //-- HAMI_CASTLE

src/map/mercenary.c

@@ -643,6 +643,7 @@ void merc_hom_init_timers(struct homun_data * hd)
 {
 	if (hd->hungry_timer == -1)
 		hd->hungry_timer = add_timer(gettick()+hd->homunculusDB->hungryDelay,merc_hom_hungry,hd->master->bl.id,0);
+	hd->ud.canact_tick = 0; //Reset can-act delay
 	hd->regen.state.block = 0; //Restore HP/SP block.
 }
 

src/map/skill.c

@@ -3329,8 +3329,6 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 			sc_start2(bl,type,100,skilllv,skillid,skill_get_time(skillid,skilllv)));
 		break;
 	case HLIF_AVOID:
-		if (hd)
-			skill_blockmerc_start(hd, skillid, skill_get_time2(skillid,skilllv));
 	case HAMI_DEFENCE:
 		i = skill_get_time(skillid,skilllv);
 		clif_skill_nodamage(bl,bl,skillid,skilllv,sc_start(bl,type,100,skilllv,i)); // Master